ricardosierra / phpspider

core/log.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 
 namespace phpspider\core;
 // 引入PATH_DATA
-require_once __DIR__ . '/constants.php';
+require_once __DIR__.'/constants.php';
 
 class log
 {
@@ -82,13 +82,13 @@ 
 
         if ($log_type == 'note') 
         {
-            $msg = self::$out_sta. $msg . "\n".self::$out_end;
+            $msg = self::$out_sta.$msg."\n".self::$out_end;
         }
         else 
         {
-            $msg = self::$out_sta.date("Y-m-d H:i:s")." [{$log_type}] " . $msg .self::$out_end. "\n";
+            $msg = self::$out_sta.date("Y-m-d H:i:s")." [{$log_type}] ".$msg.self::$out_end."\n";
         }
-        if(self::$log_show)
+        if (self::$log_show)
         {
             echo $msg;
         }
@@ -105,9 +105,9 @@ 
     {
         if ($log_type != '') 
         {
-            $msg = date("Y-m-d H:i:s")." [{$log_type}] " . $msg . "\n";
+            $msg = date("Y-m-d H:i:s")." [{$log_type}] ".$msg."\n";
         }
-        if(self::$log_show)
+        if (self::$log_show)
         {
             echo $msg;
         }

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
         if ($log_type == 'note') 
         {
             $msg = self::$out_sta. $msg . "\n".self::$out_end;
-        }
-        else 
+        } else 
         {
             $msg = self::$out_sta.date("Y-m-d H:i:s")." [{$log_type}] " . $msg .self::$out_end. "\n";
         }

core/db.php

Indentation +24 added lines, -24 removed lines

@@ -376,20 +376,20 @@ 
 
         $ids = array();
         foreach ($set as $val)
-		{
+        {
             ksort($val);
             // 去重，其实不去也可以，因为相同的when只会执行第一个，后面的就直接跳过不执行了
             $key = md5($val[$index]);
-			$ids[$key] = $val[$index];
-
-			foreach (array_keys($val) as $field)
-			{
-				if ($field != $index)
-				{
-					$final[$field][$key] =  'When `'.$index.'` = "'.$val[$index].'" Then "'.$val[$field].'"';
-				}
-			}
-		}
+            $ids[$key] = $val[$index];
+
+            foreach (array_keys($val) as $field)
+            {
+                if ($field != $index)
+                {
+                    $final[$field][$key] =  'When `'.$index.'` = "'.$val[$index].'" Then "'.$val[$field].'"';
+                }
+            }
+        }
         //$ids = array_values($ids);
 
         // 如果不是数组而且不为空，就转数组
@@ -400,29 +400,29 @@ 
         $where[] = $index.' In ("'.implode('","', $ids).'")';
         $where = empty($where) ? "" : " Where ".implode(" And ", $where);
 
-		$sql = "Update `".$table."` Set ";
-		$cases = '';
+        $sql = "Update `".$table."` Set ";
+        $cases = '';
 
-		foreach ($final as $k => $v)
-		{
+        foreach ($final as $k => $v)
+        {
             // 过滤掉数据库没有的字段
             if (!in_array($k, $fields)) 
             {
                 continue;
             }
-			$cases .= '`'.$k.'` = Case '."\n";
-			foreach ($v as $row)
-			{
-				$cases .= $row."\n";
-			}
+            $cases .= '`'.$k.'` = Case '."\n";
+            foreach ($v as $row)
+            {
+                $cases .= $row."\n";
+            }
 
-			$cases .= 'Else `'.$k.'` End, ';
-		}
+            $cases .= 'Else `'.$k.'` End, ';
+        }
 
-		$sql .= substr($cases, 0, -2);
+        $sql .= substr($cases, 0, -2);
 
         // 其实不带 Where In ($index) 的条件也可以的
-		$sql .= $where;
+        $sql .= $where;
 
         if ($return_sql) return $sql;
         

Spacing +22 added lines, -22 removed lines

@@ -39,11 +39,11 @@ 
                 //echo "progress[".self::$links[self::$link_name]['pid']."] create db connect[".self::$link_name."]\n";
             }
             self::$links[self::$link_name]['conn'] = mysqli_connect($config['host'], $config['user'], $config['pass'], $config['name'], $config['port']);
-            if(mysqli_connect_errno())
+            if (mysqli_connect_errno())
             {
                 self::$links[self::$link_name]['fail']++;
-                $errmsg = 'Mysql Connect failed['.self::$links[self::$link_name]['fail'].']: ' . mysqli_connect_error();
-                echo util::colorize(date("H:i:s") . " {$errmsg}\n\n", 'fail');
+                $errmsg = 'Mysql Connect failed['.self::$links[self::$link_name]['fail'].']: '.mysqli_connect_error();
+                echo util::colorize(date("H:i:s")." {$errmsg}\n\n", 'fail');
                 log::add($errmsg, "Error");
                 // 连接失败5次，中断进程
                 if (self::$links[self::$link_name]['fail'] >= 5) 
@@ -81,9 +81,9 @@ 
      */
     public static function clear_link()
     {
-        if(self::$links) 
+        if (self::$links) 
         {
-            foreach(self::$links as $k=>$v)
+            foreach (self::$links as $k=>$v)
             {
                 @mysqli_close($v['conn']);
                 unset(self::$links[$k]);
@@ -138,7 +138,7 @@ 
         {
             if (!is_array($GLOBALS['config']['db']))
             {
-                exit('db.php _get_default_config()' . '没有mysql配置');
+                exit('db.php _get_default_config()'.'没有mysql配置');
             }
             self::$configs['default'] = $GLOBALS['config']['db'];
         }
@@ -156,7 +156,7 @@ 
 
     public static function autocommit($mode = false)
     {
-        if ( self::$autocommiting ) 
+        if (self::$autocommiting) 
         {
             return true;
         }
@@ -218,18 +218,18 @@ 
             array_shift($backtrace);
             $narr = array('class', 'type', 'function', 'file', 'line');
             $err = "debug_backtrace：\n";
-            foreach($backtrace as $i => $l)
+            foreach ($backtrace as $i => $l)
             {
-                foreach($narr as $k)
+                foreach ($narr as $k)
                 {
-                    if( !isset($l[$k]) ) 
+                    if (!isset($l[$k])) 
                     {
                         $l[$k] = '';
                     }
                 }
                 $err .= "[$i] in function {$l['class']}{$l['type']}{$l['function']} ";
-                if($l['file']) $err .= " in {$l['file']} ";
-                if($l['line']) $err .= " on line {$l['line']} ";
+                if ($l['file']) $err .= " in {$l['file']} ";
+                if ($l['line']) $err .= " on line {$l['line']} ";
                 $err .= "\n";
             }
             log::add($err);
@@ -253,7 +253,7 @@ 
     {
         if (!preg_match("/limit/i", $sql))
         {
-            $sql = preg_replace("/[,;]$/i", '', trim($sql)) . " limit 1 ";
+            $sql = preg_replace("/[,;]$/i", '', trim($sql))." limit 1 ";
         }
         $rsid = self::query($sql);
         if ($rsid === false) 
@@ -272,7 +272,7 @@ 
         {
             return array();
         }
-        while ( $row = self::fetch($rsid) )
+        while ($row = self::fetch($rsid))
         {
             $rows[] = $row;
         }
@@ -305,7 +305,7 @@ 
             $items_sql .= "`$k`,";
             $values_sql .= "\"$v\",";
         }
-        $sql = "Insert Ignore Into `{$table}` (" . substr($items_sql, 0, -1) . ") Values (" . substr($values_sql, 0, -1) . ")";
+        $sql = "Insert Ignore Into `{$table}` (".substr($items_sql, 0, -1).") Values (".substr($values_sql, 0, -1).")";
         if ($return_sql) 
         {
             return $sql;
@@ -386,7 +386,7 @@ 
 			{
 				if ($field != $index)
 				{
-					$final[$field][$key] =  'When `'.$index.'` = "'.$val[$index].'" Then "'.$val[$field].'"';
+					$final[$field][$key] = 'When `'.$index.'` = "'.$val[$index].'" Then "'.$val[$field].'"';
 				}
 			}
 		}
@@ -453,8 +453,8 @@ 
                 unset($where[$k]);
             }
         }
-        $where = empty($where) ? "" : " Where " . implode(" And ", $where);
-        $sql = substr($sql, 0, -1) . $where;
+        $where = empty($where) ? "" : " Where ".implode(" And ", $where);
+        $sql = substr($sql, 0, -1).$where;
         if ($return_sql) 
         {
             return $sql;
@@ -479,7 +479,7 @@ 
         {
             return false;
         }
-        $where = 'Where ' . (!is_array($where) ? $where : implode(' And ', $where));
+        $where = 'Where '.(!is_array($where) ? $where : implode(' And ', $where));
         $sql = "Delete From `{$table}` {$where}";
         if ($return_sql) 
         {
@@ -511,11 +511,11 @@ 
     public static function strsafe($array)
     {
         $arrays = array();
-        if(is_array($array)===true)
+        if (is_array($array) === true)
         {
             foreach ($array as $key => $val)
             {                
-                if(is_array($val)===true)
+                if (is_array($val) === true)
                 {
                     $arrays[$key] = self::strsafe($val);
                 }
@@ -561,7 +561,7 @@ 
 
     public static function table_exists($table_name)
     {
-        $sql = "SHOW TABLES LIKE '" . $table_name . "'";
+        $sql = "SHOW TABLES LIKE '".$table_name."'";
         $rsid = self::query($sql);
         $table = self::fetch($rsid);
         if (empty($table)) 

Braces +24 added lines, -28 removed lines

@@ -51,13 +51,11 @@ 
                     exit(250);
                 }
                 self::_init($config);
-            }
-            else
+            } else
             {
                 mysqli_query(self::$links[self::$link_name]['conn'], " SET character_set_connection=utf8, character_set_results=utf8, character_set_client=binary, sql_mode='' ");
             }
-        }
-        else 
+        } else 
         {
             $curr_pid = function_exists('posix_getpid') ? posix_getpid() : 0;
             // 如果父进程已经生成资源就释放重新生成，因为多进程不能共享连接资源
@@ -106,8 +104,7 @@ 
         if (!empty($config))
         {
             self::$configs[self::$link_name] = $config;
-        }
-        else
+        } else
         {
             if (empty(self::$configs[self::$link_name]))
             {
@@ -228,15 +225,18 @@ 
                     }
                 }
                 $err .= "[$i] in function {$l['class']}{$l['type']}{$l['function']} ";
-                if($l['file']) $err .= " in {$l['file']} ";
-                if($l['line']) $err .= " on line {$l['line']} ";
+                if($l['file']) {
+                    $err .= " in {$l['file']} ";
+                }
+                if($l['line']) {
+                    $err .= " on line {$l['line']} ";
+                }
                 $err .= "\n";
             }
             log::add($err);
 
             return false;
-        }
-        else
+        } else
         {
             return self::$rsid;
         }
@@ -309,14 +309,12 @@ 
         if ($return_sql) 
         {
             return $sql;
-        }
-        else 
+        } else 
         {
             if (self::query($sql))
             {
                 return mysqli_insert_id(self::$links[self::$link_name]['conn']);
-            }
-            else 
+            } else 
             {
                 return false;
             }
@@ -356,7 +354,9 @@ 
 
         $sql = "Insert Ignore Into `{$table}`(".implode(", ", $keys_sql).") Values (".implode("), (", $vals_sql).")";
 
-        if ($return_sql) return $sql;
+        if ($return_sql) {
+            return $sql;
+        }
         
         $rt = self::query($sql);
         $insert_id = self::insert_id();
@@ -424,7 +424,9 @@ 
         // 其实不带 Where In ($index) 的条件也可以的
 		$sql .= $where;
 
-        if ($return_sql) return $sql;
+        if ($return_sql) {
+            return $sql;
+        }
         
         $rt = self::query($sql);
         $insert_id = self::affected_rows();
@@ -458,14 +460,12 @@ 
         if ($return_sql) 
         {
             return $sql;
-        }
-        else 
+        } else 
         {
             if (self::query($sql))
             {
                 return mysqli_affected_rows(self::$links[self::$link_name]['conn']);
-            }
-            else 
+            } else 
             {
                 return false;
             }
@@ -484,14 +484,12 @@ 
         if ($return_sql) 
         {
             return $sql;
-        }
-        else 
+        } else 
         {
             if (self::query($sql))
             {
                 return mysqli_affected_rows(self::$links[self::$link_name]['conn']);
-            }
-            else 
+            } else 
             {
                 return false;
             }
@@ -518,8 +516,7 @@ 
                 if(is_array($val)===true)
                 {
                     $arrays[$key] = self::strsafe($val);
-                }
-                else 
+                } else 
                 {
                     //先去掉转义，避免下面重复转义了
                     $val = stripslashes($val);
@@ -531,8 +528,7 @@ 
                 }
             }
             return $arrays;
-        }
-        else 
+        } else 
         {
             $array = stripslashes($array);
             $array = addslashes($array);

core/constants.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     ini_set('memory_limit', '1024M');
 }
 
-if( PHP_SAPI != 'cli' )
+if (PHP_SAPI != 'cli')
 {
     exit("You must run the CLI environment\n");
 }

core/init.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 //----------------------------------
 
 // 严格开发模式
-error_reporting( E_ALL );
+error_reporting(E_ALL);
 //ini_set('display_errors', 1);
 
 // 永不超时
@@ -26,7 +26,7 @@ 
     ini_set('memory_limit', '1024M');
 }
 
-if( PHP_SAPI != 'cli' )
+if (PHP_SAPI != 'cli')
 {
     exit("You must run the CLI environment\n");
 }
@@ -35,7 +35,7 @@ 
 date_default_timezone_set('Asia/Shanghai');
 
 // 引入PATH_DATA
-require_once __DIR__ . '/constants.php';
+require_once __DIR__.'/constants.php';
 // 核心库目录
 define('CORE', dirname(__FILE__));
 define('PATH_ROOT', CORE."/../");
@@ -43,7 +43,7 @@ 
 define('PATH_LIBRARY', CORE."/../library");
 
 // 系统配置
-if( file_exists( PATH_ROOT."/config/inc_config.php" ) )
+if (file_exists(PATH_ROOT."/config/inc_config.php"))
 {
     require PATH_ROOT."/config/inc_config.php"; 
 }

core/queue.php

Indentation +2 added lines, -2 removed lines

