Rozbo / puck

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 +84 added lines, -84 removed lines

@@ -35,18 +35,18 @@ 
     return $ip[$type];
 }
 //2为直接输出数组
-function show_json(array $arr,$type=2)
+function show_json(array $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();
@@ -54,14 +54,14 @@ 
 
 function success($arr)
 {
-    show_json($arr,1);
+    show_json($arr, 1);
 }
 
 function error($arr)
 {
-    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);
@@ -82,13 +82,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;
 }
 /**
@@ -97,7 +97,7 @@ 
  * @param mixed $value session值
  * @return mixed
  */
-function session($name = '', $value = '') {
+function session($name='', $value='') {
     if (is_array($name)) {
 
         if (isset($name['id'])) {
@@ -149,16 +149,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;
@@ -167,7 +167,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]);
@@ -175,30 +175,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;
 }
@@ -210,20 +210,20 @@ 
  * @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 (IS_CLI) {
-        $output = PHP_EOL . $label . $output . PHP_EOL;
+        $output=PHP_EOL.$label.$output.PHP_EOL;
     } else {
         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);
@@ -248,99 +248,99 @@ 
  * @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);
             }
-            else if (is_array($filters)){
+            else if (is_array($filters)) {
                 foreach ($filters as $filter) {
-                    $data = array_map_recursive($filter, $data); // 参数过滤
+                    $data=array_map_recursive($filter, $data); // 参数过滤
                 }
-            }else{
+            } else {
                 throw new \RuntimeException('$filters must be an array or string.');
             }
         }
     } 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, '/')) {
@@ -349,19 +349,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;
                         }
@@ -372,34 +372,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);
     }
@@ -411,18 +411,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);
 }
 /**
  * 字符串命名风格转换
@@ -431,9 +431,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 +4 added lines, -6 removed lines

@@ -40,8 +40,7 @@ 
 
     if(isset($arr['status']) && $type==2){
         $ret=$arr;
-    }
-    else{
+    } else{
         $ret['status'] = $type;
         $ret['data'] = $arr;
     }
@@ -156,7 +155,7 @@ 
                 // 重新生成id
                 session_regenerate_id();
             }
-        }else {
+        } else {
             if (strpos($name, '.')) {
                 list($name1, $name2) = explode('.', $name);
                 return isset($_SESSION[$name1][$name2]) ? $_SESSION[$name1][$name2] : null;
@@ -328,12 +327,11 @@ 
         if ($filters) {
             if (is_string($filters)) {
                 $filters = explode(',', $filters);
-            }
-            else if (is_array($filters)){
+            } else if (is_array($filters)){
                 foreach ($filters as $filter) {
                     $data = array_map_recursive($filter, $data); // 参数过滤
                 }
-            }else{
+            } else{
                 throw new \RuntimeException('$filters must be an array or string.');
             }
         }

core/helpers/Chaos.php

Doc Comments +4 added lines

@@ -139,6 +139,10 @@
 	}
 	
 	//随机重复一个字符
+
+	/**
+	 * @param string $str
+	 */
 	function setRepeat($str) {
 		$len = iconv_strlen( $str, 'UTF-8' );
 		$action = 0;

Indentation +156 added lines, -156 removed lines

@@ -1,195 +1,195 @@
 <?php
 namespace puck\helpers;
 class Chaos {
-	public $GbToBigArray;
-	public $_pinyin;
-	public $string;
-	public $url='';
-	public $msg='';
-	public $action;
-	private $prefix;
+    public $GbToBigArray;
+    public $_pinyin;
+    public $string;
+    public $url='';
+    public $msg='';
+    public $action;
+    private $prefix;
 	
     function __construct() {
-		$this->_pinyin=new PinYin();
-	}
+        $this->_pinyin=new PinYin();
+    }
 
     /**
      * @param array $prefix
      */
     public function addPrefix(array $prefix) {
         $this->prefix=$prefix[array_rand($prefix)];
-	}
+    }
 
     public function clearPrefix() {
         $this->prefix='';
-	}
+    }
     public function get($str) {
         $this->cutting($str);
         $this->convert();
         $this->clearPrefix();
         return $this->msg;
-	}
+    }
 
