supernova-ws / SuperNova

includes/classes/DBStaticRecord.php

Doc Comments +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
   }
 
   /**
-   * @param array       $where
+   * @param string[]       $where
    * @param mixed|array $fieldList
    *     Field list can be scalar - it would be converted to array and used as field name
    * @param bool        $for_update
@@ -129,8 +129,8 @@ 
   }
 
   /**
-   * @param int|string  $recordId
-   * @param mixed|array $fieldList
+   * @param integer  $recordId
+   * @param string[] $fieldList
    * @param bool        $forUpdate
    *
    * @return array|null

Spacing +8 added lines, -8 removed lines

@@ -45,11 +45,11 @@ 
             $result[] = 'NULL';
           break;
           default:
-            $string = (string)$fieldName;
+            $string = (string) $fieldName;
             if ($string == '') {
               throw new ExceptionDBFieldEmpty();
             }
-            $result[] = '`' . $string . '`';
+            $result[] = '`'.$string.'`';
         }
       }
     } else {
@@ -77,10 +77,10 @@ 
     if (!empty($fieldList)) {
       $user_record = self::$dbStatic->doquery(
         (
-          "SELECT {$fieldList}" .
-          " FROM {{" . self::$_table . "}}" .
-          (!empty($where) ? " WHERE {$where}" : '') .
-          (!empty($for_update) ? " FOR UPDATE" : '') .
+          "SELECT {$fieldList}".
+          " FROM {{".self::$_table."}}".
+          (!empty($where) ? " WHERE {$where}" : '').
+          (!empty($for_update) ? " FOR UPDATE" : '').
           ($returnFirst ? ' LIMIT 1' : '')
         ),
         $returnFirst
@@ -137,7 +137,7 @@ 
    */
   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);
+    return static::getRecord(array(static::$_idField.'='.$recordId), $fieldList, $forUpdate);
   }
 
 
@@ -149,7 +149,7 @@ 
   public static function queryExistsIdInList($idList) {
     $query = null;
     if (!empty($idList)) {
-      $query = self::$dbStatic->doquery("SELECT `" . static::$_idField . "` FROM `{{" . static::$_table . "}}` WHERE `" . static::$_idField . "` IN (" . implode(',', $idList) . ")");
+      $query = self::$dbStatic->doquery("SELECT `".static::$_idField."` FROM `{{".static::$_table."}}` WHERE `".static::$_idField."` IN (".implode(',', $idList).")");
     }
 
     return !empty($query) ? $query : null;

includes/classes/db_mysql.php

Spacing +55 added lines, -55 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;
   }