@@ -139,8 +139,8 @@
     }
 
     /**
-    * 获取默认配置
-    */
+     * 获取默认配置
+     */
     protected static function _get_default_config()
     {
         if (empty(self::$configs['default']))

Spacing +37 added lines, -37 removed lines

@@ -23,7 +23,7 @@ 
     /**
      *  redis链接标识符号
      */
-    protected static $redis   = NULL;
+    protected static $redis = NULL;
 
     /**
      *  redis配置数组
@@ -41,7 +41,7 @@ 
 
     public static function init()
     {
-        if ( ! extension_loaded('redis'))
+        if (!extension_loaded('redis'))
         {
             self::$error = 'The redis extension was not found';
             return false;
@@ -57,7 +57,7 @@ 
             self::$links[self::$link_name] = new Redis();
             if (strstr($config['host'], '.sock'))
             {
-                if ( ! self::$links[self::$link_name]->connect($config['host']))
+                if (!self::$links[self::$link_name]->connect($config['host']))
                 {
                     self::$error = 'Unable to connect to redis server';
                     unset(self::$links[self::$link_name]);
@@ -66,7 +66,7 @@ 
             }
             else
             {
-                if ( ! self::$links[self::$link_name]->connect($config['host'], $config['port'], $config['timeout']))
+                if (!self::$links[self::$link_name]->connect($config['host'], $config['port'], $config['timeout']))
                 {
                     self::$error = 'Unable to connect to redis server';
                     unset(self::$links[self::$link_name]);
@@ -77,7 +77,7 @@ 
             // 验证
             if ($config['pass'])
             {
-                if ( ! self::$links[self::$link_name]->auth($config['pass']))
+                if (!self::$links[self::$link_name]->auth($config['pass']))
                 {
                     self::$error = 'Redis Server authentication failed';
                     unset(self::$links[self::$link_name]);
@@ -98,9 +98,9 @@ 
 
     public static function clear_link()
     {
-        if(self::$links) 
+        if (self::$links) 
         {
-            foreach(self::$links as $k=>$v)
+            foreach (self::$links as $k=>$v)
             {
                 $v->close();
                 unset(self::$links[$k]);
@@ -147,7 +147,7 @@ 
         {
             if (!is_array($GLOBALS['config']['redis']))
             {
-                exit('cls_redis.php _get_default_config()' . '没有redis配置');
+                exit('cls_redis.php _get_default_config()'.'没有redis配置');
                 // You not set a config array for connect\nPlease check the configuration file config/inc_config.php
             }
             self::$configs['default'] = $GLOBALS['config']['redis'];
@@ -170,7 +170,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if ($expire > 0)
                 {
@@ -213,7 +213,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if ($expire > 0)
                 {
@@ -267,7 +267,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 $key = "Lock:{$name}";
                 while (true)
@@ -320,7 +320,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->get($key);
             }
@@ -353,7 +353,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->del($key);
             }
@@ -393,7 +393,7 @@ 
 
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 $type = self::$links[self::$link_name]->type($key);
                 if (isset($types[$type])) 
@@ -431,7 +431,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if (empty($integer)) 
                 {
@@ -472,7 +472,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if (empty($integer)) 
                 {
@@ -513,7 +513,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->append($key, $value);
             }
@@ -548,7 +548,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->substr($key, $start, $end);
             }
@@ -581,7 +581,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->select($index);
             }
@@ -614,7 +614,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->dbsize();
             }
@@ -646,7 +646,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->flushdb();
             }
@@ -678,7 +678,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->flushall();
             }
@@ -711,7 +711,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if (!$is_bgsave) 
                 {
@@ -750,7 +750,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->info();
             }
@@ -782,7 +782,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 if (!empty($len)) 
                 {
@@ -821,7 +821,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lastsave();
             }
@@ -855,7 +855,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lpush($key, $value);
             }
@@ -889,7 +889,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->rpush($key, $value);
             }
@@ -922,7 +922,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lpop($key);
             }
@@ -955,7 +955,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->rpop($key);
             }
@@ -988,7 +988,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lSize($key);
             }
@@ -1022,7 +1022,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lget($key, $index);
             }
@@ -1057,7 +1057,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->lRange($key, $start, $end);
             }
@@ -1133,7 +1133,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->keys($key);
             }
@@ -1168,7 +1168,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->ttl($key);
             }
@@ -1202,7 +1202,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->expire($key, $expire);
             }
@@ -1235,7 +1235,7 @@ 
         self::init();
         try
         {
-            if ( self::$links[self::$link_name] )
+            if (self::$links[self::$link_name])
             {
                 return self::$links[self::$link_name]->exists($key);
             }

Braces +41 added lines, -82 removed lines

@@ -63,8 +63,7 @@ 
                     unset(self::$links[self::$link_name]);
                     return false;
                 }
-            }
-            else
+            } else
             {
                 if ( ! self::$links[self::$link_name]->connect($config['host'], $config['port'], $config['timeout']))
                 {
@@ -114,8 +113,7 @@ 
         if (!empty($config))
         {
             self::$configs[self::$link_name] = $config;
-        }
-        else
+        } else
         {
             if (empty(self::$configs[self::$link_name]))
             {
@@ -175,14 +173,12 @@ 
                 if ($expire > 0)
                 {
                     return self::$links[self::$link_name]->setex($key, $expire, $value);
-                }
-                else
+                } else
                 {
                     return self::$links[self::$link_name]->set($key, $value);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -223,14 +219,12 @@ 
                     //self::$links[self::$link_name]->expire($key, $expire);
                     //self::$links[self::$link_name]->exec();
                     //return true;
-                }
-                else
+                } else
                 {
                     return self::$links[self::$link_name]->setnx($key, $value);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -284,8 +278,7 @@ 
                 }
                 return false;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -324,8 +317,7 @@ 
             {
                 return self::$links[self::$link_name]->get($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -357,8 +349,7 @@ 
             {
                 return self::$links[self::$link_name]->del($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -401,8 +392,7 @@ 
                     return $types[$type];
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -436,14 +426,12 @@ 
                 if (empty($integer)) 
                 {
                     return self::$links[self::$link_name]->incr($key);
-                }
-                else 
+                } else 
                 {
                     return self::$links[self::$link_name]->incrby($key, $integer);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -477,14 +465,12 @@ 
                 if (empty($integer)) 
                 {
                     return self::$links[self::$link_name]->decr($key);
-                }
-                else 
+                } else 
                 {
                     return self::$links[self::$link_name]->decrby($key, $integer);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -517,8 +503,7 @@ 
             {
                 return self::$links[self::$link_name]->append($key, $value);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -552,8 +537,7 @@ 
             {
                 return self::$links[self::$link_name]->substr($key, $start, $end);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -585,8 +569,7 @@ 
             {
                 return self::$links[self::$link_name]->select($index);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -618,8 +601,7 @@ 
             {
                 return self::$links[self::$link_name]->dbsize();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -650,8 +632,7 @@ 
             {
                 return self::$links[self::$link_name]->flushdb();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -682,8 +663,7 @@ 
             {
                 return self::$links[self::$link_name]->flushall();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -716,14 +696,12 @@ 
                 if (!$is_bgsave) 
                 {
                     return self::$links[self::$link_name]->save();
-                }
-                else 
+                } else 
                 {
                     return self::$links[self::$link_name]->bgsave();
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -754,8 +732,7 @@ 
             {
                 return self::$links[self::$link_name]->info();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -787,14 +764,12 @@ 
                 if (!empty($len)) 
                 {
                     return $redis->slowlog($command, $len);
-                }
-                else 
+                } else 
                 {
                     return $redis->slowlog($command);
                 }
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -825,8 +800,7 @@ 
             {
                 return self::$links[self::$link_name]->lastsave();
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -859,8 +833,7 @@ 
             {
                 return self::$links[self::$link_name]->lpush($key, $value);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -893,8 +866,7 @@ 
             {
                 return self::$links[self::$link_name]->rpush($key, $value);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -926,8 +898,7 @@ 
             {
                 return self::$links[self::$link_name]->lpop($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -959,8 +930,7 @@ 
             {
                 return self::$links[self::$link_name]->rpop($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -992,8 +962,7 @@ 
             {
                 return self::$links[self::$link_name]->lSize($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1026,8 +995,7 @@ 
             {
                 return self::$links[self::$link_name]->lget($key, $index);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1061,8 +1029,7 @@ 
             {
                 return self::$links[self::$link_name]->lRange($key, $start, $end);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1105,8 +1072,7 @@ 
                 $list[] = $data;
             }
             return $list;
-        }
-        else
+        } else
         {
             // 没有数据返回NULL
             return NULL;
@@ -1137,8 +1103,7 @@ 
             {
                 return self::$links[self::$link_name]->keys($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1172,8 +1137,7 @@ 
             {
                 return self::$links[self::$link_name]->ttl($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1206,8 +1170,7 @@ 
             {
                 return self::$links[self::$link_name]->expire($key, $expire);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1239,8 +1202,7 @@ 
             {
                 return self::$links[self::$link_name]->exists($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1303,8 +1265,7 @@ 
             {
                 return self::$links[self::$link_name]->sadd($key, $value);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1336,8 +1297,7 @@ 
             {
                 return self::$links[self::$link_name]->spop($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);
@@ -1369,8 +1329,7 @@ 
             {
                 return self::$links[self::$link_name]->scard($key);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $msg = "PHP Fatal error:  Uncaught exception 'RedisException' with message '".$e->getMessage()."'\n";
             log::warn($msg);

core/util.php

Spacing +67 added lines, -67 removed lines

@@ -15,7 +15,7 @@ 
 
 namespace phpspider\core;
 // 引入PATH_DATA
-require_once __DIR__ . '/constants.php';
+require_once __DIR__.'/constants.php';
 
 class util
 {
@@ -45,7 +45,7 @@ 
         $lock = util::get_file(PATH_DATA."/lock/{$lock_name}.lock");
         if ($lock) 
         {
-            $time = time() - $lock;
+            $time = time()-$lock;
             // 还没到10分钟，说明进程还活着
             if ($time < $lock_timeout) 
             {
@@ -64,42 +64,42 @@ 
 
     public static function time2second($time, $is_log = true)
     {
-        if(is_numeric($time)) 
+        if (is_numeric($time)) 
         {
             $value = array(
                 "years" => 0, "days" => 0, "hours" => 0,
                 "minutes" => 0, "seconds" => 0,
             );
-            if($time >= 31556926)
+            if ($time >= 31556926)
             {
-                $value["years"] = floor($time/31556926);
-                $time = ($time%31556926);
+                $value["years"] = floor($time / 31556926);
+                $time = ($time % 31556926);
             }
-            if($time >= 86400)
+            if ($time >= 86400)
             {
-                $value["days"] = floor($time/86400);
-                $time = ($time%86400);
+                $value["days"] = floor($time / 86400);
+                $time = ($time % 86400);
             }
-            if($time >= 3600)
+            if ($time >= 3600)
             {
-                $value["hours"] = floor($time/3600);
-                $time = ($time%3600);
+                $value["hours"] = floor($time / 3600);
+                $time = ($time % 3600);
             }
-            if($time >= 60)
+            if ($time >= 60)
             {
-                $value["minutes"] = floor($time/60);
-                $time = ($time%60);
+                $value["minutes"] = floor($time / 60);
+                $time = ($time % 60);
             }
             $value["seconds"] = floor($time);
             //return (array) $value;
             //$t = $value["years"] ."y ". $value["days"] ."d ". $value["hours"] ."h ". $value["minutes"] ."m ".$value["seconds"]."s";
             if ($is_log) 
             {
-                $t = $value["days"] ."d ". $value["hours"] ."h ". $value["minutes"] ."m ".$value["seconds"]."s";
+                $t = $value["days"]."d ".$value["hours"]."h ".$value["minutes"]."m ".$value["seconds"]."s";
             }
             else 
             {
-                $t = $value["days"] ." days ". $value["hours"] ." hours ". $value["minutes"] ." minutes";
+                $t = $value["days"]." days ".$value["hours"]." hours ".$value["minutes"]." minutes";
             }
             return $t;
 
@@ -114,7 +114,7 @@ 
     {
         if ($day_end === true) $day_end = date('Y-m-d');
 
-        return array_map(function ($time) {
+        return array_map(function($time) {
             return date('Y-m-d', $time);
         }, range(strtotime($day_sta), strtotime($day_end), $range));
     }
@@ -129,17 +129,17 @@ 
      */
     public static function get_file_line($filepath)
     {
-        $line = 0 ;
-        $fp = fopen($filepath , 'r');
+        $line = 0;
+        $fp = fopen($filepath, 'r');
         if (!$fp) 
         {
             return 0;
         }
         //获取文件的一行内容，注意：需要php5才支持该函数；
-        while( stream_get_line($fp,8192,"\n") ){
+        while (stream_get_line($fp, 8192, "\n")) {
             $line++;
         }
-        fclose($fp);//关闭文件
+        fclose($fp); //关闭文件
         return $line;
     }
 
@@ -203,7 +203,7 @@ 
     public static function format_bytes($size)
     {
         $unit = array('b', 'kb', 'mb', 'gb', 'tb', 'pb');
-        return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2) . ' ' . $unit[$i];
+        return @round($size / pow(1024, ($i = floor(log($size, 1024)))), 2).' '.$unit[$i];
     }
 
     /**
@@ -234,7 +234,7 @@ 
     public static function rand_num($num = 7)
     {
         $rand = "";
-        for ($i = 0; $i < $num; $i ++)
+        for ($i = 0; $i < $num; $i++)
         {
             $rand .= mt_rand(0, 9);
         }
@@ -253,7 +253,7 @@ 
     {
         $chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
         $string = "";
-        for ($i = 0; $i < $num; $i ++)
+        for ($i = 0; $i < $num; $i++)
         {
             $string .= substr($chars, rand(0, strlen($chars)), 1);
         }
@@ -284,20 +284,20 @@ 
         }
         if (count($pinyins) == 0)
         {
-            $fp = fopen(PATH_DATA . '/pinyin.dat', 'r');
+            $fp = fopen(PATH_DATA.'/pinyin.dat', 'r');
             while (!feof($fp))
             {
                 $line = trim(fgets($fp));
-                $pinyins[$line[0] . $line[1]] = substr($line, 3, strlen($line) - 3);
+                $pinyins[$line[0].$line[1]] = substr($line, 3, strlen($line)-3);
             }
             fclose($fp);
         }
-        for ($i = 0; $i < $slen; $i ++)
+        for ($i = 0; $i < $slen; $i++)
         {
             if (ord($str[$i]) > 0x80)
             {
-                $c = $str[$i] . $str[$i + 1];
-                $i ++;
+                $c = $str[$i].$str[$i+1];
+                $i++;
                 if (isset($pinyins[$c]))
                 {
                     if ($ishead == 0)
@@ -344,7 +344,7 @@ 
         if (($firstchar_ord >= 65 and $firstchar_ord <= 91) or ($firstchar_ord >= 48 and $firstchar_ord <= 57)) return $s0{0};
         // $s = iconv("utf-8", "gbk//ignore", $s0);
         $s = mb_convert_encoding($s0, "gbk", "utf-8");
-        $asc = ord($s{0}) * 256 + ord($s{1}) - 65536;
+        $asc = ord($s{0}) * 256+ord($s{1})-65536;
         if ($asc >= -20319 and $asc <= -20284) return "A";
         if ($asc >= -20283 and $asc <= -19776) return "B";
         if ($asc >= -19775 and $asc <= -19219) return "C";
@@ -382,7 +382,7 @@ 
     public static function getxtime($day)
     {
         $day = intval($day);
-        return mktime(23, 59, 59, date("m"), date("d") - $day, date("y"));
+        return mktime(23, 59, 59, date("m"), date("d")-$day, date("y"));
     }
 
     /**
@@ -446,7 +446,7 @@ 
      */
     public static function path_exists($path)
     {
-        $pathinfo = pathinfo($path . '/tmp.txt');
+        $pathinfo = pathinfo($path.'/tmp.txt');
         if (!empty($pathinfo['dirname']))
         {
             if (file_exists($pathinfo['dirname']) === false)
@@ -474,10 +474,10 @@ 
         $dh = opendir($dir);
         while ($file = readdir($dh)) 
         {
-            if($file!="." && $file!="..") 
+            if ($file != "." && $file != "..") 
             {
                 $fullpath = $dir."/".$file;
-                if(!is_dir($fullpath)) 
+                if (!is_dir($fullpath)) 
                 {
                     unlink($fullpath);
                 } 
@@ -490,7 +490,7 @@ 
 
         closedir($dh);
         //删除当前文件夹：
-        if(rmdir($dir)) 
+        if (rmdir($dir)) 
         {
             return true;
         }
@@ -519,7 +519,7 @@ 
         {
             if ($file != '.' && $file != '..')
             {
-                $fullpath = $path . '/' . $file;
+                $fullpath = $path.'/'.$file;
                 if (is_link($fullpath))
                 {
                     return FALSE;
@@ -603,7 +603,7 @@ 
      */
     public static function array_iconv($arr, $from_encoding, $to_encoding)
     {
-        eval('$arr = '.iconv($from_encoding, $to_encoding.'//IGNORE', var_export($arr,TRUE)).';');
+        eval('$arr = '.iconv($from_encoding, $to_encoding.'//IGNORE', var_export($arr, TRUE)).';');
         return $arr;
     }
 
@@ -638,7 +638,7 @@ 
         }
         if (isset($ymd[1])) $dt[1] = $ymd[1];
         if (isset($ymd[2])) $dt[2] = $ymd[2];
-        if (strlen($dt[0]) == 2) $dt[0] = '20' . $dt[0];
+        if (strlen($dt[0]) == 2) $dt[0] = '20'.$dt[0];
         if (isset($ds[1]))
         {
             $hms = explode(":", $ds[1]);
@@ -675,25 +675,25 @@ 
         {
             $j = 0;
             $wordscut = "";
-            for ($i = 0; $i < count($info[0]); $i ++)
+            for ($i = 0; $i < count($info[0]); $i++)
             {
                 $wordscut .= $info[0][$i];
                 if (ord($info[0][$i]) >= 128)
                 {
-                    $j = $j + 2;
+                    $j = $j+2;
                 }
                 else
                 {
-                    $j = $j + 1;
+                    $j = $j+1;
                 }
                 if ($j >= $length)
                 {
-                    return $wordscut . $etc;
+                    return $wordscut.$etc;
                 }
             }
             return join('', $info[0]);
         }
-        return join("", array_slice($info[0], 0, $length)) . $etc;
+        return join("", array_slice($info[0], 0, $length)).$etc;
     }
 
     /**
@@ -732,7 +732,7 @@ 
             }
             if (is_array($header['Location']))
             {
-                return $header['Location'][count($header['Location']) - 1];
+                return $header['Location'][count($header['Location'])-1];
             }
             else
             {
@@ -756,12 +756,12 @@ 
         {
             $extralen = unpack('v', substr($data, 10, 2));
             $extralen = $extralen[1];
-            $headerlen += 2 + $extralen;
+            $headerlen += 2+$extralen;
         }
         if ($flags & 8)         // Filename
-        $headerlen = strpos($data, chr(0), $headerlen) + 1;
+        $headerlen = strpos($data, chr(0), $headerlen)+1;
         if ($flags & 16)         // Comment
-        $headerlen = strpos($data, chr(0), $headerlen) + 1;
+        $headerlen = strpos($data, chr(0), $headerlen)+1;
         if ($flags & 2)         // CRC at end of file
         $headerlen += 2;
         $unpacked = @gzinflate(substr($data, $headerlen));
@@ -799,10 +799,10 @@ 
         // 整数部分
         if ($num > 0)
         {
-            $retval = "元" . $retval;
+            $retval = "元".$retval;
             $f = 1;
             $str = strrev(intval($num));
-            for ($i = 0, $c = strlen($str); $i < $c; $i ++)
+            for ($i = 0, $c = strlen($str); $i < $c; $i++)
             {
                 if ($str[$i] > 0)
                 {
@@ -817,16 +817,16 @@ 
                     $out[$i] = $char[$str[$i]];
                 }
                 $out[$i] .= $str[$i] != '0' ? $unit[$i % 4] : '';
-                if ($i > 1 and $str[$i] + $str[$i - 1] == 0)
+                if ($i > 1 and $str[$i]+$str[$i-1] == 0)
                 {
                     $out[$i] = '';
                 }
                 if ($i % 4 == 0)
                 {
-                    $out[$i] .= $unit[4 + floor($i / 4)];
+                    $out[$i] .= $unit[4+floor($i / 4)];
                 }
             }
-            $retval = join('', array_reverse($out)) . $retval;
+            $retval = join('', array_reverse($out)).$retval;
         }
         return $retval;
     }
@@ -837,22 +837,22 @@ 
         switch ($status) 
         {
             case 'succ':
-                $out = "\033[32m";    // Blue
+                $out = "\033[32m"; // Blue
                 break;
             case "error":
-                $out = "\033[31m";    // Red
+                $out = "\033[31m"; // Red
                 break;
             case "warn":
-                $out = "\033[33m";    // Yellow
+                $out = "\033[33m"; // Yellow
                 break;
             case "note":
-                $out = "\033[34m";    // Green
+                $out = "\033[34m"; // Green
                 break;
             case "debug":
-                $out = "\033[36m";    // Green
+                $out = "\033[36m"; // Green
                 break;
             default:
-                $out = "\033[0m";     // info
+                $out = "\033[0m"; // info
                 break;
         }
         return $out.$str."\033[0m";
@@ -860,19 +860,19 @@ 
 
     public static function node_to_array($dom, $node) 
     {
-        if(!is_a( $dom, 'DOMDocument' ) || !is_a( $node, 'DOMNode' )) 
+        if (!is_a($dom, 'DOMDocument') || !is_a($node, 'DOMNode')) 
         {
             return false;
         }
 
         $array = array(); 
         // Discard empty nodes
-        $localName = trim( $node->localName );
-        if( empty($localName)) 
+        $localName = trim($node->localName);
+        if (empty($localName)) 
         {
             return false;
         }
-        if( XML_TEXT_NODE == $node->nodeType ) 
+        if (XML_TEXT_NODE == $node->nodeType) 
         {
             return $node->nodeValue;
         }
@@ -882,14 +882,14 @@ 
         } 
         foreach ($node->childNodes as $childNode) 
         { 
-            if ( (isset($childNode->childNodes->length) && 1 == $childNode->childNodes->length) && 
-                 XML_TEXT_NODE == $childNode->firstChild->nodeType )
+            if ((isset($childNode->childNodes->length) && 1 == $childNode->childNodes->length) && 
+                 XML_TEXT_NODE == $childNode->firstChild->nodeType)
             { 
                 $array[$childNode->localName] = $childNode->nodeValue; 
             }  
             else 
             {
-                if( false !== ($a = self::node_to_array( $dom, $childNode))) 
+                if (false !== ($a = self::node_to_array($dom, $childNode))) 
                 {
                     $array[$childNode->localName] = $a;
                 }
@@ -900,7 +900,7 @@ 
 
     public static function is_win()
     {
-        return strtoupper(substr(PHP_OS,0,3))==="WIN";
+        return strtoupper(substr(PHP_OS, 0, 3)) === "WIN";
     }
 
     /**

Braces +139 added lines, -78 removed lines

@@ -96,15 +96,13 @@ 
             if ($is_log) 
             {
                 $t = $value["days"] ."d ". $value["hours"] ."h ". $value["minutes"] ."m ".$value["seconds"]."s";
-            }
-            else 
+            } else 
             {
                 $t = $value["days"] ." days ". $value["hours"] ." hours ". $value["minutes"] ." minutes";
             }
             return $t;
 
-        }
-        else
+        } else
         {
             return false;
         }
@@ -112,7 +110,9 @@ 
 
     public static function get_days($day_sta, $day_end = true, $range = 86400)
     {
-        if ($day_end === true) $day_end = date('Y-m-d');
+        if ($day_end === true) {
+            $day_end = date('Y-m-d');
+        }
 
         return array_map(function ($time) {
             return date('Y-m-d', $time);
@@ -303,22 +303,18 @@ 
                     if ($ishead == 0)
                     {
                         $restr .= $pinyins[$c];
-                    }
-                    else
+                    } else
                     {
                         $restr .= $pinyins[$c][0];
                     }
-                }
-                else
+                } else
                 {
                     // $restr .= "_";
                 }
-            }
-            else if (preg_match("/[a-z0-9]/i", $str[$i]))
+            } else if (preg_match("/[a-z0-9]/i", $str[$i]))
             {
                 $restr .= $str[$i];
-            }
-            else
+            } else
             {
                 // $restr .= "_";
             }
@@ -341,33 +337,81 @@ 
     public static function letter_first($s0)
     {
         $firstchar_ord = ord(strtoupper($s0{0}));
-        if (($firstchar_ord >= 65 and $firstchar_ord <= 91) or ($firstchar_ord >= 48 and $firstchar_ord <= 57)) return $s0{0};
+        if (($firstchar_ord >= 65 and $firstchar_ord <= 91) or ($firstchar_ord >= 48 and $firstchar_ord <= 57)) {
+            return $s0{0};
+        }
         // $s = iconv("utf-8", "gbk//ignore", $s0);
         $s = mb_convert_encoding($s0, "gbk", "utf-8");
         $asc = ord($s{0}) * 256 + ord($s{1}) - 65536;
-        if ($asc >= -20319 and $asc <= -20284) return "A";
-        if ($asc >= -20283 and $asc <= -19776) return "B";
-        if ($asc >= -19775 and $asc <= -19219) return "C";
-        if ($asc >= -19218 and $asc <= -18711) return "D";
-        if ($asc >= -18710 and $asc <= -18527) return "E";
-        if ($asc >= -18526 and $asc <= -18240) return "F";
-        if ($asc >= -18239 and $asc <= -17923) return "G";
-        if ($asc >= -17922 and $asc <= -17418) return "H";
-        if ($asc >= -17417 and $asc <= -16475) return "J";
-        if ($asc >= -16474 and $asc <= -16213) return "K";
-        if ($asc >= -16212 and $asc <= -15641) return "L";
-        if ($asc >= -15640 and $asc <= -15166) return "M";
-        if ($asc >= -15165 and $asc <= -14923) return "N";
-        if ($asc >= -14922 and $asc <= -14915) return "O";
-        if ($asc >= -14914 and $asc <= -14631) return "P";
-        if ($asc >= -14630 and $asc <= -14150) return "Q";
-        if ($asc >= -14149 and $asc <= -14091) return "R";
-        if ($asc >= -14090 and $asc <= -13319) return "S";
-        if ($asc >= -13318 and $asc <= -12839) return "T";
-        if ($asc >= -12838 and $asc <= -12557) return "W";
-        if ($asc >= -12556 and $asc <= -11848) return "X";
-        if ($asc >= -11847 and $asc <= -11056) return "Y";
-        if ($asc >= -11055 and $asc <= -10247) return "Z";
+        if ($asc >= -20319 and $asc <= -20284) {
+            return "A";
+        }
+        if ($asc >= -20283 and $asc <= -19776) {
+            return "B";
+        }
+        if ($asc >= -19775 and $asc <= -19219) {
+            return "C";
+        }
+        if ($asc >= -19218 and $asc <= -18711) {
+            return "D";
+        }
+        if ($asc >= -18710 and $asc <= -18527) {
+            return "E";
+        }
+        if ($asc >= -18526 and $asc <= -18240) {
+            return "F";
+        }
+        if ($asc >= -18239 and $asc <= -17923) {
+            return "G";
+        }
+        if ($asc >= -17922 and $asc <= -17418) {
+            return "H";
+        }
+        if ($asc >= -17417 and $asc <= -16475) {
+            return "J";
+        }
+        if ($asc >= -16474 and $asc <= -16213) {
+            return "K";
+        }
+        if ($asc >= -16212 and $asc <= -15641) {
+            return "L";
+        }
+        if ($asc >= -15640 and $asc <= -15166) {
+            return "M";
+        }
+        if ($asc >= -15165 and $asc <= -14923) {
+            return "N";
+        }
+        if ($asc >= -14922 and $asc <= -14915) {
+            return "O";
+        }
+        if ($asc >= -14914 and $asc <= -14631) {
+            return "P";
+        }
+        if ($asc >= -14630 and $asc <= -14150) {
+            return "Q";
+        }
+        if ($asc >= -14149 and $asc <= -14091) {
+            return "R";
+        }
+        if ($asc >= -14090 and $asc <= -13319) {
+            return "S";
+        }
+        if ($asc >= -13318 and $asc <= -12839) {
+            return "T";
+        }
+        if ($asc >= -12838 and $asc <= -12557) {
+            return "W";
+        }
+        if ($asc >= -12556 and $asc <= -11848) {
+            return "X";
+        }
+        if ($asc >= -11847 and $asc <= -11056) {
+            return "Y";
+        }
+        if ($asc >= -11055 and $asc <= -10247) {
+            return "Z";
+        }
         return 0; // null
     }
     
@@ -400,11 +444,15 @@ 
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
             $content = curl_exec($ch);
             curl_close($ch);
-            if ($content) return $content;
+            if ($content) {
+                return $content;
+            }
         }
         $ctx = stream_context_create(array('http' => array('timeout' => $timeout)));
         $content = @file_get_contents($url, 0, $ctx);
-        if ($content) return $content;
+        if ($content) {
+            return $content;
+        }
         return false;
     }
 
@@ -429,8 +477,7 @@ 
             // 多个php-fpm写一个文件的时候容易丢失，要加锁
             //return @file_put_contents($file, $content, FILE_APPEND|LOCK_EX);
             return @file_put_contents($file, $content, FILE_APPEND);
-        }
-        else
+        } else
         {
             return @file_put_contents($file, $content, LOCK_EX);
         }
@@ -480,8 +527,7 @@ 
                 if(!is_dir($fullpath)) 
                 {
                     unlink($fullpath);
-                } 
-                else
+                } else
                 {
                     self::deldir($fullpath);
                 }
@@ -493,8 +539,7 @@ 
         if(rmdir($dir)) 
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -523,12 +568,10 @@ 
                 if (is_link($fullpath))
                 {
                     return FALSE;
-                }
-                elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
+                } elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
                 {
                     return FALSE;
-                }
-                elseif (!self::chmodr($fullpath, $filemode))
+                } elseif (!self::chmodr($fullpath, $filemode))
                 {
                     return FALSE;
                 }
@@ -540,8 +583,7 @@ 
         if (@chmod($path, $filemode))
         {
             return TRUE;
-        }
-        else
+        } else
         {
             return FALSE;
         }
@@ -576,8 +618,7 @@ 
         if ($str === mb_convert_encoding(mb_convert_encoding($str, "UTF-32", "UTF-8"), "UTF-8", "UTF-32"))
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -636,15 +677,27 @@ 
         {
             $dt[0] = $ymd[0];
         }
-        if (isset($ymd[1])) $dt[1] = $ymd[1];
-        if (isset($ymd[2])) $dt[2] = $ymd[2];
-        if (strlen($dt[0]) == 2) $dt[0] = '20' . $dt[0];
+        if (isset($ymd[1])) {
+            $dt[1] = $ymd[1];
+        }
+        if (isset($ymd[2])) {
+            $dt[2] = $ymd[2];
+        }
+        if (strlen($dt[0]) == 2) {
+            $dt[0] = '20' . $dt[0];
+        }
         if (isset($ds[1]))
         {
             $hms = explode(":", $ds[1]);
-            if (isset($hms[0])) $dt[3] = $hms[0];
-            if (isset($hms[1])) $dt[4] = $hms[1];
-            if (isset($hms[2])) $dt[5] = $hms[2];
+            if (isset($hms[0])) {
+                $dt[3] = $hms[0];
+            }
+            if (isset($hms[1])) {
+                $dt[4] = $hms[1];
+            }
+            if (isset($hms[2])) {
+                $dt[5] = $hms[2];
+            }
         }
         foreach ($dt as $k => $v)
         {
@@ -658,8 +711,7 @@ 
         if (!empty($mt))
         {
             return $mt;
-        }
-        else
+        } else
         {
             return strtotime($dtime);
         }
@@ -668,8 +720,12 @@ 
     public static function cn_substr($string, $length = 80, $etc = '...', $count_words = true)
     {
         mb_internal_encoding("UTF-8");
-        if ($length == 0) return '';
-        if (strlen($string) <= $length) return $string;
+        if ($length == 0) {
+            return '';
+        }
+        if (strlen($string) <= $length) {
+            return $string;
+        }
         preg_match_all("/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xef][\x80-\xbf][\x80-\xbf]|\xf0[\x90-\xbf][\x80-\xbf][\x80-\xbf]|[\xf1-\xf7][\x80-\xbf][\x80-\xbf][\x80-\xbf]/", $string, $info);
         if ($count_words)
         {
@@ -681,8 +737,7 @@ 
                 if (ord($info[0][$i]) >= 128)
                 {
                     $j = $j + 2;
-                }
-                else
+                } else
                 {
                     $j = $j + 1;
                 }
@@ -733,13 +788,11 @@ 
             if (is_array($header['Location']))
             {
                 return $header['Location'][count($header['Location']) - 1];
-            }
-            else
+            } else
             {
                 return $header['Location'];
             }
-        }
-        else
+        } else
         {
             return $url;
         }
@@ -758,14 +811,22 @@ 
             $extralen = $extralen[1];
             $headerlen += 2 + $extralen;
         }
-        if ($flags & 8)         // Filename
+        if ($flags & 8) {
+            // Filename
         $headerlen = strpos($data, chr(0), $headerlen) + 1;
-        if ($flags & 16)         // Comment
+        }
+        if ($flags & 16) {
+            // Comment
         $headerlen = strpos($data, chr(0), $headerlen) + 1;
-        if ($flags & 2)         // CRC at end of file
+        }
+        if ($flags & 2) {
+            // CRC at end of file
         $headerlen += 2;
+        }
         $unpacked = @gzinflate(substr($data, $headerlen));
-        if ($unpacked === FALSE) $unpacked = $data;
+        if ($unpacked === FALSE) {
+            $unpacked = $data;
+        }
         return $unpacked;
     }
 
@@ -777,7 +838,9 @@ 
      */
     public static function number2chinese($num, $sim = FALSE)
     {
-        if (!is_numeric($num)) return '含有非数字非小数点字符！';
+        if (!is_numeric($num)) {
+            return '含有非数字非小数点字符！';
+        }
         $char = $sim ? array('零', '一', '二', '三', '四', '五', '六', '七', '八', '九') : array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
         $unit = $sim ? array('', '十', '百', '千', '', '万', '亿', '兆') : array('', '拾', '佰', '仟', '', '萬', '億', '兆');
         $retval = '';
@@ -811,8 +874,7 @@ 
                 if ($f == 1 && $str[$i] == 0)
                 {
                     $out[$i] = "";
-                }
-                else
+                } else
                 {
                     $out[$i] = $char[$str[$i]];
                 }
@@ -886,8 +948,7 @@ 
                  XML_TEXT_NODE == $childNode->firstChild->nodeType )
             { 
                 $array[$childNode->localName] = $childNode->nodeValue; 
-            }  
-            else 
+            } else 
             {
                 if( false !== ($a = self::node_to_array( $dom, $childNode))) 
                 {

core/phpspider.php

Switch Indentation +29 added lines, -29 removed lines

@@ -758,35 +758,35 @@
         switch($command)
         {
             // 启动 phpspider
-        case 'start':
-            if ($command2 === '-d') 
-            {
-                self::$daemonize = true;
-            }
-            break;
-        case 'stop':
-            exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}'", $info);
-            if (count($info) <= 1)
-            {
-                echo "PHPSpider[$start_file] not run\n";
-            }
-            else 
-            {
-                //echo "PHPSpider[$start_file] is stoping ...\n";
-                echo "PHPSpider[$start_file] stop success";
-                exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}' |xargs kill -SIGINT", $info);
-            }
-            exit;
-            break;
-        case 'kill':
-            exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}' |xargs kill -SIGKILL");
-            break;
-            // 显示 phpspider 运行状态
-        case 'status':
-            exit(0);
-            // 未知命令
-        default :
-            exit("Usage: php yourfile.php {start|stop|status|kill}\n");
+            case 'start':
+                if ($command2 === '-d') 
+                {
+                    self::$daemonize = true;
+                }
+                break;
+            case 'stop':
+                exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}'", $info);
+                if (count($info) <= 1)
+                {
+                    echo "PHPSpider[$start_file] not run\n";
+                }
+                else 
+                {
+                    //echo "PHPSpider[$start_file] is stoping ...\n";
+                    echo "PHPSpider[$start_file] stop success";
+                    exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}' |xargs kill -SIGINT", $info);
+                }
+                exit;
+                break;
+            case 'kill':
+                exec("ps aux | grep $start_file | grep -v grep | awk '{print $2}' |xargs kill -SIGKILL");
+                break;
+                // 显示 phpspider 运行状态
+            case 'status':
+                exit(0);
+                // 未知命令
+            default :
+                exit("Usage: php yourfile.php {start|stop|status|kill}\n");
         }
     }
 

Spacing +133 added lines, -133 removed lines

@@ -399,7 +399,7 @@ 
     public function __construct($configs = array())
     {
         // 产生时钟云，解决php7下面ctrl+c无法停止bug
-        declare(ticks = 1);
+        declare(ticks=1);
 
         // 先打开以显示验证报错内容
         log::$log_show = true;
@@ -416,16 +416,16 @@ 
             exit;
         }
 
-        $configs['name']        = isset($configs['name'])        ? $configs['name']        : 'phpspider';
-        $configs['proxy']       = isset($configs['proxy'])       ? $configs['proxy']       : false;
-        $configs['user_agent']  = isset($configs['user_agent'])  ? $configs['user_agent']  : self::AGENT_PC;
-        $configs['client_ip']   = isset($configs['client_ip'])   ? $configs['client_ip']   : array();
-        $configs['interval']    = isset($configs['interval'])    ? $configs['interval']    : self::INTERVAL;
-        $configs['timeout']     = isset($configs['timeout'])     ? $configs['timeout']     : self::TIMEOUT;
-        $configs['max_try']     = isset($configs['max_try'])     ? $configs['max_try']     : self::MAX_TRY;
-        $configs['max_depth']   = isset($configs['max_depth'])   ? $configs['max_depth']   : 0;
-        $configs['max_fields']  = isset($configs['max_fields'])  ? $configs['max_fields']  : 0;
-        $configs['export']      = isset($configs['export'])      ? $configs['export']      : array();
+        $configs['name']        = isset($configs['name']) ? $configs['name'] : 'phpspider';
+        $configs['proxy']       = isset($configs['proxy']) ? $configs['proxy'] : false;
+        $configs['user_agent']  = isset($configs['user_agent']) ? $configs['user_agent'] : self::AGENT_PC;
+        $configs['client_ip']   = isset($configs['client_ip']) ? $configs['client_ip'] : array();
+        $configs['interval']    = isset($configs['interval']) ? $configs['interval'] : self::INTERVAL;
+        $configs['timeout']     = isset($configs['timeout']) ? $configs['timeout'] : self::TIMEOUT;
+        $configs['max_try']     = isset($configs['max_try']) ? $configs['max_try'] : self::MAX_TRY;
+        $configs['max_depth']   = isset($configs['max_depth']) ? $configs['max_depth'] : 0;
+        $configs['max_fields']  = isset($configs['max_fields']) ? $configs['max_fields'] : 0;
+        $configs['export']      = isset($configs['export']) ? $configs['export'] : array();
         //新增参数 BY KEN <a-site@foxmail.com>
         $configs['max_pages']         = isset($configs['max_pages']) ? $configs['max_pages'] : self::$max_pages;
         $configs['max_duration']      = isset($configs['max_duration']) ? $configs['max_duration'] : self::$max_duration;
@@ -443,11 +443,11 @@ 
         }
 
         // csv、sql、db
