supernova-ws / SuperNova

includes/includes/eco_bld_structures.php

Spacing +11 added lines, -11 removed lines

@@ -68,11 +68,11 @@ 
     }
     $build_unit_list = sn_get_groups('tech');
     $artifact_id = ART_HEURISTIC_CHIP;
-    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
+    $page_header = classLocale::$lang['tech'][UNIT_TECHNOLOGIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
   } elseif ($que_type == QUE_MERCENARY) {
     $build_unit_list = sn_get_groups('mercenaries');
     $artifact_id = 0;
-    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
+    $page_header = classLocale::$lang['tech'][UNIT_MERCENARIES].($user['user_as_ally'] ? " {$classLocale['sys_of_ally']} {$user['username']}" : '');
   } else {
     if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
       message(classLocale::$lang['need_hangar'], classLocale::$lang['tech'][STRUC_FACTORY_HANGAR]);
@@ -245,7 +245,7 @@ 
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
           ) {
-            $level_production_base['R' . $resource_id] = $resource_income;
+            $level_production_base['R'.$resource_id] = $resource_income;
           }
         }
       }
@@ -272,8 +272,8 @@ 
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
           ) {
-            $level_production['R' . $resource_id] = $resource_income;
-            $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id];
+            $level_production['R'.$resource_id] = $resource_income;
+            $level_production['D'.$resource_id] = $resource_income - $level_production_base[$resource_id];
           }
         }
         $production['.']['resource'][] = $level_production;
@@ -288,15 +288,15 @@ 
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
       for ($i = 0; $i < 6; $i++) {
         $level_production = array('LEVEL' => $level_start + $i);
-        $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
-        $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
-        $level_production['R' . UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
-        $level_production['D' . UNIT_PLAYER_COLONIES_MAX] = $level_production['R' . UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
+        $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
+        $level_production['D'.UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
+        $level_production['R'.UNIT_PLAYER_COLONIES_MAX] = get_player_max_colonies($user, $level_start + $i);
+        $level_production['D'.UNIT_PLAYER_COLONIES_MAX] = $level_production['R'.UNIT_PLAYER_COLONIES_MAX] - $level_production_base[UNIT_PLAYER_COLONIES_MAX];
         $production['.']['resource'][] = $level_production;
 
         $level_production_base = array(
-          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX],
-          UNIT_PLAYER_COLONIES_MAX    => $level_production['R' . UNIT_PLAYER_COLONIES_MAX],
+          UNIT_PLAYER_EXPEDITIONS_MAX => $level_production['R'.UNIT_PLAYER_EXPEDITIONS_MAX],
+          UNIT_PLAYER_COLONIES_MAX    => $level_production['R'.UNIT_PLAYER_COLONIES_MAX],
         );
       }
     }

includes/classes/cache.php

Spacing +30 added lines, -30 removed lines

@@ -98,11 +98,11 @@ 
       default:
         switch (self::$mode) {
           case CACHER_NO_CACHE:
-            self::$data[$this->prefix . $name] = $value;
+            self::$data[$this->prefix.$name] = $value;
           break;
 
           case CACHER_XCACHE:
-            xcache_set($this->prefix . $name, $value);
+            xcache_set($this->prefix.$name, $value);
           break;
         }
       break;
@@ -122,11 +122,11 @@ 
       default:
         switch (self::$mode) {
           case CACHER_NO_CACHE:
-            return self::$data[$this->prefix . $name];
+            return self::$data[$this->prefix.$name];
           break;
 
           case CACHER_XCACHE:
-            return xcache_get($this->prefix . $name);
+            return xcache_get($this->prefix.$name);
           break;
 
         }
@@ -139,11 +139,11 @@ 
   public function __isset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        return isset(self::$data[$this->prefix . $name]);
+        return isset(self::$data[$this->prefix.$name]);
       break;
 
       case CACHER_XCACHE:
-        return xcache_isset($this->prefix . $name) && ($this->__get($name) !== null);
+        return xcache_isset($this->prefix.$name) && ($this->__get($name) !== null);
       break;
     }
 
@@ -153,25 +153,25 @@ 
   public function __unset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        unset(self::$data[$this->prefix . $name]);
+        unset(self::$data[$this->prefix.$name]);
       break;
 
       case CACHER_XCACHE:
-        xcache_unset($this->prefix . $name);
+        xcache_unset($this->prefix.$name);
       break;
     }
   }
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
     switch (self::$mode) {
       case CACHER_NO_CACHE:
 //        array_walk(self::$data, create_function('&$v,$k,$p', 'if(strpos($k, $p) === 0)$v = NULL;'), $this->prefix.$prefix_unset);
-        array_walk(self::$data, $array_clear, $this->prefix . $prefix_unset);
+        array_walk(self::$data, $array_clear, $this->prefix.$prefix_unset);
 
         return true;
       break;
@@ -181,7 +181,7 @@ 
           return false;
         }
 
-        return xcache_unset_by_prefix($this->prefix . $prefix_unset);
+        return xcache_unset_by_prefix($this->prefix.$prefix_unset);
       break;
     }
 