-	//分离URL
-	private function cutting($str){
+    //分离URL
+    private function cutting($str){
 
-		if(preg_match("@(http://[^\\s]+)@i", $str, $result)) {
-			$this->url = $result[1];
-			$this->msg = $str = str_replace($this->url, '%%%%', $str);
-		} else {
-			$this->msg = $str;
-		}
-	}
+        if(preg_match("@(http://[^\\s]+)@i", $str, $result)) {
+            $this->url = $result[1];
+            $this->msg = $str = str_replace($this->url, '%%%%', $str);
+        } else {
+            $this->msg = $str;
+        }
+    }
 	
 	
 	
-	private function convert( $method = 'msg' ){
-		if( $method == 'msg' || $method == 'all') {
-			$this->msg = $this->setPinyin($this->msg);
-			$this->msg = $this->setRepeat($this->msg);
-			//$this->msg = $this->GbToBig($this->msg);
-			$this->msg = $this->setBlankness($this->msg);
+    private function convert( $method = 'msg' ){
+        if( $method == 'msg' || $method == 'all') {
+            $this->msg = $this->setPinyin($this->msg);
+            $this->msg = $this->setRepeat($this->msg);
+            //$this->msg = $this->GbToBig($this->msg);
+            $this->msg = $this->setBlankness($this->msg);
 			
-		}
-		if( $method == 'url' || $method == 'all') {
-			$this->url = $this->setChacha($this->url);
-		}
-		$this->msg=$this->prefix.str_replace( '%%%%', $this->url, $this->msg);
-	}
+        }
+        if( $method == 'url' || $method == 'all') {
+            $this->url = $this->setChacha($this->url);
+        }
+        $this->msg=$this->prefix.str_replace( '%%%%', $this->url, $this->msg);
+    }
 	