-        self::$export_type  = isset($configs['export']['type'])  ? $configs['export']['type']  : '';
-        self::$export_file  = isset($configs['export']['file'])  ? $configs['export']['file']  : '';
+        self::$export_type  = isset($configs['export']['type']) ? $configs['export']['type'] : '';
+        self::$export_file  = isset($configs['export']['file']) ? $configs['export']['file'] : '';
         self::$export_table = isset($configs['export']['table']) ? $configs['export']['table'] : '';
-        self::$db_config    = isset($configs['db_config'])       ? $configs['db_config']       : array();
-        self::$queue_config = isset($configs['queue_config'])    ? $configs['queue_config']    : array();
+        self::$db_config    = isset($configs['db_config']) ? $configs['db_config'] : array();
+        self::$queue_config = isset($configs['queue_config']) ? $configs['queue_config'] : array();
 
         // 是否设置了并发任务数, 并且大于1, 而且不是windows环境
         if (isset($configs['tasknum']) && $configs['tasknum'] > 1 && !util::is_win()) 
@@ -492,7 +492,7 @@ 
         // 投递状态
         $status = false;
         //限制最大子域名数量
-        if ( ! empty(self::$configs['max_sub_num']))
+        if (!empty(self::$configs['max_sub_num']))
         {
             //抓取到的子域名超过指定数量，就丢掉此域名
             $sub_domain_count = $this->sub_domain_count($url);
@@ -557,7 +557,7 @@ 
         // 投递状态
         $status = false;
         //限制最大子域名数量
-        if ( ! empty(self::$configs['max_sub_num']))
+        if (!empty(self::$configs['max_sub_num']))
         {
             //抓取超过 max_sub_num 子域名的，就丢掉
             $sub_domain_count = $this->sub_domain_count($url);
@@ -615,12 +615,12 @@ 
     {
         $parse_url = parse_url($url);
         //2018-1-3 通配所有域名
-        if ( ! empty($parse_url['host']) and self::$configs['domains'][0] == '*')
+        if (!empty($parse_url['host']) and self::$configs['domains'][0] == '*')
         {
             return true;
         }
         //限定域名
-        if (empty($parse_url['host']) || ! in_array($parse_url['host'], self::$configs['domains']))
+        if (empty($parse_url['host']) || !in_array($parse_url['host'], self::$configs['domains']))
         {
             return false;
         }
@@ -645,7 +645,7 @@ 
         }
 
         //增加 要排除的列表页特征正则 BY KEN <a-site@foxmail.com>
-        if ( ! empty(self::$configs['list_url_regexes_remove']))
+        if (!empty(self::$configs['list_url_regexes_remove']))
         {
             foreach (self::$configs['list_url_regexes_remove'] as $regex)
             {
@@ -668,7 +668,7 @@ 
             return true;
         }
 
-        if ( ! empty(self::$configs['list_url_regexes']))
+        if (!empty(self::$configs['list_url_regexes']))
         {
             foreach (self::$configs['list_url_regexes'] as $regex) 
             {
@@ -700,7 +700,7 @@ 
         }
 
         //增加 要排除的内容页特征正则 BY KEN <a-site@foxmail.com>
-        if ( ! empty(self::$configs['content_url_regexes_remove']))
+        if (!empty(self::$configs['content_url_regexes_remove']))
         {
             foreach (self::$configs['content_url_regexes_remove'] as $regex)
             {
@@ -722,7 +722,7 @@ 
             return false;
         }
 
-        if ( ! empty(self::$configs['content_url_regexes']))
+        if (!empty(self::$configs['content_url_regexes']))
         {
             foreach (self::$configs['content_url_regexes'] as $regex) 
             {
@@ -755,7 +755,7 @@ 
         $command2 = isset($argv[2]) ? $argv[2] : '';
 
         // 根据命令做相应处理
-        switch($command)
+        switch ($command)
         {
             // 启动 phpspider
         case 'start':
@@ -920,7 +920,7 @@ 
             // 显示最后结果
             log::$log_show = true;
 
-            $spider_time_run = util::time2second(intval(microtime(true) - self::$time_start));
+            $spider_time_run = util::time2second(intval(microtime(true)-self::$time_start));
             log::note("Spider finished in {$spider_time_run}");
 
             $get_collected_url_num = $this->get_collected_url_num();
@@ -949,12 +949,12 @@ 
         // 检查PHP版本
         if (version_compare(PHP_VERSION, '5.3.0', 'lt')) 
         {
-            log::error('PHP 5.3+ is required, currently installed version is: ' . phpversion());
+            log::error('PHP 5.3+ is required, currently installed version is: '.phpversion());
             exit;
         }
 
         // 检查CURL扩展
-        if(!function_exists('curl_init'))
+        if (!function_exists('curl_init'))
         {
             log::error('The curl extension was not found');
             exit;
@@ -975,26 +975,26 @@ 
         }
 
         // 集群、保存运行状态、多任务都需要Redis支持
-        if ( self::$multiserver || self::$save_running_state || self::$tasknum > 1 ) 
+        if (self::$multiserver || self::$save_running_state || self::$tasknum > 1) 
         {
             self::$use_redis = true;
 
             queue::set_connect('default', self::$queue_config);
             if (!queue::init()) 
             {
-                if ( self::$multiserver ) 
+                if (self::$multiserver) 
                 {
                     log::error('Multiserver needs Redis support, '.queue::$error);
                     exit;
                 }
 
-                if ( self::$tasknum > 1 ) 
+                if (self::$tasknum > 1) 
                 {
                     log::error('Multitasking needs Redis support, '.queue::$error);
                     exit;
                 }
 
-                if ( self::$save_running_state ) 
+                if (self::$save_running_state) 
                 {
                     log::error('Spider kept running state needs Redis support, '.queue::$error);
                     exit;
@@ -1015,7 +1015,7 @@ 
             exit;
         }
 
-        foreach ( self::$configs['scan_urls'] as $url ) 
+        foreach (self::$configs['scan_urls'] as $url) 
         {
             // 只检查配置中的入口URL, 通过 add_scan_url 添加的不检查了.
             if (!$this->is_scan_page($url))
@@ -1047,7 +1047,7 @@ 
             $start_file = $argv[0]; 
 
             $header = '';
-            if ( ! util::is_win())
+            if (!util::is_win())
             {
                 $header .= "\033[33m";
             }
@@ -1057,7 +1057,7 @@ 
             $header .= "  * Documentation: https://doc.phpspider.org\n";
             $header .= '  * Task Number: '.self::$tasknum."\n\n";
             $header .= "Input \"php $start_file stop\" to quit. Start success.\n";
-            if ( ! util::is_win())
+            if (!util::is_win())
             {
                 $header .= "\033[0m";
             }
@@ -1079,7 +1079,7 @@ 
         //--------------------------------------------------------------------------------
 
         // 添加入口URL到队列
-        foreach ( self::$configs['scan_urls'] as $url ) 
+        foreach (self::$configs['scan_urls'] as $url) 
         {
             // false 表示不允许重复
             $this->add_scan_url($url, null, false);
@@ -1127,7 +1127,7 @@ 
         $pid = pcntl_fork();
 
         // 主进程记录子进程pid
-        if($pid > 0)
+        if ($pid > 0)
         {
             // 暂时没用
             //self::$taskpids[$taskid] = $pid;
@@ -1173,7 +1173,7 @@ 
 
     public function do_collect_page() 
     {
-        while( $queue_lsize = $this->queue_lsize() )
+        while ($queue_lsize = $this->queue_lsize())
         { 
             // 如果是主任务
             if (self::$taskmaster) 
@@ -1182,7 +1182,7 @@ 
                 if (self::$tasknum > 1 && !self::$fork_task_complete) 
                 {
                     // 主进程采集到多于任务数2个时, 生成子任务一起采集
-                    if ($queue_lsize > self::$tasknum + 2)
+                    if ($queue_lsize > self::$tasknum+2)
                     {
                         self::$fork_task_complete = true;
 
@@ -1196,7 +1196,7 @@ 
                     }
                 }
                 //在主进程中，保存当前配置到缓存，以使子进程可实时读取动态修改后的配置 20180209
-                if (self::$use_redis and ! empty(self::$configs))
+                if (self::$use_redis and !empty(self::$configs))
                 {
                     queue::set('configs_'.self::$configs['name'], json_encode(self::$configs));
                 }
@@ -1215,10 +1215,10 @@ 
             else 
             {
                 // 主进程采集到多于任务数2个时, 子任务可以采集, 否则等待...
-                if ($queue_lsize > self::$taskid + 2)
+                if ($queue_lsize > self::$taskid+2)
                 {
                     //在子进程中，从内存中实时读取当前最新配置，用于适应主进程常驻内存模式，无限循环后的配置变动 20180209
-                    if (self::$use_redis and ! empty(self::$configs))
+                    if (self::$use_redis and !empty(self::$configs))
                     {
                         if ($configs_active = queue::get('configs_'.self::$configs['name']))
                         {
@@ -1345,7 +1345,7 @@ 
         $html = $this->request_url($url, $link);
 
         //记录速度较慢域名花费抓取时间 20180213
-        $time_run = round(microtime(true) - $page_time_start);
+        $time_run = round(microtime(true)-$page_time_start);
         if ($time_run > 1)
         {
             $this->incr_duration_num($url, $time_run);
@@ -1453,7 +1453,7 @@ 
             if (self::$configs['max_depth'] == 0 || $link['depth'] < self::$configs['max_depth']) 
             {
                 // 分析提取HTML页面中的URL
-                $this->get_urls($page['raw'], $url, $link['depth'] + 1);
+                $this->get_urls($page['raw'], $url, $link['depth']+1);
             }
         }
 
@@ -1468,10 +1468,10 @@ 
         $this->incr_depth_num($link['depth']);
 
         // 处理页面耗时时间
-        $time_run = round(microtime(true) - $page_time_start, 3);
+        $time_run = round(microtime(true)-$page_time_start, 3);
         log::debug('task id: '.self::$taskid." Success process page {$url} in {$time_run} s");
 
-        $spider_time_run = util::time2second(intval(microtime(true) - self::$time_start));
+        $spider_time_run = util::time2second(intval(microtime(true)-self::$time_start));
         log::info('task id: '.self::$taskid." Spider running in {$spider_time_run}");
 
         // 爬虫爬取每个网页的时间间隔, 单位: 毫秒
@@ -1559,7 +1559,7 @@ 
                 $html = $return;
             }
             unset($return);
-            if ( ! $html)
+            if (!$html)
             {
                 return false;
             }
@@ -1593,19 +1593,19 @@ 
             }
             else 
             {
-                if ( ! empty(self::$configs['max_try']) and $http_code == 407)
+                if (!empty(self::$configs['max_try']) and $http_code == 407)
                 {
                     // 扔到队列头部去, 继续采集
                     $this->queue_rpush($link);
                     log::error("Failed to download page {$url}");
                     self::$collect_fail++;
                 }
-                elseif ( ! empty(self::$configs['max_try']) and in_array($http_code, array('0', '502', '503', '429')))
+                elseif (!empty(self::$configs['max_try']) and in_array($http_code, array('0', '502', '503', '429')))
                 {
                     // 采集次数加一
                     $link['try_num']++;
                     // 抓取次数 小于 允许抓取失败次数
-                    if ( $link['try_num'] <= $link['max_try'] ) 
+                    if ($link['try_num'] <= $link['max_try']) 
                     {
                         // 扔到队列头部去, 继续采集
                         $this->queue_rpush($link);
@@ -1623,7 +1623,7 @@ 
         }
 
         // 爬取页面耗时时间
-        $time_run = round(microtime(true) - $time_start, 3);
+        $time_run = round(microtime(true)-$time_start, 3);
         log::debug("Success download page {$url} in {$time_run} s");
         self::$collect_succ++;
 
@@ -1669,7 +1669,7 @@ 
         foreach ($urls as $key=>$url) 
         {
             //限制最大子域名数量
-            if ( ! empty(self::$configs['max_sub_num']))
+            if (!empty(self::$configs['max_sub_num']))
             {
                 //抓取子域名超过超过指定值，就丢掉
                 $sub_domain_count = $this->sub_domain_count($url);
@@ -1784,7 +1784,7 @@ 
             return false;
         }
         // 过滤mailto、tel、sms、wechat、sinaweibo、weixin等协议
-        if ( ! in_array($parse_url['scheme'], array('http', 'https')))
+        if (!in_array($parse_url['scheme'], array('http', 'https')))
         {
             return false;
         }
@@ -1794,8 +1794,8 @@ 
         $base_url_path = $domain.$path;
         $base_url_path = preg_replace("/\/([^\/]*)\.(.*)$/", '/', $base_url_path);
         $base_url_path = preg_replace("/\/$/", '', $base_url_path);
-        $i             = $path_step             = 0;
-        $dstr          = $pstr          = '';
+        $i             = $path_step = 0;
+        $dstr          = $pstr = '';
         $pos           = strpos($url, '#');
         if ($pos > 0)
         {
@@ -1809,28 +1809,28 @@ 
             $url = preg_replace('/^\/\//iu', '', $url);
         }
         // /1234.html
-        elseif($url[0] == '/')
+        elseif ($url[0] == '/')
         {
             $url = $domain.$url;
         }
         // ./1234.html、../1234.html 这种类型的
-        elseif($url[0] == '.')
+        elseif ($url[0] == '.')
         {
-            if(!isset($url[2]))
+            if (!isset($url[2]))
             {
                 return false;
             }
             else
             {
-                $urls = explode('/',$url);
-                foreach($urls as $u)
+                $urls = explode('/', $url);
+                foreach ($urls as $u)
                 {
-                    if( $u == '..' )
+                    if ($u == '..')
                     {
                         $path_step++;
                     }
                     // 遇到 ., 不知道为什么不直接写$u == '.', 貌似一样的
-                    else if( $i < count($urls)-1 )
+                    else if ($i < count($urls)-1)
                     {
                         $dstr .= $urls[$i].'/';
                     }
@@ -1840,29 +1840,29 @@ 
                     }
                     $i++;
                 }
-                $urls = explode('/',$base_url_path);
-                if(count($urls) <= $path_step)
+                $urls = explode('/', $base_url_path);
+                if (count($urls) <= $path_step)
                 {
                     return false;
                 }
                 else
                 {
                     $pstr = '';
-                    for($i=0;$i<count($urls)-$path_step;$i++){ $pstr .= $urls[$i].'/'; }
+                    for ($i = 0; $i < count($urls)-$path_step; $i++) { $pstr .= $urls[$i].'/'; }
                     $url = $pstr.$dstr;
                 }
             }
         }
         else 
         {
-            if( strtolower(substr($url, 0, 7))=='http://' )
+            if (strtolower(substr($url, 0, 7)) == 'http://')
             {
                 $url    = preg_replace('#^http://#i', '', $url);
                 $scheme = 'http';
             }
-            else if( strtolower(substr($url, 0, 8))=='https://' )
+            else if (strtolower(substr($url, 0, 8)) == 'https://')
             {
-                $url = preg_replace('#^https://#i','',$url);
+                $url = preg_replace('#^https://#i', '', $url);
                 $scheme = "https";
             }
             // 相对路径，像 1111.html 这种
@@ -1882,7 +1882,7 @@ 
         $parse_url = @parse_url($url);
         $domain    = empty($parse_url['host']) ? $domain : $parse_url['host'];
         // 如果host不为空, 判断是不是要爬取的域名
-        if ( ! empty($parse_url['host']))
+        if (!empty($parse_url['host']))
         {
             //2018-1-3 通配所有域名
             if (empty(self::$configs['domains']) or self::$configs['domains'][0] == '*')
@@ -1968,16 +1968,16 @@ 
     public function link_uncompress($link)
     {
         $link = array(
-            'url'          => isset($link['url'])          ? $link['url']          : '',             
-            'url_type'     => isset($link['url_type'])     ? $link['url_type']     : '',             
-            'method'       => isset($link['method'])       ? $link['method']       : 'get',             
-            'headers'      => isset($link['headers'])      ? $link['headers']      : array(),    
-            'params'       => isset($link['params'])       ? $link['params']       : array(),           
+            'url'          => isset($link['url']) ? $link['url'] : '',             
+            'url_type'     => isset($link['url_type']) ? $link['url_type'] : '',             
+            'method'       => isset($link['method']) ? $link['method'] : 'get',             
+            'headers'      => isset($link['headers']) ? $link['headers'] : array(),    
+            'params'       => isset($link['params']) ? $link['params'] : array(),           
             'context_data' => isset($link['context_data']) ? $link['context_data'] : '',                
-            'proxy'        => isset($link['proxy'])        ? $link['proxy']        : self::$configs['proxy'],             
-            'try_num'      => isset($link['try_num'])      ? $link['try_num']      : 0,                 
-            'max_try'      => isset($link['max_try'])      ? $link['max_try']      : self::$configs['max_try'],
-            'depth'        => isset($link['depth'])        ? $link['depth']        : 0,             
+            'proxy'        => isset($link['proxy']) ? $link['proxy'] : self::$configs['proxy'],             
+            'try_num'      => isset($link['try_num']) ? $link['try_num'] : 0,                 
+            'max_try'      => isset($link['max_try']) ? $link['max_try'] : self::$configs['max_try'],
+            'depth'        => isset($link['depth']) ? $link['depth'] : 0,             
         );
 
         return $link;
@@ -2027,10 +2027,10 @@ 
                     exit(0);
                 }
 
-                if (version_compare(PHP_VERSION,'5.4.0','<'))
+                if (version_compare(PHP_VERSION, '5.4.0', '<'))
                 {
                     $fields_str = json_encode($fields);
-                    $fields_str = preg_replace_callback("#\\\u([0-9a-f]{4})#i", function ($matchs)
+                    $fields_str = preg_replace_callback("#\\\u([0-9a-f]{4})#i", function($matchs)
                     {
                         return @iconv('UCS-2BE', 'UTF-8', pack('H4', $matchs[1]));
                     }, $fields_str);
@@ -2099,7 +2099,7 @@ 
             if (!empty($conf['selector'])) 
             {
                 // 如果这个field是上一个field的附带连接
-                if (isset($conf['source_type']) && $conf['source_type']=='attached_url') 
+                if (isset($conf['source_type']) && $conf['source_type'] == 'attached_url') 
                 {
                     // 取出上个field的内容作为连接, 内容分页是不进队列直接下载网页的
                     if (!empty($fields[$conf['attached_url']])) 
@@ -2126,16 +2126,16 @@ 
                 }
 
                 // 没有设置抽取规则的类型 或者 设置为 xpath
-                if (!isset($conf['selector_type']) || $conf['selector_type']=='xpath') 
+                if (!isset($conf['selector_type']) || $conf['selector_type'] == 'xpath') 
                 {
                     // 如果找不到，返回的是false
                     $values = $this->get_fields_xpath($html, $conf['selector'], $conf['name']);
                 }
-                elseif ($conf['selector_type']=='css') 
+                elseif ($conf['selector_type'] == 'css') 
                 {
                     $values = $this->get_fields_css($html, $conf['selector'], $conf['name']);
                 }
-                elseif ($conf['selector_type']=='regex') 
+                elseif ($conf['selector_type'] == 'regex') 
                 {
                     $values = $this->get_fields_regex($html, $conf['selector'], $conf['name']);
                 }
@@ -2288,7 +2288,7 @@ 
 
                 $config = self::$db_config;
                 @mysqli_connect($config['host'], $config['user'], $config['pass'], $config['name'], $config['port']);
-                if(mysqli_connect_errno())
+                if (mysqli_connect_errno())
                 {
                     log::error('Export data to a database need Mysql support, '.mysqli_connect_error());
                     exit;
@@ -2308,7 +2308,7 @@ 
 
     public function check_cache()
     {
-        if ( !self::$use_redis || self::$save_running_state)
+        if (!self::$use_redis || self::$save_running_state)
         {
             return false;
         }
@@ -2318,7 +2318,7 @@ 
         //$count = count($keys);
         // 直接检查db，清空的时候整个db清空，所以注意db不要跟其他项目混用
         $count = queue::dbsize();
-        if ( $count > 0 ) 
+        if ($count > 0) 
         {
             // After this operation, 4,318 kB of additional disk space will be used.
             // Do you want to continue? [Y/n] 
@@ -2327,7 +2327,7 @@ 
             $msg .= 'Do you want to continue? [Y/n]';
             fwrite(STDOUT, $msg);
             $arg = strtolower(trim(fgets(STDIN)));
-            $arg = empty($arg) || !in_array($arg, array('Y', 'N', 'y','n')) ? 'y' : strtolower($arg);
+            $arg = empty($arg) || !in_array($arg, array('Y', 'N', 'y', 'n')) ? 'y' : strtolower($arg);
             if ($arg == 'n') 
             {
                 log::warn('Clear redis data...');
@@ -2370,9 +2370,9 @@ 
     public function set_task_status()
     {
         // 每采集成功一个页面, 生成当前进程状态到文件, 供主进程使用
-        $mem = round(memory_get_usage(true)/(1024*1024),2);
-        $use_time = microtime(true) - self::$time_start; 
-        $speed = round((self::$collect_succ + self::$collect_fail) / $use_time, 2);
+        $mem = round(memory_get_usage(true) / (1024 * 1024), 2);
+        $use_time = microtime(true)-self::$time_start; 
+        $speed = round((self::$collect_succ+self::$collect_fail) / $use_time, 2);
         $status = array(
             'id' => self::$taskid,
             'pid' => self::$taskpid,
@@ -2472,7 +2472,7 @@ 
         // 更新服务器列表
         $server_list_json = queue::get('server_list');
         $server_list      = array();
-        if ( ! $server_list_json)
+        if (!$server_list_json)
         {
             $server_list[$serverid] = array(
                 'serverid' => $serverid,
@@ -2678,7 +2678,7 @@ 
             {
                 $exists = queue::exists($key);
                 // 不存在或者当然URL可重复入
-                if ( ! $exists || $allowed_repeat)
+                if (!$exists || $allowed_repeat)
                 {
                     // 待爬取网页记录数加一
                     queue::incr('collect_urls_num');
@@ -2906,7 +2906,7 @@ 
      */
     public function incr_pages_num($url = '')
     {
-        if ( ! empty($url))
+        if (!empty($url))
         {
             $domain = $this->getRootDomain($url, 'host');
         }
@@ -2942,7 +2942,7 @@ 
      */
     public function incr_duration_num($url = '', $time_run = 1)
     {
-        if ( ! empty($url))
+        if (!empty($url))
         {
             $domain = $this->getRootDomain($url);
         }
@@ -2978,7 +2978,7 @@ 
      */
     public function get_duration_num($url = '')
     {
-        if ( ! empty($url))
+        if (!empty($url))
         {
             $domain = $this->getRootDomain($url);
         }
@@ -2992,7 +2992,7 @@ 
         }
         else
         {
-            $duration[$domain] =  ! empty(self::$duration[$domain]) ? self::$duration[$domain] : 0;
+            $duration[$domain] = !empty(self::$duration[$domain]) ? self::$duration[$domain] : 0;
         }
         return $duration[$domain] ? $duration[$domain] : 0;
     }
@@ -3159,7 +3159,7 @@ 
     {
         static $last_lines = 0;
 
-        if(!is_null($force_clear_lines)) 
+        if (!is_null($force_clear_lines)) 
         {
             $last_lines = $force_clear_lines;
         }
@@ -3167,19 +3167,19 @@ 
         // 获取终端宽度
         $toss = $status = null;
         $term_width = exec('tput cols', $toss, $status);
-        if($status || empty($term_width)) 
+        if ($status || empty($term_width)) 
         {
             $term_width = 64; // Arbitrary fall-back term width.
         }
 
         $line_count = 0;
-        foreach(explode("\n", $message) as $line) 
+        foreach (explode("\n", $message) as $line) 
         {
             $line_count += count(str_split($line, $term_width));
         }
 
         // Erasure MAGIC: Clear as many lines as the last output had.
-        for($i = 0; $i < $last_lines; $i++) 
+        for ($i = 0; $i < $last_lines; $i++) 
         {
             // Return to the beginning of the line
             echo "\r";
@@ -3215,7 +3215,7 @@ 
         }
         $display_str = "\033[1A\n\033[K-----------------------------\033[47;30m PHPSPIDER \033[0m-----------------------------\n\033[0m";
         //$display_str = "-----------------------------\033[47;30m PHPSPIDER \033[0m-----------------------------\n\033[0m";
-        $run_time_str = util::time2second(time() - self::$time_start, false);
+        $run_time_str = util::time2second(time()-self::$time_start, false);
         $display_str .= 'PHPSpider version:'.self::VERSION.'          PHP version:'.PHP_VERSION."\n";
         $display_str .= 'start time:'.date('Y-m-d H:i:s', self::$time_start).'   run '.$run_time_str." \n";
 
@@ -3255,12 +3255,12 @@ 
     {
         $display_str = "-------------------------------\033[47;30m TASKS \033[0m-------------------------------\n";
 
-        $display_str .= "\033[47;30mtaskid\033[0m". str_pad('', self::$taskid_length+2-strlen('taskid')). 
-            "\033[47;30mtaskpid\033[0m". str_pad('', self::$pid_length+2-strlen('taskpid')). 
-            "\033[47;30mmem\033[0m". str_pad('', self::$mem_length+2-strlen('mem')). 
-            "\033[47;30mcollect succ\033[0m". str_pad('', self::$urls_length-strlen('collect succ')). 
-            "\033[47;30mcollect fail\033[0m". str_pad('', self::$urls_length-strlen('collect fail')). 
-            "\033[47;30mspeed\033[0m". str_pad('', self::$speed_length+2-strlen('speed')). 
+        $display_str .= "\033[47;30mtaskid\033[0m".str_pad('', self::$taskid_length+2-strlen('taskid')). 
+            "\033[47;30mtaskpid\033[0m".str_pad('', self::$pid_length+2-strlen('taskpid')). 
+            "\033[47;30mmem\033[0m".str_pad('', self::$mem_length+2-strlen('mem')). 
+            "\033[47;30mcollect succ\033[0m".str_pad('', self::$urls_length-strlen('collect succ')). 
+            "\033[47;30mcollect fail\033[0m".str_pad('', self::$urls_length-strlen('collect fail')). 
+            "\033[47;30mspeed\033[0m".str_pad('', self::$speed_length+2-strlen('speed')). 
             "\n";
 
         // "\033[32;40m [OK] \033[0m"
@@ -3272,12 +3272,12 @@ 
             {
                 continue;
             }
-            $display_str .= str_pad($task['id'], self::$taskid_length + 2).
-            str_pad($task['pid'], self::$pid_length + 2).
-            str_pad($task['mem'].'MB', self::$mem_length + 2).
+            $display_str .= str_pad($task['id'], self::$taskid_length+2).
+            str_pad($task['pid'], self::$pid_length+2).
+            str_pad($task['mem'].'MB', self::$mem_length+2).
             str_pad($task['collect_succ'], self::$urls_length).
             str_pad($task['collect_fail'], self::$urls_length).
-            str_pad($task['speed'].'/s', self::$speed_length + 2).
+            str_pad($task['speed'].'/s', self::$speed_length+2).
                 "\n";
         }
         //echo "\033[9;0H";
@@ -3288,12 +3288,12 @@ 
     {
         $display_str = "-------------------------------\033[47;30m SERVER \033[0m------------------------------\n";
 
-        $display_str .= "\033[47;30mserver\033[0m". str_pad('', self::$server_length+2-strlen('serverid')). 
-            "\033[47;30mtasknum\033[0m". str_pad('', self::$tasknum_length+2-strlen('tasknum')). 
-            "\033[47;30mmem\033[0m". str_pad('', self::$mem_length+2-strlen('mem')). 
-            "\033[47;30mcollect succ\033[0m". str_pad('', self::$urls_length-strlen('collect succ')). 
-            "\033[47;30mcollect fail\033[0m". str_pad('', self::$urls_length-strlen('collect fail')). 
-            "\033[47;30mspeed\033[0m". str_pad('', self::$speed_length+2-strlen('speed')). 
+        $display_str .= "\033[47;30mserver\033[0m".str_pad('', self::$server_length+2-strlen('serverid')). 
+            "\033[47;30mtasknum\033[0m".str_pad('', self::$tasknum_length+2-strlen('tasknum')). 
+            "\033[47;30mmem\033[0m".str_pad('', self::$mem_length+2-strlen('mem')). 
+            "\033[47;30mcollect succ\033[0m".str_pad('', self::$urls_length-strlen('collect succ')). 
+            "\033[47;30mcollect fail\033[0m".str_pad('', self::$urls_length-strlen('collect fail')). 
+            "\033[47;30mspeed\033[0m".str_pad('', self::$speed_length+2-strlen('speed')). 
             "\n";
 
         $server_list_json = queue::get('server_list');
@@ -3320,11 +3320,11 @@ 
             }
 
             $display_str .= str_pad($serverid, self::$server_length).
-            str_pad($tasknum, self::$tasknum_length + 2).
-            str_pad($mem.'MB', self::$mem_length + 2).
+            str_pad($tasknum, self::$tasknum_length+2).
+            str_pad($mem.'MB', self::$mem_length+2).
             str_pad($collect_succ, self::$urls_length).
             str_pad($collect_fail, self::$urls_length).
-            str_pad($speed.'/s', self::$speed_length + 2).
+            str_pad($speed.'/s', self::$speed_length+2).
                 "\n";
         }
         return $display_str;
@@ -3334,11 +3334,11 @@ 
     {
         $display_str = "---------------------------\033[47;30m COLLECT STATUS \033[0m--------------------------\n";
 
-        $display_str .= "\033[47;30mfind pages\033[0m". str_pad('', 16-strlen('find pages')). 
-            "\033[47;30mqueue\033[0m". str_pad('', 14-strlen('queue')). 
-            "\033[47;30mcollected\033[0m". str_pad('', 15-strlen('collected')). 
-            "\033[47;30mfields\033[0m". str_pad('', 15-strlen('fields')). 
-            "\033[47;30mdepth\033[0m". str_pad('', 12-strlen('depth')). 
+        $display_str .= "\033[47;30mfind pages\033[0m".str_pad('', 16-strlen('find pages')). 
+            "\033[47;30mqueue\033[0m".str_pad('', 14-strlen('queue')). 
+            "\033[47;30mcollected\033[0m".str_pad('', 15-strlen('collected')). 
+            "\033[47;30mfields\033[0m".str_pad('', 15-strlen('fields')). 
+            "\033[47;30mdepth\033[0m".str_pad('', 12-strlen('depth')). 
             "\n";
 
         $collect   = $this->get_collect_url_num();
@@ -3448,7 +3448,7 @@ 
         if (self::$use_redis)
         {
             $count = queue::get($domain);
-            if ( ! empty(self::$configs['max_sub_num']) and $count > self::$configs['max_sub_num'])
+            if (!empty(self::$configs['max_sub_num']) and $count > self::$configs['max_sub_num'])
             {
                 return $count;
             }
@@ -3458,7 +3458,7 @@ 
             }
             $hostkey = 'sub_d-'.$host;
             $exists  = queue::exists($hostkey);
-            if ( ! $exists)
+            if (!$exists)
             {
                 // 子域名数量加一
                 $count = queue::incr($domain);
@@ -3476,7 +3476,7 @@ 
             return $url;
         }
         $url = trim($url);
-        if ( ! preg_match('/^http/i', $url))
+        if (!preg_match('/^http/i', $url))
         {
             $url = 'http://'.$url;
         }
@@ -3511,7 +3511,7 @@ 
         $count         = count($urlarr);
         $res['scheme'] = $url_parse['scheme'];
         $res['host']   = $url_parse['host'];
-        if ( ! empty($url_parse['path']))
+        if (!empty($url_parse['path']))
         {
             $res['path'] = $url_parse['path'];
         }
@@ -3538,7 +3538,7 @@ 
             $res['name']   = $last_2;
 
             //排除非标准 ltd 域名
-            if ( ! in_array($last, $state_domain))
+            if (!in_array($last, $state_domain))
             {
                 return false;
             }
@@ -3550,14 +3550,14 @@ 
                 $res['tld']    = $last;
             }
             //排除顶级根二级后缀
-            if ($last_1 !== $last and in_array($last_1, $state_domain) and ! in_array($last, array('com', 'net', 'org', 'edu', 'gov')))
+            if ($last_1 !== $last and in_array($last_1, $state_domain) and !in_array($last, array('com', 'net', 'org', 'edu', 'gov')))
             {
                 $res['domain'] = $last_2.'.'.$last_1.'.'.$last; //n.n.com形式
                 $res['name']   = $last_2;
                 $res['tld']    = $last_1.'.'.$last;
             }
             //限定cn顶级根二级后缀为'com', 'net', 'org', 'edu', 'gov'
-            if (in_array($last, array('cn')) and $last_1 !== $last and strlen($last_1) > 2 and ! in_array($last_1, array('com', 'net', 'org', 'edu', 'gov')))
+            if (in_array($last, array('cn')) and $last_1 !== $last and strlen($last_1) > 2 and !in_array($last_1, array('com', 'net', 'org', 'edu', 'gov')))
             {
                 $res['domain'] = $last_1.'.'.$last; //n.n.cn形式
                 $res['name']   = $last_1;
@@ -3566,7 +3566,7 @@ 
         }
 
         //检测和验证返回的是不是域名格式
-        if ( ! empty($res['domain']) and preg_match('/^([\p{Han}a-zA-Z0-9])+([\p{Han}a-zA-Z0-9\-])*\.[a-zA-Z\.\p{Han}]+$/iu', $res['domain']))
+        if (!empty($res['domain']) and preg_match('/^([\p{Han}a-zA-Z0-9])+([\p{Han}a-zA-Z0-9\-])*\.[a-zA-Z\.\p{Han}]+$/iu', $res['domain']))
         {
             if ($type == 'arr')
             {

Braces +85 added lines, -161 removed lines

@@ -436,8 +436,7 @@ 
         if ($configs['max_task_per_host'] > 0)
         {
             $configs['queue_order'] = 'rand';
-        }
-        else
+        } else
         {
             $configs['queue_order'] = isset($configs['queue_order']) ? $configs['queue_order'] : 'list';
         }
@@ -512,13 +511,11 @@ 
         {
             $link['url_type'] = 'content_page';
             $status           = $this->queue_lpush($link, $allowed_repeat);
-        }
-        elseif ($this->is_list_page($url))
+        } elseif ($this->is_list_page($url))
         {
             $link['url_type'] = 'list_page';
             $status           = $this->queue_lpush($link, $allowed_repeat);
-        }
-        else
+        } else
         {
             $status = $this->queue_lpush($link, $allowed_repeat);
         }
@@ -528,12 +525,10 @@ 
             if ($link['url_type'] == 'scan_page')
             {
                 log::debug("Find scan page: {$url}");
-            }
-            elseif ($link['url_type'] == 'content_page')
+            } elseif ($link['url_type'] == 'content_page')
             {
                 log::debug("Find content page: {$url}");
-            }
-            elseif ($link['url_type'] == 'list_page')
+            } elseif ($link['url_type'] == 'list_page')
             {
                 log::debug("Find list page: {$url}");
             }
@@ -577,8 +572,7 @@ 
         {
             $link['url_type'] = 'content_page';
             $status           = $this->queue_lpush($link);
-        }
-        elseif ($this->is_list_page($url))
+        } elseif ($this->is_list_page($url))
         {
             $link['url_type'] = 'list_page';
             $status           = $this->queue_lpush($link);
@@ -589,12 +583,10 @@ 
             if ($link['url_type'] == 'scan_page')
             {
                 log::debug("Find scan page: {$url}");
-            }
-            elseif ($link['url_type'] == 'content_page')
+            } elseif ($link['url_type'] == 'content_page')
             {
                 log::debug("Find content page: {$url}");
-            }
-            elseif ($link['url_type'] == 'list_page')
+            } elseif ($link['url_type'] == 'list_page')
             {
                 log::debug("Find list page: {$url}");
             }
@@ -769,8 +761,7 @@ 
             if (count($info) <= 1)
             {
                 echo "PHPSpider[$start_file] not run\n";
-            }
-            else 
+            } else 
             {
                 //echo "PHPSpider[$start_file] is stoping ...\n";
                 echo "PHPSpider[$start_file] stop success";
@@ -851,8 +842,7 @@ 
         if (-1 === $pid) 
         {
             throw new Exception('fork fail');
-        } 
-        elseif ($pid > 0) 
+        } elseif ($pid > 0) 
         {
             exit(0);
         }
@@ -865,8 +855,7 @@ 
         if (-1 === $pid)
         {
             throw new Exception('fork fail');
-        }
-        elseif (0 !== $pid)
+        } elseif (0 !== $pid)
         {
             exit(0);
         }
@@ -907,8 +896,7 @@ 
                 if ($all_stop)
                 {
                     break;
-                }
-                else
+                } else
                 {
                     log::warn('Task stop waiting...');
                 }
@@ -1035,8 +1023,7 @@ 
         elseif (self::$daemonize) 
         {
             log::$log_show = true;
-        }
-        else 
+        } else 
         {
             log::$log_show = isset(self::$configs['log_show']) ? self::$configs['log_show'] : false;
         }
@@ -1101,8 +1088,7 @@ 
                 // 先显示一次面板, 然后下面再每次采集成功显示一次
                 $this->display_ui();
             }
-        }
-        else 
+        } else 
         {
             $this->daemonize();
         }
@@ -1163,8 +1149,7 @@ 
 
             // 这里用0表示子进程正常退出
             exit(0);
-        }
-        else
+        } else
         {
             log::error("Fork children task({$taskid}) fail...");
             exit;
@@ -1229,8 +1214,7 @@ 
                     $this->collect_page();
                     // 保存任务状态
                     $this->set_task_status();
-                }
-                else 
+                } else 
                 {
                     log::warn('Task('.self::$taskid.') waiting...reason: queue_lsize = '.$queue_lsize.' < tasknum  = '.self::$tasknum);
                     sleep(1);
@@ -1317,8 +1301,7 @@ 
             if ($task_per_host < self::$configs['max_task_per_host'])
             {
                 $task_per_host = $this->incr_task_per_host($url);
-            }
-            else
+            } else
             {
                 log::warn('Task('.self::$taskid.') task_per_host = '.$task_per_host.' > '.self::$configs['max_task_per_host'].' ; URL: '.$url.' will be retry later...');
                 $this->queue_lpush($link); //放回队列
@@ -1338,7 +1321,9 @@ 
         if ($this->on_before_download_page) 
         {
             $return = call_user_func($this->on_before_download_page, $url, $link, $this);
-            if (isset($return)) $link = $return;
+            if (isset($return)) {
+                $link = $return;
+            }
         }
 
         requests::$input_encoding = null;
@@ -1420,8 +1405,7 @@ 
 
                 unset($return);
             }
-        }
-        elseif ($link['url_type'] == 'content_page')
+        } elseif ($link['url_type'] == 'content_page')
         {
             if ($this->on_content_page)
             {
@@ -1432,8 +1416,7 @@ 
                 }
                 unset($return);
             }
-        }
-        elseif ($link['url_type'] == 'list_page')
+        } elseif ($link['url_type'] == 'list_page')
         {
             if ($this->on_list_page)
             {
@@ -1585,13 +1568,11 @@ 
                     {
                         $html .= $link['context_data'];
                     }
-                }
-                else 
+                } else 
                 {
                     return false;
                 }
-            }
-            else 
+            } else 
             {
                 if ( ! empty(self::$configs['max_try']) and $http_code == 407)
                 {
@@ -1599,8 +1580,7 @@ 
                     $this->queue_rpush($link);
                     log::error("Failed to download page {$url}");
                     self::$collect_fail++;
-                }
-                elseif ( ! empty(self::$configs['max_try']) and in_array($http_code, array('0', '502', '503', '429')))
+                } elseif ( ! empty(self::$configs['max_try']) and in_array($http_code, array('0', '502', '503', '429')))
                 {
                     // 采集次数加一
                     $link['try_num']++;
@@ -1611,8 +1591,7 @@ 
                         $this->queue_rpush($link);
                     }
                     log::error("Failed to download page {$url}, retry({$link['try_num']})");
-                }
-                else 
+                } else 
                 {
                     log::error("Failed to download page {$url}");
                     self::$collect_fail++;
@@ -1711,8 +1690,7 @@ 
             if ($val)
             {
                 $urls[$k] = $val;
-            }
-            else 
+            } else 
             {
                 unset($urls[$k]);
             }
@@ -1772,11 +1750,12 @@ 
             return false;
         }
         // 排除没有被解析成功的语言标签
-        if (substr($url, 0, 3) == '<%=' or substr($url, 0, 1) == '{' or substr($url, 0, 2) == ' {')
-        // if(substr($url, 0, 3) == '<%=')
+        if (substr($url, 0, 3) == '<%=' or substr($url, 0, 1) == '{' or substr($url, 0, 2) == ' {') {
+                // if(substr($url, 0, 3) == '<%=')
         {
             return false;
         }
+        }
 
         $parse_url = @parse_url($collect_url);
         if (empty($parse_url['scheme']) || empty($parse_url['host'])) 
@@ -1819,8 +1798,7 @@ 
             if(!isset($url[2]))
             {
                 return false;
-            }
-            else
+            } else
             {
                 $urls = explode('/',$url);
                 foreach($urls as $u)
@@ -1833,8 +1811,7 @@ 
                     else if( $i < count($urls)-1 )
                     {
                         $dstr .= $urls[$i].'/';
-                    }
-                    else
+                    } else
                     {
                         $dstr .= $urls[$i];
                     }
@@ -1844,23 +1821,20 @@ 
                 if(count($urls) <= $path_step)
                 {
                     return false;
-                }
-                else
+                } else
                 {
                     $pstr = '';
                     for($i=0;$i<count($urls)-$path_step;$i++){ $pstr .= $urls[$i].'/'; }
                     $url = $pstr.$dstr;
                 }
             }
-        }
-        else 
+        } else 
         {
             if( strtolower(substr($url, 0, 7))=='http://' )
             {
                 $url    = preg_replace('#^http://#i', '', $url);
                 $scheme = 'http';
-            }
-            else if( strtolower(substr($url, 0, 8))=='https://' )
+            } else if( strtolower(substr($url, 0, 8))=='https://' )
             {
                 $url = preg_replace('#^https://#i','',$url);
                 $scheme = "https";
@@ -2008,12 +1982,10 @@ 
                 elseif ($return === false)
                 {
                     return false;
-                }
-                elseif (!is_array($return))
+                } elseif (!is_array($return))
                 {
                     log::warn('on_extract_page return value must be an array');
-                }
-                else 
+                } else 
                 {
                     $fields = $return;
                 }
@@ -2034,8 +2006,7 @@ 
                     {
                         return @iconv('UCS-2BE', 'UTF-8', pack('H4', $matchs[1]));
                     }, $fields_str);
-                }
-                else
+                } else
                 {
                     $fields_str = json_encode($fields, JSON_UNESCAPED_UNICODE);
                 }
@@ -2053,13 +2024,11 @@ 
                     if (self::$export_type == 'csv') 
                     {
                         util::put_file(self::$export_file, util::format_csv($fields)."\n", FILE_APPEND);
-                    }
-                    elseif (self::$export_type == 'sql') 
+                    } elseif (self::$export_type == 'sql') 
                     {
                         $sql = db::insert(self::$export_table, $fields, true);
                         util::put_file(self::$export_file, $sql.";\n", FILE_APPEND);
-                    }
-                    elseif (self::$export_type == 'db') 
+                    } elseif (self::$export_type == 'db') 
                     {
                         db::insert(self::$export_table, $fields);
                     }
