Rozbo / puck

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)) {

Spacing +18 added lines, -18 removed lines

@@ -4,44 +4,44 @@ 
 class controller
 {
 
-    protected $viewPath = '';
+    protected $viewPath='';
     private $twig;
-    private $tVar = array();
+    private $tVar=array();
     protected $title='';
     public function __construct()
     {
-        $loader = new \Twig_Loader_Filesystem(BASE_PATH . $this->viewPath);
-        $twig = new \Twig_Environment($loader, array(
+        $loader=new \Twig_Loader_Filesystem(BASE_PATH.$this->viewPath);
+        $twig=new \Twig_Environment($loader, array(
             'debug' => DEBUG,
-            'cache' => BASE_PATH . '/cache',
+            'cache' => BASE_PATH.'/cache',
         ));
-        $this->twig = $twig;
+        $this->twig=$twig;
         $this->initTwigFilter();
         $this->initTwigFunction();
-        $this->db = \MysqliDb::getInstance();
+        $this->db=\MysqliDb::getInstance();
     }
-    private function initTwigFilter(){
-        $filter = new \Twig_SimpleFilter('long2ip', 'long2ip');
+    private function initTwigFilter() {
+        $filter=new \Twig_SimpleFilter('long2ip', 'long2ip');
         $this->twig->addFilter($filter);
     }
-    private function initTwigFunction(){
-        $function = new \Twig_SimpleFunction('I','I');
+    private function initTwigFunction() {
+        $function=new \Twig_SimpleFunction('I', 'I');
         $this->twig->addFunction($function);
     }
-    protected function assign($name, $value = '')
+    protected function assign($name, $value='')
     {
         if (is_array($name)) {
-            $this->tVar = array_merge($this->tVar, $name);
+            $this->tVar=array_merge($this->tVar, $name);
         } else {
-            $this->tVar[$name] = $value;
+            $this->tVar[$name]=$value;
         }
     }
 
-    protected function show($tmpPath = '')
+    protected function show($tmpPath='')
     {
         if ($tmpPath == '') {
             if (defined("CONTROLLER_NAME") && defined("ACTION_NAME")) {
-                $tmpPath = CONTROLLER_NAME . '/' . ACTION_NAME;
+                $tmpPath=CONTROLLER_NAME.'/'.ACTION_NAME;
             } else {
                 show_json($this->tVar);
             }
@@ -49,8 +49,8 @@ 
         header('Content-Type:text/html; charset=utf-8');
         header('Cache-control: private'); // 页面缓存控制
         header('X-Powered-By:ViviAnAuthSystem');
-        $this->assign('title',$this->title);
-        echo $this->twig->render($tmpPath . '.' . TempExt, $this->tVar);
+        $this->assign('title', $this->title);
+        echo $this->twig->render($tmpPath.'.'.TempExt, $this->tVar);
         die();
     }
 }
\ No newline at end of file

core/functions/function.php

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){

Indentation -5 removed lines

@@ -70,15 +70,10 @@
 
 
 /**
-
  * 数据签名认证
-
  * @param  array  $data 被认证的数据
-
  * @return string       签名
-
  * @author 麦当苗儿 <zuojiazi@vip.qq.com>
-
  */
 function data_auth_sign($data) {
     //数据类型检测

Spacing +92 added lines, -92 removed lines

@@ -6,46 +6,46 @@ 
  * @param boolean $adv 是否进行高级模式获取（有可能被伪装）
  * @return mixed
  */
-function get_client_ip($type = 0, $adv = true)
+function get_client_ip($type=0, $adv=true)
 {
-    $type = $type ? 1 : 0;
-    static $ip = null;
+    $type=$type ? 1 : 0;
+    static $ip=null;
     if (null !== $ip) {
         return $ip[$type];
     }
     if ($adv) {
         if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-            $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
-            $pos = array_search('unknown', $arr);
+            $arr=explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+            $pos=array_search('unknown', $arr);
             if (false !== $pos) {
                 unset($arr[$pos]);
             }
-            $ip = trim($arr[0]);
+            $ip=trim($arr[0]);
         } elseif (isset($_SERVER['HTTP_CLIENT_IP'])) {
-            $ip = $_SERVER['HTTP_CLIENT_IP'];
+            $ip=$_SERVER['HTTP_CLIENT_IP'];
         } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-            $ip = $_SERVER['REMOTE_ADDR'];
+            $ip=$_SERVER['REMOTE_ADDR'];
         }
     } elseif (isset($_SERVER['REMOTE_ADDR'])) {
-        $ip = $_SERVER['REMOTE_ADDR'];
+        $ip=$_SERVER['REMOTE_ADDR'];
     }
     // IP地址合法验证
-    $long = sprintf("%u", ip2long($ip));
-    $ip = $long ? array($ip, $long) : array('0.0.0.0', 0);
+    $long=sprintf("%u", ip2long($ip));
+    $ip=$long ? array($ip, $long) : array('0.0.0.0', 0);
     return $ip[$type];
 }
 //2为直接输出数组
-function show_json($arr,$type=2)
+function show_json($arr, $type=2)
 {
-    if(isset($arr['status']) && $type==2){
+    if (isset($arr['status']) && $type == 2) {
         $ret=$arr;
     }
-    else{
-        $ret['status'] = $type;
-        $ret['data'] = $arr;
+    else {
+        $ret['status']=$type;
+        $ret['data']=$arr;
     }
 
-    $obj = json_encode($ret);
+    $obj=json_encode($ret);
     header('Content-Type: application/json');
     echo $obj;
     exit();
@@ -53,16 +53,16 @@ 
 
 function success($arr)
 {
-    show_json($arr,1);
+    show_json($arr, 1);
 }
 
 function error($arr)
 {
 /*    $db=\MysqliDb::getInstance();
     $db->_transaction_status_check();*/
-    show_json($arr,0);
+    show_json($arr, 0);
 }
-function not_found($str='page not found,that is all we know!'){
+function not_found($str='page not found,that is all we know!') {
     header('HTTP/1.1 404 Not Found');
     header("status: 404 Not Found");
     exit($str);
@@ -83,13 +83,13 @@ 
 function data_auth_sign($data) {
     //数据类型检测
 
-    if(!is_array($data)){
+    if (!is_array($data)) {
 
-        $data = (array)$data;
+        $data=(array) $data;
     }
     ksort($data); //排序
-    $code = http_build_query($data); //url编码并生成query字符串
-    $sign = sha1($code); //生成签名
+    $code=http_build_query($data); //url编码并生成query字符串
+    $sign=sha1($code); //生成签名
     return $sign;
 }
 /**
@@ -98,7 +98,7 @@ 
  * @param mixed $value session值
  * @return mixed
  */
-function session($name = '', $value = '') {
+function session($name='', $value='') {
     if (is_array($name)) {
 
         if (isset($name['id'])) {
@@ -150,16 +150,16 @@ 
                 session_start();
             } elseif ('[destroy]' == $name) {
                 // 销毁session
-                $_SESSION = array();
+                $_SESSION=array();
                 session_unset();
                 session_destroy();
             } elseif ('[regenerate]' == $name) {
                 // 重新生成id
                 session_regenerate_id();
             }
-        }else {
+        } else {
             if (strpos($name, '.')) {
-                list($name1, $name2) = explode('.', $name);
+                list($name1, $name2)=explode('.', $name);
                 return isset($_SESSION[$name1][$name2]) ? $_SESSION[$name1][$name2] : null;
             } else {
                 return isset($_SESSION[$name]) ? $_SESSION[$name] : null;
@@ -168,7 +168,7 @@ 
     } elseif (is_null($value)) {
         // 删除session
         if (strpos($name, '.')) {
-            list($name1, $name2) = explode('.', $name);
+            list($name1, $name2)=explode('.', $name);
             unset($_SESSION[$name1][$name2]);
         } else {
             unset($_SESSION[$name]);
@@ -176,30 +176,30 @@ 
     } else {
         // 设置session
         if (strpos($name, '.')) {
-            list($name1, $name2) = explode('.', $name);
-            $_SESSION[$name1][$name2] = $value;
+            list($name1, $name2)=explode('.', $name);
+            $_SESSION[$name1][$name2]=$value;
         } else {
-            $_SESSION[$name] = $value;
+            $_SESSION[$name]=$value;
         }
     }
     return null;
 }
 
 
-function admin_is_login(){
-    $user = session('admin_user_auth');
+function admin_is_login() {
+    $user=session('admin_user_auth');
     if (empty($user)) {
         return 0;
     } else {
         $auth_sign=session('admin_user_auth_sign');
-        if(data_auth_sign($user)!=$auth_sign){
+        if (data_auth_sign($user) != $auth_sign) {
             return 0;
         }
         return $user['uid'];
     }
 }
-function json($str){
-    $obj = json_encode($str,JSON_UNESCAPED_UNICODE);
+function json($str) {
+    $obj=json_encode($str, JSON_UNESCAPED_UNICODE);
     header('Content-Type: application/json');
     echo $obj;
 }
@@ -211,17 +211,17 @@ 
  * @param integer       $flags htmlspecialchars flags
  * @return void|string
  */
-function dump($var, $echo = true, $label = null, $flags = ENT_SUBSTITUTE)
+function dump($var, $echo=true, $label=null, $flags=ENT_SUBSTITUTE)
 {
-    $label = (null === $label) ? '' : rtrim($label) . ':';
+    $label=(null === $label) ? '' : rtrim($label).':';
     ob_start();
     var_dump($var);
-    $output = ob_get_clean();
-    $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
+    $output=ob_get_clean();
+    $output=preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
     if (!extension_loaded('xdebug')) {
-        $output = htmlspecialchars($output, $flags);
+        $output=htmlspecialchars($output, $flags);
     }
-    $output = '<pre>' . $label . $output . '</pre>';
+    $output='<pre>'.$label.$output.'</pre>';
     if ($echo) {
         echo($output);
         return;
@@ -245,95 +245,95 @@ 
  * @param mixed $datas 要获取的额外数据源
  * @return mixed
  */
-function I($name, $default = '', $filter = null, $datas = null)
+function I($name, $default='', $filter=null, $datas=null)
 {
-    static $_PUT = null;
+    static $_PUT=null;
     if (strpos($name, '/')) {
         // 指定修饰符
-        list($name, $type) = explode('/', $name, 2);
-    } else{
+        list($name, $type)=explode('/', $name, 2);
+    } else {
         // 默认强制转换为字符串
-        $type = 's';
+        $type='s';
     }
     if (strpos($name, '.')) {
         // 指定参数来源
-        list($method, $name) = explode('.', $name, 2);
+        list($method, $name)=explode('.', $name, 2);
     } else {
         // 默认为自动判断
-        $method = 'param';
+        $method='param';
     }
     switch (strtolower($method)) {
         case 'get':
-            $input = &$_GET;
+            $input=&$_GET;
             break;
         case 'post':
-            $input = &$_POST;
+            $input=&$_POST;
             break;
         case 'put':
             if (is_null($_PUT)) {
                 parse_str(file_get_contents('php://input'), $_PUT);
             }
-            $input = $_PUT;
+            $input=$_PUT;
             break;
         case 'param':
             switch ($_SERVER['REQUEST_METHOD']) {
                 case 'POST':
-                    $input = $_POST;
+                    $input=$_POST;
                     break;
                 case 'PUT':
                     if (is_null($_PUT)) {
                         parse_str(file_get_contents('php://input'), $_PUT);
                     }
-                    $input = $_PUT;
+                    $input=$_PUT;
                     break;
                 default:
-                    $input = $_GET;
+                    $input=$_GET;
             }
             break;
         case 'path':
-            $input = array();
+            $input=array();
             if (!empty($_SERVER['PATH_INFO'])) {
-                $depr  = C('URL_PATHINFO_DEPR');
-                $input = explode($depr, trim($_SERVER['PATH_INFO'], $depr));
+                $depr=C('URL_PATHINFO_DEPR');
+                $input=explode($depr, trim($_SERVER['PATH_INFO'], $depr));
             }
             break;
         case 'request':
-            $input = &$_REQUEST;
+            $input=&$_REQUEST;
             break;
         case 'session':
-            $input = &$_SESSION;
+            $input=&$_SESSION;
             break;
         case 'cookie':
-            $input = &$_COOKIE;
+            $input=&$_COOKIE;
             break;
         case 'server':
-            $input = &$_SERVER;
+            $input=&$_SERVER;
             break;
         case 'globals':
-            $input = &$GLOBALS;
+            $input=&$GLOBALS;
             break;
         case 'data':
-            $input = &$datas;
+            $input=&$datas;
             break;
         default:
             return null;
     }
     if ('' == $name) {
         // 获取全部变量
-        $data    = $input;
-        $filters = isset($filter) ? $filter : 'htmlspecialchars';
+        $data=$input;
+        $filters=isset($filter) ? $filter : 'htmlspecialchars';
         if ($filters) {
             if (is_string($filters)) {
-                $filters = explode(',', $filters);
+                $filters=explode(',', $filters);
             }
             foreach ($filters as $filter) {
-                $data = array_map_recursive($filter, $data); // 参数过滤
+                $data=array_map_recursive($filter, $data); // 参数过滤
             }
         }
     } elseif (isset($input[$name])) {
         // 取值操作
-        $data    = $input[$name];
-        $filters = isset($filter) ? $filter : 'htmlspecialchars';
+        $data=$input[$name];
+        $filters=isset($filter) ? $filter : 'htmlspecialchars';
         if ($filters) {
             if (is_string($filters)) {
                 if (0 === strpos($filters, '/')) {
@@ -342,19 +342,19 @@ 
                         return isset($default) ? $default : null;
                     }
                 } else {
-                    $filters = explode(',', $filters);
+                    $filters=explode(',', $filters);
                 }
             } elseif (is_int($filters)) {
-                $filters = array($filters);
+                $filters=array($filters);
             }
 
             if (is_array($filters)) {
                 foreach ($filters as $filter) {
-                    $filter = trim($filter);
+                    $filter=trim($filter);
                     if (function_exists($filter)) {
-                        $data = is_array($data) ? array_map_recursive($filter, $data) : $filter($data); // 参数过滤
+                        $data=is_array($data) ? array_map_recursive($filter, $data) : $filter($data); // 参数过滤
                     } else {
-                        $data = filter_var($data, is_int($filter) ? $filter : filter_id($filter));
+                        $data=filter_var($data, is_int($filter) ? $filter : filter_id($filter));
                         if (false === $data) {
                             return isset($default) ? $default : null;
                         }
@@ -365,34 +365,34 @@ 
         if (!empty($type)) {
             switch (strtolower($type)) {
                 case 'a':    // 数组
-                    $data = (array) $data;
+                    $data=(array) $data;
                     break;
                 case 'd':    // 数字
-                    $data = (int) $data;
+                    $data=(int) $data;
                     break;
                 case 'f':    // 浮点
-                    $data = (float) $data;
+                    $data=(float) $data;
                     break;
                 case 'b':    // 布尔
-                    $data = (boolean) $data;
+                    $data=(boolean) $data;
                     break;
                 case 's':// 字符串
                 default:
-                    $data = (string) $data;
+                    $data=(string) $data;
             }
         }
     } else {
         // 变量默认值
-        $data = isset($default) ? $default : null;
+        $data=isset($default) ? $default : null;
     }
     is_array($data) && array_walk_recursive($data, 'think_filter');
     return $data;
 }
 function array_map_recursive($filter, $data)
 {
-    $result = array();
+    $result=array();
     foreach ($data as $key => $val) {
-        $result[$key] = is_array($val)
+        $result[$key]=is_array($val)
             ? array_map_recursive($filter, $val)
             : call_user_func($filter, $val);
     }
@@ -404,18 +404,18 @@ 
 
     // 过滤查询特殊字符
     if (preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
-        $value .= ' ';
+        $value.=' ';
     }
 }
-function config($name=null,$value=null,$default=null){
+function config($name=null, $value=null, $default=null) {
     $config=\puck\conf::load();
-    if ($name===null){
+    if ($name === null) {
         return $config->all();
     }
-    if ($value===null){
-        return $config->get($name,$default);
+    if ($value === null) {
+        return $config->get($name, $default);
     }
-    $config->set($name,$value);
+    $config->set($name, $value);
 }
 /**
  * 字符串命名风格转换
@@ -424,9 +424,9 @@ 
  * @param integer $type 转换类型
  * @return string
  */
-function parse_name($name, $type = 0) {
+function parse_name($name, $type=0) {
     if ($type) {
-        return ucfirst(preg_replace_callback('/_([a-zA-Z])/', function ($match) {return strtoupper($match[1]);}, $name));
+        return ucfirst(preg_replace_callback('/_([a-zA-Z])/', function($match) {return strtoupper($match[1]); }, $name));
     } else {
         return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_"));
     }

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;

core/helpers/DispatchHelper.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()) {

Spacing +32 added lines, -32 removed lines

@@ -6,48 +6,48 @@ 
 
 class DispatchHelper
 {
-    static public function init(){
+    static public function init() {
         define('NOW_TIME', $_SERVER['REQUEST_TIME']);
         define('REQUEST_METHOD', $_SERVER['REQUEST_METHOD']);
         define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
         define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
         define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false);
         define('IS_DELETE', REQUEST_METHOD == 'DELETE' ? true : false);
-        define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ) ? true : false);
+        define('IS_AJAX', ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? true : false);
         define('__SELF__', strip_tags($_SERVER['REQUEST_URI']));
     }
-    static public function dispatch($path='',$app='\\admin') {
+    static public function dispatch($path='', $app='\\admin') {
         self::init();
-        if($path==''){
+        if ($path == '') {
             $path=array();
-        }else{
-            $path=str_replace('-','_',$path);
-            $path   = explode('/',$path);
+        } else {
+            $path=str_replace('-', '_', $path);
+            $path=explode('/', $path);
         }
 
-        if(count($path)==0){
-            array_push($path,'home');
-            array_push($path,'index');
+        if (count($path) == 0) {
+            array_push($path, 'home');
+            array_push($path, 'index');
         }
-        elseif (count($path)==1){
-            array_push($path,'index');
+        elseif (count($path) == 1) {
+            array_push($path, 'index');
         }
-        if(!empty($path)){
+        if (!empty($path)) {
             $tmpAction=array_pop($path);
             $tmpAction=preg_replace('/\.(html|aspx|do|php|htm|h5|api)$/i', '', $tmpAction);
-            $tmpAction=parse_name($tmpAction,1);
+            $tmpAction=parse_name($tmpAction, 1);
             $var['a']=$tmpAction;
         }
-        define('ACTION_NAME',$var['a']);
+        define('ACTION_NAME', $var['a']);
         if (!preg_match('/^[A-Za-z](\w)*$/', ACTION_NAME)) {
             die("error action");
         }
-        if(!empty($path)){
+        if (!empty($path)) {
             $tmpController=array_pop($path);
-            $tmpController=parse_name($tmpController,1);
+            $tmpController=parse_name($tmpController, 1);
             $var['c']=$tmpController;
         }
-        define('CONTROLLER_NAME',$var['c']);
+        define('CONTROLLER_NAME', $var['c']);
         if (!preg_match('/^[A-Za-z](\/|\w)*$/', CONTROLLER_NAME)) {
             die("error controller");
         }
@@ -55,20 +55,20 @@ 
         if (!class_exists($class)) {
             not_found('this controller is can not work now!');
         }
-        $class= new $class();
-        if (!method_exists($class,ACTION_NAME)) {
+        $class=new $class();
+        if (!method_exists($class, ACTION_NAME)) {
             not_found();
         }
         self::param();
-        self::exec($class,ACTION_NAME);
+        self::exec($class, ACTION_NAME);
     }
-    static public function exec($class,$function){
-        $method = new \ReflectionMethod($class, $function);
+    static public function exec($class, $function) {
+        $method=new \ReflectionMethod($class, $function);
         if ($method->isPublic() && !$method->isStatic()) {
-            $refClass = new \ReflectionClass($class);
+            $refClass=new \ReflectionClass($class);
             //前置方法
-            if ($refClass->hasMethod('_before_' . $function)) {
-                $before = $refClass->getMethod('_before_' . $function);
+            if ($refClass->hasMethod('_before_'.$function)) {
+                $before=$refClass->getMethod('_before_'.$function);
                 if ($before->isPublic()) {
                     $before->invoke($class);
                 }
@@ -76,8 +76,8 @@ 
             //方法本身
             $response=$method->invoke($class);
             //后置方法
-            if ($refClass->hasMethod('_after_' . $function)) {
-                $after = $refClass->getMethod('_after_' . $function);
+            if ($refClass->hasMethod('_after_'.$function)) {
+                $after=$refClass->getMethod('_after_'.$function);
                 if ($after->isPublic()) {
                     $after->invoke($class);
                 }
@@ -85,14 +85,14 @@ 
             self::render($response);
         }
     }
-    static public function param(){
+    static public function param() {
         $vars=array();
-        parse_str(parse_url($_SERVER['REQUEST_URI'],PHP_URL_QUERY),$vars);
+        parse_str(parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY), $vars);
         $_GET=$vars;
     }
-    static public function render($res){
+    static public function render($res) {
         $response=$res;
-        if(is_array($res)){
+        if (is_array($res)) {
             $response=json($res);
         }
         echo $response;

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/PageHelper.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;

Spacing +57 added lines, -57 removed lines

@@ -3,7 +3,7 @@ 
 
 namespace puck\helpers;
 
-class PageHelper{
+class PageHelper {
     /**
      * set the number of items per page.
      *
@@ -37,7 +37,7 @@ 
      *
      * @var numeric
      */
-    private $_totalRows = 0;
+    private $_totalRows=0;
 
 
 
@@ -49,9 +49,9 @@ 
      * @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;
-        $this->_perPage = $perPage;
+    public function __construct($perPage, $instance) {
+        $this->_instance=$instance;
+        $this->_perPage=$perPage;
         $this->set_instance();
     }
 
@@ -61,7 +61,7 @@ 
      * creates the starting point for limiting the dataset
      * @return numeric
      */
-    public function get_start(){
+    public function get_start() {
         return ($this->_page * $this->_perPage) - $this->_perPage;
     }
 
@@ -72,9 +72,9 @@ 
      *
      * @var numeric
      */
-    private function set_instance(){
-        $this->_page = (int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
-        $this->_page = ($this->_page == 0 ? 1 : $this->_page);
+    private function set_instance() {
+        $this->_page=(int) (!isset($_GET[$this->_instance]) ? 1 : $_GET[$this->_instance]);
+        $this->_page=($this->_page == 0 ? 1 : $this->_page);
     }
 
     /**
@@ -84,8 +84,8 @@ 
      *
      * @var numeric
      */
-    public function set_total($_totalRows){
-        $this->_totalRows = $_totalRows;
+    public function set_total($_totalRows) {
+        $this->_totalRows=$_totalRows;
     }
 
     /**
@@ -95,18 +95,18 @@ 
      *
      * @return string
      */
-    public function get_limit(){
+    public function get_limit() {
         return "LIMIT ".$this->get_start().",$this->_perPage";
     }
 
 
-    private function getParam(){
+    private function getParam() {
         $vars=$_GET;
-        if(isset($vars[$this->_instance])){
+        if (isset($vars[$this->_instance])) {
             unset($vars[$this->_instance]);
         }
         $str=http_build_query($vars);
-        $str ='&'.$str;
+        $str='&'.$str;
         return $str;
     }
 
@@ -119,86 +119,86 @@ 
      * @var sting $ext optionally pass in extra parameters to the GET
      * @return string returns the html menu
      */
-    public function page_links($path='?',$ext=null)
+    public function page_links($path='?', $ext=null)
     {
-        $adjacents = "2";
-        $prev = $this->_page - 1;
-        $next = $this->_page + 1;
-        $lastpage = ceil($this->_totalRows/$this->_perPage);
-        $lpm1 = $lastpage - 1;
-        $pagination = "";
-        if($lastpage > 1)
+        $adjacents="2";
+        $prev=$this->_page - 1;
+        $next=$this->_page + 1;
+        $lastpage=ceil($this->_totalRows / $this->_perPage);
+        $lpm1=$lastpage - 1;
+        $pagination="";
+        if ($lastpage > 1)
         {
-            if($ext==null){
+            if ($ext == null) {
                 $ext=$this->getParam();
             }
-            $pagination .= "<ul class='pager'>";
+            $pagination.="<ul class='pager'>";
             if ($this->_page > 1)
-                $pagination.= "<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
+                $pagination.="<li class='previous'><a href='".$path."$this->_instance=$prev"."$ext'><<</a></li>";
             else
-                $pagination.= "<li class='disabled previous'><span class='disabled'><<</span></li>";
+                $pagination.="<li class='disabled previous'><span class='disabled'><<</span></li>";
 
             if ($lastpage < 7 + ($adjacents * 2))
             {
-                for ($counter = 1; $counter <= $lastpage; $counter++)
+                for ($counter=1; $counter <= $lastpage; $counter++)
                 {
                     if ($counter == $this->_page)
-                        $pagination.= "<li class='current'><span>$counter</span></li>";
+                        $pagination.="<li class='current'><span>$counter</span></li>";
                     else
-                        $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                        $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))
+                if ($this->_page < 1 + ($adjacents * 2))
                 {
-                    for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
+                    for ($counter=1; $counter < 4 + ($adjacents * 2); $counter++)
                     {
                         if ($counter == $this->_page)
-                            $pagination.= "<li class='current'><span>$counter</span></li>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $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>";
+                    $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++)
+                    $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>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $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>";
+                    $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
                 {
-                    $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++)
+                    $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>";
+                            $pagination.="<li class='current'><span>$counter</span></li>";
                         else
-                            $pagination.= "<li><a href='".$path."$this->_instance=$counter"."$ext'>$counter</a></li>";
+                            $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>";
+                $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";
+                $pagination.="<li class='next disabled'><span class='disabled'>>></span></li>";
+            $pagination.="</ul>\n";
         }
 
 

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/model.php

Spacing +24 added lines, -24 removed lines

@@ -17,57 +17,57 @@
     protected $limitCount=null;
     public function __construct()
     {
-        if(!$this->dbConn){
+        if (!$this->dbConn) {
             $this->dbConn='main';
         }
-        $this->db = mysql::getDb($this->dbConn);
+        $this->db=mysql::getDb($this->dbConn);
     }
-    public function __call($method,$arg){
+    public function __call($method, $arg) {
         $ret=$this;
-        if(method_exists ($this->db, $method)){
-            $ret=call_user_func_array(array($this->db,$method),$arg);
+        if (method_exists($this->db, $method)) {
+            $ret=call_user_func_array(array($this->db, $method), $arg);
         }
-        return $ret==$this->db? $this: $ret;
+        return $ret == $this->db ? $this : $ret;
     }
-    public function __get($name){
-        if(property_exists($this->db, $name)){
+    public function __get($name) {
+        if (property_exists($this->db, $name)) {
             return $this->db->$name;
         }
-        throw new MemberAccessException('model Property ' . $name . ' not exists');
+        throw new MemberAccessException('model Property '.$name.' not exists');
     }
-    public function limit($limit){
+    public function limit($limit) {
         $this->limitCount=$limit;
         return $this;
     }
-    public function find(){
-        return $this->db->getOne($this->table,$this->field);
+    public function find() {
+        return $this->db->getOne($this->table, $this->field);
     }
-    public function select(){
-        return $this->db->get($this->table,$this->limitCount?$this->limitCount:null,$this->field);
+    public function select() {
+        return $this->db->get($this->table, $this->limitCount ? $this->limitCount : null, $this->field);
     }
-    public function count(){
+    public function count() {
         return $this->db->count;
     }
-    public function table($table){
+    public function table($table) {
         $this->table=$table;
         return $this;
     }
-    public function add($data){
-        return $this->db->insert($this->table,$data);
+    public function add($data) {
+        return $this->db->insert($this->table, $data);
     }
-    public function update($data){
-        return $this->db->update($this->table,$data);
+    public function update($data) {
+        return $this->db->update($this->table, $data);
     }
-    public function field($field){
+    public function field($field) {
         $this->field=$field;
         return $this;
     }
-    public function delete(){
+    public function delete() {
         return $this->db->delete($this->table);
     }
-    public function page($page,$pageLimit='10'){
+    public function page($page, $pageLimit='10') {
         $this->db->pageLimit=$pageLimit;
-        $info= $this->db->paginate($this->table,$page);
+        $info=$this->db->paginate($this->table, $page);
         return $info;
     }
 }
\ No newline at end of file

core/helpers/PinYinHelper.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 namespace puck\helpers;
 
 use Overtrue\Pinyin\Pinyin;
-class PinYinHelper extends Pinyin{
+class PinYinHelper extends Pinyin {
 
     public function noun($str) {
         $pinyinArr=$this->convert($str);
@@ -17,6 +17,6 @@ 
             //首字母转大写
             $pinyin[0]=strtoupper($pinyin[0]);
         }
-        return implode('',$pinyinArr);
+        return implode('', $pinyinArr);
     }
 }
\ No newline at end of file

core/mysql.php

Spacing +3 added lines, -3 removed lines

@@ -9,11 +9,11 @@
 namespace puck;
 
 
-class mysql extends \MysqliDb{
+class mysql extends \MysqliDb {
 
-    static public function getDb($db){
+    static public function getDb($db) {
         static $dbList;
-        if(!isset($dbList[$db])){
+        if (!isset($dbList[$db])) {
             $dbList[$db]=new \MysqliDb(config('db.'.$db));
         }
         return $dbList[$db];

start.php

Spacing +3 added lines, -3 removed lines

@@ -2,13 +2,13 @@
 @ini_set('date.timezone', 'Asia/Shanghai');
 @header('content-type:text/html;charset=utf-8');
 
-define('EXPORT_PATH',__DIR__);
+define('EXPORT_PATH', __DIR__);
 
-if(DEBUG){
+if (DEBUG) {
     error_reporting(E_ALL);
     @ini_set('display_errors', 'On');
     @ob_start();
-    $whoops = new \Whoops\Run;
+    $whoops=new \Whoops\Run;
     $whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler);
     $whoops->register();
 }
\ No newline at end of file

core/conf.php

Spacing +2 added lines, -2 removed lines

@@ -11,8 +11,8 @@
 
 class conf {
     static $config=false;
-    static public function load(){
-        if(!self::$config){
+    static public function load() {
+        if (!self::$config) {
             self::$config=Config::load(BASE_PATH.'/app/conf');
         }
         return self::$config;