-	/**
-	 * @param string $url
-	 */
-	function setChacha($url ){
-		$url = strtolower($url);
-		$arr = array(
-			'a' => array('a','A','ａ','Ａ','Α','А','α'),
-			'b' => array('b','B','ｂ','Ｂ','Β','В','Ь'),
-			'c' => array('c','C','ｃ','Ｃ','С','с'),
-			'd' => array('d','D','ｄ','Ｄ'),
-			'e' => array('e','E','ｅ','Ｅ','Ε','Е','е'),
-			'f' => array('f','F','ｆ','Ｆ'),
-			'g' => array('g','G','ｇ','Ｇ'),
-			'h' => array('h','H','ｈ','Ｈ','Η','Н','н'),
-			'i' => array('i','I','ｉ','Ｉ','Ι','Ⅰ'),
-			'j' => array('j','J','ｊ','Ｊ'),
-			'k' => array('k','K','ｋ','Ｋ','Κ','κ','к','К'),
-			'l' => array('l','L','ｌ','Ｌ','︱','︳','|'),
-			'm' => array('m','M','ｍ','Ｍ','Μ','М','м'),
-			'n' => array('n','N','ｎ','Ｎ','Ν','∩'),
-			'o' => array('o','O','ｏ','Ｏ','Ο','О'),
-			'p' => array('p','P','ｐ','Ｐ','Ρ','Р','р'),
-			'q' => array('q','Q','ｑ','Ｑ'),
-			'r' => array('r','R','ｒ','Ｒ'),
-			's' => array('s','S','ｓ','Ｓ'),
-			't' => array('t','T','ｔ','Ｔ','Τ','Т','ㄒ'),
-			'u' => array('u','U','ｕ','Ｕ','∪'),
-			'v' => array('v','V','ｖ','Ｖ','∨','ν'),
-			'w' => array('w','W','ｗ','Ｗ'),
-			'x' => array('x','X','ｘ','Ｘ','Χ','χ','Х','х','Ⅹ','×'),
-			'y' => array('y','Y','ｙ','Ｙ','У'),
-			'z' => array('z','Z','ｚ','Ｚ','Ζ'),
+    /**
+     * @param string $url
+     */
+    function setChacha($url ){
+        $url = strtolower($url);
+        $arr = array(
+            'a' => array('a','A','ａ','Ａ','Α','А','α'),
+            'b' => array('b','B','ｂ','Ｂ','Β','В','Ь'),
+            'c' => array('c','C','ｃ','Ｃ','С','с'),
+            'd' => array('d','D','ｄ','Ｄ'),
+            'e' => array('e','E','ｅ','Ｅ','Ε','Е','е'),
+            'f' => array('f','F','ｆ','Ｆ'),
+            'g' => array('g','G','ｇ','Ｇ'),
+            'h' => array('h','H','ｈ','Ｈ','Η','Н','н'),
+            'i' => array('i','I','ｉ','Ｉ','Ι','Ⅰ'),
+            'j' => array('j','J','ｊ','Ｊ'),
+            'k' => array('k','K','ｋ','Ｋ','Κ','κ','к','К'),
+            'l' => array('l','L','ｌ','Ｌ','︱','︳','|'),
+            'm' => array('m','M','ｍ','Ｍ','Μ','М','м'),
+            'n' => array('n','N','ｎ','Ｎ','Ν','∩'),
+            'o' => array('o','O','ｏ','Ｏ','Ο','О'),
+            'p' => array('p','P','ｐ','Ｐ','Ρ','Р','р'),
+            'q' => array('q','Q','ｑ','Ｑ'),
+            'r' => array('r','R','ｒ','Ｒ'),
+            's' => array('s','S','ｓ','Ｓ'),
+            't' => array('t','T','ｔ','Ｔ','Τ','Т','ㄒ'),
+            'u' => array('u','U','ｕ','Ｕ','∪'),
+            'v' => array('v','V','ｖ','Ｖ','∨','ν'),
+            'w' => array('w','W','ｗ','Ｗ'),
+            'x' => array('x','X','ｘ','Ｘ','Χ','χ','Х','х','Ⅹ','×'),
+            'y' => array('y','Y','ｙ','Ｙ','У'),
+            'z' => array('z','Z','ｚ','Ｚ','Ζ'),
 			
-			'1' => array('1','１'),
-			'2' => array('2','２'),
-			'3' => array('3','３'),
-			'4' => array('4','４'),
-			'5' => array('5','５'),
-			'6' => array('6','６'),
-			'7' => array('7','７'),
-			'8' => array('8','８'),
-			'9' => array('9','９'),
-			'0' => array('0','０'),
+            '1' => array('1','１'),
+            '2' => array('2','２'),
+            '3' => array('3','３'),
+            '4' => array('4','４'),
+            '5' => array('5','５'),
+            '6' => array('6','６'),
+            '7' => array('7','７'),
+            '8' => array('8','８'),
+            '9' => array('9','９'),
+            '0' => array('0','０'),
 			
-			':' => array(':','：','∶'),
-			'/' => array('/','／'),
-			'.' => array('。','·','．','、','﹒','，','丶')
+            ':' => array(':','：','∶'),
+            '/' => array('/','／'),
+            '.' => array('。','·','．','、','﹒','，','丶')
 		
-		);
-		$len = strlen( $url );
-		$temp = "\n\n";
-		for( $i=0; $i<$len; $i++){
-			$t_str = substr( $url, $i, 1 );
-			$sj = mt_rand( 0, count($arr[$t_str])-1 );
-			$temp .= $arr[$t_str][$sj];
-		}
-		return $temp;
-	}
+        );
+        $len = strlen( $url );
+        $temp = "\n\n";
+        for( $i=0; $i<$len; $i++){
+            $t_str = substr( $url, $i, 1 );
+            $sj = mt_rand( 0, count($arr[$t_str])-1 );
+            $temp .= $arr[$t_str][$sj];
+        }
+        return $temp;
+    }
 
-	//随机把一个字符转为拼音
+    //随机把一个字符转为拼音
 