@@ -2130,12 +2099,10 @@ 
                 {
                     // 如果找不到，返回的是false
                     $values = $this->get_fields_xpath($html, $conf['selector'], $conf['name']);
-                }
-                elseif ($conf['selector_type']=='css') 
+                } elseif ($conf['selector_type']=='css') 
                 {
                     $values = $this->get_fields_css($html, $conf['selector'], $conf['name']);
-                }
-                elseif ($conf['selector_type']=='regex') 
+                } elseif ($conf['selector_type']=='regex') 
                 {
                     $values = $this->get_fields_regex($html, $conf['selector'], $conf['name']);
                 }
@@ -2180,21 +2147,18 @@ 
                 // 避免内容分页时attached_url拼接时候string + array了
                 $fields[$conf['name']] = '';
                 //$fields[$conf['name']] = array();
-            }
-            else 
+            } else 
             {
                 if (is_array($values)) 
                 {
                     if ($repeated) 
                     {
                         $fields[$conf['name']] = $values;
-                    }
-                    else 
+                    } else 
                     {
                         $fields[$conf['name']] = $values[0];
                     }
-                }
-                else 
+                } else 
                 {
                     $fields[$conf['name']] = $values;
                 }
@@ -2216,8 +2180,7 @@ 
                     if (!isset($return))
                     {
                         log::warn("on_handle_img return value can't be empty\n");
-                    }
-                    else 
+                    } else 
                     {
                         // 有数据才会执行 on_handle_img 方法, 所以这里不要被替换没了
                         $data = $return;
@@ -2231,8 +2194,7 @@ 
                     if (!isset($return))
                     {
                         log::warn("on_extract_field return value can't be empty\n");
-                    }
-                    else 
+                    } else 
                     {
                         // 有数据才会执行 on_extract_field 方法, 所以这里不要被替换没了
                         $fields[$fieldname] = $return;
@@ -2263,16 +2225,14 @@ 
                     log::error('Export data into CSV files need to Set the file path.');
                     exit;
                 }
