supernova-ws / SuperNova

includes/classes/auth_local.php

Doc Comments +7 added lines, -1 removed lines

@@ -134,7 +134,6 @@ 
   /**
    * Попытка залогиниться с использованием метода $method
    *
-   * @param string $method_name
    */
   public function login() {
     // TODO Проверяем поддерживаемость метода
@@ -162,6 +161,10 @@ 
    * @return array|bool|resource
    */
   // OK v4.5
+
+  /**
+   * @param string $salt_unsafe
+   */
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
     $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe);
     if($result) {
@@ -171,6 +174,9 @@ 
     return $result;
   }
 
+  /**
+   * @param Account $account_to_impersonate
+   */
   public function impersonate($account_to_impersonate) {
     $this->cookie_set($account_to_impersonate);
   }

includes/classes/classSupernova.php

Doc Comments +4 added lines, -1 removed lines

@@ -200,7 +200,7 @@ 
   /**
    * Блокирует указанные таблицу/список таблиц
    *
-   * @param string|array $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
+   * @param string $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
    * <p>string - название таблицы для блокировки</p>
    * <p>array - массив, где ключ - имя таблицы, а значение - условия блокировки элементов</p>
    */
@@ -377,6 +377,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $location_type
+   */
   public static function db_ins_field_set($location_type, $field_set, $serialize = false) {
     // TODO multiinsert
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set, $serialize) : false;

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 
 use Vector\Vector;
-
 use Common\GlobalContainer;
 
 class classSupernova {

Spacing +25 added lines, -27 removed lines

@@ -207,7 +207,7 @@ 
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      self::$db->doSelect("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      self::$db->doSelect("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -249,8 +249,8 @@ 
           $query = static::$db->doSelect(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($fetch ? ' LIMIT 1' : ''));
           while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
@@ -263,13 +263,13 @@ 
           if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
         }
       }
 
       $query = static::$db->doSelect(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
         . " FOR UPDATE"
       );
