supernova-ws / SuperNova

includes/classes/db_mysql.php

Doc Comments +11 added lines, -4 removed lines

@@ -124,7 +124,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -138,8 +138,8 @@ 
   }
 
   /**
-   * @param       $query
-   * @param       $fetch
+   * @param       string $query
+   * @param       boolean $fetch
    */
   protected function logQuery($query, $fetch) {
     if (!classSupernova::$config->debug) {
@@ -180,7 +180,7 @@ 
   /**
    * @param string|DbSqlStatement $statement
    *
-   * @return array|bool|mysqli_result|null
+   * @return mysqli_result
    */
   public function execOld($statement) {
     return $this->doquery($statement);
@@ -361,6 +361,10 @@ 
   }
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -384,6 +388,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query, $skip_query_check = false) {
     if ($skip_query_check) {
       return;

Spacing +34 added lines, -34 removed lines

@@ -65,7 +65,7 @@ 
   public function load_db_settings() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
 
     $this->dbsettings = $dbsettings;
   }
@@ -130,7 +130,7 @@ 
     $sql = $query;
     if (strpos($sql, '{{') !== false) {
       foreach ($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -150,7 +150,7 @@ 
     $arr = debug_backtrace();
     $file = end(explode('/', $arr[0]['file']));
     $line = $arr[0]['line'];
-    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> " . ($fetch ? '+' : '&nbsp;') . " </th></tr>");
+    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> ".($fetch ? '+' : '&nbsp;')." </th></tr>");
   }
 
 
@@ -239,13 +239,13 @@ 
           ->execute()
           ->getResult();
       } else {
-        $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+        $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
       }
       if (!$queryResult) {
         throw new Exception();
       }
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     if ($fetch) {
@@ -293,13 +293,13 @@ 
           ->storeResult()
           ->getIterator();
       } else {
-        $queryResult = $this->db_sql_query($stringQuery . DbSqlHelper::quoteComment($queryTrace));
+        $queryResult = $this->db_sql_query($stringQuery.DbSqlHelper::quoteComment($queryTrace));
 
         if (!$queryResult) {
           throw new Exception();
         }
 
-        if($queryResult instanceof mysqli_result) {
+        if ($queryResult instanceof mysqli_result) {
           $result = new DbMysqliResultIterator($queryResult);
         } else {
           $result = $queryResult;
@@ -308,7 +308,7 @@ 
       }
 
     } catch (Exception $e) {
-      classSupernova::$debug->error($this->db_error() . "<br />{$query}<br />", 'SQL Error');
+      classSupernova::$debug->error($this->db_error()."<br />{$query}<br />", 'SQL Error');
     }
 
     return $result;
@@ -373,10 +373,10 @@ 
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
       if (!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
       if (!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -391,7 +391,7 @@ 
 
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -402,37 +402,37 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - " . $user['id'] . "\n";
-        $report .= "\tUser - " . $user['username'] . "\n";
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
+        $report .= "\tID - ".$user['id']."\n";
+        $report .= "\tUser - ".$user['username']."\n";
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - " . $query . "\n";
+        $report .= "\tQuery - ".$query."\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
         fwrite($fp, $report);
         fclose($fp);
 
@@ -453,7 +453,7 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
+    while ($row = $this->db_fetch($query)) {
       foreach ($row as $table_name) {
         if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
@@ -584,7 +584,7 @@ 
     if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

includes/classes/DbSqlPrepare.php

Doc Comments +10 added lines, -1 removed lines

@@ -100,6 +100,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function setQuery($query) {
     $this->query = $query;
 
@@ -113,6 +116,9 @@ 
     }
   }
 
+  /**
+   * @param string $comment
+   */
   protected function commentAdd($comment) {
     if (empty($this->values[static::COMMENT_PLACEHOLDER])) {
       $this->query .= static::COMMENT_PLACEHOLDER;
@@ -243,12 +249,15 @@ 
     return $this;
   }
 
+  /**
+   * @return mysqli_result
+   */
   public function getResult() {
     return $this->statement->get_result();
   }
 
   /**
-   * @return bool|mysqli_result
+   * @return DBMysqliStatementIterator
    */
   public function getIterator() {
     return new DBMysqliStatementIterator($this->statement);

admin/userlist.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $user;
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -39,10 +39,10 @@ 
 $sort = sys_get_param_int('sort', SORT_ID);
 $sort = $sort_fields[$sort] ? $sort : SORT_ID;
 
-if(($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
+if (($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
   $user_selected = DBStaticUser::db_user_by_id($user_id, false, 'id, username, authlevel');
-  if($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
-    switch($action) {
+  if ($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
+    switch ($action) {
       case ACTION_DELETE:
         DeleteSelectedUser($user_id);
         sys_redirect("{$_SERVER['SCRIPT_NAME']}?sort={$sort}");
@@ -62,19 +62,19 @@ 
 $template = gettemplate('admin/userlist', true);
 
 $multi_ip = array();
-foreach(DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
+foreach (DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
   $multi_ip[$ip['user_lastip']] = $ip['ip_count'];
 }
 
 $geoip = geoip_status();
 
-foreach(DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row ) {
-  if($user_row['banaday']) {
+foreach (DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row) {
+  if ($user_row['banaday']) {
     $ban_details = db_ban_list_get_details($user_row);
   }
 
   $geoip_info = $geoip ? geoip_ip_info(ip2longu($user_row['user_lastip'])) : array();
-  foreach($geoip_info as $key => $value) {
+  foreach ($geoip_info as $key => $value) {
     $geoip_info[strtoupper($key)] = $value;
     unset($geoip_info[$key]);
   }

includes/debug.class.php

Spacing +74 added lines, -75 removed lines

@@ -30,10 +30,10 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
-  define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
+  define('__DEBUG_LINE', '-------------------------------------------------'.__DEBUG_CRLF);
 } else {
   // Not in cli-mode
   define('__DEBUG_CRLF', '<br />');
@@ -50,17 +50,17 @@ 
   function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
-      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
+    if ($this->log_file_handler === null) {
+      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL.'/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
-      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
+    if ($this->log_file_handler) {
+      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()).str_repeat(' ', $ident + 1).$message."\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
   }
@@ -80,7 +80,7 @@ 
   }
 
   function echo_log() {
-    echo '<br><table><tr><td class=k colspan=4><a href="' . SN_ROOT_PHYSICAL . "admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
+    echo '<br><table><tr><td class=k colspan=4><a href="'.SN_ROOT_PHYSICAL."admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
     die();
   }
 
@@ -90,25 +90,25 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
         ($a_trace['type']
           ? ($a_trace['type'] == '->'
-            ? "({$a_trace['class']})" . get_class($a_trace['object'])
+            ? "({$a_trace['class']})".get_class($a_trace['object'])
             : $a_trace['class']
-          ) . $a_trace['type']
+          ).$a_trace['type']
           : ''
-        ) . $a_trace['function'] . '()';
+        ).$a_trace['function'].'()';
 
       $file = str_replace(SN_ROOT_PHYSICAL, '', str_replace('\\', '/', $a_trace['file']));
 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -122,26 +122,26 @@ 
   function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -149,22 +149,21 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -193,14 +192,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -212,16 +211,16 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($userId) . "',
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
+        `log_time` = '" . time()."', `log_code` = '".db_escape($error_code)."', `log_sender` = '".db_escape($userId)."',
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
 //        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
-      ", `log_dump` = '" . ($error_backtrace ? db_escape(serialize($error_backtrace)) : '') . "'" . ";";
-      doquery($query, '', false, true) or die($fatal_error . db_error());
+      ", `log_dump` = '".($error_backtrace ? db_escape(serialize($error_backtrace)) : '')."'".";";
+      doquery($query, '', false, true) or die($fatal_error.db_error());
 
-      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . db_insert_id() . "</b>";
+      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>".db_insert_id()."</b>";
 
       $sys_stop_log_hit = true;
       $sys_log_disabled = true;
@@ -231,7 +230,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -243,7 +242,7 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
@@ -252,12 +251,12 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($userId) . "',
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
-        ", `log_dump` = '" . ($error_backtrace ? db_escape(serialize($error_backtrace)) : '') . "'" . ";";
+        `log_time` = '" . time()."', `log_code` = '".db_escape($log_code)."', `log_sender` = '".db_escape($userId)."',
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
+        ", `log_dump` = '".($error_backtrace ? db_escape(serialize($error_backtrace)) : '')."'".";";
       doquery($query, '', false, true);
     } else {
 //        // TODO Здесь надо писать в файло
@@ -270,11 +269,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -283,31 +282,31 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
-    $dumper = mt_rand(10, 99) . '|' . $varname;
+    $dumper = mt_rand(10, 99).'|'.$varname;
   }
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
-    $dumper .= '(' . strlen($value) . ')';
+  if ($type == 'string') {
+    $dumper .= '('.strlen($value).')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
-    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
+    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
+    foreach ($props as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
-    $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
+  } elseif ($type == 'array') {
+    $dumper .= '('.count($value).')';
+    foreach ($value as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, '', -1).' => ';
       $dumper .= dump($val, '', $level + 1);
     }
     $value = '';
@@ -326,24 +325,24 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
-    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
-      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
-      $backtrace[1]['function'] .
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '').
+      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '').
+      $backtrace[1]['function'].
       (!empty($backtrace[0]['file'])
         ? (
-          ' (' . substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN) .
-          (!empty($backtrace[0]['line']) ? ':' . $backtrace[0]['line'] : '') .
+          ' ('.substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN).
+          (!empty($backtrace[0]['line']) ? ':'.$backtrace[0]['line'] : '').
           ')'
         )
         : ''
       );
-    $caller = "\r\n" . $caller;
+    $caller = "\r\n".$caller;
   }
 
-  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">' .
-    dump($value, $varname) .
-    $caller .
+  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">'.
+    dump($value, $varname).
+    $caller.
     '</pre>'
   );
 }
@@ -353,24 +352,24 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print(mt_rand() . __DEBUG_CRLF);
+  print(mt_rand().__DEBUG_CRLF);
 }
 
 function pc($prePrint = false) {
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
+  print($_PRINT_COUNT_VALUE.__DEBUG_CRLF);
 }
 
 function prep($message) {
-  print('<pre>' . $message . '</pre>');
+  print('<pre>'.$message.'</pre>');
 }
 
 function backtrace_no_arg() {
@@ -393,5 +392,5 @@ 
  */
 function pdie($message = '') {
   $backtrace = debug_backtrace();
-  die(__DEBUG_LINE . ($message ? $message . ' @ ' : '') . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
+  die(__DEBUG_LINE.($message ? $message.' @ ' : '').$backtrace[0]['file'].':'.$backtrace[0]['line']);
 }

includes/classes/DBMysqliStatementIterator.php

Spacing +2 added lines, -2 removed lines

@@ -62,14 +62,14 @@
     $this->currentRow = $this->fetchArray();
   }
 
-  protected function fetchArray () {
+  protected function fetchArray() {
     $data = mysqli_stmt_result_metadata($this->stmt);
     $fields = array();
     $out = array();
 
     $fields[0] = &$this->stmt;
 
-    while($field = mysqli_fetch_field($data)) {
+    while ($field = mysqli_fetch_field($data)) {
       $fields[] = &$out[$field->name];
     }
 

includes/classes/DBStaticRecord.php

Spacing +4 added lines, -4 removed lines

@@ -97,7 +97,7 @@ 
    * @return array|null
    */
   public static function getRecordById($recordId, $fieldList = '*', $forUpdate = false) {
-    return static::getRecord(array(static::$_idField . '=' . $recordId), $fieldList, $forUpdate);
+    return static::getRecord(array(static::$_idField.'='.$recordId), $fieldList, $forUpdate);
   }
 
   /**
@@ -106,7 +106,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   protected static function execute($statement) {
-    return static::$dbStatic->execOld((string)$statement);
+    return static::$dbStatic->execOld((string) $statement);
   }
 
   /**
@@ -134,7 +134,7 @@ 
       $query = static::execute(
         static::buildSelectAll()
           ->fields(static::$_idField)
-          ->where(array("`" . static::$_idField . "` IN (" . implode(',', $idList) . ")"))
+          ->where(array("`".static::$_idField."` IN (".implode(',', $idList).")"))
       );
     }
 
@@ -154,7 +154,7 @@ 
     $result = array();
     if (!empty($idList)) {
       $query = static::queryExistsIdInList($idList);
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $result[] = $row[static::$_idField];
       }
     }