-            }
-            elseif (self::$export_type == 'sql') 
+            } elseif (self::$export_type == 'sql') 
             {
                 if (empty(self::$export_file)) 
                 {
                     log::error('Export data into SQL files need to Set the file path.');
                     exit;
                 }
-            }
-            elseif (self::$export_type == 'db') 
+            } elseif (self::$export_type == 'db') 
             {
                 if (!function_exists('mysqli_connect'))
                 {
@@ -2387,8 +2347,7 @@ 
         {
             $key = 'server-'.self::$serverid.'-task_status-'.self::$taskid;
             queue::set($key, $task_status);
-        }
-        else 
+        } else 
         {
             self::$task_status = array($task_status);
         }
@@ -2447,8 +2406,7 @@ 
                 $key           = "server-{$serverid}-task_status-".$i;
                 $task_status[] = queue::get($key);
             }
-        }
-        else 
+        } else 
         {
             $task_status = self::$task_status;
         }
@@ -2479,8 +2437,7 @@ 
                 'tasknum' => $tasknum,
                 'time' => time(),
             );
-        }
-        else 
+        } else 
         {
             $server_list            = json_decode($server_list_json, true);
             $server_list[$serverid] = array(
@@ -2539,8 +2496,7 @@ 
         if (self::$use_redis)
         {
             $count = queue::get('collect_urls_num');
-        }
-        else 
+        } else 
         {
             $count = self::$collect_urls_num;
         }
@@ -2560,8 +2516,7 @@ 
         if (self::$use_redis)
         {
             $count = queue::get('collected_urls_num');
-        }
-        else 
+        } else 
         {
             $count = self::$collected_urls_num;
         }
