supernova-ws / SuperNova

classes/core_auth.php

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
-    $result[] = "tID {$transaction_id}";
+    $result[] = "tid {$transaction_id}";
     foreach($backtrace as $a_trace) {
       if(in_array($a_trace['function'], $exclude_functions)) {
         continue;

Spacing +42 added lines, -43 removed lines

@@ -24,7 +24,7 @@ 
  * que esperabas!!! soy newbie!!! D':<
 */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die("attemp hacking");
 }
 
@@ -37,16 +37,16 @@ 
   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) {
+    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) {
+    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;
@@ -81,8 +81,8 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -98,7 +98,7 @@ 
 
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -107,26 +107,26 @@ 
   }
 
   function dump($dump = false, $force_base = false, $deadlock = false) {
-    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;
@@ -134,24 +134,23 @@ 
       }
     }
 
-    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'] = _SnCacheInternal::$locks;
       $error_backtrace['cSN_data'] = _SnCacheInternal::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
         {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
     }
 
-    if($base_dump) {
-      if(!is_array($this->log_array) || empty($this->log_array)) {
+    if ($base_dump) {
+      if (!is_array($this->log_array) || empty($this->log_array)) {
         $this->log_array = [];
       } else {
-        foreach($this->log_array as $log) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -163,17 +162,17 @@ 
       // Converting object instances to object names
 
       foreach ($error_backtrace['backtrace'] as &$backtrace) {
-        if(is_object($backtrace['object'])) {
+        if (is_object($backtrace['object'])) {
           $backtrace['object'] = get_class($backtrace['object']);
         }
 
-        if(empty($backtrace['args'])) {
+        if (empty($backtrace['args'])) {
           continue;
         }
 
         // Doing same conversion for backtrace params
-        foreach($backtrace['args'] as &$arg) {
-          if(is_object($arg)) {
+        foreach ($backtrace['args'] as &$arg) {
+          if (is_object($arg)) {
             $arg = 'object::' . get_class($arg);
           }
         }
@@ -202,14 +201,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $config, $sys_stop_log_hit, $lang, $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>" . htmlspecialchars($message) . "</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -219,7 +218,7 @@ 
     $error_text = db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . ($user['id'] ? db_escape($user['id']) : 0) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -237,7 +236,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('<hr>');
         pdump($value, $name);
       }
@@ -249,14 +248,14 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $lang, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . ($user['id'] ? db_escape($user['id']) : 0) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -274,11 +273,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;;';
@@ -287,7 +286,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -295,22 +294,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
+    foreach ($props as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == 'array') {
+  } elseif ($type == 'array') {
     $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
+    foreach ($value as $key => $val) {
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
       $dumper .= dump($val, '', $level + 1);
     }
@@ -330,7 +329,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_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'] .
@@ -357,7 +356,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print(mt_rand() . "<br>");
@@ -367,7 +366,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print($_PRINT_COUNT_VALUE . "<br>");

Braces +3 added lines, -1 removed lines

@@ -139,11 +139,13 @@
       $error_backtrace['locks'] = _SnCacheInternal::$locks;
       $error_backtrace['cSN_data'] = _SnCacheInternal::$data;
       foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+        foreach($location as $location_id => &$location_data) {
+          //          $location_data = $location_id;
         {
           $location_data = isset($location_data['username']) ? $location_data['username'] :
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
+        }
       }
     }
 

includes/db/db_queries.php

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 
 function db_unit_records_sum($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -115,7 +115,7 @@ 
 
 function db_unit_records_plain($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -125,7 +125,7 @@ 
 }
 
 function db_stat_list_statistic($who, $is_common_stat, $Rank, $start, $source = false) {
-  if(!$source) {
+  if (!$source) {
     $source = array(
       'statpoints' => 'statpoints',
       'users' => 'users',
@@ -146,8 +146,8 @@ 
     );
   }
 
-  if($who == 1) {
-    if($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
+  if ($who == 1) {
+    if ($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
       @rownum:=@rownum+1 rownum, subject.{$source['id']} as `id`, sp.{$Rank}_rank as rank, sp.{$Rank}_old_rank as rank_old, sp.{$Rank}_points as points, subject.{$source['username']} as `name`, subject.*
@@ -161,7 +161,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
@@ -174,7 +174,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      ". $start .",100;";
+      " . $start . ",100;";
     }
   } else {
     // TODO
@@ -191,7 +191,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    ". $start .",100;";
+    " . $start . ",100;";
   }
 
   return doquery($query_str);
@@ -277,7 +277,7 @@ 
 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 = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
-  if(!isset($value_id['id_field']) || !$value_id['id_field']) {
+  if (!isset($value_id['id_field']) || !$value_id['id_field']) {
     doquery("INSERT INTO {{{$db_table_name}}} (`{$db_value_field_name}`) VALUES ('{$current_value_safe}');");
     $variable_id = db_insert_id();
   } else {

Braces +11 added lines, -22 removed lines

@@ -6,8 +6,7 @@ 
 require_once('db_queries_fleet.php');
 
 
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
-{
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
     " FROM {{planets}} AS p
@@ -16,8 +15,7 @@ 
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
-function db_planet_list_search($searchtext)
-{
+function db_planet_list_search($searchtext) {
   return doquery(
     "SELECT
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -37,8 +35,7 @@ 
 
 
 
-function db_user_list_search($searchtext)
-{
+function db_user_list_search($searchtext) {
   return doquery(
     "SELECT
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -56,8 +53,7 @@ 
   );
 }
 
-function db_buddy_list_by_user($user_id)
-{
+function db_buddy_list_by_user($user_id) {
 //  return ($user_id = intval($user_id)) ? doquery(
   return ($user_id = idval($user_id)) ? doquery(
     "SELECT
@@ -87,8 +83,7 @@ 
 
 
 
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -99,8 +94,7 @@ 
     , true);
 }
 
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -184,15 +178,13 @@ 
 }
 
 
-function db_stat_list_delete_ally_player()
-{
+function db_stat_list_delete_ally_player() {
   return doquery('DELETE s FROM `{{statpoints}}` AS s JOIN `{{users}}` AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
 }
 
 
 
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
-{
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
 
   return doquery(
@@ -206,13 +198,11 @@ 
     ORDER BY authlevel DESC, `username`");
 }
 
-function db_referrals_list_by_id($user_id)
-{
+function db_referrals_list_by_id($user_id) {
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
 }
 
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
-{
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
   return doquery("SELECT
   message_id as `ID`,
   message_from as `FROM`,
@@ -231,8 +221,7 @@ 
 }
 
 
-function db_message_insert_all($message_type, $from, $subject, $text)
-{
+function db_message_insert_all($message_type, $from, $subject, $text) {
   return doquery($QryInsertMessage = '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}}");
 }

includes/db/db_helpers.php

Spacing +7 added lines, -7 removed lines

@@ -27,19 +27,19 @@ 
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
     $field = '`' . db_escape($field) . '`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
       $new_value = '"' . db_escape($value) . '"';
-    } elseif($delta) {
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }
@@ -59,8 +59,8 @@ 
  */
 function missile_list_convert_to_fleet(&$missile_db_list, &$fleet_db_list) {
   // Missile attack
-  foreach($missile_db_list as $irak) {
-    if($irak['fleet_end_time'] >= SN_TIME_NOW) {
+  foreach ($missile_db_list as $irak) {
+    if ($irak['fleet_end_time'] >= SN_TIME_NOW) {
       $irak['fleet_start_type'] = PT_PLANET;
       $planet_start = DBStaticPlanet::db_planet_by_vector($irak, 'fleet_start_', false, 'name');
       $irak['fleet_id'] = -$irak['id'];

includes/general_pname.php

Braces +2 added lines, -4 removed lines

@@ -2,12 +2,10 @@
 
 // Эти функции будут переписаны по добавлению инфы в БД
 
-function pname_factory_production_field_name($factory_unit_id)
-{
+function pname_factory_production_field_name($factory_unit_id) {
   return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
 }
 
-function pname_resource_name($resource_id)
-{
+function pname_resource_name($resource_id) {
   return get_unit_param($resource_id, P_NAME);
 }
\ No newline at end of file

includes/functions/int_fleet_events.php

Spacing +11 added lines, -11 removed lines

@@ -8,23 +8,23 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if(empty($fleet_list))
+  if (empty($fleet_list))
   {
     return;
   }
 
-  foreach($fleet_list as $fleet)
+  foreach ($fleet_list as $fleet)
   {
     $planet_start_type = $fleet['fleet_start_type'] == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_start_galaxy'], $fleet['fleet_start_system'], $fleet['fleet_start_planet'], $planet_start_type, false, 'name');
     $fleet['fleet_start_name'] = $planet_start['name'];
 
     $planet_end_type = $fleet['fleet_end_type'] == PT_MOON ? PT_MOON : PT_PLANET;
-    if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
+    if ($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
     }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    elseif ($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
     }
@@ -34,7 +34,7 @@ 
       $fleet['fleet_end_name'] = $planet_end['name'];
     }
 
-    if($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
+    if ($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -49,12 +49,12 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 0, $planet_end_type);
     }
 
-    if($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
+    if ($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $fleet['fleet_end_time'] > SN_TIME_NOW && $fleet['fleet_mission'] != MT_MISSILE && ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mission'] != MT_RELOCATE && $fleet['fleet_mission'] != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $fleet['fleet_owner'] == $user['id'])
@@ -71,7 +71,7 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 2, $planet_end_type);
     }
     
-    if($fleet['fleet_mission'] == MT_MISSILE)
+    if ($fleet['fleet_mission'] == MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 3, $planet_end_type);
     }
@@ -84,7 +84,7 @@ 
 {
   global $user, $planetrow, $fleet_number;
 
-  switch($fleet['ov_label'] = $ov_label)
+  switch ($fleet['ov_label'] = $ov_label)
   {
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
@@ -116,9 +116,9 @@ 
 
   }
 
-  $fleet['ov_this_planet'] = $is_this_planet;// || $planet_scanned != false;
+  $fleet['ov_this_planet'] = $is_this_planet; // || $planet_scanned != false;
 
-  if($fleet['fleet_owner'] == $user['id'])
+  if ($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
   }

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -89,18 +89,18 @@ 
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
     case 1:
       $fleet['event_time'] = $fleet['fleet_end_stay'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
@@ -108,9 +108,9 @@ 
     case 3:
       $fleet['event_time'] = $fleet['fleet_end_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_start_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_start_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_start_system']) and
+        ($planetrow['planet'] == $fleet['fleet_start_planet']) and
         ($planetrow['planet_type'] == $fleet['fleet_start_type']));
     break;
 

Braces +6 added lines, -12 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 
-function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false)
-{
+function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) {
   global $config, $user, $fleet_number, $lang;
 
   $fleet_events = array();
@@ -23,12 +22,10 @@ 
     if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
-    }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    } elseif($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
-    }
-    else
+    } else
     {
       $planet_end = DBStaticPlanet::db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name');
       $fleet['fleet_end_name'] = $planet_end['name'];
@@ -80,8 +77,7 @@ 
   return $fleet_events;
 }
 
-function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
-{
+function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) {
   global $user, $planetrow, $fleet_number;
 
   switch($fleet['ov_label'] = $ov_label)
@@ -121,8 +117,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }
@@ -134,8 +129,7 @@ 
  * @param array    $planetrow
  * @param template $template
  */
-function int_planet_pretemplate($planetrow, &$template)
-{
+function int_planet_pretemplate($planetrow, &$template) {
   global $lang, $user;
 
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];

includes/functions/flt_mission_missile.php

Braces +2 added lines, -4 removed lines

@@ -4,8 +4,7 @@ 
 // Open Source
 // V1
 //
-function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0')
-{
+function COE_missileAttack($defenceTech, $attackerTech, $MIPs, $structures, $targetedStructure = '0') {
   // Here we select which part of defense should take damage: structure or shield
   // $damageTo = P_SHIELD;
   // $damageTo = P_STRUCTURE;
@@ -34,8 +33,7 @@ 
     $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
     $structures[$targetedStructure][0] -= $structsDestroyed;
     $MIPDamage -= $structsDestroyed*$damageDone;
-  }
-  else
+  } else
   {
     // REALLY random attack
     $can_be_damaged = sn_get_groups('defense_active');

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
-  foreach($structures as $key => $structure)
+  foreach ($structures as $key => $structure)
   {
     $unit_info = get_unit_param($key);
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@ 
   {
     //attacking only selected structure
     $damageDone = $structures[$targetedStructure][$damageTo];
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
     $structures[$targetedStructure][0] -= $structsDestroyed;
-    $MIPDamage -= $structsDestroyed*$damageDone;
+    $MIPDamage -= $structsDestroyed * $damageDone;
   }
   else
   {
@@ -44,16 +44,16 @@ 
     do
     {
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
-      foreach($can_be_damaged as $key => $unit_id)
+      foreach ($can_be_damaged as $key => $unit_id)
       {
 //debug($structures[$unit_id][0]);
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
         {
           unset($can_be_damaged[$key]);
         }
       }
-      if(empty($can_be_damaged))
+      if (empty($can_be_damaged))
       {
         break;
       }
@@ -72,7 +72,7 @@ 
 //debug($destroyed, 'Actually destroyed');
 
 //print('<hr>');
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
 //debug($MIPDamage, 'MIPDamage left');
   }
 //debug($structures);//die();
@@ -87,8 +87,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal']      = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal']      = floor($metal); // Metal scraps
   $return['crystal']    = floor($crystal); // Crystal scraps
 
   return $return;
@@ -112,7 +112,7 @@ 
 
   $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
 
-  while($fleetRow = db_fetch($iraks)) {
+  while ($fleetRow = db_fetch($iraks)) {
     set_time_limit(15);
     $db_changeset = array();
 
@@ -128,9 +128,9 @@ 
 
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
 
-    if($target_planet_row['id']) {
+    if ($target_planet_row['id']) {
       $planetDefense = array();
-      foreach(sn_get_groups('defense_active') as $unit_id) {
+      foreach (sn_get_groups('defense_active') as $unit_id) {
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
       }
 
@@ -141,23 +141,23 @@ 
         $message = $lang['mip_all_destroyed'];
         $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
       } else {
-        if($interceptors) {
+        if ($interceptors) {
           $message = sprintf($lang['mip_destroyed'], $interceptors);
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
         }
 
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
 
-        foreach($attackResult['structures'] as $key => $structure) {
+        foreach ($attackResult['structures'] as $key => $structure) {
           $destroyed = $planetDefense[$key][0] - $structure[0];
-          if($destroyed) {
+          if ($destroyed) {
             $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($key, -$destroyed, $targetUser, $target_planet_row['id']);
 
             $message .= "&nbsp;&nbsp;{$lang['tech'][$key]} - {$destroyed} {$lang['quantity']}<br>";
           }
         }
 
-        if(!empty($message)) {
+        if (!empty($message)) {
           $message = $lang['mip_defense_destroyed'] . $message . "{$lang['mip_recycled']}{$lang['Metal']}: {$attackResult['metal']}, {$lang['Crystal']}: {$attackResult['crystal']}<br>";
 
           DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
@@ -174,8 +174,8 @@ 
 
       empty($message) ? $message = $lang['mip_no_defense'] : false;
 
-      msg_send_simple_message ( $fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
-      msg_send_simple_message ( $fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
+      msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
+      msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
     }
     doquery("DELETE FROM {{iraks}} WHERE id = '{$fleetRow['id']}';");
   }

includes/functions/eco_queue.php

Braces +1 added lines, -2 removed lines

@@ -458,8 +458,7 @@
 
     if(is_numeric($planet['id'])) {
       DBStaticPlanet::db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
-    }
-    elseif(is_numeric($user['id'])) {
+    } elseif(is_numeric($user['id'])) {
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
     }
 

Spacing +91 added lines, -91 removed lines

@@ -2,8 +2,8 @@ 
 
 function que_get_unit_que($unit_id) {
   $que_type = false;
-  foreach(sn_get_groups('ques') as $que_id => $que_data) {
-    if(in_array($unit_id, $que_data['unit_list'])) {
+  foreach (sn_get_groups('ques') as $que_id => $que_data) {
+    if (in_array($unit_id, $que_data['unit_list'])) {
       $que_type = $que_id;
       break;
     }
@@ -16,14 +16,14 @@ 
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
   global $config;
 
-  if(empty($que_data)) {
+  if (empty($que_data)) {
     $que_data = sn_get_groups('ques');
     $que_data = $que_data[$que_id];
   }
 
 
   $que_length = 1;
-  switch($que_id) {
+  switch ($que_id) {
     case QUE_RESEARCH:
       $que_length = $config->server_que_length_research + mrc_get_level($user, '', UNIT_PREMIUM); // TODO - вынести в модуль
     break;
@@ -37,8 +37,8 @@ 
 
 function eco_que_str2arr($que_str) {
   $que_arr = explode(';', $que_str);
-  foreach($que_arr as $que_index => &$que_item) {
-    if($que_item) {
+  foreach ($que_arr as $que_index => &$que_item) {
+    if ($que_item) {
       $que_item = explode(',', $que_item);
     } else {
       unset($que_arr[$que_index]);
@@ -48,7 +48,7 @@ 
 }
 
 function eco_que_arr2str($que_arr) {
-  foreach($que_arr as &$que_item) {
+  foreach ($que_arr as &$que_item) {
     $que_item = implode(',', $que_item);
   }
   return implode(';', $que_arr);
@@ -59,14 +59,14 @@ 
   global $lang, $config;
 
   $is_autoconvert = false;
-  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
+  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
     $build_mode = BUILD_CREATE;
     $is_autoconvert = true;
   }
 
   $unit_amount_qued = 0;
   try {
-    if(!$user['id']) {
+    if (!$user['id']) {
       throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -77,16 +77,16 @@ 
       foreach($unit_list as $unit_id => $unit_amount) if($unit_amount) break;
     }
     */
-    if(!$unit_id) {
+    if (!$unit_id) {
       throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
     $que_id = que_get_unit_que($unit_id);
-    if(!$que_id) {
+    if (!$que_id) {
       throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
+    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
       throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -94,11 +94,11 @@ 
     $que_data = $que_data[$que_id];
 
     // TODO Переделать под подочереди
-    if($que_id == QUE_STRUCTURES) {
+    if ($que_id == QUE_STRUCTURES) {
       $sn_groups_build_allow = sn_get_groups('build_allow');
       $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']];
 
-      if(!isset($que_data['unit_list'][$unit_id])) {
+      if (!isset($que_data['unit_list'][$unit_id])) {
         throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
       }
     }
@@ -119,7 +119,7 @@ 
     // Это нужно, что бы заблокировать пользователя и работу с очередями
     $user = db_user_by_id($user['id']);
     // Это нужно, что бы заблокировать планету от списания ресурсов
-    if(isset($planet['id']) && $planet['id']) {
+    if (isset($planet['id']) && $planet['id']) {
       $planet = DBStaticPlanet::db_planet_by_id($planet['id'], true);
     } else {
       $planet['id'] = 0;
@@ -131,17 +131,17 @@ 
     $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id];
     $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data);
     // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей
-    if(count($in_que) >= $que_max_length) {
+    if (count($in_que) >= $que_max_length) {
       throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION
     }
 
     // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов
-    switch(eco_can_build_unit($user, $planet, $unit_id)) {
+    switch (eco_can_build_unit($user, $planet, $unit_id)) {
       case BUILD_ALLOWED: break;
       case BUILD_UNIT_BUSY: throw new exception('{Строение занято}', ERR_ERROR); break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading
       // case BUILD_REQUIRE_NOT_MEET:
       default:
-        if($build_mode == BUILD_CREATE) {
+        if ($build_mode == BUILD_CREATE) {
           throw new exception('{Требования не удовлетворены}', ERR_ERROR);
         }
         break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet
@@ -151,14 +151,14 @@ 
     $unit_amount_qued = $unit_amount;
     $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0;
     $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued;
-    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
-      if($unit_level >= $unit_max) {
+    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
+      if ($unit_level >= $unit_max) {
         throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
       }
       $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level));
     }
 
-    if($unit_amount < 1) {
+    if ($unit_amount < 1) {
       throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -174,21 +174,21 @@ 
     //  {
     //    die('Unit busy'); // TODO EXCEPTION
     //  }
-    if(get_unit_param($unit_id, P_STACKABLE)) {
+    if (get_unit_param($unit_id, P_STACKABLE)) {
       // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь
-      if(in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
+      if (in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
         // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита
         $used_silo = 0;
-        foreach($group_missile as $missile_id) {
+        foreach ($group_missile as $missile_id) {
           $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0;
           $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE);
         }
         $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo;
-        if($free_silo <= 0) {
+        if ($free_silo <= 0) {
           throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
         }
         $unit_size = get_unit_param($unit_id, P_UNIT_SIZE);
-        if($free_silo < $unit_size) {
+        if ($free_silo < $unit_size) {
           throw new exception("{В ракетной шахте нет места для {$lang['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
         }
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -196,10 +196,10 @@ 
       $unit_level = $new_unit_level = 0;
     } else {
       $unit_amount = 1;
-      if($que_id == QUE_STRUCTURES) {
+      if ($que_id == QUE_STRUCTURES) {
         // if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $que['sectors'][$planet['id']] <= 0)
         $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0;
-        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0)
+        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0)
         {
           throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION
         }
@@ -217,9 +217,9 @@ 
 
     $exchange = array();
     $market_get_autoconvert_cost = market_get_autoconvert_cost();
-    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
+    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
       $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
         throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
       }
 
@@ -229,7 +229,7 @@ 
       $resource_exchange_rates = array();
       $resource_diff = array();
       $all_positive = true;
-      foreach($resources_loot as $resource_id) {
+      foreach ($resources_loot as $resource_id) {
         $resource_db_name = pname_resource_name($resource_id);
         $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id));
         $resource_exchange_rates[$resource_id] = $config->__get("rpg_exchange_{$resource_db_name}");
@@ -237,15 +237,15 @@ 
         $all_positive = $all_positive && ($resource_diff[$resource_id] > 0);
       }
       // Нужна автоконвертация
-      if($all_positive) {
+      if ($all_positive) {
         $is_autoconvert = false;
       } else {
-        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) {
-          if($resource_diff_amount >= 0) {
+        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) {
+          if ($resource_diff_amount >= 0) {
             continue;
           }
-          foreach($resource_diff as $resource_got_id => &$resource_got_amount) {
-            if($resource_got_amount <= 0) {
+          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) {
+            if ($resource_got_amount <= 0) {
               continue;
             }
             $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id];
@@ -261,14 +261,14 @@ 
         }
 
         $is_autoconvert_ok = true;
-        foreach($resource_diff as $resource_diff_amount2) {
-          if($resource_diff_amount2 < 0) {
+        foreach ($resource_diff as $resource_diff_amount2) {
+          if ($resource_diff_amount2 < 0) {
             $is_autoconvert_ok = false;
             break;
           }
         }
 
-        if($is_autoconvert_ok) {
+        if ($is_autoconvert_ok) {
           $build_data['RESULT'][$build_mode] = BUILD_ALLOWED;
           $build_data['CAN'][$build_mode] = $unit_amount;
         } else {
@@ -277,19 +277,19 @@ 
       }
     }
     $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount);
-    if($unit_amount <= 0) {
+    if ($unit_amount <= 0) {
       throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($new_unit_level < 0) {
+    if ($new_unit_level < 0) {
       throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
+    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
       throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($is_autoconvert) {
+    if ($is_autoconvert) {
       ksort($exchange);
       ksort($resource_got);
       db_change_units($user, $planet, array(
@@ -304,7 +304,7 @@ 
     }
 
     $unit_amount_qued = 0;
-    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
+    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
       $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW);
       que_add_unit($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
       $unit_amount -= $place;
@@ -314,7 +314,7 @@ 
 
     sn_db_transaction_commit();
 
-    if($redirect) {
+    if ($redirect) {
       sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
     }
 
@@ -322,7 +322,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => '{Строительство начато}',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $operation_result = array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -330,7 +330,7 @@ 
     );
   }
 
-  if(!empty($operation_result['MESSAGE'])) {
+  if (!empty($operation_result['MESSAGE'])) {
     $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . $lang['tech'][$unit_id] . ']';
   }
 
@@ -344,11 +344,11 @@ 
 function que_recalculate($old_que) {
   $new_que = array();
 
-  if(!is_array($old_que['items'])) {
+  if (!is_array($old_que['items'])) {
     return $new_que;
   }
-  foreach($old_que['items'] as $row) {
-    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
+  foreach ($old_que['items'] as $row) {
+    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
       continue;
     }
 
@@ -359,9 +359,9 @@ 
 
     $last_id = count($new_que['items']) - 1;
 
-    if($row['que_planet_id']) {
+    if ($row['que_planet_id']) {
       $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id];
-    } elseif($row['que_type'] == QUE_RESEARCH) {
+    } elseif ($row['que_type'] == QUE_RESEARCH) {
       $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id];
     }
     $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id];
@@ -396,9 +396,9 @@ 
   $que_type = que_get_unit_que($unit_id);
   $planet_id_origin = $planet['id'] ? $planet['id'] : 'NULL';
   $planet_id = $que_type == QUE_RESEARCH ? 'NULL' : $planet_id_origin;
-  if(is_numeric($planet_id)) {
+  if (is_numeric($planet_id)) {
     DBStaticPlanet::db_planet_set_by_id($planet_id, "`que_processed` = UNIX_TIMESTAMP(NOW())");
-  } elseif(is_numeric($user['id'])) {
+  } elseif (is_numeric($user['id'])) {
     db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
   }
 
@@ -428,17 +428,17 @@ 
   $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0;
   $global_que = que_get($user['id'], $planet['id'], $que_type, true);
 
-  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
+  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
     $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]);
 
-    foreach($que as $que_item) {
+    foreach ($que as $que_item) {
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
 
-      if($que_item['que_planet_id_origin']) {
+      if ($que_item['que_planet_id_origin']) {
         $planet['id'] = $que_item['que_planet_id_origin'];
       }
 
-      if(!isset($planets_locked[$planet['id']])) {
+      if (!isset($planets_locked[$planet['id']])) {
         $planets_locked[$planet['id']] = $planet['id'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet;
       }
 
@@ -450,15 +450,15 @@ 
         RES_DEUTERIUM => $build_data[RES_DEUTERIUM] * $que_item['que_unit_amount'],
       ));
 
-      if(!$clear) {
+      if (!$clear) {
         break;
       }
     }
 
-    if(is_numeric($planet['id'])) {
+    if (is_numeric($planet['id'])) {
       DBStaticPlanet::db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
     }
-    elseif(is_numeric($user['id'])) {
+    elseif (is_numeric($user['id'])) {
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
     }
 
@@ -503,21 +503,21 @@ 
   // TODO: Переделать для $que_type === false
   $planet['id'] = $planet['id'] ? $planet['id'] : 0;
 
-  if(!is_array($que)) {
+  if (!is_array($que)) {
     $que = que_get($user['id'], $planet['id'], $que_type);
   }
 
-  if(is_array($que) && isset($que['items'])) {
+  if (is_array($que) && isset($que['items'])) {
     $que = $que['ques'][$que_type][$user['id']][$planet['id']];
   }
 
-  if($que) {
-    foreach($que as $que_element) {
+  if ($que) {
+    foreach ($que as $que_element) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names));
     }
   }
 
-  if($que_type == QUE_RESEARCH) {
+  if ($que_type == QUE_RESEARCH) {
     // TODO Исправить
 //    $template->assign_var('RESEARCH_ONGOING', count($global_que[QUE_RESEARCH][0]) >= $config->server_que_length_research);
   }
@@ -545,7 +545,7 @@ 
   $user = db_user_by_id($user['id'], true);
 
   $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']);
-  if($planet === null && !$time_left[$user['id']][0]) {
+  if ($planet === null && !$time_left[$user['id']][0]) {
     // TODO
     return $que;
   }
@@ -554,12 +554,12 @@ 
   $que_type_id = $planet === null ? QUE_RESEARCH : false;
   $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false
   $que = que_get($user['id'], $planet, $que_type_id, true);
-  if(empty($que['items'])) {
+  if (empty($que['items'])) {
     return $que;
   }
 
   $planet_list = array();
-  if($planet !== null) {
+  if ($planet !== null) {
     // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них
     // TODO - от них не надо ничего, кроме ID и que_processed
     $planet_row = DBStaticPlanet::db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -568,21 +568,21 @@ 
   }
 
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
-  if(array_sum($time_left[$user['id']]) == 0) {
+  if (array_sum($time_left[$user['id']]) == 0) {
     return $que;
   }
 
   $db_changeset = array();
   $unit_changes = array();
-  foreach($que['items'] as &$que_item) {
+  foreach ($que['items'] as &$que_item) {
     $que_player_id = &$que_item['que_player_id'];
     $que_planet_id = intval($que_item['que_planet_id']);
 
     $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']];
-    if(!isset($que_time_left)) {
+    if (!isset($que_time_left)) {
       $que_time_left = $time_left[$que_player_id][$que_planet_id];
     }
-    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
+    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
       continue;
     }
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -595,7 +595,7 @@ 
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
 
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
-    if($que_time_left >= $que_item['que_time_left']) {
+    if ($que_time_left >= $que_item['que_time_left']) {
       // Увеличиваем количество отстроенных юнитов
       $unit_processed++;
       // Вычитаем из времени очереди потраченное на постройку время
@@ -608,12 +608,12 @@ 
     $que_item['que_unit_amount'] -= $unit_processed;
 
     // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита
-    if($que_item['que_unit_amount'] > 0) {
+    if ($que_item['que_unit_amount'] > 0) {
       $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left;
       $que_time_left = 0;
     }
 
-    if($que_item['que_unit_amount'] <= 0) {
+    if ($que_item['que_unit_amount'] <= 0) {
       $db_changeset['que'][] = array(
         'action' => SQL_OP_DELETE,
         P_VERSION => 1,
@@ -639,14 +639,14 @@ 
       );
     }
 
-    if($unit_processed) {
+    if ($unit_processed) {
       $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1);
       $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta;
     }
   }
 
-  foreach($time_left as $player_id => $planet_data) {
-    foreach($planet_data as $planet_id => $time_on_planet) {
+  foreach ($time_left as $player_id => $planet_data) {
+    foreach ($planet_data as $planet_id => $time_on_planet) {
       $table = $planet_id ? 'planets' : 'users';
       $id = $planet_id ? $planet_id : $player_id;
       $db_changeset[$table][] = array(
@@ -662,8 +662,8 @@ 
         ),
       );
 
-      if(is_array($unit_changes[$player_id][$planet_id])) {
-        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
+      if (is_array($unit_changes[$player_id][$planet_id])) {
+        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
           $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
         }
       }
@@ -673,7 +673,7 @@ 
   $que = que_recalculate($que);
 
   // TODO: Re-enable quests for Alliances
-  if(!empty($unit_changes) && !$user['user_as_ally']) {
+  if (!empty($unit_changes) && !$user['user_as_ally']) {
     $quest_list = qst_get_quests($user['id'], QUEST_STATUS_ALL);
     $quest_triggers = qst_active_triggers($quest_list);
     $quest_rewards = array();
@@ -681,26 +681,26 @@ 
 
 
     $xp_incoming = array();
-    foreach($unit_changes as $user_id => $planet_changes) {
-      foreach($planet_changes as $planet_id => $changes) {
+    foreach ($unit_changes as $user_id => $planet_changes) {
+      foreach ($planet_changes as $planet_id => $changes) {
         $planet_this = $planet_id ? classSupernova::db_get_record_by_id(LOC_PLANET, $planet_id) : array();
-        foreach($changes as $unit_id => $unit_value) {
+        foreach ($changes as $unit_id => $unit_value) {
           $que_id = que_get_unit_que($unit_id);
           $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value;
-          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
+          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
             $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1);
             $build_data = $build_data[BUILD_CREATE];
-            foreach(sn_get_groups('resources_loot') as $resource_id) {
+            foreach (sn_get_groups('resources_loot') as $resource_id) {
               $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена
             }
           }
 
-          if(is_array($quest_triggers)) {
+          if (is_array($quest_triggers)) {
             // TODO: Check mutiply condition quests
             $quest_trigger_list = array_keys($quest_triggers, $unit_id);
 
-            if(is_array($quest_trigger_list)) {
-              foreach($quest_trigger_list as $quest_id) {
+            if (is_array($quest_trigger_list)) {
+              foreach ($quest_trigger_list as $quest_id) {
                 if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE) {
                   if ($quest_list[$quest_id]['quest_unit_amount'] <= $unit_level_new) {
                     $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list'];
@@ -718,7 +718,7 @@ 
     // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч
     qst_reward($user, $quest_rewards, $quest_list, $quest_statuses);
 
-    foreach($xp_incoming as $que_id => $xp) {
+    foreach ($xp_incoming as $que_id => $xp) {
       rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000);
     }
   }

includes/functions/sys_maintenance.php

Braces +2 added lines, -4 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function sys_maintenance()
-{
+function sys_maintenance() {
   global $config;
 
   $bashing_time_limit = SN_TIME_NOW - $config->fleet_bashing_scope;
@@ -42,8 +41,7 @@ 
  * TODO: 2. [<m|w|d|h|m|s>@]<time>
  */
 
-function sys_schedule_get_prev_run($scheduleList, $recorded_run = SN_TIME_NOW, $return_next_run = false)
-{
+function sys_schedule_get_prev_run($scheduleList, $recorded_run = SN_TIME_NOW, $return_next_run = false) {
   static $date_part_names_reverse = array('seconds', 'minutes', 'hours', 'days', 'months', 'years',);
 
   $possible_schedules = array();

Spacing +9 added lines, -9 removed lines

@@ -17,11 +17,11 @@ 
     array('query' => "DELETE FROM `{{planets}}` WHERE `id_owner` = 0 AND `destruyed` < UNIX_TIMESTAMP();", 'result' => false, 'error' => '', 'affected_rows' => 0),
   );
 
-  foreach($queries as &$query)
+  foreach ($queries as &$query)
   {
     $query['result'] = doquery($query['query']);
     $query['error']  = classSupernova::$db->db_error();
-    $query['affected_rows']  = classSupernova::$db->db_affected_rows();
+    $query['affected_rows'] = classSupernova::$db->db_affected_rows();
   }
 
   return $queries;
@@ -53,30 +53,30 @@ 
   $recorded_run = strtotime($recorded_run);
 
   $prev_run_array = getdate($recorded_run);
-  $prev_run_array = array($prev_run_array['seconds'],$prev_run_array['minutes'],$prev_run_array['hours'],$prev_run_array['mday'],$prev_run_array['mon'],$prev_run_array['year']);
+  $prev_run_array = array($prev_run_array['seconds'], $prev_run_array['minutes'], $prev_run_array['hours'], $prev_run_array['mday'], $prev_run_array['mon'], $prev_run_array['year']);
   $today_array = getdate(SN_TIME_NOW);
-  $today_array = array($today_array['seconds'],$today_array['minutes'],$today_array['hours'],$today_array['mday'],$today_array['mon'],$today_array['year']);
+  $today_array = array($today_array['seconds'], $today_array['minutes'], $today_array['hours'], $today_array['mday'], $today_array['mon'], $today_array['year']);
   $scheduleList = explode(',', $scheduleList);
   array_walk($scheduleList, function(&$schedule) use ($prev_run_array, $today_array, $date_part_names_reverse, &$possible_schedules) {
     $schedule = array('schedule_array' => array_reverse(explode(':', trim($schedule))));
 
     $interval = $date_part_names_reverse[count($schedule['schedule_array'])];
 
-    foreach($prev_run_array as $index => $date_part) {
+    foreach ($prev_run_array as $index => $date_part) {
       $schedule['array']['recorded'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $date_part;
       $schedule['array']['now'][$index] = isset($schedule['schedule_array'][$index]) ? intval($schedule['schedule_array'][$index]) : $today_array[$index];
     }
-    if($schedule['array']['recorded'] == $schedule['array']['now']) {
+    if ($schedule['array']['recorded'] == $schedule['array']['now']) {
       unset($schedule['array']['now']);
     }
 
-    foreach($schedule['array'] as $name => $array) {
+    foreach ($schedule['array'] as $name => $array) {
       $schedule['string'][$name] = "{$array[5]}-{$array[4]}-{$array[3]} {$array[2]}:{$array[1]}:{$array[0]}";
       $schedule['string'][$name . '_next'] = $schedule['string'][$name] . ' +1 ' . $interval;
       $schedule['string'][$name . '_prev'] = $schedule['string'][$name] . ' -1 ' . $interval;
     }
 
-    foreach($schedule['string'] as $string) {
+    foreach ($schedule['string'] as $string) {
       $timestamp = strtotime($string);
       $schedule['timestamp'][$timestamp] = $possible_schedules[$timestamp] = date(FMT_DATE_TIME_SQL, strtotime($string));
     }
@@ -86,7 +86,7 @@ 
 
   $prev_run = 0;
   $next_run = 0;
-  foreach($possible_schedules as $timestamp => $string_date) {
+  foreach ($possible_schedules as $timestamp => $string_date) {
     $prev_run = SN_TIME_NOW >= $timestamp ? $timestamp : $prev_run;
     $next_run = SN_TIME_NOW < $timestamp && !$next_run ? $timestamp : $next_run;
   }