Rozbo / puck

core/functions/function.php

Braces +2 added lines, -3 removed lines

@@ -39,8 +39,7 @@ 
 {
     if(isset($arr['status']) && $type==2){
         $ret=$arr;
-    }
-    else{
+    } else{
         $ret['status'] = $type;
         $ret['data'] = $arr;
     }
@@ -157,7 +156,7 @@ 
                 // 重新生成id
                 session_regenerate_id();
             }
-        }else {
+        } else {
             if (strpos($name, '.')) {
                 list($name1, $name2) = explode('.', $name);
                 return isset($_SESSION[$name1][$name2]) ? $_SESSION[$name1][$name2] : null;

Doc Comments +6 added lines, -1 removed lines

@@ -94,7 +94,7 @@ 
 }
 /**
  * session管理函数
- * @param string|array $name session名称 如果为数组则表示进行session设置
+ * @param string $name session名称 如果为数组则表示进行session设置
  * @param mixed $value session值
  * @return mixed
  */
@@ -407,6 +407,11 @@ 
         $value .= ' ';
     }
 }
+/**
+ * @param string $name
+ *
+ * @return string|null
+ */
 function config($name=null,$value=null,$default=null){
     $config=\puck\Conf::load();
     if ($name===null){

core/Controller.php

Doc Comments +4 added lines

@@ -28,6 +28,10 @@
         $function = new \Twig_SimpleFunction('I','I');
         $this->twig->addFunction($function);
     }
+
+    /**
+     * @param string $name
+     */
     protected function assign($name, $value = '')
     {
         if (is_array($name)) {

core/helpers/Dispatch.php

Doc Comments +4 added lines

@@ -62,6 +62,10 @@
         self::param();
         self::exec($class,ACTION_NAME);
     }
+
+    /**
+     * @param string $function
+     */
     static public function exec($class,$function){
         $method = new \ReflectionMethod($class, $function);
         if ($method->isPublic() && !$method->isStatic()) {

Braces +2 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
         self::init();
         if($path==''){
             $path=array();
-        }else{
+        } else{
             $path=str_replace('-','_',$path);
             $path   = explode('/',$path);
         }
@@ -28,8 +28,7 @@ 
         if(count($path)==0){
             array_push($path,'home');
             array_push($path,'index');
-        }
-        elseif (count($path)==1){
+        } elseif (count($path)==1){
             array_push($path,'index');
         }
         if(!empty($path)){

core/helpers/Page.php

Doc Comments +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
      *
      *  pass values when class is istantiated
      *
-     * @param numeric  $_perPage  sets the number of iteems per page
-     * @param numeric  $_instance sets the instance for the GET parameter
+     * @param numeric  $perPage  sets the number of iteems per page
+     * @param numeric  $instance sets the instance for the GET parameter
      */
     public function __construct($perPage,$instance){
         $this->_instance = $instance;

Braces +33 added lines, -30 removed lines

@@ -133,71 +133,74 @@
                 $ext=$this->getParam();
             }
             $pagination .= "<ul class='pager'>";
-            if ($this->_page > 1)
-                $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
-            else
-                $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+            if ($this->_page > 1) {
+                            $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
+            } else {
+                            $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+            }
 
             if ($lastpage < 7 + ($adjacents * 2))
             {
                 for ($counter = 1; $counter <= $lastpage; $counter++)
                 {
-                    if ($counter == $this->_page)
-                        $pagination.= "<li class='current'><span>$counter</span></li>";
-                    else
-                        $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                    if ($counter == $this->_page) {
+                                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                    } else {
+                                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                    }
                 }
-            }
-            elseif($lastpage > 5 + ($adjacents * 2))
+            } elseif($lastpage > 5 + ($adjacents * 2))
             {
                 if($this->_page < 1 + ($adjacents * 2))
                 {
                     for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                     $pagination.= "...";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
-                }
-                elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
+                } elseif($lastpage - ($adjacents * 2) > $this->_page && $this->_page > ($adjacents * 2))
                 {
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
                     $pagination.= "...";
                     for ($counter = $this->_page - $adjacents; $counter <= $this->_page + $adjacents; $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                     $pagination.= "..";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lpm1"."$ext'>$lpm1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=$lastpage"."$ext'>$lastpage</a></li>";
-                }
-                else
+                } else
                 {
                     $pagination.= "<li><a href='".$path."$this->_instance=1"."$ext'>1</a></li>";
                     $pagination.= "<li><a href='".$path."$this->_instance=2"."$ext'>2</a></li>";
                     $pagination.= "..";
                     for ($counter = $lastpage - (2 + ($adjacents * 2)); $counter <= $lastpage; $counter++)
                     {
-                        if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
-                        else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        if ($counter == $this->_page) {
+                                                    $pagination.= "<li class='current'><span>$counter</span></li>";
+                        } else {
+                                                    $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        }
                     }
                 }
             }
 
-            if ($this->_page < $counter - 1)
-                $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
-            else
-                $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
+            if ($this->_page < $counter - 1) {
+                            $pagination.= "<li class='next'><a href='".$path."$this->_instance=$next"."$ext'>>></a></li>";
+            } else {
+                            $pagination.= "<li class='next disabled'><span class='disabled'>>></span></li>";
+            }
             $pagination.= "</ul>\n";
         }
 

core/Validate.php

Doc Comments +5 added lines, -5 removed lines

@@ -1098,7 +1098,7 @@ 
      * @access protected
      * @param string    $value  字段值
      * @param mixed     $rule  验证规则
-     * @return mixed
+     * @return boolean
      */
     protected function allowIp($value, $rule)
     {
@@ -1110,7 +1110,7 @@ 
      * @access protected
      * @param string    $value  字段值
      * @param mixed     $rule  验证规则
-     * @return mixed
+     * @return boolean
      */
     protected function denyIp($value, $rule)
     {
@@ -1121,8 +1121,8 @@ 
      * 使用正则验证数据
      * @access protected
      * @param mixed     $value  字段值
-     * @param mixed     $rule  验证规则 正则规则或者预定义正则名
-     * @return mixed
+     * @param string     $rule  验证规则 正则规则或者预定义正则名
+     * @return boolean
      */
     protected function regex($value, $rule)
     {
@@ -1140,7 +1140,7 @@ 
      * 验证表单令牌
      * @access protected
      * @param mixed     $value  字段值
-     * @param mixed     $rule  验证规则
+     * @param string     $rule  验证规则
      * @param array     $data  数据
      * @return bool
      */

core/Model.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
     public function update($data){
         return $this->db->update($this->table,$data);
     }
+
+    /**
+     * @param string $field
+     */
     public function field($field){
         $this->field=$field;
         return $this;