@@ -2581,8 +2536,7 @@ 
         if (self::$use_redis)
         {
             queue::incr('collected_urls_num');
-        }
-        else 
+        } else 
         {
             self::$collected_urls_num++;
         }
@@ -2627,8 +2581,7 @@ 
                     if (self::$configs['queue_order'] == 'rand')
                     {
                         queue::sadd('collect_queue', $link);
-                    }
-                    else
+                    } else
                     {
                         queue::lpush('collect_queue', $link);
                     }
@@ -2637,8 +2590,7 @@ 
                 // 解锁
                 queue::unlock($lock);
             }
-        }
-        else 
+        } else 
         {
             $key = md5($url);
             if (!array_key_exists($key, self::$collect_urls))
@@ -2690,8 +2642,7 @@ 
                     if (self::$configs['queue_order'] == 'rand')
                     {
                         queue::sadd('collect_queue', $link); //无序集合
-                    }
-                    else
+                    } else
                     {
                         queue::rpush('collect_queue', $link); //有序列表
                     }
@@ -2700,8 +2651,7 @@ 
                 // 解锁
                 queue::unlock($lock);
             }
-        }
-        else 
+        } else 
         {
             $key = md5($url);
             if (!array_key_exists($key, self::$collect_urls))
@@ -2733,14 +2683,12 @@ 
             if (self::$configs['queue_order'] == 'rand')
             {
                 $link = queue::spop('collect_queue');
-            }
-            else
+            } else
             {
                 $link = queue::lpop('collect_queue');
             }
             $link = json_decode($link, true);