-	/**
-	 * @param string $str
-	 */
-	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
-		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
+    /**
+     * @param string $str
+     */
+    function setPinyin($str) {
+        $py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
+        $t_str = iconv_substr( $str, $py, 1, 'UTF-8');
+        if(mt_rand(0,10) > 5) {
+            $pinyin = " ";
+        }
+        $pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
         $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
-		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
-		}
-		return $str;
-	}
+        if(mt_rand(0,10) > 5) {
+            $pinyin .= " ";
+        }
+        if($t_str != "%"){
+            $str = preg_replace("'$t_str'", $pinyin, $str, 1);
+        }
+        return $str;
+    }
 	
-	//随机重复一个字符
-	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
-				}
-			}
-			$temp .= $t_str;
-		}
-		return $temp;
-	}
+    //随机重复一个字符
+    function setRepeat($str) {
+        $len = iconv_strlen( $str, 'UTF-8' );
+        $action = 0;
+        $temp = '';
+        for( $i=0;  $i<$len; $i++ ){
+            $t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
+            if( mt_rand( 1, 50 ) > 48 && $action == 0) {
+                if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp .= $t_str;
+                    $action = 1;
+                }
+            }
+            $temp .= $t_str;
+        }
+        return $temp;
+    }
 	
-	//随机插入不影响阅读的字符
+    //随机插入不影响阅读的字符
 
-	/**
-	 * @param string $str
-	 */
-	function setBlankness($str) {
-		$blankness = array(" ", '　', '҉','̅̅','̲','̲̲','̅','̲̲̅̅');
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 ) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $blankness[mt_rand(0, 7)];
-				}
-			}
-			$temp .= $t_str;
-		}
-		return $temp;
-	}
+    /**
+     * @param string $str
+     */
+    function setBlankness($str) {
+        $blankness = array(" ", '　', '҉','̅̅','̲','̲̲','̅','̲̲̅̅');
+        $len = iconv_strlen( $str, 'UTF-8' );
+        $temp = '';
+        for( $i=0;  $i<$len; $i++ ){
+            $t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
+            if( mt_rand( 1, 50 ) > 48 ) {
+                if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+                    $temp .= $blankness[mt_rand(0, 7)];
+                }
+            }
+            $temp .= $t_str;
+        }
+        return $temp;
+    }
 	
-	//随机进行繁体中文转换
-	function GbToBig( $str ){
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 ) {
-				$t_str = strtr( $t_str, $this->GbToBigArray );
-			}
-			$temp .= $t_str;
-		}
-		return $temp;
-	}
+    //随机进行繁体中文转换
+    function GbToBig( $str ){
+        $len = iconv_strlen( $str, 'UTF-8' );
+        $temp = '';
+        for( $i=0;  $i<$len; $i++ ){
+            $t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
+            if( mt_rand( 1, 50 ) > 48 ) {
+                $t_str = strtr( $t_str, $this->GbToBigArray );
+            }
+            $temp .= $t_str;
+        }
+        return $temp;
+    }
 }
 
 

Spacing +98 added lines, -98 removed lines

@@ -31,87 +31,87 @@ 
 	}
 
 	//分离URL
