ricardosierra / phpspider

autoloader.php

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
         if (strpos($name, 'phpspider\\') === 0) 
         {
             $class_file = __DIR__ . substr($class_path, strlen('phpspider')) . '.php';
-        }
-        else 
+        } else 
         {
             if (self::$_autoload_root_path) 
             {

demo/52mnw.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
     if ($fieldname == 'name') 
     {
         $data = str_replace("-我爱美女网手机版", "", $data);
-    }
-    elseif ($fieldname == 'addtime') 
+    } elseif ($fieldname == 'addtime') 
     {
         $data = time();
     }

demo/qiushibaike_task.php

Braces +3 added lines, -6 removed lines

@@ -161,8 +161,7 @@ 
             //$data = substr($data, 0, 10)."...";
             $data = mb_substr($data, 0, 10, 'UTF-8')."...";
         }
-    }
-    elseif ($fieldname == 'article_publish_time') 
+    } elseif ($fieldname == 'article_publish_time') 
     {
         // 用当前采集时间戳作为发布时间
         $data = time();
@@ -171,12 +170,10 @@ 
     elseif ($fieldname == 'url') 
     {
         $data = $page['url'];
-    }
-    elseif ($fieldname == 'depth') 
+    } elseif ($fieldname == 'depth') 
     {
         $data = $page['request']['depth'];
-    }
-    elseif ($fieldname == 'taskid') 
+    } elseif ($fieldname == 'taskid') 
     {
         $data = $page['request']['taskid'];
     }

demo/qiushibaike_css_selector.php

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
             //$data = substr($data, 0, 10)."...";
             $data = mb_substr($data, 0, 10, 'UTF-8')."...";
         }
-    }
-    elseif ($fieldname == 'article_publish_time') 
+    } elseif ($fieldname == 'article_publish_time') 
     {
         // 用当前采集时间戳作为发布时间
         $data = time();

demo/qiushibaike.php

Braces +1 added lines, -2 removed lines

@@ -139,8 +139,7 @@
             $data = mb_substr($data, 0, 10, 'UTF-8')."...";
             $data = trim($data);
         }
-    }
-    elseif ($fieldname == 'article_publish_time') 
+    } elseif ($fieldname == 'article_publish_time') 
     {
         // 用当前采集时间戳作为发布时间
         $data = time();

demo/13384.php

Braces +2 added lines, -4 removed lines

@@ -132,16 +132,14 @@
     if ($fieldname == 'url') 
     {
         $data = $page['request']['url'];
-    }
-    elseif ($fieldname == 'name') 
+    } elseif ($fieldname == 'name') 
     {
         $data = trim(preg_replace("#\(.*?\)#", "", $data));
     }
     if ($fieldname == 'addtime') 
     {
         $data = strtotime(substr($data, 0, 19));
-    }
-    elseif ($fieldname == 'content') 
+    } elseif ($fieldname == 'content') 
     {
         $contents = $data;
         $array = array();

core/log.php

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

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

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