@@ -219,7 +219,7 @@ 
     if ($this->$name[0] === null) {
       for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
+        $cName1 = "{$name[$i - 1]}_COUNT";
         if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
@@ -264,7 +264,7 @@ 
 
     for ($i = 1; $i < count($name); $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
       if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;
@@ -400,7 +400,7 @@ 
         $qry[] = "('{$item_name}', '{$item_value}')";
       }
     }
-    doquery("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
+    doquery("REPLACE INTO `{{".$this->table_name."}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES ".implode(',', $qry).";");
 
     // И только после взятия блокировок - меняем значения в кэше
     foreach ($item_list as $item_name => $item_value) {
@@ -600,9 +600,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -633,25 +633,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
     'fleet_update_interval' => 4,
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -665,13 +665,13 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview' => 3,    // How much last news to show in Overview page
+    'game_news_overview' => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -721,8 +721,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -740,7 +740,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General

includes/db/db_queries.php

Spacing +14 added lines, -14 removed lines

@@ -17,11 +17,11 @@ 
 
 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' : '') .
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
     " FROM {{planets}} AS p
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
 function db_planet_list_search($searchtext) {
@@ -121,7 +121,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
@@ -134,7 +134,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     }
   } else {
     // TODO
@@ -151,7 +151,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    " . $start . ",100;";
+    ".$start.",100;";
   }
 
   return doquery($query_str);
@@ -374,9 +374,9 @@ 
  */
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
   $extra_conditions =
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
   $query = doquery("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
 
@@ -404,7 +404,7 @@ 
 
 // Log Online *************************************************************************************************************
 function db_log_online_insert() {
-  doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = " . classSupernova::$config->var_online_user_count);
+  doquery("INSERT IGNORE INTO {{log_users_online}} SET online_count = ".classSupernova::$config->var_online_user_count);
 }
 
 // Log *************************************************************************************************************
@@ -612,7 +612,7 @@ 
       `ban_user_id` = '{$banned['id']}',
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
-      `ban_time` = " . SN_TIME_NOW . ",
+      `ban_time` = ".SN_TIME_NOW.",
       `ban_until` = {$ban_until},
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
@@ -634,7 +634,7 @@ 
       `ban_user_name` = '{$banned['username']}',
       `ban_reason` = '{$reason}',
       `ban_time` = 0,
-      `ban_until` = " . SN_TIME_NOW . ",
+      `ban_until` = ".SN_TIME_NOW.",
       `ban_issuer_id` = '{$banner['id']}',
       `ban_issuer_name` = '{$banner['username']}',
       `ban_issuer_email` = '{$banner['email']}'
@@ -693,9 +693,9 @@ 
 function db_ube_report_get_best_battles() {
   $query = doquery("SELECT *
       FROM {{ube_report}}
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
 
   return $query;
 }

flotenajax.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

includes/classes/auth_local.php

Spacing +62 added lines, -62 removed lines

@@ -93,12 +93,12 @@ 
     $this->prepare();
 
     $this->manifest['active'] = false;
-    if(!empty($this->config) && is_array($this->config['db'])) {
+    if (!empty($this->config) && is_array($this->config['db'])) {
       // БД, отличная от стандартной
       $this->db = new db_mysql();
 
       $this->db->sn_db_connect($this->config['db']);
-      if($this->manifest['active'] = $this->db->connected) {
+      if ($this->manifest['active'] = $this->db->connected) {
         $this->provider_id = ACCOUNT_PROVIDER_CENTRAL;
 
         $this->domain = $this->config['domain'];
@@ -112,7 +112,7 @@ 
     }
 
     // Fallback to local DB
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       $this->db = classSupernova::$db;
 
       $this->provider_id = ACCOUNT_PROVIDER_LOCAL;
@@ -125,7 +125,7 @@ 
       $this->manifest['active'] = true;
     }
 
-    $this->cookie_name_impersonate = $this->cookie_name . AUTH_COOKIE_IMPERSONATE_SUFFIX;
+    $this->cookie_name_impersonate = $this->cookie_name.AUTH_COOKIE_IMPERSONATE_SUFFIX;
 
     $this->account = new Account($this->db);
     $this->confirmation = new Confirmation($this->db);
@@ -166,7 +166,7 @@ 
   // OK v4.5
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
     $result = parent::password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe);
-    if($result) {
+    if ($result) {
       $this->cookie_set();
     }
 
@@ -194,12 +194,12 @@ 
    */
   // OK v4.6
   protected function password_reset_send_code() {
-    if(!$this->is_password_reset) {
+    if (!$this->is_password_reset) {
       return $this->account_login_status;
     }
 
     // Проверяем поддержку сброса пароля
-    if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
+    if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
       return $this->account_login_status;
     }
 
@@ -209,7 +209,7 @@ 
       unset($this->account);
       $this->account = new Account($this->db);
 
-      if(!$this->account->db_get_by_email($email_unsafe)) {
+      if (!$this->account->db_get_by_email($email_unsafe)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_EMAIL_NOT_EXISTS, ERR_ERROR);
         // return $this->account_login_status;
       }
@@ -219,14 +219,14 @@ 
 
       // TODO - Проверять уровень доступа аккаунта!
       // Аккаунты с АУТЛЕВЕЛ больше 0 - НЕ СБРАСЫВАЮТ ПАРОЛИ!
-      foreach($user_list as $user_id => $user_data) {
-        if($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) {
+      foreach ($user_list as $user_id => $user_data) {
+        if ($user_data['authlevel'] > AUTH_LEVEL_REGISTERED) {
           throw new Exception(PASSWORD_RESTORE_ERROR_ADMIN_ACCOUNT, ERR_ERROR);
         }
       }
 
       $confirmation = $this->confirmation->db_confirmation_get_latest_by_type_and_email(CONFIRM_PASSWORD_RESET, $email_unsafe); // OK 4.5
-      if(isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) {
+      if (isset($confirmation['create_time']) && SN_TIME_NOW - strtotime($confirmation['create_time']) < PERIOD_MINUTE_10) {
         throw new Exception(PASSWORD_RESTORE_ERROR_TOO_OFTEN, ERR_ERROR);
       }
 
@@ -239,11 +239,11 @@ 
 
       @$result = mymail($email_unsafe,
         sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name),
-        sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL . 'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name)
+        sprintf(classLocale::$lang['log_lost_email_code'], SN_ROOT_VIRTUAL.'login.php', $confirm_code_unsafe, date(FMT_DATE_TIME, SN_TIME_NOW + AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE), classSupernova::$config->game_name)
       );
 
       $result = $result ? PASSWORD_RESTORE_SUCCESS_CODE_SENT : PASSWORD_RESTORE_ERROR_SENDING;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
       $result = $e->getMessage();
     }
@@ -256,46 +256,46 @@ 
    * @return int|string
    */
   protected function password_reset_confirm() {
-    if(!$this->is_password_reset_confirm) {
+    if (!$this->is_password_reset_confirm) {
       return $this->account_login_status;
     }
 
-    if($this->account_login_status != LOGIN_UNDEFINED) {
+    if ($this->account_login_status != LOGIN_UNDEFINED) {
       return $this->account_login_status;
     }
 
     // Проверяем поддержку сброса пароля
-    if(!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
+    if (!$this->is_feature_supported(AUTH_FEATURE_PASSWORD_RESET)) {
       return $this->account_login_status;
     }
 
     try {
       $code_unsafe = sys_get_param_str_unsafe('password_reset_code');
-      if(empty($code_unsafe)) {
+      if (empty($code_unsafe)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_EMPTY, ERR_ERROR);
       }
 
       sn_db_transaction_start();
       $confirmation = $this->confirmation->db_confirmation_get_by_type_and_code(CONFIRM_PASSWORD_RESET, $code_unsafe); // OK 4.5
 
-      if(empty($confirmation)) {
+      if (empty($confirmation)) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_WRONG, ERR_ERROR);
       }
 
-      if(SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) {
+      if (SN_TIME_NOW - strtotime($confirmation['create_time']) > AUTH_PASSWORD_RESET_CONFIRMATION_EXPIRE) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_TOO_OLD, ERR_ERROR);
       }
 
       unset($this->account);
       $this->account = new Account($this->db);
 
-      if(!$this->account->db_get_by_email($confirmation['email'])) {
+      if (!$this->account->db_get_by_email($confirmation['email'])) {
         throw new Exception(PASSWORD_RESTORE_ERROR_CODE_OK_BUT_NO_ACCOUNT_FOR_EMAIL, ERR_ERROR);
       }
 
       $new_password_unsafe = $this->make_random_password();
       $salt_unsafe = $this->password_salt_generate();
-      if(!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) {
+      if (!$this->account->db_set_password($new_password_unsafe, $salt_unsafe)) {
         // Ошибка смены пароля
         throw new Exception(AUTH_ERROR_INTERNAL_PASSWORD_CHANGE_ON_RESTORE, ERR_ERROR);
       }
@@ -305,14 +305,14 @@ 
       $this->cookie_set();
       $this->login_cookie();
 
-      if($this->account_login_status == LOGIN_SUCCESS) {
+      if ($this->account_login_status == LOGIN_SUCCESS) {
         // TODO - НЕ ОБЯЗАТЕЛЬНО ОТПРАВЛЯТЬ ЧЕРЕЗ ЕМЕЙЛ! ЕСЛИ ЭТО ФЕЙСБУЧЕК ИЛИ ВКШЕЧКА - МОЖНО ЧЕРЕЗ ЛС ПИСАТЬ!!
         $message_header = sprintf(classLocale::$lang['log_lost_email_title'], classSupernova::$config->game_name);
         $message = sprintf(classLocale::$lang['log_lost_email_pass'], classSupernova::$config->game_name, $this->account->account_name, $new_password_unsafe);
         @$operation_result = mymail($confirmation['email'], $message_header, htmlspecialchars($message));
 
         $users_translated = PlayerToAccountTranslate::db_translate_get_users_from_account_list($this->provider_id, $this->account->account_id); // OK 4.5
-        if(!empty($users_translated)) {
+        if (!empty($users_translated)) {
           // Отправляем в лички письмо о сбросе пароля
 
           // ПО ОПРЕДЕЛЕНИЮ в $users_translated только
@@ -321,9 +321,9 @@ 
           //    - игроки, привязанные только к этим аккаунтам
           // Значит им всем сразу скопом можно отправлять сообщения
           $message = sprintf(classLocale::$lang['sys_password_reset_message_body'], $new_password_unsafe);
-          $message = sys_bbcodeParse($message) . '<br><br>';
+          $message = sys_bbcodeParse($message).'<br><br>';
 
-          foreach($users_translated as $user_id => $providers_list) {
+          foreach ($users_translated as $user_id => $providers_list) {
             msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['sys_administration'], classLocale::$lang['sys_login_register_message_title'], $message);
           }
         } else {
@@ -375,10 +375,10 @@ 
   // OK v4.5
   protected function register() {
     // TODO РЕГИСТРАЦИЯ ВСЕГДА ДОЛЖНА ЛОГИНИТЬ ПОЛЬЗОВАТЕЛЯ!
-    $this->flog('Регистрация: начинаем. Провайдер ' . $this->provider_id);
+    $this->flog('Регистрация: начинаем. Провайдер '.$this->provider_id);
 
     try {
-      if(!$this->is_register) {
+      if (!$this->is_register) {
         $this->flog('Регистрация: не выставлен флаг регистрации - пропускаем');
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
@@ -388,8 +388,8 @@ 
       sn_db_transaction_start();
 
       $this->account->db_get_by_name_or_email($this->input_login_unsafe, $this->input_email_unsafe);
-      if($this->account->is_exists) {
-        if($this->account->account_email == $this->input_email_unsafe) {
+      if ($this->account->is_exists) {
+        if ($this->account->account_email == $this->input_email_unsafe) {
           throw new Exception(REGISTER_ERROR_EMAIL_EXISTS, ERR_ERROR);
         } else {
           throw new Exception(REGISTER_ERROR_ACCOUNT_NAME_EXISTS, ERR_ERROR);
@@ -411,7 +411,7 @@ 
       // А вот это пока не нужно. Трансляцией аккаунтов в юзеров и созданием новых юзеров для новозашедших аккаунтов занимается Auth
       // $this->register_account();
       sn_db_transaction_commit();
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
       $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false;
     }
@@ -427,19 +427,19 @@ 
    */
   // OK v4.5
   protected function login_cookie() {
-    if($this->account_login_status != LOGIN_UNDEFINED) {
+    if ($this->account_login_status != LOGIN_UNDEFINED) {
       return $this->account_login_status;
     }
 
     // Пытаемся войти по куке
-    if(!empty($_COOKIE[$this->cookie_name])) {
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+    if (!empty($_COOKIE[$this->cookie_name])) {
+      if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
         list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]);
       } else {
         list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]);
       }
 
-      if(
+      if (
         $this->account->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account->account_password) == $cookie_password_hash_salted)
       ) {
@@ -448,7 +448,7 @@ 
       }
     }
 
-    if($this->account_login_status != LOGIN_SUCCESS) {
+    if ($this->account_login_status != LOGIN_SUCCESS) {
       // Невалидная кука - чистим
       $this->cookie_clear();
     }
@@ -466,29 +466,29 @@ 
   protected function login_username() {
     // TODO - Логин по старым именам
     try {
-      if(!$this->is_login) {
+      if (!$this->is_login) {
         $this->flog('Логин: не выставлен флаг входа в игру - это не логин');
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
 
       // TODO Пустое имя аккаунта
-      if(!$this->input_login_unsafe) {
+      if (!$this->input_login_unsafe) {
         throw new Exception(LOGIN_UNDEFINED, ERR_ERROR);
       }
 
       $this->login_validate_input();
 
-      if(!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) {
+      if (!$this->account->db_get_by_name($this->input_login_unsafe) && !$this->account->db_get_by_email($this->input_login_unsafe)) {
         throw new Exception(LOGIN_ERROR_USERNAME, ERR_ERROR);
       }
 
-      if(!$this->account->password_check($this->input_login_password_raw)) {
+      if (!$this->account->password_check($this->input_login_password_raw)) {
         throw new Exception(LOGIN_ERROR_PASSWORD, ERR_ERROR);
       }
 
       $this->cookie_set();
       $this->account_login_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       $this->account_login_status == LOGIN_UNDEFINED ? $this->account_login_status = $e->getMessage() : false;
     }
 
@@ -510,18 +510,18 @@ 
   protected function cookie_set($account_to_impersonate = null) {
     $this_account = is_object($account_to_impersonate) ? $account_to_impersonate : $this->account;
 
-    if(!is_object($this_account) || !$this_account->is_exists) {
+    if (!is_object($this_account) || !$this_account->is_exists) {
       throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR);
     }
 
-    if(is_object($account_to_impersonate) && $account_to_impersonate->is_exists) {
+    if (is_object($account_to_impersonate) && $account_to_impersonate->is_exists) {
       sn_setcookie($this->cookie_name_impersonate, $_COOKIE[$this->cookie_name], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain);
     }
 
     $expire_time = $this->remember_me ? SN_TIME_NOW + PERIOD_YEAR : 0;
 
     $password_encoded = $this->password_encode_for_cookie($this_account->account_password);
-    $cookie = $this_account->account_id . AUTH_COOKIE_DELIMETER . $password_encoded . AUTH_COOKIE_DELIMETER . $this->remember_me;
+    $cookie = $this_account->account_id.AUTH_COOKIE_DELIMETER.$password_encoded.AUTH_COOKIE_DELIMETER.$this->remember_me;
     $this->flog("cookie_set() - Устанавливаем куку {$cookie}");
     return sn_setcookie($this->cookie_name, $cookie, $expire_time, $this->sn_root_path, $this->domain);
   }
@@ -532,7 +532,7 @@ 
   // OK v4.1
   protected function cookie_clear() {
     // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё
-    if(!empty($_COOKIE[$this->cookie_name_impersonate])) {
+    if (!empty($_COOKIE[$this->cookie_name_impersonate])) {
       sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $this->domain);
       sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $this->domain);
     } else {
@@ -551,10 +551,10 @@ 
   protected function login_validate_input() {
     // Проверяем, что бы в начале и конце не было пустых символов
     // TODO - при копировании Эксель -> Опера - в конце образуются пустые места. Это не должно быть проблемой! Вынести проверку пароля в регистрацию!
-    if($this->input_login_password_raw != trim($this->input_login_password_raw)) {
+    if ($this->input_login_password_raw != trim($this->input_login_password_raw)) {
       throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR);
     }
-    if(!$this->input_login_password_raw) {
+    if (!$this->input_login_password_raw) {
       throw new Exception(LOGIN_ERROR_PASSWORD_EMPTY, ERR_ERROR);
     }
   }
@@ -570,37 +570,37 @@ 
     $this->login_validate_input();
 
     // Если нет имени пользователя - NO GO!
-    if(!$this->input_login_unsafe) {
+    if (!$this->input_login_unsafe) {
       throw new Exception(LOGIN_ERROR_USERNAME_EMPTY, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($this->input_login_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       throw new Exception(LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($this->input_login_unsafe) < LOGIN_LENGTH_MIN) {
       throw new Exception(REGISTER_ERROR_USERNAME_SHORT, ERR_ERROR);
     }
     // Если пароль меньше минимальной длины - NO GO!
-    if(strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) {
+    if (strlen($this->input_login_password_raw) < PASSWORD_LENGTH_MIN) {
       throw new Exception(REGISTER_ERROR_PASSWORD_INSECURE, ERR_ERROR);
     }
     // Если пароль имеет пробельные символы в начале или конце - NO GO!
-    if($this->input_login_password_raw != trim($this->input_login_password_raw)) {
+    if ($this->input_login_password_raw != trim($this->input_login_password_raw)) {
       throw new Exception(LOGIN_ERROR_PASSWORD_TRIMMED, ERR_ERROR);
     }
     // Если пароль не совпадает с подтверждением - NO GO! То, что у пароля нет пробельных символов в начале/конце - мы уже проверили выше
     //Если они есть у повтора - значит пароль и повтор не совпадут
-    if($this->input_login_password_raw <> $this->input_login_password_raw_repeat) {
+    if ($this->input_login_password_raw <> $this->input_login_password_raw_repeat) {
       throw new Exception(REGISTER_ERROR_PASSWORD_DIFFERENT, ERR_ERROR);
     }
     // Если нет емейла - NO GO!
     // TODO - регистрация без емейла
-    if(!$this->input_email_unsafe) {
+    if (!$this->input_email_unsafe) {
       throw new Exception(REGISTER_ERROR_EMAIL_EMPTY, ERR_ERROR);
     }
     // Если емейл не является емейлом - NO GO!
-    if(!is_email($this->input_email_unsafe)) {
+    if (!is_email($this->input_email_unsafe)) {
       throw new Exception(REGISTER_ERROR_EMAIL_WRONG, ERR_ERROR);
     }
   }
@@ -609,7 +609,7 @@ 
 
   // OK v4
   protected function password_encode_for_cookie($password) {
-    return md5("{$password}--" . $this->secret_word);
+    return md5("{$password}--".$this->secret_word);
   }
   // OK v4
   protected function password_encode($password, $salt) {
@@ -629,22 +629,22 @@ 
     return core_auth::make_random_password();
   }
   protected function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
 
     $caller_name =
-      ((get_called_class()) ? get_called_class() : (!empty($caller['class']) ? $caller['class'] : '')) .
-      (!empty($caller['type']) ? $caller['type'] : '') .
-      (!empty($caller['function']) ? $caller['function'] : '') .
-      (!empty($called['line']) ? ':' . $called['line'] : '');
+      ((get_called_class()) ? get_called_class() : (!empty($caller['class']) ? $caller['class'] : '')).
+      (!empty($caller['type']) ? $caller['type'] : '').
+      (!empty($caller['function']) ? $caller['function'] : '').
+      (!empty($called['line']) ? ':'.$called['line'] : '');
 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
-      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
+    if ($die) {
+      $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в ".get_called_class()." (располагается в ".get_class()."). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }
 

admin/ajax_maintenance.php

Spacing +25 added lines, -25 removed lines

@@ -2,9 +2,9 @@ 
 
 define('IN_ADMIN', true);
 
-require('../includes/init.' . substr(strrchr(__FILE__, '.'), 1));
+require('../includes/init.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   message(classLocale::$lang['sys_noalloaw'], classLocale::$lang['sys_noaccess']);
   die();
@@ -20,13 +20,13 @@ 
 // [#] info_best_battles 1b0
 $best_reports = array();
 
-if(defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
+if (defined('MODULE_INFO_BEST_BATTLES_QUERY')) {
   $query = db_ube_report_get_best_battles();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $best_reports[] = $row['ube_report_id'];
   }
 }
-$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN (' . implode(',', $best_reports) . ')' : '';
+$best_reports = !empty($best_reports) ? ' AND ube_report_id NOT IN ('.implode(',', $best_reports).')' : '';
 
 
 $ques = array(
@@ -90,14 +90,14 @@ 
   // Удаляем юниты без планет
   'DELETE un FROM {{unit}} AS un
     LEFT JOIN {{planets}} AS pl ON pl.id = un.unit_location_id
-  WHERE unit_location_type = ' . LOC_PLANET . ' AND pl.id IS NULL;',
+  WHERE unit_location_type = ' . LOC_PLANET.' AND pl.id IS NULL;',
   // Удаляем пустые юниты с 0 уровнем (кроме Капитана)
-  'DELETE FROM {{unit}} WHERE unit_location_type = ' . LOC_PLANET . ' AND unit_level = 0 AND unit_type <> ' . UNIT_CAPTAIN,
+  'DELETE FROM {{unit}} WHERE unit_location_type = '.LOC_PLANET.' AND unit_level = 0 AND unit_type <> '.UNIT_CAPTAIN,
   // Удаляем очереди на ничьих планетах
   'DELETE q FROM {{que}} AS q
     LEFT JOIN {{planets}} AS p ON p.id = q.que_planet_id
   WHERE
-    que_type IN (' . QUE_STRUCTURES . ', ' . QUE_HANGAR . ', ' . SUBQUE_FLEET . ', ' . SUBQUE_DEFENSE . ')
+    que_type IN (' . QUE_STRUCTURES.', '.QUE_HANGAR.', '.SUBQUE_FLEET.', '.SUBQUE_DEFENSE.')
     AND
     (p.id_owner = 0 OR p.id_owner IS NULL);',
 
@@ -112,12 +112,12 @@ 
   // Удаляются сообщения, старше  4 недель, кроме личных и Альянсовских
   'DELETE FROM {{messages}} WHERE
     UNIX_TIMESTAMP() - message_time > 4*7 * 24 * 60 * 60 AND
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ');',
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.');',
   // Удаляются сообщения у пользователей, которые неактивны больше 4 недель - кроме личных и Альянсовских
   'DELETE m FROM `{{users}}` AS u
   JOIN {{messages}} AS m ON m.message_owner = u.id
   WHERE
-    message_type NOT IN (' . MSG_TYPE_PLAYER . ', ' . MSG_TYPE_ALLIANCE . ') AND
+    message_type NOT IN (' . MSG_TYPE_PLAYER.', '.MSG_TYPE_ALLIANCE.') AND
     authlevel = 0 AND  user_as_ally IS NULL AND /* Не админы, Не Альянсы */
     UNIX_TIMESTAMP() - onlinetime > 4*7 *86400;',
 
@@ -137,7 +137,7 @@ 
       (log_dark_matter_timestamp, log_dark_matter_username, log_dark_matter_reason, log_dark_matter_amount,
       log_dark_matter_comment, log_dark_matter_page, log_dark_matter_sender)
     SELECT
-      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), " . RPG_CUMULATIVE . ", sum(ldm.log_dark_matter_amount),
+      '{$pack_until}', IF(u.username IS NULL, ldm.log_dark_matter_username, u.username), ".RPG_CUMULATIVE.", sum(ldm.log_dark_matter_amount),
       'Баланс на {$pack_until}', 'admin/ajax_maintenance.php', ldm.log_dark_matter_sender
     FROM
       {{log_dark_matter}} AS ldm
@@ -155,22 +155,22 @@ 
     "REPLACE INTO `{{log_users_online}}`
       (online_timestamp, online_count, online_aggregated)
     SELECT
-      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ")), ceil(avg(online_count)), " . LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10 . "
+      FROM_UNIXTIME((UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.")), ceil(avg(online_count)), ".LOG_ONLIINE_AGGREGATE_PERIOD_MINUTE_10."
     FROM
       `{{log_users_online}}`
     WHERE
-      online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE . "
+      online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE."
     GROUP BY
-      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10 . ") * (" . PERIOD_MINUTE_10 . ");",
+      (UNIX_TIMESTAMP(online_timestamp) DIV " . PERIOD_MINUTE_10.") * (".PERIOD_MINUTE_10.");",
 
-    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = " . LOG_ONLIINE_AGGREGATE_NONE,
+    "DELETE FROM {{log_users_online}} WHERE online_timestamp < '{$pack_until}' AND online_aggregated = ".LOG_ONLIINE_AGGREGATE_NONE,
   ),
 
   // Удаляем старые записи из логов
   "DELETE FROM `{{logs}}` WHERE log_timestamp < '{$pack_until}';",
   // Удаляем записи о маинтенансе, апдейте и пересчете статистики более чем недельной давности - они нам уже не нужны
   'DELETE FROM `{{logs}}` WHERE
-    `log_code` IN (' . LOG_INFO_DB_CHANGE . ', ' . LOG_INFO_MAINTENANCE . ', ' . LOG_INFO_STAT_START . ', ' . LOG_INFO_STAT_PROCESS . ', ' . LOG_INFO_STAT_FINISH . ')
+    `log_code` IN (' . LOG_INFO_DB_CHANGE.', '.LOG_INFO_MAINTENANCE.', '.LOG_INFO_STAT_START.', '.LOG_INFO_STAT_PROCESS.', '.LOG_INFO_STAT_FINISH.')
     AND `log_timestamp` < DATE_SUB(NOW(),INTERVAL 7 DAY);',
 
 
@@ -189,13 +189,13 @@ 
 $old_server_status == GAME_DISABLE_NONE ? classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_MAINTENANCE) : false;
 sn_db_transaction_commit();
 
-foreach($ques as $que_transaction) {
+foreach ($ques as $que_transaction) {
   sn_db_transaction_start();
 
   !is_array($que_transaction) ? $que_transaction = array($que_transaction) : false;
-  foreach($que_transaction as $que) {
+  foreach ($que_transaction as $que) {
     set_time_limit(120);
-    if(is_callable($que)) {
+    if (is_callable($que)) {
       $QryResult = call_user_func($que);
     } else {
       $QryResult = doquery($que);
@@ -206,12 +206,12 @@ 
     //$que = str_replace('}}', '', $que);
 
     $msg .=
-      '<li>' . htmlspecialchars($que) .
-        ' --- <span style="' . ($QryResult ? 'ok">OK' : 'error">FAILED!') . '</span> ' .
-      classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'] .
+      '<li>'.htmlspecialchars($que).
+        ' --- <span style="'.($QryResult ? 'ok">OK' : 'error">FAILED!').'</span> '.
+      classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'].
       "</li>";
 
-    classSupernova::$debug->warning($que . ' --- ' . ($QryResult ? 'OK' : 'FAILED!') . ' ' . classSupernova::$db->db_affected_rows() . ' ' . classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
+    classSupernova::$debug->warning($que.' --- '.($QryResult ? 'OK' : 'FAILED!').' '.classSupernova::$db->db_affected_rows().' '.classLocale::$lang['adm_records'], 'System maintenance', LOG_INFO_MAINTENANCE);
   }
 
   sn_db_transaction_commit();
@@ -239,5 +239,5 @@ 
 
 $adm_stat_title = classLocale::$lang['adm_stat_title'];
 $result = $result ? "<li>{$adm_stat_title} - {$result}</li>" : '';
-$result = '<div align="left"><ul>' . $msg . $result . '</ul></div>';
-echo json_encode($result . ' ' . $totaltime);
+$result = '<div align="left"><ul>'.$msg.$result.'</ul></div>';
+echo json_encode($result.' '.$totaltime);

common.php

Spacing +7 added lines, -7 removed lines

@@ -12,24 +12,24 @@ 
 global $template_result, $user;
 
 // Напоминание для Администрации, что игра отключена
-if($template_result[F_GAME_DISABLE]) {
+if ($template_result[F_GAME_DISABLE]) {
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
 }
 unset($disable_reason);
 
 
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
   lng_include('admin');
-} elseif($sys_user_logged_in) {
+} elseif ($sys_user_logged_in) {
   sys_user_vacation($user);
 
   $planet_id = SetSelectedPlanet($user);
 
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
-  if($user['ally_id']) {
+  if ($user['ally_id']) {
     sn_db_transaction_start();
     sn_ali_fill_user_ally($user);
-    if(!$user['ally']['player']['id']) {
+    if (!$user['ally']['player']['id']) {
       // sn_sys_logout(false, true);
       // core_auth::logout(false);
       classSupernova::$auth->logout(false);
@@ -37,7 +37,7 @@ 
     }
     // TODO UNCOMMENT
     que_process($user['ally']['player']);
-    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = ' . SN_TIME_NOW);
+    DBStaticUser::db_user_set_by_id($user['ally']['player']['id'], '`onlinetime` = '.SN_TIME_NOW);
     sn_db_transaction_commit();
   }
 
@@ -48,7 +48,7 @@ 
   sn_db_transaction_commit();
 
   $planetrow = $global_data['planet'];
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false);
     classSupernova::$auth->logout(false);

admin/admin_user.php

Spacing +7 added lines, -7 removed lines

@@ -3,22 +3,22 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 lng_include('admin');
 
 $user_id = sys_get_param_id('uid');
-if(!($user_row = DBStaticUser::db_user_by_id($user_id))) {
+if (!($user_row = DBStaticUser::db_user_by_id($user_id))) {
   AdminMessage(sprintf(classLocale::$lang['adm_dm_user_none'], $user_id));
 }
 
 $template = gettemplate('admin/admin_user', true);
 
-if(!empty($user_row['user_last_browser_id'])) {
+if (!empty($user_row['user_last_browser_id'])) {
   $user_row['browser_user_agent'] = db_browser_agent_get_by_id($user_row['user_last_browser_id']);
 }
 
@@ -54,10 +54,10 @@ 
     'raidsloose',
     'raidswin',
     'total_rank',
-    'total_points',  ),
+    'total_points',),
 );
-foreach($formats as $callable => $field_list) {
-  foreach($field_list as $field_name) {
+foreach ($formats as $callable => $field_list) {
+  foreach ($field_list as $field_name) {
     $user_row[$field_name] = call_user_func($callable, $user_row[$field_name]);
   }
 }

includes/functions/sys_user.php

Spacing +27 added lines, -27 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 function sys_user_vacation($user) {
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + classSupernova::$config->player_vacation_timeout;
@@ -15,7 +15,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -45,33 +45,33 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = DBStaticUser::db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
-    $TheAlly = doquery ( "SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true );
+  if ($TheUser['ally_id'] != 0) {
+    $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '".$TheUser['ally_id']."';", '', true);
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
-      doquery ( "UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
+    if ($TheAlly['ally_members'] > 0) {
+      doquery("UPDATE `{{alliance}}` SET `ally_members` = '".$TheAlly['ally_members']."' WHERE `id` = '".$TheAlly['id']."';");
     } else {
-      doquery ( "DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
-      doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
+      doquery("DELETE FROM `{{alliance}}` WHERE `id` = '".$TheAlly['id']."';");
+      doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '".$TheAlly['id']."';");
     }
   }
-  doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '".$UserID."';");
 
   db_planet_list_delete_by_owner($UserID);
 
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '".$UserID."';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '".$UserID."';");
+  doquery("DELETE FROM `{{notes}}` WHERE `owner` = '".$UserID."';");
   FleetList::db_fleet_list_delete_by_owner($UserID);
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';");
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '".$UserID."';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '".$UserID."';");
+  doquery("DELETE FROM `{{annonce}}` WHERE `user` = '".$UserID."';");
 
 
   classSupernova::db_del_record_by_id(LOC_USER, $UserID);
-  doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
+  doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
   classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->db_loadItem('users_amount') - 1);
   sn_db_transaction_commit();
 }
@@ -87,7 +87,7 @@ 
   $ban_current = DBStaticUser::db_user_by_id($banned['id'], false, 'banaday');
   $ban_until = ($ban_current['banaday'] ? $ban_current['banaday'] : SN_TIME_NOW) + $term;
 
-  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = {$ban_until} " . ($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
+  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = {$ban_until} ".($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
 
   $banned['username'] = db_escape($banned['username']);
   $banner['username'] = db_escape($banner['username']);
@@ -105,7 +105,7 @@ 
  * @param string $reason
  */
 function sys_admin_player_ban_unset($banner, $banned, $reason = '') {
-  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = 0, `vacation` = " . SN_TIME_NOW . "");
+  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = 0, `vacation` = ".SN_TIME_NOW."");
 
   $banned['username'] = db_escape($banned['username']);
   $banner['username'] = db_escape($banner['username']);
@@ -134,7 +134,7 @@ 
 
     'total_points' => $options['total_points'] = empty($options['total_points']) ? 0 : $options['total_points'],
 
-    'options' => (empty($options['options']) ? $player_options_string : $options['options']) . (empty($options['options_extra']) ? '' : $options['options_extra']),
+    'options' => (empty($options['options']) ? $player_options_string : $options['options']).(empty($options['options_extra']) ? '' : $options['options_extra']),
 
     'galaxy' => $options['galaxy'] = intval($options['galaxy'] ? $options['galaxy'] : 0),
     'system' => $options['system'] = intval($options['system'] ? $options['system'] : 0),
@@ -145,28 +145,28 @@ 
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
 
   $user_new = classSupernova::db_ins_field_set(LOC_USER, $field_set);
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = classSupernova::$config->LastSettedGalaxyPos;
     $options['system'] = classSupernova::$config->LastSettedSystemPos;
-    $segment_size = floor(Vector::$knownPlanets/ 3);
+    $segment_size = floor(Vector::$knownPlanets / 3);
     $segment = floor(classSupernova::$config->LastSettedPlanetPos / $segment_size);
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
     // $new_planet_id = 0;
-    while(true) {
-      if($options['planet'] > Vector::$knownPlanets) {
+    while (true) {
+      if ($options['planet'] > Vector::$knownPlanets) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > Vector::$knownSystems) {
+      if ($options['system'] > Vector::$knownSystems) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
-      $options['galaxy'] > Vector::$knownGalaxies? $options['galaxy'] = 1 : false;
+      $options['galaxy'] > Vector::$knownGalaxies ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         classSupernova::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -189,7 +189,7 @@ 
   $username_safe = db_escape($username_unsafe);
   db_player_name_history_replace($user_new, $username_safe);
 
-  if(!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
     db_referral_insert($options, $user_new);
   }