-	private function cutting($str){
+	private function cutting($str) {
 
-		if(preg_match("@(http://[^\\s]+)@i", $str, $result)) {
-			$this->url = $result[1];
-			$this->msg = $str = str_replace($this->url, '%%%%', $str);
+		if (preg_match("@(http://[^\\s]+)@i", $str, $result)) {
+			$this->url=$result[1];
+			$this->msg=$str=str_replace($this->url, '%%%%', $str);
 		} else {
-			$this->msg = $str;
+			$this->msg=$str;
 		}
 	}
 	
 	
 	
-	private function convert( $method = 'msg' ){
-		if( $method == 'msg' || $method == 'all') {
-			$this->msg = $this->setPinyin($this->msg);
-			$this->msg = $this->setRepeat($this->msg);
+	private function convert($method='msg') {
+		if ($method == 'msg' || $method == 'all') {
+			$this->msg=$this->setPinyin($this->msg);
+			$this->msg=$this->setRepeat($this->msg);
 			//$this->msg = $this->GbToBig($this->msg);
-			$this->msg = $this->setBlankness($this->msg);
+			$this->msg=$this->setBlankness($this->msg);
 			
 		}
-		if( $method == 'url' || $method == 'all') {
-			$this->url = $this->setChacha($this->url);
+		if ($method == 'url' || $method == 'all') {
+			$this->url=$this->setChacha($this->url);
 		}
-		$this->msg=$this->prefix.str_replace( '%%%%', $this->url, $this->msg);
+		$this->msg=$this->prefix.str_replace('%%%%', $this->url, $this->msg);
 	}
 	
 	/**
 	 * @param string $url
 	 */
-	function setChacha($url ){
-		$url = strtolower($url);
-		$arr = array(
-			'a' => array('a','A','ａ','Ａ','Α','А','α'),
-			'b' => array('b','B','ｂ','Ｂ','Β','В','Ь'),
-			'c' => array('c','C','ｃ','Ｃ','С','с'),
-			'd' => array('d','D','ｄ','Ｄ'),
-			'e' => array('e','E','ｅ','Ｅ','Ε','Е','е'),
-			'f' => array('f','F','ｆ','Ｆ'),
-			'g' => array('g','G','ｇ','Ｇ'),
-			'h' => array('h','H','ｈ','Ｈ','Η','Н','н'),
-			'i' => array('i','I','ｉ','Ｉ','Ι','Ⅰ'),
-			'j' => array('j','J','ｊ','Ｊ'),
-			'k' => array('k','K','ｋ','Ｋ','Κ','κ','к','К'),
-			'l' => array('l','L','ｌ','Ｌ','︱','︳','|'),
-			'm' => array('m','M','ｍ','Ｍ','Μ','М','м'),
-			'n' => array('n','N','ｎ','Ｎ','Ν','∩'),
-			'o' => array('o','O','ｏ','Ｏ','Ο','О'),
-			'p' => array('p','P','ｐ','Ｐ','Ρ','Р','р'),
-			'q' => array('q','Q','ｑ','Ｑ'),
-			'r' => array('r','R','ｒ','Ｒ'),
-			's' => array('s','S','ｓ','Ｓ'),
-			't' => array('t','T','ｔ','Ｔ','Τ','Т','ㄒ'),
-			'u' => array('u','U','ｕ','Ｕ','∪'),
-			'v' => array('v','V','ｖ','Ｖ','∨','ν'),
-			'w' => array('w','W','ｗ','Ｗ'),
-			'x' => array('x','X','ｘ','Ｘ','Χ','χ','Х','х','Ⅹ','×'),
-			'y' => array('y','Y','ｙ','Ｙ','У'),
-			'z' => array('z','Z','ｚ','Ｚ','Ζ'),
+	function setChacha($url) {
+		$url=strtolower($url);
+		$arr=array(
+			'a' => array('a', 'A', 'ａ', 'Ａ', 'Α', 'А', 'α'),
+			'b' => array('b', 'B', 'ｂ', 'Ｂ', 'Β', 'В', 'Ь'),
+			'c' => array('c', 'C', 'ｃ', 'Ｃ', 'С', 'с'),
+			'd' => array('d', 'D', 'ｄ', 'Ｄ'),
+			'e' => array('e', 'E', 'ｅ', 'Ｅ', 'Ε', 'Е', 'е'),
+			'f' => array('f', 'F', 'ｆ', 'Ｆ'),
+			'g' => array('g', 'G', 'ｇ', 'Ｇ'),
+			'h' => array('h', 'H', 'ｈ', 'Ｈ', 'Η', 'Н', 'н'),
+			'i' => array('i', 'I', 'ｉ', 'Ｉ', 'Ι', 'Ⅰ'),
+			'j' => array('j', 'J', 'ｊ', 'Ｊ'),
+			'k' => array('k', 'K', 'ｋ', 'Ｋ', 'Κ', 'κ', 'к', 'К'),
+			'l' => array('l', 'L', 'ｌ', 'Ｌ', '︱', '︳', '|'),
+			'm' => array('m', 'M', 'ｍ', 'Ｍ', 'Μ', 'М', 'м'),
+			'n' => array('n', 'N', 'ｎ', 'Ｎ', 'Ν', '∩'),
+			'o' => array('o', 'O', 'ｏ', 'Ｏ', 'Ο', 'О'),
+			'p' => array('p', 'P', 'ｐ', 'Ｐ', 'Ρ', 'Р', 'р'),
+			'q' => array('q', 'Q', 'ｑ', 'Ｑ'),
+			'r' => array('r', 'R', 'ｒ', 'Ｒ'),
+			's' => array('s', 'S', 'ｓ', 'Ｓ'),
+			't' => array('t', 'T', 'ｔ', 'Ｔ', 'Τ', 'Т', 'ㄒ'),
+			'u' => array('u', 'U', 'ｕ', 'Ｕ', '∪'),
+			'v' => array('v', 'V', 'ｖ', 'Ｖ', '∨', 'ν'),
+			'w' => array('w', 'W', 'ｗ', 'Ｗ'),
+			'x' => array('x', 'X', 'ｘ', 'Ｘ', 'Χ', 'χ', 'Х', 'х', 'Ⅹ', '×'),
+			'y' => array('y', 'Y', 'ｙ', 'Ｙ', 'У'),
+			'z' => array('z', 'Z', 'ｚ', 'Ｚ', 'Ζ'),
 			
-			'1' => array('1','１'),
-			'2' => array('2','２'),
-			'3' => array('3','３'),
-			'4' => array('4','４'),
-			'5' => array('5','５'),
-			'6' => array('6','６'),
-			'7' => array('7','７'),
-			'8' => array('8','８'),
-			'9' => array('9','９'),
-			'0' => array('0','０'),
+			'1' => array('1', '１'),
+			'2' => array('2', '２'),
+			'3' => array('3', '３'),
+			'4' => array('4', '４'),
+			'5' => array('5', '５'),
+			'6' => array('6', '６'),
+			'7' => array('7', '７'),
+			'8' => array('8', '８'),
+			'9' => array('9', '９'),
+			'0' => array('0', '０'),
 			
-			':' => array(':','：','∶'),
-			'/' => array('/','／'),
-			'.' => array('。','·','．','、','﹒','，','丶')
+			':' => array(':', '：', '∶'),
+			'/' => array('/', '／'),
+			'.' => array('。', '·', '．', '、', '﹒', '，', '丶')
 		
 		);
-		$len = strlen( $url );
-		$temp = "\n\n";
-		for( $i=0; $i<$len; $i++){
-			$t_str = substr( $url, $i, 1 );
-			$sj = mt_rand( 0, count($arr[$t_str])-1 );
-			$temp .= $arr[$t_str][$sj];
+		$len=strlen($url);
+		$temp="\n\n";
+		for ($i=0; $i < $len; $i++) {
+			$t_str=substr($url, $i, 1);
+			$sj=mt_rand(0, count($arr[$t_str]) - 1);
+			$temp.=$arr[$t_str][$sj];
 		}
 		return $temp;
 	}
@@ -122,36 +122,36 @@ 
 	 * @param string $str
 	 */
 	function setPinyin($str) {
-		$py = mt_rand(0, iconv_strlen( $str, 'UTF-8' )-1);
-		$t_str = iconv_substr( $str, $py, 1, 'UTF-8');
-		if(mt_rand(0,10) > 5) {
-		    $pinyin = " ";
+		$py=mt_rand(0, iconv_strlen($str, 'UTF-8') - 1);
+		$t_str=iconv_substr($str, $py, 1, 'UTF-8');
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin=" ";
 		}
-		$pinyin = $this->_pinyin->convert($t_str,PINYIN_UNICODE);
-        $pinyin=implode(" ",$pinyin);
-		if(mt_rand(0,10) > 5) {
-		    $pinyin .= " ";
+		$pinyin=$this->_pinyin->convert($t_str, PINYIN_UNICODE);
+        $pinyin=implode(" ", $pinyin);
+		if (mt_rand(0, 10) > 5) {
+		    $pinyin.=" ";
 		}
-		if($t_str != "%"){
-			$str = preg_replace("'$t_str'", $pinyin, $str, 1);
+		if ($t_str != "%") {
+			$str=preg_replace("'$t_str'", $pinyin, $str, 1);
 		}
 		return $str;
 	}
 	
 	//随机重复一个字符
 	function setRepeat($str) {
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$action = 0;
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 && $action == 0) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $t_str;
-					$action = 1;
+		$len=iconv_strlen($str, 'UTF-8');
+		$action=0;
+		$temp='';
+		for ($i=0; $i < $len; $i++) {
+			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
+			if (mt_rand(1, 50) > 48 && $action == 0) {
+				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+					$temp.=$t_str;
+					$action=1;
 				}
 			}
-			$temp .= $t_str;
+			$temp.=$t_str;
 		}
 		return $temp;
 	}
@@ -162,31 +162,31 @@ 
 	 * @param string $str
 	 */
 	function setBlankness($str) {
-		$blankness = array(" ", '　', '҉','̅̅','̲','̲̲','̅','̲̲̅̅');
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 ) {
-				if(!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
-					$temp .= $blankness[mt_rand(0, 7)];
+		$blankness=array(" ", '　', '҉', '̅̅', '̲', '̲̲', '̅', '̲̲̅̅');
+		$len=iconv_strlen($str, 'UTF-8');
+		$temp='';
+		for ($i=0; $i < $len; $i++) {
+			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
+			if (mt_rand(1, 50) > 48) {
+				if (!preg_match("@[a-z0-9%\\s]+@i", $t_str)) {
+					$temp.=$blankness[mt_rand(0, 7)];
 				}
 			}
-			$temp .= $t_str;
+			$temp.=$t_str;
 		}
 		return $temp;
 	}
 	
 	//随机进行繁体中文转换
-	function GbToBig( $str ){
-		$len = iconv_strlen( $str, 'UTF-8' );
-		$temp = '';
-		for( $i=0;  $i<$len; $i++ ){
-			$t_str = iconv_substr( $str, $i, 1 ,'UTF-8');
-			if( mt_rand( 1, 50 ) > 48 ) {
-				$t_str = strtr( $t_str, $this->GbToBigArray );
+	function GbToBig($str) {
+		$len=iconv_strlen($str, 'UTF-8');
+		$temp='';
+		for ($i=0; $i < $len; $i++) {
+			$t_str=iconv_substr($str, $i, 1, 'UTF-8');
+			if (mt_rand(1, 50) > 48) {
+				$t_str=strtr($t_str, $this->GbToBigArray);
 			}
-			$temp .= $t_str;
+			$temp.=$t_str;
 		}
 		return $temp;
 	}

core/Model.php

Spacing +26 added lines, -26 removed lines

@@ -15,64 +15,64 @@
     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->field("count(*) as count")->find()['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 replace($data){
-        return $this->db->replace($this->table,$data);
+    public function replace($data) {
+        return $this->db->replace($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);
     }
 
     /**
      * @param string $field
      */
-    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,$this->field);
+        $info=$this->db->paginate($this->table, $page, $this->field);
         return $info;
     }
 }
\ No newline at end of file

core/Controller.php

Spacing +16 added lines, -16 removed lines

@@ -4,48 +4,48 @@
 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);
     }
 
     /**
      * @param string $name
      */
-    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 = parse_name(CONTROLLER_NAME) . '/' . parse_name(ACTION_NAME);
+                $tmpPath=parse_name(CONTROLLER_NAME).'/'.parse_name(ACTION_NAME);
             } else {
                 show_json($this->tVar);
             }

core/helpers/TimeAgo.php

Spacing +23 added lines, -23 removed lines

@@ -54,84 +54,84 @@
      * @param integer $past
      * @param integer $now
      */
-    public function inStamp($past, $now = null) {
-        if($now==null){
+    public function inStamp($past, $now=null) {
+        if ($now == null) {
             $now=time();
         }
         // creates the "time ago" string. This always starts with an "about..."
-        $timeAgo = "";
+        $timeAgo="";
 
         // finds the time difference
-        $timeDifference = $now - $past;
+        $timeDifference=$now - $past;
         // rule 0
         // $past is null or empty or ''
-        if ($past==0) {
-            $timeAgo = $this->translate('never');
+        if ($past == 0) {
+            $timeAgo=$this->translate('never');
         }
         // rule 1
         // less than 29secs
         else if ($this->isLessThan29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('lessThanAMinute');
+            $timeAgo=$this->translate('lessThanAMinute');
         }
         // rule 2
         // more than 29secs and less than 1min29secss
         else if ($this->isLessThan1Min29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('oneMinute');
+            $timeAgo=$this->translate('oneMinute');
         }
         // rule 3
         // between 1min30secs and 44mins29secs
         else if ($this->isLessThan44Min29Secs($timeDifference)) {
-            $minutes = round($timeDifference / $this->secondsPerMinute);
-            $timeAgo = $this->translate('lessThanOneHour', $minutes);
+            $minutes=round($timeDifference / $this->secondsPerMinute);
+            $timeAgo=$this->translate('lessThanOneHour', $minutes);
         }
         // rule 4
         // between 44mins30secs and 1hour29mins59secs
         else if ($this->isLessThan1Hour29Mins59Seconds($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneHour');
+            $timeAgo=$this->translate('aboutOneHour');
         }
         // rule 5
         // between 1hour29mins59secs and 23hours59mins29secs
         else if ($this->isLessThan23Hours59Mins29Seconds($timeDifference)) {
-            $hours = round($timeDifference / $this->secondsPerHour);
-            $timeAgo = $this->translate('hours', $hours);
+            $hours=round($timeDifference / $this->secondsPerHour);
+            $timeAgo=$this->translate('hours', $hours);
         }
         // rule 6
         // between 23hours59mins30secs and 47hours59mins29secs
         else if ($this->isLessThan47Hours59Mins29Seconds($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneDay');
+            $timeAgo=$this->translate('aboutOneDay');
         }
         // rule 7
         // between 47hours59mins30secs and 29days23hours59mins29secs
         else if ($this->isLessThan29Days23Hours59Mins29Seconds($timeDifference)) {
-            $days = round($timeDifference / $this->secondsPerDay);
-            $timeAgo = $this->translate('days', $days);
+            $days=round($timeDifference / $this->secondsPerDay);
+            $timeAgo=$this->translate('days', $days);
         }
         // rule 8
         // between 29days23hours59mins30secs and 59days23hours59mins29secs
         else if ($this->isLessThan59Days23Hours59Mins29Secs($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneMonth');
+            $timeAgo=$this->translate('aboutOneMonth');
         }
         // rule 9
         // between 59days23hours59mins30secs and 1year (minus 1sec)
         else if ($this->isLessThan1Year($timeDifference)) {
-            $months = round($timeDifference / $this->secondsPerMonth);
+            $months=round($timeDifference / $this->secondsPerMonth);
             // if months is 1, then set it to 2, because we are "past" 1 month
             if ($months == 1) {
-                $months = 2;
+                $months=2;
             }
 
-            $timeAgo = $this->translate('months', $months);
+            $timeAgo=$this->translate('months', $months);
         }
         // rule 10
         // between 1year and 2years (minus 1sec)
         else if ($this->isLessThan2Years($timeDifference)) {
-            $timeAgo = $this->translate('aboutOneYear');
+            $timeAgo=$this->translate('aboutOneYear');
         }
         // rule 11
         // 2years or more
         else {
-            $years = floor($timeDifference / $this->secondsPerYear);
-            $timeAgo = $this->translate('years', $years);
+            $years=floor($timeDifference / $this->secondsPerYear);
+            $timeAgo=$this->translate('years', $years);
         }
 
         return $timeAgo;

core/helpers/Page.php

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/helpers/Dispatch.php

Spacing +27 added lines, -27 removed lines

@@ -6,49 +6,49 @@ 
 
 class Dispatch
 {
-    static public function init(){
-        if(!IS_CLI){
+    static public function init() {
+        if (!IS_CLI) {
             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');
-        } elseif (count($path)==1){
-            array_push($path,'index');
+        if (count($path) == 0) {
+            array_push($path, 'home');
+            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");
         }
@@ -56,24 +56,24 @@ 
         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);
     }
 
     /**
      * @param string $function
      */
-    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);
                 }