supernova-ws / SuperNova

classes/core_auth.php

Doc Comments +7 added lines

@@ -829,10 +829,17 @@
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;

Spacing +64 added lines, -64 removed lines

@@ -205,18 +205,18 @@ 
     // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ
     // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно
 
-    if(sys_get_param('login_player_register_logout')) {
+    if (sys_get_param('login_player_register_logout')) {
       $this->logout();
     }
 
     $original_suggest = '';
     // Смотрим - есть ли у нас данные от пользователя
-    if(($player_name_submitted = sys_get_param('submit_player_name'))) {
+    if (($player_name_submitted = sys_get_param('submit_player_name'))) {
       // Попытка регистрации нового игрока из данных, введенных пользователем
       $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name');
     } else {
-      foreach($this->providers_authorised as $provider) {
-        if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
+      foreach ($this->providers_authorised as $provider) {
+        if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
           $original_suggest = $provider->player_name_suggest();
           break;
         }
@@ -224,7 +224,7 @@ 
     }
 
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
-    if(!$this->player_suggested_name) {
+    if (!$this->player_suggested_name) {
       $max_user_id = db_player_get_max_id(); // 4.5
       // TODO - предлагать имя игрока по локали
 
@@ -233,15 +233,15 @@ 
         sn_db_transaction_rollback();
         $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
-      } while(db_player_name_exists($this->player_suggested_name));
+      } while (db_player_name_exists($this->player_suggested_name));
 
     }
 
-    if($player_name_submitted) {
+    if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
-      if($this->register_status == LOGIN_SUCCESS) {
+      if ($this->register_status == LOGIN_SUCCESS) {
         sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-      } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
+      } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
 //      if(self::$login_status != LOGIN_SUCCESS) {
@@ -265,7 +265,7 @@ 
         : false
       );
 
-    if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+    if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
       $prohibited_characters = array_map(function($value) {
         return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -297,27 +297,27 @@ 
     global $sn_module_list, $lang;
 
     // !self::$is_init ? self::init() : false;
-    if(empty($sn_module_list['auth'])) {
+    if (empty($sn_module_list['auth'])) {
       die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}');
     }
 
     !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false;
     !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false;
-    !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false;
+    !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false;
 
     $this->auth_reset(); // OK v4.5
 
     $this->providers = array();
-    foreach($sn_module_list['auth'] as $module_name => $module) {
+    foreach ($sn_module_list['auth'] as $module_name => $module) {
       $this->providers[$module->provider_id] = $module;
     }
 
     // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым!
 //pdump($this->providers);
-    foreach($this->providers as $provider_id => $provider) {
+    foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
       self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? $lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
-      if($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
+      if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
         $this->user_id_to_provider = array_replace_recursive(
@@ -325,20 +325,20 @@ 
           // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
           PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
         );
-      } elseif($login_status != LOGIN_UNDEFINED) {
+      } elseif ($login_status != LOGIN_UNDEFINED) {
         $this->provider_error_list[$provider_id] = $login_status;
       }
     }
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // Ни один аккаунт не авторизирован
       // Проверяем - есть ли у нас ошибки в аккаунтах?
-      if(!empty($this->provider_error_list)) {
+      if (!empty($this->provider_error_list)) {
         // Если есть - выводим их
         self::$login_status = reset($this->provider_error_list);
         $providerError = $this->providers[key($this->provider_error_list)]->account_login_message;
 
-        if(!empty($providerError)) {
+        if (!empty($providerError)) {
           self::$login_message = $providerError;
         }
       }
@@ -353,12 +353,12 @@ 
       // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users`
 
       // Остались ли у нас в списке доступные игроки?
-      if(empty($this->accessible_user_row_list)) {
+      if (empty($this->accessible_user_row_list)) {
         // Нет ни одного игрока ни на одном авторизированном аккаунте
         // Надо регать нового игрока
 
         // Сейчас происходит процесс регистрации игрока?
-        if(!$this->is_player_register) {
+        if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
           sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
@@ -367,7 +367,7 @@ 
         // Да, есть доступные игроки, которые так же прописаны в базе
         $this->get_active_user(); // 4.5
 
-        if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
+        if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
           $a_user = db_user_by_id($this->is_impersonating);
           $this->impersonator_username = $a_user['username'];
         }
@@ -375,9 +375,9 @@ 
 
         //Прописываем текущего игрока на все авторизированные аккаунты
         // TODO - ИЛИ ВСЕХ ИГРОКОВ??
-        if(empty($this->is_impersonating)) {
-          foreach($this->providers_authorised as $provider_id => $provider) {
-            if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
+        if (empty($this->is_impersonating)) {
+          foreach ($this->providers_authorised as $provider_id => $provider) {
+            if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
               // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true;
@@ -387,9 +387,9 @@ 
       }
     }
 
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       self::cookie_set(''); // OK 4.5
-    } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
+    } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
       self::cookie_set(self::$user['id']); // OK 4.5
     }
 
@@ -408,21 +408,21 @@ 
    */
   // OK v4.7
   public function logout($redirect = true) {
-    if(!empty($_COOKIE[SN_COOKIE_U_I])) {
+    if (!empty($_COOKIE[SN_COOKIE_U_I])) {
       self::cookie_set($_COOKIE[SN_COOKIE_U_I]);
       self::cookie_set(0, true);
       self::$main_provider->logout();
     } else {
-      foreach($this->providers as $provider_name => $provider) {
+      foreach ($this->providers as $provider_name => $provider) {
         $provider->logout();
       }
 
       self::cookie_set(0);
     }
 
-    if($redirect === true) {
+    if ($redirect === true) {
       sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
-    } elseif($redirect !== false) {
+    } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
   }
@@ -433,15 +433,15 @@ 
    * @param $user_selected
    */
   public function impersonate($user_selected) {
-    if($_COOKIE[SN_COOKIE_U_I]) {
+    if ($_COOKIE[SN_COOKIE_U_I]) {
       die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
+    if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
       die('You can\'t impersonate - too low level'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local <= $user_selected['authlevel']) {
+    if ($this->auth_level_max_local <= $user_selected['authlevel']) {
       die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it
     }
 
@@ -449,7 +449,7 @@ 
     $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]);
     $account_to_impersonate = new Account(self::$main_provider->db);
     $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']);
-    if(!$account_to_impersonate->is_exists) {
+    if (!$account_to_impersonate->is_exists) {
       die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it
     }
     self::$main_provider->impersonate($account_to_impersonate);
@@ -475,12 +475,12 @@ 
   public function password_check($password_unsafe) {
     $result = false;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
     } else {
-      foreach($this->providers_authorised as $provider_id => $provider) {
-        if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
+      foreach ($this->providers_authorised as $provider_id => $provider) {
+        if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
           $result = $result || $provider->password_check($password_unsafe);
         }
       }
@@ -501,7 +501,7 @@ 
   public function password_change($old_password_unsafe, $new_password_unsafe) {
     global $lang;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
       return false;
@@ -514,8 +514,8 @@ 
     $salt_unsafe = self::password_salt_generate();
 
     $providers_changed_password = array();
-    foreach($this->providers_authorised as $provider_id => $provider) {
-      if(
+    foreach ($this->providers_authorised as $provider_id => $provider) {
+      if (
         !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE)
         || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe)
       ) {
@@ -527,7 +527,7 @@ 
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id);
 
       // Рассылаем уведомления о смене пароля в ЛС
-      foreach($account_translation as $user_id => $provider_info) {
+      foreach ($account_translation as $user_id => $provider_info) {
         // TODO - УКазывать тип аккаунта, на котором сменён пароль
         msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN,
           $lang['sys_administration'], $lang['sys_login_register_message_title'],
@@ -574,7 +574,7 @@ 
       sn_db_transaction_start();
       // Проверить наличие такого имени в истории имён
 
-      if(db_player_name_exists($player_name_unsafe)) {
+      if (db_player_name_exists($player_name_unsafe)) {
         throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR);
       }
 
@@ -582,11 +582,11 @@ 
       $player_language = '';
       $player_email = '';
       // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
-      foreach($this->providers_authorised as $provider) {
-        if(!$player_language && $provider->account->account_language) {
+      foreach ($this->providers_authorised as $provider) {
+        if (!$player_language && $provider->account->account_language) {
           $player_language = $provider->account->account_language;
         }
-        if(!$player_email && $provider->account->account_email) {
+        if (!$player_email && $provider->account->account_email) {
           $player_email = $provider->account->account_email;
         }
       }
@@ -602,7 +602,7 @@ 
       ));
       // Зарегестрировать на него аккаунты из self::$accounts_authorised
       $a_user = self::$user;
-      foreach($this->providers_authorised as $provider) {
+      foreach ($this->providers_authorised as $provider) {
         // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор
         // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
         // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']);
@@ -614,7 +614,7 @@ 
 
       sn_db_transaction_commit();
       $this->register_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
 
       // Если старое имя занято
@@ -633,10 +633,10 @@ 
     // Пробиваем все ИД игроков по базе - есть ли вообще такие записи
     // Вообще-то это не особо нужно - у нас по определению стоят констраинты
     // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров
-    foreach($this->user_id_to_provider as $user_id => $cork) {
+    foreach ($this->user_id_to_provider as $user_id => $cork) {
       $user = db_user_by_id($user_id);
       // Если записи игрока в БД не существует?
-      if(empty($user['id'])) {
+      if (empty($user['id'])) {
         // Удаляем этого и переходим к следующему
         unset($this->user_id_to_provider[$user_id]);
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -657,7 +657,7 @@ 
   // OK v4.5
   protected function get_active_user() {
     // Проверяем куку "текущего игрока" из браузера
-    if(
+    if (
       // Кука не пустая
       ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U])
       // И в куке находится ID
@@ -682,7 +682,7 @@ 
     }
 
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       // Берем первого из доступных
       // TODO - default_user
       self::$user = reset($this->accessible_user_row_list);
@@ -706,7 +706,7 @@ 
 
     $result = array();
 
-    if($user_id && empty($this->is_impersonating)) {
+    if ($user_id && empty($this->is_impersonating)) {
       // self::db_counter_insert();
       self::$device->db_counter_insert($user_id);
 
@@ -714,12 +714,12 @@ 
 
       sys_user_options_unpack($user);
 
-      if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
+      if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
         $user['banaday'] = 0;
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -733,13 +733,13 @@ 
       );
     }
 
-    if($extra = $config->security_ban_extra) {
+    if ($extra = $config->security_ban_extra) {
       $extra = explode(',', $extra);
-      array_walk($extra,'trim');
+      array_walk($extra, 'trim');
       in_array(self::$device->device_id, $extra) and die();
     }
 
-    if(self::$login_message) {
+    if (self::$login_message) {
       $result[F_LOGIN_MESSAGE] = self::$login_message;
     }
 
@@ -775,21 +775,21 @@ 
   protected function register_player_name_validate($player_name_unsafe) {
     // TODO - переделать под RAW-строки
     // Если имя игрока пустое - NO GO!
-    if(trim($player_name_unsafe) == '') {
+    if (trim($player_name_unsafe) == '') {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR);
     }
     // Проверяем, что бы в начале и конце не было пустых символов
-    if($player_name_unsafe != trim($player_name_unsafe)) {
+    if ($player_name_unsafe != trim($player_name_unsafe)) {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // TODO - выдавать в сообщение об ошибке список запрещенных символов
       // TODO - заранее извещать игрока, какие символы являются запрещенными
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
       // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока
       // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR);
@@ -847,7 +847,7 @@ 
   }
 
   protected static function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
@@ -860,7 +860,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }

classes/db_mysql.php

Doc Comments +6 added lines

@@ -180,6 +180,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_watch_user_queries($query) {
     // TODO Заменить это на новый логгер
     global $config, $is_watching, $user, $debug;
@@ -202,6 +205,9 @@ 
   }
 
 
+  /**
+   * @param string $query
+   */
   function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 

Spacing +49 added lines, -49 removed lines

@@ -64,7 +64,7 @@ 
   }
 
   public function schema() {
-    if(!isset(self::$schema)) {
+    if (!isset(self::$schema)) {
       self::$schema = new \DBAL\Schema($this);
     }
 
@@ -82,23 +82,23 @@ 
   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 && empty($this->schema()->getSnTables())) {
+      if ($this->connected && empty($this->schema()->getSnTables())) {
         die('DB error - cannot find any table. Halting...');
       }
     } else {
@@ -111,11 +111,11 @@ 
   function driver_connect() {
     global $debug;
 
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       $debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       $debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -123,7 +123,7 @@ 
   }
 
   function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -134,11 +134,11 @@ 
   function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
     global $numqueries, $debug, $sn_cache, $config;
 
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -147,30 +147,30 @@ 
     $skip_query_check or $this->security_query_check_bad_words($query);
 
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->schema()->getSnTables() as $tableName) {
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->schema()->getSnTables() as $tableName) {
         $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
       }
     }
 
-    if($config->debug) {
+    if ($config->debug) {
       $numqueries++;
       $arr = debug_backtrace();
-      $file = end(explode('/',$arr[0]['file']));
+      $file = end(explode('/', $arr[0]['file']));
       $line = $arr[0]['line'];
       $debug->add("<tr><th>Query $numqueries: </th><th>$query</th><th>$file($line)</th><th>$table</th><th>$fetch</th></tr>");
     }
 
-    if(defined('DEBUG_SQL_COMMENT')) {
+    if (defined('DEBUG_SQL_COMMENT')) {
       $backtrace = debug_backtrace();
       $sql_comment = $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')) {
+      if (defined('DEBUG_SQL_ONLINE')) {
         $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));
         $debug->add_to_array($sql_comment);
         // $debug->add_to_array($sql_comment . preg_replace("/\s+/", ' ', $sql));
@@ -178,7 +178,7 @@ 
       $sql = $sql_commented;
     }
 
-    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error()."<br />$sql<br />",'SQL Error');
+    $sqlquery = $this->db_sql_query($sql) or $debug->error(db_error() . "<br />$sql<br />", 'SQL Error');
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -197,16 +197,16 @@ 
     // TODO Заменить это на новый логгер
     global $config, $is_watching, $user, $debug;
 
-    if(!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
+    if (!$is_watching && $config->game_watchlist_array && in_array($user['id'], $config->game_watchlist_array))
     {
-      if(!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
+      if (!preg_match('/^(select|commit|rollback|start transaction)/i', $query)) {
         $is_watching = 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');
         }
         $debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
         $is_watching = false;
@@ -218,7 +218,7 @@ 
   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:
@@ -229,33 +229,33 @@ 
       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";
 
@@ -286,7 +286,7 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
     $q1 = $this->db_sql_query("SHOW FULL COLUMNS FROM `{$prefixedTableName_safe}`;");
-    while($r1 = db_fetch($q1)) {
+    while ($r1 = db_fetch($q1)) {
       $result[$r1['Field']] = $r1;
     }
     return $result;
@@ -302,7 +302,7 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
     $q1 = $this->db_sql_query("SHOW INDEX FROM {$prefixedTableName_safe};");
-    while($r1 = db_fetch($q1)) {
+    while ($r1 = db_fetch($q1)) {
       $indexName = $r1['Key_name'];
 
       $result[$indexName]['name'] = $r1['Key_name'];
@@ -327,8 +327,8 @@ 
 
     $prefixedTableName_safe = $this->db_escape($this->db_prefix . $tableName_unsafe);
 
-    $q1 = $this->db_sql_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name). "' AND `TABLE_NAME` = '{$prefixedTableName_safe}' AND `REFERENCED_TABLE_NAME` IS NOT NULL;");
-    while($r1 = db_fetch($q1)) {
+    $q1 = $this->db_sql_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND `TABLE_NAME` = '{$prefixedTableName_safe}' AND `REFERENCED_TABLE_NAME` IS NOT NULL;");
+    while ($r1 = db_fetch($q1)) {
       $indexName = $r1['CONSTRAINT_NAME'];
 
       $table_referenced = str_replace($this->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);

classes/db_mysql_v4.php

Doc Comments +3 added lines

@@ -55,6 +55,9 @@
     return true;
   }
 
+  /**
+   * @param string $query_string
+   */
   function mysql_query($query_string) {
     return mysql_query($query_string, $this->link);
   }

Spacing +4 added lines, -4 removed lines

@@ -30,17 +30,17 @@ 
 
     static $need_keys = array('server', 'user', 'pass', 'name', 'prefix');
 
-    if($this->connected) {
+    if ($this->connected) {
       return true;
     }
 
-    if(empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
+    if (empty($settings) || !is_array($settings) || array_intersect($need_keys, array_keys($settings)) != $need_keys) {
       $debug->error_fatal('There is missconfiguration in your config.php. Check it again', $this->mysql_error());
     }
 
     // TODO !!!!!! DEBUG -> error!!!!
     @$this->link = mysql_connect($settings['server'], $settings['user'], $settings['pass']);
-    if(!is_resource($this->link)) {
+    if (!is_resource($this->link)) {
       $debug->error_fatal('DB Error - cannot connect to server', $this->mysql_error());
     }
 
@@ -68,7 +68,7 @@ 
     return mysql_real_escape_string($unescaped_string, $this->link);
   }
   function mysql_close_link() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = false;
       mysql_close($this->link);
       unset($this->link);

classes/DBStaticUnit.php

Doc Comments +6 added lines

@@ -56,6 +56,9 @@ 
     WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
   }
 
+  /**
+   * @param string $set
+   */
   public static function db_unit_set_by_id($unit_id, $set) {
     return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set);
   }
@@ -69,6 +72,9 @@ 
     return classSupernova::db_ins_record(LOC_UNIT, $set);
   }
 
+  /**
+   * @param integer $unit_location_type
+   */
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
     return classSupernova::db_del_record_list(LOC_UNIT,
       "`unit_location_type` = {$unit_location_type}" .

classes/Vector/Vector.php

Doc Comments +2 added lines, -2 removed lines

@@ -70,8 +70,8 @@
   /**
    * Vector constructor.
    *
-   * @param int|string       $galaxy
-   * @param int|Vector|array $system
+   * @param integer       $galaxy
+   * @param integer $system
    * @param int              $planet
    * @param int              $type
    */

includes/db/db_queries_fleet.php

Doc Comments +2 added lines

@@ -141,6 +141,7 @@ 
  * LIST - Get fleet list by condition
  *
  * @param string $where_safe
+ * @param boolean $for_update
  *
  * @return array
  */
@@ -432,6 +433,7 @@ 
  * LIST - Get missile attack list by condition
  *
  * @param string $where
+ * @param boolean $for_update
  *
  * @return array
  */

galaxy.php

Braces +7 added lines, -10 removed lines

@@ -80,11 +80,12 @@ 
 
 $planet_precache_query = DBStaticPlanet::db_planet_list_in_system($uni_galaxy, $uni_system);
 // while($planet_row = db_fetch($planet_precache_query))
-if(!empty($planet_precache_query))
-foreach($planet_precache_query as $planet_row)
+if(!empty($planet_precache_query)) {
+  foreach($planet_precache_query as $planet_row)
 {
   $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
 }
+}
 
 
 //$fleet_precache_query = doquery(
@@ -139,14 +140,12 @@ 
   if ($uni_galaxyRowPlanet['destruyed'])
   {
     CheckAbandonPlanetState ($uni_galaxyRowPlanet);
-  }
-  elseif($uni_galaxyRowPlanet['id'])
+  } elseif($uni_galaxyRowPlanet['id'])
   {
     if($cached['users'][$uni_galaxyRowPlanet['id_owner']])
     {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
-    }
-    else
+    } else
     {
       $uni_galaxyRowUser = db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
@@ -168,8 +167,7 @@ 
         if($cached['allies'][$uni_galaxyRowUser['ally_id']])
         {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
-        }
-        else
+        } else
         {
           $allyquery = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '{$uni_galaxyRowUser['ally_id']}';", '', true);
           $cached['allies'][$uni_galaxyRowUser['ally_id']] = $allyquery;
@@ -188,8 +186,7 @@ 
       if ($uni_galaxyRowMoon['destruyed'])
       {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
-      }
-      else
+      } else
       {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet(false, $fleet_list[$Planet][PT_MOON]);

Indentation +94 added lines, -94 removed lines

@@ -238,53 +238,53 @@ 
   $birthday_array = $uni_galaxyRowUser['user_birthday'] ? date_parse($uni_galaxyRowUser['user_birthday']) : array();
   $user_activity = floor((SN_TIME_NOW - $uni_galaxyRowUser['onlinetime'])/(60*60*24));
   $template->assign_block_vars('galaxyrow', array(
-     'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
-     'PLANET_NUM'       => $Planet,
-     'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
-     'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
-     'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
-     'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
-     'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
-     'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
-     'PLANET_FLEET_ID'  => $planet_fleet_id,
-     'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
-
-     'MOON_NAME_JS'   => js_safe_string($uni_galaxyRowMoon['name']),
-     'MOON_IMAGE'     => $uni_galaxyRowMoon['image'],
-     'MOON_DIAMETER'  => number_format($uni_galaxyRowMoon['diameter'], 0, '', '.'),
-     'MOON_TEMP'      => number_format($uni_galaxyRowMoon['temp_min'], 0, '', '.'),
-     'MOON_FLEET_ID'  => $moon_fleet_id,
-
-     'DEBRIS'         => $uni_galaxyRowPlanet['debris'],
-     'DEBRIS_METAL'   => $uni_galaxyRowPlanet['debris_metal'],
-     'DEBRIS_CRYSTAL' => $uni_galaxyRowPlanet['debris_crystal'],
-     'DEBRIS_REST_PERCENT' => $uni_galaxyRowPlanet["debris_rest_percent"],
-
-     'DEBRIS_RESERVED' => $uni_galaxyRowPlanet['debris_reserved'],
-     'DEBRIS_RESERVED_PERCENT' => $uni_galaxyRowPlanet['debris_reserved_percent'],
-     'DEBRIS_WILL_GATHER' => $uni_galaxyRowPlanet['debris_will_gather'],
-     'DEBRIS_WILL_GATHER_PERCENT' => $uni_galaxyRowPlanet['debris_will_gather_percent'],
-     'DEBRIS_GATHER_TOTAL' => $uni_galaxyRowPlanet['debris_gather_total'],
-     'DEBRIS_GATHER_TOTAL_PERCENT' => $uni_galaxyRowPlanet['debris_gather_total_percent'],
-
-     'USER_ID'       => $uni_galaxyRowUser['id'],
-     'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
-     'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
-     'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
-     'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
-     'USER_VACATION' => $uni_galaxyRowUser['vacation'],
-     'USER_ACTIVITY' => $user_activity,
-     'USER_ATTACKABLE' => $user_activity >= 7,
-     'USER_INACTIVE' => $user_activity >= 28,
-     'USER_PROTECTED'=> $RowUserPoints <= classSupernova::$config->game_noob_points,
-     'USER_NOOB'     => $RowUserPoints * classSupernova::$config->game_noob_factor < $CurrentPoints && classSupernova::$config->game_noob_factor,
-     'USER_STRONG'   => $CurrentPoints * classSupernova::$config->game_noob_factor < $RowUserPoints && classSupernova::$config->game_noob_factor,
-     'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
-     'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
-     'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
-
-     'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
-     'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
+      'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
+      'PLANET_NUM'       => $Planet,
+      'PLANET_NAME'      => $uni_galaxyRowPlanet['name'],
+      'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
+      'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
+      'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
+      'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
+      'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
+      'PLANET_FLEET_ID'  => $planet_fleet_id,
+      'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
+
+      'MOON_NAME_JS'   => js_safe_string($uni_galaxyRowMoon['name']),
+      'MOON_IMAGE'     => $uni_galaxyRowMoon['image'],
+      'MOON_DIAMETER'  => number_format($uni_galaxyRowMoon['diameter'], 0, '', '.'),
+      'MOON_TEMP'      => number_format($uni_galaxyRowMoon['temp_min'], 0, '', '.'),
+      'MOON_FLEET_ID'  => $moon_fleet_id,
+
+      'DEBRIS'         => $uni_galaxyRowPlanet['debris'],
+      'DEBRIS_METAL'   => $uni_galaxyRowPlanet['debris_metal'],
+      'DEBRIS_CRYSTAL' => $uni_galaxyRowPlanet['debris_crystal'],
+      'DEBRIS_REST_PERCENT' => $uni_galaxyRowPlanet["debris_rest_percent"],
+
+      'DEBRIS_RESERVED' => $uni_galaxyRowPlanet['debris_reserved'],
+      'DEBRIS_RESERVED_PERCENT' => $uni_galaxyRowPlanet['debris_reserved_percent'],
+      'DEBRIS_WILL_GATHER' => $uni_galaxyRowPlanet['debris_will_gather'],
+      'DEBRIS_WILL_GATHER_PERCENT' => $uni_galaxyRowPlanet['debris_will_gather_percent'],
+      'DEBRIS_GATHER_TOTAL' => $uni_galaxyRowPlanet['debris_gather_total'],
+      'DEBRIS_GATHER_TOTAL_PERCENT' => $uni_galaxyRowPlanet['debris_gather_total_percent'],
+
+      'USER_ID'       => $uni_galaxyRowUser['id'],
+      'USER_NAME'     => player_nick_render_to_html($uni_galaxyRowUser),
+      'USER_NAME_JS'  => js_safe_string(player_nick_render_to_html($uni_galaxyRowUser)),
+      'USER_RANK'     => in_array($uni_galaxyRowUser['id'], $user_skip_list) ? '-' : $uni_galaxyRowUser['total_rank'],
+      'USER_BANNED'   => $uni_galaxyRowUser['banaday'],
+      'USER_VACATION' => $uni_galaxyRowUser['vacation'],
+      'USER_ACTIVITY' => $user_activity,
+      'USER_ATTACKABLE' => $user_activity >= 7,
+      'USER_INACTIVE' => $user_activity >= 28,
+      'USER_PROTECTED'=> $RowUserPoints <= classSupernova::$config->game_noob_points,
+      'USER_NOOB'     => $RowUserPoints * classSupernova::$config->game_noob_factor < $CurrentPoints && classSupernova::$config->game_noob_factor,
+      'USER_STRONG'   => $CurrentPoints * classSupernova::$config->game_noob_factor < $RowUserPoints && classSupernova::$config->game_noob_factor,
+      'USER_AUTH'     => $uni_galaxyRowUser['authlevel'],
+      'USER_ADMIN'    => $lang['user_level_shortcut'][$uni_galaxyRowUser['authlevel']],
+      'USER_BIRTHDAY' => $birthday_array['month'] == $time_now_parsed['mon'] && $birthday_array['day'] == $time_now_parsed['mday'] ? date(FMT_DATE, SN_TIME_NOW) : 0,
+
+      'ALLY_ID'       => $uni_galaxyRowUser['ally_id'],
+      'ALLY_TAG'      => $uni_galaxyRowUser['ally_tag'],
   ));
 }
 
@@ -350,53 +350,53 @@ 
 $system_name = doquery("select `universe_name` from `{{universe}}` where `universe_galaxy` = {$uni_galaxy} and `universe_system` = {$uni_system} limit 1;", true);
 
 $template->assign_vars(array(
-     'rows'                => $Result,
-     'userCount'           => classSupernova::$config->users_amount,
-     'ALLY_COUNT'          => $ally_count['ally_count'],
-     'PLANET_EXPEDITION'   => classSupernova::$config->game_maxPlanet + 1,
-     'curPlanetID'         => $planetrow['id'],
-     'curPlanetG'          => $planetrow['galaxy'],
-     'curPlanetS'          => $planetrow['system'],
-     'curPlanetP'          => $planetrow['planet'],
-     'curPlanetPT'         => $planetrow['planet_type'],
-     'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
-     'galaxy'              => $uni_galaxy,
-     'system'              => $uni_system,
-     'planet'              => $planet,
-     'MIPs'                => round($CurrentMIP),
-     'MODE'                => $mode,
-     'planets'             => $planetcount,
-     'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
-     'SHOW_ADMIN'          => SHOW_ADMIN,
-     'fleet_count'         => $flying_fleet_count,
-     'fleet_max'           => $fleetmax,
-     'ALLY_ID'             => $user['ally_id'],
-     'USER_ID'             => $user['id'],
-     'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
-     'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
-     'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
-     'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
-     'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
-     'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
-     'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
-     'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
-     'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
-     'ACT_MISSILE'         => $is_missile,
-     'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
-     'PAGE_HINT'           => $lang['gal_sys_hint'],
-     'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
-     'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
-     'GALAXY_NAME'         => $galaxy_name['universe_name'],
-     'SYSTEM_NAME'         => $system_name['universe_name'],
-     'COL_SPAN'            => $colspan + 9,
-     'COL_SPAN_PLUS'       => $colspan + 3,
-
-     'COL_SPAN_NEW'        => $colspan + 4,
-     'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
-
-     'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
-     'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
-   )
+      'rows'                => $Result,
+      'userCount'           => classSupernova::$config->users_amount,
+      'ALLY_COUNT'          => $ally_count['ally_count'],
+      'PLANET_EXPEDITION'   => classSupernova::$config->game_maxPlanet + 1,
+      'curPlanetID'         => $planetrow['id'],
+      'curPlanetG'          => $planetrow['galaxy'],
+      'curPlanetS'          => $planetrow['system'],
+      'curPlanetP'          => $planetrow['planet'],
+      'curPlanetPT'         => $planetrow['planet_type'],
+      'deathStars'          => mrc_get_level($user, $planetrow, SHIP_HUGE_DEATH_STAR, false, true),
+      'galaxy'              => $uni_galaxy,
+      'system'              => $uni_system,
+      'planet'              => $planet,
+      'MIPs'                => round($CurrentMIP),
+      'MODE'                => $mode,
+      'planets'             => $planetcount,
+      'SPs'                 => pretty_number(mrc_get_level($user, $planetrow, SHIP_SPY, false, true)),
+      'SHOW_ADMIN'          => SHOW_ADMIN,
+      'fleet_count'         => $flying_fleet_count,
+      'fleet_max'           => $fleetmax,
+      'ALLY_ID'             => $user['ally_id'],
+      'USER_ID'             => $user['id'],
+      'ACT_SPIO'            => classSupernova::$user_options[PLAYER_OPTION_FLEET_SPY_DEFAULT],
+      'ACT_SPY'             => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_SPYING],
+      'ACT_WRITE'           => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PM],
+      'ACT_STATISTICS'      => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_STATS],
+      'ACT_INFO'            => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_PROFILE],
+      'ACT_FRIEND'          => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_ICON_BUDDY],
+      'opt_uni_tooltip_time'=> classSupernova::$user_options[PLAYER_OPTION_TOOLTIP_DELAY],
+      'opt_uni_avatar_user' => $user['opt_uni_avatar_user'],
+      'opt_uni_avatar_ally' => $user['opt_uni_avatar_ally'],
+      'ACT_MISSILE'         => $is_missile,
+      'PLANET_PHALANX'      => $HavePhalanx && $uni_galaxy == $CurrentGalaxy && $uni_system >= $CurrentSystem - $PhalanxRange && $uni_system <= $CurrentSystem + $PhalanxRange,
+      'PAGE_HINT'           => $lang['gal_sys_hint'],
+      'PLANET_RECYCLERS'    => $planet_recyclers_orbiting,
+      'PLANET_RECYCLERS_TEXT' => pretty_number($planet_recyclers_orbiting),
+      'GALAXY_NAME'         => $galaxy_name['universe_name'],
+      'SYSTEM_NAME'         => $system_name['universe_name'],
+      'COL_SPAN'            => $colspan + 9,
+      'COL_SPAN_PLUS'       => $colspan + 3,
+
+      'COL_SPAN_NEW'        => $colspan + 4,
+      'COL_SPAN_NEW_COLONIZE' => $colspan - 2,
+
+      'PLAYER_OPTION_UNIVERSE_OLD' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_OLD],
+      'PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE' => classSupernova::$user_options[PLAYER_OPTION_UNIVERSE_DISABLE_COLONIZE],
+    )
 );
 
 if($scan) {

Spacing +29 added lines, -29 removed lines

@@ -30,7 +30,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet     = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -81,8 +81,8 @@ 
 
 $planet_precache_query = DBStaticPlanet::db_planet_list_in_system($uni_galaxy, $uni_system);
 // while($planet_row = db_fetch($planet_precache_query))
-if(!empty($planet_precache_query))
-foreach($planet_precache_query as $planet_row)
+if (!empty($planet_precache_query))
+foreach ($planet_precache_query as $planet_row)
 {
   $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
 }
@@ -101,7 +101,7 @@ 
 //  $fleet_list[$fleet_planet][$fleet_type][] = $fleet_row;
 //}
 $system_fleet_list = fleet_list_by_planet_coords($uni_galaxy, $uni_system);
-foreach($system_fleet_list as $fleet_row) {
+foreach ($system_fleet_list as $fleet_row) {
   $fleet_planet = $fleet_row['fleet_mess'] == 0 ? $fleet_row['fleet_end_planet'] : $fleet_row['fleet_start_planet'];
   $fleet_type   = $fleet_row['fleet_mess'] == 0 ? $fleet_row['fleet_end_type'] : $fleet_row['fleet_start_type'];
   $fleet_list[$fleet_planet][$fleet_type][] = $fleet_row;
@@ -112,7 +112,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(sn_get_groups('flt_recyclers') as $recycler_id)
+foreach (sn_get_groups('flt_recyclers') as $recycler_id)
 {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
@@ -139,11 +139,11 @@ 
   $planet_fleet_id = 0;
   if ($uni_galaxyRowPlanet['destruyed'])
   {
-    CheckAbandonPlanetState ($uni_galaxyRowPlanet);
+    CheckAbandonPlanetState($uni_galaxyRowPlanet);
   }
-  elseif($uni_galaxyRowPlanet['id'])
+  elseif ($uni_galaxyRowPlanet['id'])
   {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']])
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']])
     {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     }
@@ -153,7 +153,7 @@ 
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id'])
+    if (!$uni_galaxyRowUser['id'])
     {
       $debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
@@ -161,12 +161,12 @@ 
       DBStaticPlanet::db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id'])
+    if ($uni_galaxyRowUser['id'])
     {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id'])
+      if ($uni_galaxyRowUser['ally_id'])
       {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']])
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']])
         {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         }
@@ -178,7 +178,7 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet(false, $fleet_list[$Planet][PT_PLANET]);
-      if($fleets_to_planet['own']['count'])
+      if ($fleets_to_planet['own']['count'])
       {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
@@ -194,7 +194,7 @@ 
       {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet(false, $fleet_list[$Planet][PT_MOON]);
-        if($fleets_to_planet['own']['count'])
+        if ($fleets_to_planet['own']['count'])
         {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
@@ -207,12 +207,12 @@ 
 //  $recyclers_incoming = 0;
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if($fleet_list[$Planet][PT_DEBRIS]) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $fleet_row) {
-        if($fleet_row['fleet_owner'] == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if ($fleet_list[$Planet][PT_DEBRIS]) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $fleet_row) {
+        if ($fleet_row['fleet_owner'] == $user['id']) {
           $fleet_data = sys_unit_str2arr($fleet_row['fleet_array']);
-          foreach($recycler_info as $recycler_id => $recycler_data) {
+          foreach ($recycler_info as $recycler_id => $recycler_data) {
             $recyclers_incoming_capacity += $fleet_data[$recycler_id] * $recycler_data['capacity'];
           }
         }
@@ -236,7 +236,7 @@ 
 
   $RowUserPoints = $uni_galaxyRowUser['total_points'];
   $birthday_array = $uni_galaxyRowUser['user_birthday'] ? date_parse($uni_galaxyRowUser['user_birthday']) : array();
-  $user_activity = floor((SN_TIME_NOW - $uni_galaxyRowUser['onlinetime'])/(60*60*24));
+  $user_activity = floor((SN_TIME_NOW - $uni_galaxyRowUser['onlinetime']) / (60 * 60 * 24));
   $template->assign_block_vars('galaxyrow', array(
      'PLANET_ID'        => $uni_galaxyRowPlanet['id'],
      'PLANET_NUM'       => $Planet,
@@ -244,7 +244,7 @@ 
      'PLANET_NAME_JS'   => js_safe_string($uni_galaxyRowPlanet['name']),
      'PLANET_DESTROYED' => $uni_galaxyRowPlanet["destruyed"],
      'PLANET_TYPE'      => $uni_galaxyRowPlanet["planet_type"],
-     'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update'])/60),
+     'PLANET_ACTIVITY'  => floor((SN_TIME_NOW - $uni_galaxyRowPlanet['last_update']) / 60),
      'PLANET_IMAGE'     => $uni_galaxyRowPlanet['image'],
      'PLANET_FLEET_ID'  => $planet_fleet_id,
      'PLANET_DIAMETER'  => number_format($uni_galaxyRowPlanet['diameter'], 0, '', '.'),
@@ -290,21 +290,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID' => $unit_id,
     'NAME' => $lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -327,9 +327,9 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly)
+foreach ($cached['allies'] as $PlanetAlly)
 {
-  if($PlanetAlly)
+  if ($PlanetAlly)
   {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
@@ -399,7 +399,7 @@ 
    )
 );
 
-if($scan) {
+if ($scan) {
   $template_result = array_merge($template_result, array(
     'GLOBAL_DISPLAY_MENU' => false,
     'GLOBAL_DISPLAY_NAVBAR' => false,

language/en/menu.mo.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(

language/en/buildings.mo.php

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 * DO NOT CHANGE
 */
 
-if (!defined('INSIDE')) die();
+if (!defined('INSIDE')) {
+  die();
+}
 
 
 $a_lang_array = (array(