Merge pull request pi-module#4 from linzongshu/master

Reconstructed current files
liuchuangww · Jul 22, 2013 · f680066 · f680066
2 parents 0c9d886 + f37e742
commit f680066
Show file tree

Hide file tree

Showing 25 changed files with 272 additions and 189 deletions.
diff --git a/asset/image/default-author.png b/asset/image/default-author.png
diff --git a/config/block.php b/config/block.php
diff --git a/config/navigation.php b/config/navigation.php
@@ -19,27 +19,27 @@
 return array(
     'meta'  => array(
         'cms'    => array(
-            'title'     => __('Article site navigation'),
+            'title'     => _t('Article site navigation'),
             'section'   => 'front',
         ),
     ),
     'item'  => array(
         // Default front navigation
         'front'   => array(
             'article-homepage'  => array(
-                'label'         => __('Article Homepage'),
+                'label'         => _t('Article Homepage'),
                 'route'         => 'default',
                 'controller'    => 'index',
                 'action'        => 'index',
             ),
             'topic-homepage'    => array(
-                'label'         => __('Topic Homepage'),
+                'label'         => _t('Topic Homepage'),
                 'route'         => 'default',
                 'controller'    => 'topic',
                 'action'        => 'index',
             ),
             'my'                => array(
-                'label'         => __('My Article'),
+                'label'         => _t('My Article'),
                 'route'         => 'default',
                 'controller'    => 'my',
                 'action'        => 'index',
@@ -49,7 +49,7 @@
         // Default admin navigation
         'admin'   => array(
             'article'           => array(
-                'label'         => __('All Articles'),
+                'label'         => _t('All Articles'),
                 'route'         => 'admin',
                 'controller'    => 'article',
                 'resource'      => array(
@@ -58,7 +58,7 @@
             ),
 
             'topic'             => array(
-                'label'         => __('Topic'),
+                'label'         => _t('Topic'),
                 'route'         => 'admin',
                 'controller'    => 'topic',
                 'resource'      => array(
@@ -67,7 +67,7 @@
             ),
 
             'media'             => array(
-                'label'         => __('Media'),
+                'label'         => _t('Media'),
                 'route'         => 'admin',
                 'controller'    => 'media',
                 'resource'      => array(
@@ -76,7 +76,7 @@
             ),
 
             'author'            => array(
-                'label'         => __('Author'),
+                'label'         => _t('Author'),
                 'route'         => 'admin',
                 'controller'    => 'author',
                 'resource'      => array(
@@ -85,7 +85,7 @@
             ),
 
             'category'          => array(
-                'label'         => __('Category'),
+                'label'         => _t('Category'),
                 'route'         => 'admin',
                 'controller'    => 'category',
                 'resource'      => array(
@@ -94,7 +94,7 @@
             ),
 
             'permission'        => array(
-                'label'         => __('Permission'),
+                'label'         => _t('Permission'),
                 'route'         => 'admin',
                 'controller'    => 'permission',
                 'resource'      => array(
@@ -103,7 +103,7 @@
             ),
 
             'analysis'          => array(
-                'label'         => __('Statistics'),
+                'label'         => _t('Statistics'),
                 'route'         => 'admin',
                 'controller'    => 'statistics',
                 'resource'      => array(
@@ -115,17 +115,17 @@
         // Custom front navigation, need setup at backend
         'cms'     => array(
             'article-homepage'  => array(
-                'label'         => __('Article Homepage'),
+                'label'         => _t('Article Homepage'),
                 'route'         => 'default',
                 'controller'    => 'index',
             ),
             'topic-homepage'    => array(
-                'label'         => __('Topic Homepage'),
+                'label'         => _t('Topic Homepage'),
                 'route'         => 'default',
                 'controller'    => 'topic',
             ),
             'my'                => array(
-                'label'         => __('My Article'),
+                'label'         => _t('My Article'),
                 'route'         => 'default',
                 'controller'    => 'my',
             ),

diff --git a/src/Controller/Front/AuthorController.php b/src/Controller/Front/AuthorController.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Zongshu Lin <[email protected]>
  * @since           1.0

diff --git a/src/Controller/Front/CategoryController.php b/src/Controller/Front/CategoryController.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Zongshu Lin <[email protected]>
  * @since           1.0

diff --git a/src/Controller/Front/IndexController.php b/src/Controller/Front/IndexController.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Zongshu Lin <[email protected]>
  * @since           1.0

diff --git a/src/Form/AuthorEditFilter.php b/src/Form/AuthorEditFilter.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>

diff --git a/src/Form/AuthorEditForm.php b/src/Form/AuthorEditForm.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>

diff --git a/src/Form/CategoryEditFilter.php b/src/Form/CategoryEditFilter.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,14 @@
 use Pi;
 use Zend\InputFilter\InputFilter;
 
+/**
+ * Class for verfying and filter form 
+ */
 class CategoryEditFilter extends InputFilter
 {
+    /**
+     * Initializing validator and filter 
+     */
     public function __construct()
     {
         $this->add(array(

diff --git a/src/Form/CategoryEditForm.php b/src/Form/CategoryEditForm.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,14 @@
 use Pi;
 use Pi\Form\Form as BaseForm;
 
+/**
+ * Initializing category form 
+ */
 class CategoryEditForm extends BaseForm
 {
+    /**
+     * Initializing form 
+     */
     public function init()
     {
         $this->add(array(

diff --git a/src/Form/CategoryMergeFilter.php b/src/Form/CategoryMergeFilter.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,14 @@
 use Pi;
 use Zend\InputFilter\InputFilter;
 
+/**
+ * Class for verifying and filtering form 
+ */
 class CategoryMergeFilter extends InputFilter
 {
+    /**
+     * Initializing validator and filter 
+     */
     public function __construct()
     {
         $this->add(array(

diff --git a/src/Form/CategoryMergeForm.php b/src/Form/CategoryMergeForm.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,14 @@
 use Pi;
 use Pi\Form\Form as BaseForm;
 
+/**
+ * Class for initializing form 
+ */
 class CategoryMergeForm extends BaseForm
 {
+    /**
+     * Initializing form 
+     */
     public function init()
     {
         $this->add(array(

diff --git a/src/Form/CategoryMoveFilter.php b/src/Form/CategoryMoveFilter.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,14 @@
 use Pi;
 use Zend\InputFilter\InputFilter;
 
+/**
+ * Class for verfying and filtering form 
+ */
 class CategoryMoveFilter extends InputFilter
 {
+    /**
+     * Initializing validator and filter 
+     */
     public function __construct()
     {
         $this->add(array(

diff --git a/src/Form/CategoryMoveForm.php b/src/Form/CategoryMoveForm.php
@@ -22,8 +22,14 @@
 use Pi;
 use Pi\Form\Form as BaseForm;
 
+/**
+ * Class for initializing form 
+ */
 class CategoryMoveForm extends BaseForm
 {
+    /**
+     * Initializing form element
+     */
     public function init()
     {
         $this->add(array(

diff --git a/src/Form/Element/Category.php b/src/Form/Element/Category.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,16 @@
 use Pi;
 use Zend\Form\Element\Select;
 
+/**
+ * Class for creating select of all category
+ */
 class Category extends Select
 {
+    /**
+     * Reading added category from database
+     * 
+     * @return array 
+     */
     public function getValueOptions()
     {
         if (empty($this->valueOptions)) {

diff --git a/src/Form/Element/CategoryWithRoot.php b/src/Form/Element/CategoryWithRoot.php
@@ -9,7 +9,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @copyright       Copyright (c) http://www.eefocus.com
+ * @copyright       Copyright (c) Pi Engine http://www.xoopsengine.org
  * @license         http://www.xoopsengine.org/license New BSD License
  * @author          Lijun Dong <[email protected]>
  * @author          Zongshu Lin <[email protected]>
@@ -22,8 +22,16 @@
 use Pi;
 use Zend\Form\Element\Select;
 
+/**
+ * Class for creating category select with root 
+ */
 class CategoryWithRoot extends Select
 {
+    /**
+     * Reading category from database
+     * 
+     * @return array 
+     */
     public function getValueOptions()
     {
         if (empty($this->valueOptions)) {

diff --git a/src/Model/Author.php b/src/Model/Author.php
@@ -21,13 +21,26 @@
 use Pi;
 use Pi\Application\Model\Model;
 
+/**
+ * Model class for operating author table 
+ */
 class Author extends Model
 {
+    /**
+     * Getting available fields
+     * 
+     * @return array 
+     */
     public static function getAvailableFields()
     {
         return array('id', 'name', 'photo', 'description');
     }
 
+    /**
+     * Getting author name
+     * 
+     * @return array 
+     */
     public function getSelectOptions()
     {
         $result = array('0' => '');