-        }
-        else 
+        } else 
         {
             $link = array_pop(self::$collect_queue); 
         }
@@ -2762,14 +2710,12 @@ 
             if (self::$configs['queue_order'] == 'rand')
             {
                 $link = queue::spop('collect_queue');
-            }
-            else
+            } else
             {
                 $link = queue::rpop('collect_queue');
             }
             $link = json_decode($link, true);
-        }
-        else 
+        } else 
         {
             $link = array_shift(self::$collect_queue); 
         }
@@ -2791,13 +2737,11 @@ 
             if (self::$configs['queue_order'] == 'rand')
             {
                 $lsize = queue::scard('collect_queue');
-            }
-            else
+            } else
             {
                 $lsize = queue::lsize('collect_queue');
             }
-        }
-        else 
+        } else 
         {
             $lsize = count(self::$collect_queue);
         }
@@ -2826,8 +2770,7 @@ 
 
                 queue::unlock($lock);
             }
-        }
-        else 
+        } else 
         {
             if (self::$depth_num < $depth) 
             {
@@ -2849,8 +2792,7 @@ 
         {
             $depth_num = queue::get('depth_num');
             return $depth_num ? $depth_num : 0;
-        }
-        else 
+        } else 
         {
             return self::$depth_num;
         }
@@ -2868,8 +2810,7 @@ 
         if (self::$use_redis)
         {
             $fields_num = queue::incr('fields_num');
-        }
-        else 
+        } else 
         {
             self::$fields_num++;
             $fields_num = self::$fields_num;
@@ -2889,8 +2830,7 @@ 
         if (self::$use_redis)
         {
             $fields_num = queue::get('fields_num');
-        }
-        else 
+        } else 
         {
             $fields_num = self::$fields_num;
         }