@@ -341,7 +341,7 @@ 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if ($result = static::$db->doUpdate("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::$db->doUpdate("UPDATE {{{$table_name}}} SET ".$set.($condition ? ' WHERE '.$condition : ''))) {
 
       if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
@@ -499,7 +499,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = static::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -515,7 +515,7 @@ 
 
     if ($user === null && !empty($where_safe)) {
       // Вытаскиваем запись
-      $user = static::$db->doSelectFetch("SELECT * FROM {{users}} WHERE {$where_safe}" . " FOR UPDATE");
+      $user = static::$db->doSelectFetch("SELECT * FROM {{users}} WHERE {$where_safe}"." FOR UPDATE");
 
       SnCache::cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
     }
@@ -557,7 +557,7 @@ 
     }
 
     if (SnCache::isUnitLocatorNotSet($location_type, $location_id)) {
-      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
+      $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".static::db_unit_time_restrictions());
       if (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           SnCache::setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -616,7 +616,7 @@ 
     if ($que_type == QUE_RESEARCH || $planet_id === null) {
       $query[] = "`que_planet_id` IS NULL";
     } elseif ($planet_id) {
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
     if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
@@ -730,13 +730,13 @@ 
         $condition = "`{$field_name}` = ";
         $value = '';
         if ($field_data['delta']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
         } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
         if ($value) {
-          $fields[] = $condition . $value;
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
@@ -750,9 +750,7 @@ 
           // Простое условие - $field_id = $field_value
           if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'".db_escape($field_value)."'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -779,7 +777,7 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
@@ -866,7 +864,7 @@ 
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
     if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
@@ -882,43 +880,43 @@ 
     $gc = static::$gc;
 
     // Default db
-    $gc->db = function ($c) {
+    $gc->db = function($c) {
       $db = new db_mysql($c);
       $db->sn_db_connect();
 
       return $db;
     };
 
-    $gc->debug = function ($c) {
+    $gc->debug = function($c) {
       return new debug();
     };
 
-    $gc->cache = function ($c) {
+    $gc->cache = function($c) {
       return new classCache(classSupernova::$cache_prefix);
     };
 
-    $gc->config = function ($c) {
+    $gc->config = function($c) {
       return new classConfig(classSupernova::$cache_prefix);
     };
 
-    $gc->localePlayer = function (GlobalContainer $c) {
+    $gc->localePlayer = function(GlobalContainer $c) {
       return new classLocale($c->config->server_locale_log_usage);
     };
 
-    $gc->dbRowOperator = function ($c) {
+    $gc->dbRowOperator = function($c) {
       return new DbRowDirectOperator($c);
     };
 
     $gc->buddyClass = 'Buddy\BuddyModel';
-    $gc->buddy = $gc->factory(function (GlobalContainer $c) {
+    $gc->buddy = $gc->factory(function(GlobalContainer $c) {
       return new $c->buddyClass($c);
     });
 
-    $gc->query = $gc->factory(function (GlobalContainer $c) {
+    $gc->query = $gc->factory(function(GlobalContainer $c) {
       return new DbQueryConstructor($c->db);
     });
 
-    $gc->unit = $gc->factory(function (GlobalContainer $c) {
+    $gc->unit = $gc->factory(function(GlobalContainer $c) {
       return new \V2Unit\V2UnitModel($c);
     });
 
@@ -931,7 +929,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

Braces +3 added lines, -1 removed lines

@@ -363,9 +363,11 @@
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if ($result = static::$db->doInsert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = classSupernova::$db->db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего

includes/classes/db_mysql.php

Doc Comments +9 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
   /**
    * @param string $query
    *
-   * @return mixed|string
+   * @return string
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
@@ -163,7 +163,7 @@ 
   }
 
   /**
-   * @param $query
+   * @param string $query
    */
   protected function logQuery($query) {
     if (!classSupernova::$config->debug) {
@@ -352,6 +352,10 @@ 
   }
 
   // TODO Заменить это на новый логгер
+
+  /**
+   * @param string $query
+   */
   protected function security_watch_user_queries($query) {
     global $user;
 
@@ -375,6 +379,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   public function security_query_check_bad_words($query) {
     if ($this->skipQueryCheck) {
       return;

Spacing +28 added lines, -28 removed lines

@@ -83,7 +83,7 @@ 
   public function load_db_settings($configFile = '') {
     $dbsettings = array();
 
-    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX : false;
+    empty($configFile) ? $configFile = SN_ROOT_PHYSICAL."config".DOT_PHP_EX : false;
 
     require $configFile;
 
@@ -103,7 +103,7 @@ 
     }
 
     if (empty($this->dbsettings)) {
-      $this->load_db_settings(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+      $this->load_db_settings(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
@@ -155,7 +155,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);
       }
     }
 
@@ -228,12 +228,12 @@ 
 
     $queryResult = null;
     try {
-      $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');
     }
 
     return $queryResult;
@@ -364,10 +364,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;
@@ -393,37 +393,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);
 

includes/classes/DBAL/DbTransaction.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
    *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
    *   <p>false - всё равно - для совместимости с $for_update</p>
    *
-   * @return bool Текущий статус транзакции
+   * @return null|boolean Текущий статус транзакции
    */
   public function check($status = null) {
     $error_msg = false;

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
     if (!empty($error_msg)) {
       // TODO - Убрать позже
-      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -64,7 +64,7 @@ 
   public function start($level = '') {
     $this->check(null);
 
-    $level ? $this->db->doExecute('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? $this->db->doExecute('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     $this->transaction_id++;
     $this->db->doExecute('START TRANSACTION');

includes/classes/DbQueryConstructor.php

Doc Comments +8 added lines, -4 removed lines

@@ -155,10 +155,17 @@ 
     return $this->field(DbSqlLiteral::build($this->db)->literal($field));
   }
 
+  /**
+   * @param string $functionName
+   * @param string $alias
+   */
   public function fieldSingleFunction($functionName, $field = '*', $alias = DbSqlLiteral::SQL_LITERAL_ALIAS_NONE) {
     return $this->field(DbSqlLiteral::build($this->db)->buildSingleArgument($functionName, $field, $alias));
   }
 
+  /**
+   * @param string $alias
+   */
   public function fieldCount($field = '*', $alias = DbSqlLiteral::SQL_LITERAL_ALIAS_NONE) {
     return $this->field(DbSqlLiteral::build($this->db)->count($field, $alias));
   }
@@ -240,7 +247,7 @@ 
 
   /**
    * @param db_mysql|null $db
-   * @param string|object|DBStaticRecord|DbSqlAware $className
+   * @param string $className
    *
    * @return static
    */
@@ -435,7 +442,6 @@ 
   }
 
   /**
-   * @param bool $skip_query_check
    *
    * @return DbEmptyIterator|DbMysqliResultIterator
    */
@@ -444,7 +450,6 @@ 
   }
 
   /**
-   * @param bool $skip_query_check
    *
    * @return array
    */
@@ -455,7 +460,6 @@ 
   }
 
   /**
-   * @param bool $skip_query_check
    *
    * @return mixed|null
    */

includes/classes/DBStaticMessages.php

Doc Comments +3 added lines

@@ -477,6 +477,9 @@
   {$StartRec}, 25;");
   }
 
+  /**
+   * @param integer $message_type
+   */
   public static function db_message_insert_all($message_type, $from, $subject, $text) {
     return classSupernova::$db->doInsert('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");

Spacing +10 added lines, -10 removed lines

@@ -114,7 +114,7 @@ 
       $owners = array();
     } else {
       $insert_values = array();
-      $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
+      $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
 
       foreach ($owners as $owner) {
         if ($user['id'] != $owner) {
@@ -155,7 +155,7 @@ 
     $sendList = array();
     $list = '';
     $query = DBStaticUser::db_user_list(
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
       false, 'id, username');
     foreach ($query as $u) {
       $sendList[] = $u['id'];
@@ -253,7 +253,7 @@ 
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
 
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
 
@@ -422,7 +422,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -470,7 +470,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
       "ORDER BY
   `message_id` DESC
 LIMIT
@@ -478,7 +478,7 @@ 
   }
 
   public static function db_message_insert_all($message_type, $from, $subject, $text) {
-    return classSupernova::$db->doInsert('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsert('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
   }
 
@@ -488,7 +488,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_message_count_by_type($int_type_selected) {
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM {{messages}}' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM {{messages}}'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
 
     return $page_max;
   }
@@ -505,15 +505,15 @@ 
    * @param $int_type_selected
    */
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
-    classSupernova::$db->doDelete("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
+    classSupernova::$db->doDelete("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')".($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
   }
 
   /**
    * @param $insert_values
    */
   public static function db_message_insert($insert_values) {
-    classSupernova::$db->doInsert('INSERT INTO `{{messages}}` (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
-      'VALUES ' . implode(',', $insert_values));
+    classSupernova::$db->doInsert('INSERT INTO `{{messages}}` (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
+      'VALUES '.implode(',', $insert_values));
   }
 
 }

includes/classes/debug.php

Doc Comments +3 added lines

@@ -187,6 +187,9 @@
     return $error_backtrace;
   }
 
+  /**
+   * @param string $die_message
+   */
   public function error_fatal($die_message, $details = 'There is a fatal error on page') {
     // TODO - Записывать детали ошибки в лог-файл
     die($die_message);

Spacing +75 added lines, -76 removed lines

@@ -32,10 +32,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 />');
@@ -52,17 +52,17 @@ 
   public 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;
   }
@@ -82,7 +82,7 @@ 
   }
 
   public 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();
   }
 
@@ -92,25 +92,25 @@ 
     $result = array();
     $transaction_id = classSupernova::$db->getTransaction()->getNextQueryTransactionId();
     $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;
       }
     }
@@ -124,26 +124,26 @@ 
   public 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;
@@ -151,22 +151,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'] = SnCache::getLocks();
       $error_backtrace['cSN_data'] = SnCache::getData();
-      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'] = SnCache::getQueries();
     }
 
-    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;
         }
       }
@@ -195,14 +194,14 @@ 
   public 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>";
     }
@@ -214,16 +213,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)) : '') . "'" . ";";
-      classSupernova::$db->doExecute($query, true) or die($fatal_error . classSupernova::$db->db_error());
+      ", `log_dump` = '".($error_backtrace ? db_escape(serialize($error_backtrace)) : '')."'".";";
+      classSupernova::$db->doExecute($query, true) or die($fatal_error.classSupernova::$db->db_error());
 
-      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . classSupernova::$db->db_insert_id() . "</b>";
+      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>".classSupernova::$db->db_insert_id()."</b>";
 
       $sys_stop_log_hit = true;
       $sys_log_disabled = true;
@@ -233,7 +232,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);
       }
@@ -245,7 +244,7 @@ 
   public 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...');
     }
@@ -254,12 +253,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)) : '')."'".";";
       classSupernova::$db->doExecute($query, true);
     } else {
 //        // TODO Здесь надо писать в файло
@@ -272,11 +271,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;;';
@@ -285,31 +284,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 == TYPE_STRING) {
-    $dumper .= '(' . strlen($value) . ')';
+  if ($type == TYPE_STRING) {
+    $dumper .= '('.strlen($value).')';
     $value = dump($value, '', -1);
-  } elseif($type == TYPE_BOOLEAN) {
+  } elseif ($type == 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 == TYPE_ARRAY) {
-    $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
+  } elseif ($type == 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 = '';
@@ -328,24 +327,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>'
   );
 }
@@ -355,24 +354,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() {
@@ -396,9 +395,9 @@ 
  */
 function pdie($message = '', $level = 0) {
   $backtrace = debug_backtrace();
-  for($i = 0; $i < $level; $i++) {
+  for ($i = 0; $i < $level; $i++) {
     array_pop($backtrace);
   }
 
-  die(__DEBUG_LINE . ($message ? $message . ' @ ' : '') . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
+  die(__DEBUG_LINE.($message ? $message.' @ ' : '').$backtrace[0]['file'].':'.$backtrace[0]['line']);
 }

includes/db.php

Doc Comments +9 added lines

@@ -9,6 +9,9 @@ 
 
 require_once('db/db_queries.php');
 
+/**
+ * @param string $tablename
+ */
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
   if($query && $object_id) {
@@ -60,6 +63,9 @@ 
   db_change_units_perform($query[LOC_USER], 'users', $user['id']);
   db_change_units_perform($query[LOC_PLANET], 'planets', $planet['id']);
 }
+/**
+ * @param string $table
+ */
 function sn_db_perform($table, $values, $type = 'insert', $options = false) {
   $field_set = '';
 
@@ -153,6 +159,9 @@ 
 
 
 
+/**
+ * @param boolean $transaction_should_be_started
+ */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
 }

includes/db/db_queries.php

Doc Comments +13 added lines, -8 removed lines

@@ -173,6 +173,11 @@ 
  */
 // OK v4
 // TODO - вынести в отдельный класс
+/**
+ * @param string $db_id_field_name
+ * @param string $db_table_name
+ * @param string $db_value_field_name
+ */
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = classSupernova::$db->doSelectFetch("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE");
@@ -474,8 +479,8 @@ 
 
 
 /**
- * @param $user_id
- * @param $change_type
+ * @param integer $user_id
+ * @param integer $change_type
  * @param $dark_matter
  * @param $comment
  * @param $row
@@ -495,7 +500,7 @@ 
 /**
  * @param $user_id_safe
  *
- * @return array|bool|mysqli_result|null
+ * @return integer
  */
 function db_referral_get_by_id($user_id_safe) {
   $old_referral = classSupernova::$db->doSelectFetch("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;");
@@ -523,9 +528,9 @@ 
 
 // Quests ***********************************************************************************************************
 /**
- * @param $query_add_select
+ * @param string $query_add_select
  * @param $query_add_from
- * @param $query_add_where
+ * @param string $query_add_where
  *
  * @return array|bool|mysqli_result|null
  */
@@ -570,10 +575,10 @@ 
 
 /**
  * @param $quest_name
- * @param $quest_type
+ * @param integer $quest_type
  * @param $quest_description
  * @param $quest_conditions
- * @param $quest_rewards
+ * @param string $quest_rewards
  * @param $quest_id
  */
 function db_quest_update($quest_name, $quest_type, $quest_description, $quest_conditions, $quest_rewards, $quest_id) {
@@ -592,7 +597,7 @@ 
 /**
  * @param $banner
  * @param $banned
- * @param $reason
+ * @param string $reason
  * @param $ban_until
  */
 function db_ban_insert($banner, $banned, $reason, $ban_until) {

Spacing +14 added lines, -14 removed lines

@@ -4,11 +4,11 @@ 
 
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return classSupernova::$db->doSelect(
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
     " FROM {{planets}} AS p
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
 function db_planet_list_search($searchtext) {
@@ -106,7 +106,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -119,7 +119,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     }
   } else {
     // TODO
@@ -136,7 +136,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    " . $start . ",100;";
+    ".$start.",100;";
   }
 
   return classSupernova::$db->doSelect($query_str);
@@ -365,9 +365,9 @@ 
  */
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
   $extra_conditions =
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
   $query = classSupernova::$db->doSelect("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
 
@@ -395,7 +395,7 @@ 
 
 // Log Online *************************************************************************************************************
 function db_log_online_insert() {
-  classSupernova::$db->doInsert("INSERT IGNORE INTO `{{log_users_online}}` SET online_count = " . classSupernova::$config->var_online_user_count);
+  classSupernova::$db->doInsert("INSERT IGNORE INTO `{{log_users_online}}` SET online_count = ".classSupernova::$config->var_online_user_count);
 }
 
 // Log *************************************************************************************************************
@@ -603,7 +603,7 @@ 
       `ban_user_id` = '{$banned['id']}',
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
-      `ban_time` = " . SN_TIME_NOW . ",
+      `ban_time` = ".SN_TIME_NOW.",
       `ban_until` = {$ban_until},
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
@@ -625,7 +625,7 @@ 
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
       `ban_time` = 0,
-      `ban_until` = " . SN_TIME_NOW . ",
+      `ban_until` = ".SN_TIME_NOW.",
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
       `ban_issuer_email` = '{$banner['email']}'
@@ -684,9 +684,9 @@ 
 function db_ube_report_get_best_battles() {
   $query = classSupernova::$db->doSelect("SELECT *
       FROM `{{ube_report}}`
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
 
   return $query;
 }