@@ -73,23 +73,23 @@ 
   public function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -101,11 +101,11 @@ 
   }
 
   protected function driver_connect() {
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       classSupernova::$debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       classSupernova::$debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -113,7 +113,7 @@ 
   }
 
   public function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -128,9 +128,9 @@ 
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->table_list as $tableName) {
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -142,7 +142,7 @@ 
    * @param       $fetch
    */
   protected function logQuery($query, $fetch) {
-    if(!classSupernova::$config->debug) {
+    if (!classSupernova::$config->debug) {
       return;
     }
 
@@ -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>");
   }
 
 
@@ -160,18 +160,18 @@ 
    * @return void
    */
   protected function commentQuery(&$sql) {
-    if(!defined('DEBUG_SQL_COMMENT')) {
+    if (!defined('DEBUG_SQL_COMMENT')) {
       return;
     }
     $backtrace = debug_backtrace();
     $sql_comment = classSupernova::$debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
-    $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-    if(defined('DEBUG_SQL_ONLINE')) {
+    $sql_commented = '/* '.implode("<br />", $sql_comment).'<br /> */ '.preg_replace("/\s+/", ' ', $sql);
+    if (defined('DEBUG_SQL_ONLINE')) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
 
-    if(defined('DEBUG_SQL_ERROR')) {
+    if (defined('DEBUG_SQL_ERROR')) {
       array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
       classSupernova::$debug->add_to_array($sql_comment);
     }
@@ -185,7 +185,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public function execute($statement) {
-    return $this->doquery((string)$statement);
+    return $this->doquery((string) $statement);
   }
 
   /**
@@ -199,11 +199,11 @@ 
   }
 
   public function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -214,7 +214,7 @@ 
 
     $sql = $this->replaceTablePlaceholders($query);
     $this->commentQuery($sql);
-    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error() . "<br />$sql<br />", 'SQL Error') : false;
+    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error()."<br />$sql<br />", 'SQL Error') : false;
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -224,7 +224,7 @@ 
   protected function security_watch_user_queries($query) {
     global $user;
 
-    if(
+    if (
       !$this->isWatching // Not already watching
       && !empty(classSupernova::$config->game_watchlist_array) // There is some players in watchlist
       && in_array($user['id'], classSupernova::$config->game_watchlist_array) // Current player is in watchlist
@@ -232,11 +232,11 @@ 
     ) {
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
-      if(!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+      if (!empty($_POST)) {
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
-      if(!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+      if (!empty($_GET)) {
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -247,7 +247,7 @@ 
   public function security_query_check_bad_words($query) {
     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:
@@ -258,37 +258,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);
 
@@ -309,11 +309,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    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);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);
@@ -408,7 +408,7 @@ 
     $result = array();
 
     $status = explode('  ', $this->driver->mysql_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $result[$row[0]] = $row[1];
     }
@@ -424,10 +424,10 @@ 
     $result = array();
 
     $query = $this->db_sql_query('SHOW STATUS;');
-    if(is_bool($query)) {
+    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/DBStaticNote.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
    * @param $note_id_edit
    */
   public static function db_note_update_by_id($note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky, $note_id_edit) {
-    doquery("UPDATE {{notes}} SET `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("UPDATE {{notes}} SET `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky}
         WHERE `id` = {$note_id_edit} LIMIT 1;");
   }
@@ -53,7 +53,7 @@ 
    * @param $note_sticky
    */
   public static function db_note_insert($user, $note_priority, $note_title, $note_text, $note_galaxy, $note_system, $note_planet, $note_planet_type, $note_sticky) {
-    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = " . SN_TIME_NOW . ", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
+    doquery("INSERT INTO {{notes}} SET `owner` = {$user['id']}, `time` = ".SN_TIME_NOW.", `priority` = {$note_priority}, `title` = '{$note_title}', `text` = '{$note_text}',
         `galaxy` = {$note_galaxy}, `system` = {$note_system}, `planet` = {$note_planet}, `planet_type` = {$note_planet_type}, `sticky` = {$note_sticky};");
   }
 

includes/classes/DbSqlStatement.php

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
    */
   public static function build($db = null, $className = '') {
     $result = new self($db);
-    if(!empty($className) && is_string($className)) {
+    if (!empty($className) && is_string($className)) {
       $result->getParamsFromStaticClass($className);
     }
     return $result;
@@ -186,23 +186,23 @@ 
     $result = '';
     $result .= $this->stringEscape($this->operation);
 
-    $result .= ' ' . $this->selectFieldsToString($this->fields);
+    $result .= ' '.$this->selectFieldsToString($this->fields);
 
     $result .= ' FROM';
-    $result .= ' `{{' . $this->stringEscape($this->table) . '}}`';
-    $result .= !empty($this->alias) ? ' AS `' . $this->stringEscape($this->alias) . '`' : '';
+    $result .= ' `{{'.$this->stringEscape($this->table).'}}`';
+    $result .= !empty($this->alias) ? ' AS `'.$this->stringEscape($this->alias).'`' : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->where) ? ' WHERE ' . implode(' AND ', $this->where) : '';
+    $result .= !empty($this->where) ? ' WHERE '.implode(' AND ', $this->where) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->group) ? ' GROUP BY ' . implode(',', $this->group) : '';
+    $result .= !empty($this->group) ? ' GROUP BY '.implode(',', $this->group) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->order) ? ' ORDER BY ' . implode(',', $this->order) : '';
+    $result .= !empty($this->order) ? ' ORDER BY '.implode(',', $this->order) : '';
 
     // TODO - fields should be escaped !!
-    $result .= !empty($this->limit) ? ' LIMIT ' . implode(',', $this->limit) : '';
+    $result .= !empty($this->limit) ? ' LIMIT '.implode(',', $this->limit) : '';
 
     // TODO - protect from double escape!
 
@@ -240,17 +240,17 @@ 
         break;
 
         default:
-          $string = (string)$fieldName;
+          $string = (string) $fieldName;
           if ($string == '') {
             continue;
           }
 
-          if($fieldName instanceof DbSqlLiteral) {
+          if ($fieldName instanceof DbSqlLiteral) {
             // Literals plays as they are - they do properly format by itself
             $result[] = $string;
           } else {
             // Other should be formatted
-            $result[] = '`' . $this->stringEscape($string) . '`';
+            $result[] = '`'.$this->stringEscape($string).'`';
           }
       }
     }