@@ -2917,14 +2857,12 @@ 
         if (self::$use_redis)
         {
             $pages_num[$domain] = queue::incr('pages_num:'.$domain);
-        }
-        else
+        } else
         {
             if (empty(self::$pages_num[$domain]))
             {
                 self::$pages_num[$domain] = 1;
-            }
-            else
+            } else
             {
                 self::$pages_num[$domain]++;
             }
@@ -2953,14 +2891,12 @@ 
         if (self::$use_redis)
         {
             $duration[$domain] = queue::incr('duration:'.$domain, $time_run);
-        }
-        else
+        } else
         {
             if (empty(self::$duration[$domain]))
             {
                 self::$duration[$domain] = $time_run;
-            }
-            else
+            } else
             {
                 self::$duration[$domain] += $time_run;
             }
@@ -2989,8 +2925,7 @@ 
         if (self::$use_redis)
         {
             $duration[$domain] = queue::get('duration:'.$domain);
-        }
-        else
+        } else
         {
             $duration[$domain] =  ! empty(self::$duration[$domain]) ? self::$duration[$domain] : 0;
         }
@@ -3019,26 +2954,22 @@ 
             if ($type == 'decr')
             {
                 $task_per_host_counter[$domain] = queue::decr('task_per_host:'.$domain);
-            }
-            else
+            } else
             {
                 $task_per_host_counter[$domain] = queue::incr('task_per_host:'.$domain);
             }
-        }
-        else
+        } else
         {
 
             if (empty(self::$task_per_host_counter[$domain]))
             {
                 self::$task_per_host_counter[$domain] = 1;
-            }
-            else
+            } else
             {
                 if ($type == 'decr')
                 {
                     self::$task_per_host_counter[$domain]--;
-                }
-                else
+                } else
                 {
                     self::$task_per_host_counter[$domain]++;
                 }
@@ -3063,8 +2994,7 @@ 
         if (self::$use_redis)
         {
             $count = queue::get('task_per_host:'.$domain);
-        }
-        else
+        } else
         {
             $count = self::$task_per_host_counter[$domain];
         }
@@ -3528,8 +3458,7 @@ 
                 $res['name']   = $last_1;
                 $res['tld']    = $last;
             }
-        }
-        elseif ($count > 2)
+        } elseif ($count > 2)
         {
             $last          = array_pop($urlarr);
             $last_1        = array_pop($urlarr);
@@ -3571,25 +3500,20 @@ 
             if ($type == 'arr')
             {
                 return $res;
-            }
-            elseif ($type == 'host')
+            } elseif ($type == 'host')
             {
                 return $res['host'];
-            }
-            elseif ($type == 'tld')
+            } elseif ($type == 'tld')
             {
                 return $res['tld'];
-            }
-            elseif ($type == 'subdomain')
+            } elseif ($type == 'subdomain')
             {
                 return $res['name'];
-            }
-            else
+            } else
             {
                 return $res['domain'];
             }
-        }
-        else
+        } else
         {
             return '';
         }

core/worker.php

Switch Indentation +30 added lines, -30 removed lines

@@ -385,36 +385,36 @@
     {
         switch($type)
         {
-        case E_ERROR: // 1 //
-            return 'E_ERROR';
-        case E_WARNING: // 2 //
-            return 'E_WARNING';
-        case E_PARSE: // 4 //
-            return 'E_PARSE';
-        case E_NOTICE: // 8 //
-            return 'E_NOTICE';
-        case E_CORE_ERROR: // 16 //
-            return 'E_CORE_ERROR';
-        case E_CORE_WARNING: // 32 //
-            return 'E_CORE_WARNING';
-        case E_COMPILE_ERROR: // 64 //
-            return 'E_COMPILE_ERROR';
-        case E_COMPILE_WARNING: // 128 //
-            return 'E_COMPILE_WARNING';
-        case E_USER_ERROR: // 256 //
-            return 'E_USER_ERROR';
-        case E_USER_WARNING: // 512 //
-            return 'E_USER_WARNING';
-        case E_USER_NOTICE: // 1024 //
-            return 'E_USER_NOTICE';
-        case E_STRICT: // 2048 //
-            return 'E_STRICT';
-        case E_RECOVERABLE_ERROR: // 4096 //
-            return 'E_RECOVERABLE_ERROR';
-        case E_DEPRECATED: // 8192 //
-            return 'E_DEPRECATED';
-        case E_USER_DEPRECATED: // 16384 //
-            return 'E_USER_DEPRECATED';
+            case E_ERROR: // 1 //
+                return 'E_ERROR';
+            case E_WARNING: // 2 //
+                return 'E_WARNING';
+            case E_PARSE: // 4 //
+                return 'E_PARSE';
+            case E_NOTICE: // 8 //
+                return 'E_NOTICE';
+            case E_CORE_ERROR: // 16 //
+                return 'E_CORE_ERROR';
+            case E_CORE_WARNING: // 32 //
+                return 'E_CORE_WARNING';
+            case E_COMPILE_ERROR: // 64 //
+                return 'E_COMPILE_ERROR';
+            case E_COMPILE_WARNING: // 128 //
+                return 'E_COMPILE_WARNING';
+            case E_USER_ERROR: // 256 //
+                return 'E_USER_ERROR';
+            case E_USER_WARNING: // 512 //
+                return 'E_USER_WARNING';
+            case E_USER_NOTICE: // 1024 //
+                return 'E_USER_NOTICE';
+            case E_STRICT: // 2048 //
+                return 'E_STRICT';
+            case E_RECOVERABLE_ERROR: // 4096 //
+                return 'E_RECOVERABLE_ERROR';
+            case E_DEPRECATED: // 8192 //
+                return 'E_DEPRECATED';
+            case E_USER_DEPRECATED: // 16384 //
+                return 'E_USER_DEPRECATED';
         }
         return "";
     }

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
     {
         self::$_master_pid = posix_getpid();
         // 产生时钟云，添加后父进程才可以收到信号
-        declare(ticks = 1);
+        declare(ticks=1);
         $this->install_signal();
     }
 
@@ -62,7 +62,7 @@ 
     protected function install_signal()
     {
         // stop
-        pcntl_signal(SIGINT,  array($this, 'signal_handler'), false);
+        pcntl_signal(SIGINT, array($this, 'signal_handler'), false);
         // reload
         pcntl_signal(SIGUSR1, array($this, 'signal_handler'), false);
         // status
@@ -80,7 +80,7 @@ 
     protected function uninstall_signal()
     {
         // uninstall stop signal handler
-        pcntl_signal(SIGINT,  SIG_IGN, false);
+        pcntl_signal(SIGINT, SIG_IGN, false);
         // uninstall reload signal handler
         pcntl_signal(SIGUSR1, SIG_IGN, false);
         // uninstall  status signal handler
@@ -149,12 +149,12 @@ 
         $pid = pcntl_fork();
 
         // 主进程记录子进程pid
-        if($pid > 0)
+        if ($pid > 0)
         {
             self::$_worker_pids[$worker_id] = $pid;
         }
         // 子进程运行
-        elseif(0 === $pid)
+        elseif (0 === $pid)
         {
             $this->time_start = microtime(true);
             $this->worker_id = $worker_id;
@@ -197,14 +197,14 @@ 
     protected static function set_process_user($user_name)
     {
         // 用户名为空 或者 当前用户不是root用户
-        if(empty($user_name) || posix_getuid() !== 0)
+        if (empty($user_name) || posix_getuid() !== 0)
         {
             return;
         }
         $user_info = posix_getpwnam($user_name);
-        if($user_info['uid'] != posix_getuid() || $user_info['gid'] != posix_getgid())
+        if ($user_info['uid'] != posix_getuid() || $user_info['gid'] != posix_getgid())
         {
-            if(!posix_setgid($user_info['gid']) || !posix_setuid($user_info['uid']))
+            if (!posix_setgid($user_info['gid']) || !posix_setuid($user_info['uid']))
             {
                 log::add('Can not run woker as '.$user_name." , You shuld be root", "Error");
             }
@@ -222,7 +222,7 @@ 
         if (!empty($title)) 
         {
             // 需要扩展
-            if(extension_loaded('proctitle') && function_exists('setproctitle'))
+            if (extension_loaded('proctitle') && function_exists('setproctitle'))
             {
                 @setproctitle($title);
             }
@@ -242,7 +242,7 @@ 
     {
         // 设置master进程的运行状态为运行中
         self::$_status = "running";
-        while(1)
+        while (1)
         {
             // pcntl_signal_dispatch 子进程无法接受到信号
             // 如果有信号到来，尝试触发信号处理函数
@@ -254,13 +254,13 @@ 
             //pcntl_signal_dispatch();
 
             // 子进程退出信号
-            if($pid > 0)
+            if ($pid > 0)
             {
                 //echo "worker[".$pid."] stop\n";
                 //$this->stop();
 
                 // 如果不是正常退出，是被kill等杀掉的
-                if($status !== 0)
+                if ($status !== 0)
                 {
                     log::add("worker {$pid} exit with status $status", "Warning");
                 }
@@ -321,7 +321,7 @@ 
         // 设置master、worker进程的运行状态为关闭状态
         self::$_status = "shutdown";
         // master进程
-        if(self::$_master_pid === posix_getpid())
+        if (self::$_master_pid === posix_getpid())
         {
             // 循环给worker进程发送关闭信号
             foreach (self::$_worker_pids as $worker_pid) 
@@ -360,17 +360,17 @@ 
     public function check_errors()
     {
         // 如果当前worker进程不是正常退出
-        if(self::$_status != "shutdown")
+        if (self::$_status != "shutdown")
         {
             $error_msg = "WORKER EXIT UNEXPECTED ";
             $errors = error_get_last();
-            if($errors && ($errors['type'] === E_ERROR ||
+            if ($errors && ($errors['type'] === E_ERROR ||
                 $errors['type'] === E_PARSE ||
                 $errors['type'] === E_CORE_ERROR ||
                 $errors['type'] === E_COMPILE_ERROR || 
-                $errors['type'] === E_RECOVERABLE_ERROR ))
+                $errors['type'] === E_RECOVERABLE_ERROR))
             {
-                $error_msg .= $this->get_error_type($errors['type']) . " {$errors['message']} in {$errors['file']} on line {$errors['line']}";
+                $error_msg .= $this->get_error_type($errors['type'])." {$errors['message']} in {$errors['file']} on line {$errors['line']}";
             }
             log::add($error_msg, 'Error');
         }
@@ -383,7 +383,7 @@ 
      */
     protected function get_error_type($type)
     {
-        switch($type)
+        switch ($type)
         {
         case E_ERROR: // 1 //
             return 'E_ERROR';

Braces +1 added lines, -2 removed lines

@@ -181,8 +181,7 @@
             $this->stop();
             // 这里用0表示正常退出
             exit(0);
-        }
-        else
+        } else
         {
             log::add("fork one worker fail", "Error");
             exit;

core/cache.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
      */
     public static function init()
     {
-        if(extension_loaded('Redis'))
+        if (extension_loaded('Redis'))
         {
             $_instance = new Redis();
         }
@@ -42,7 +42,7 @@ 
         // 验证
         if ($GLOBALS['config']['redis']['pass'])
         {
-            if ( !$_instance->auth($GLOBALS['config']['redis']['pass']) ) 
+            if (!$_instance->auth($GLOBALS['config']['redis']['pass'])) 
             {
                 $errmsg = "Redis Server authentication failed!!";
                 log::add($errmsg, "Error");
@@ -55,7 +55,7 @@ 
         //$_instance->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);      // use built-in serialize/unserialize
         //$_instance->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_IGBINARY); // use igBinary serialize/unserialize
 
-        $_instance->setOption(Redis::OPT_PREFIX, $GLOBALS['config']['redis']['prefix'] . ":");
+        $_instance->setOption(Redis::OPT_PREFIX, $GLOBALS['config']['redis']['prefix'].":");
 
         return $_instance;
     }

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
         if(extension_loaded('Redis'))
         {
             $_instance = new Redis();
-        }
-        else
+        } else
         {
             $errmsg = "extension redis is not installed";
             log::add($errmsg, "Error");