supernova-ws / SuperNova

includes/pages/options.php

Spacing +2 added lines, -2 removed lines

@@ -401,7 +401,7 @@ 
     unset($player_options[PLAYER_OPTION_TUTORIAL_CURRENT]);
   }
 
-  array_walk($player_options, function (&$value) {
+  array_walk($player_options, function(&$value) {
     // TODO - Когда будет больше параметров - сделать больше проверок
     $value = intval($value);
   });
@@ -450,7 +450,7 @@ 
           $user['id'],
           RPG_NAME_CHANGE,
           -$config->game_user_changename_cost,
-          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username,])
+          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username, ])
         );
 
       case SERVER_PLAYER_NAME_CHANGE_FREE:

classes/classConfig.php

Spacing +19 added lines, -19 removed lines

@@ -150,9 +150,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, // Minimum alliance size to start using bonus
 
@@ -186,7 +186,7 @@ 
     'Defs_Cdr'                     => 30,
     '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
 
@@ -197,11 +197,11 @@ 
     '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,
@@ -209,8 +209,8 @@ 
     'fleet_update_interval' => 4,
     'fleet_update_lock'     => '', // SQL time when lock was acquired
 
-    '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/',
@@ -224,14 +224,14 @@ 
     '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'        => PERIOD_DAY_3, // 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_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
+    'game_news_overview'      => 3, // How much last news to show in Overview page
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
     // 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)
@@ -285,12 +285,12 @@ 
     '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_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
 
@@ -312,7 +312,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/general/formatters.php

Spacing +6 added lines, -6 removed lines

@@ -112,10 +112,10 @@ 
     $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
     if (preg_match($rexep, $date, $out)) {
       $ret = array(
-        "tm_sec"  => (int)$out['S'],
-        "tm_min"  => (int)$out['M'],
-        "tm_hour" => (int)$out['H'],
-        "tm_mday" => (int)$out['d'],
+        "tm_sec"  => (int) $out['S'],
+        "tm_min"  => (int) $out['M'],
+        "tm_hour" => (int) $out['H'],
+        "tm_mday" => (int) $out['d'],
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
@@ -150,7 +150,7 @@ 
  * @return int
  */
 function datePart($fullDate) {
-  return (int)strtotime(date('Y-m-d', $fullDate));
+  return (int) strtotime(date('Y-m-d', $fullDate));
 }
 
 
@@ -178,7 +178,7 @@ 
    * @return bool
    * @throws ErrorException
    */
-    function ($errno, $errstr, $errfile, $errline) {
+    function($errno, $errstr, $errfile, $errline) {
       throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
     }
   );

includes/alliance/ali_internal_admin_diplomacy.inc

Braces +7 added lines, -14 removed lines

@@ -67,8 +67,7 @@ 
       ->doInsert();
 
     $accept_offer = false;
-  }
-  else
+  } else
   {
     $accept_offer = true;
     $autoAccept = true;
@@ -80,8 +79,7 @@ 
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
     );
   }
-}
-else
+} else
 {
   $offer_id = sys_get_param_id('offer_id');
   if($offer_id)
@@ -92,31 +90,26 @@ 
     if(!$negotiation)
     {
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
-    }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
       if($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
-    }
-    else
+    } else
     {
       if($offer_answer == 'accept')
       {
         $accept_offer = true;
-      }
-      elseif($offer_answer == 'deny')
+      } elseif($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }

Spacing +19 added lines, -19 removed lines

@@ -3,7 +3,7 @@ 
 use Alliance\DBStaticAlly;
 use \DBAL\DbQuery;
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -18,28 +18,28 @@ 
 $ally_name_safe = db_escape($user['ally_name']);
 
 $autoAccept = false;
-if(sys_get_param_str('ali_dip_offer_make'))
+if (sys_get_param_str('ali_dip_offer_make'))
 {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
   {
     messageBox($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
   {
     messageBox($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
-  if(!$contr_ally_row)
+  if (!$contr_ally_row)
   {
     messageBox($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id)
+  if ($alliance_negotiation_relation == $relation_current_id)
   {
     messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
@@ -51,7 +51,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
   {
     DbQuery::build()
       ->setTable('alliance_negotiation')
@@ -85,39 +85,39 @@ 
 else
 {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id)
+  if ($offer_id)
   {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
-    if(!$negotiation)
+    if (!$negotiation)
     {
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
     {
       // TODO: Add log of hack attempt
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
     }
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         // TODO: Add log of hack attempt
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
       }
     }
     else
     {
-      if($offer_answer == 'accept')
+      if ($offer_answer == 'accept')
       {
         $accept_offer = true;
       }
-      elseif($offer_answer == 'deny')
+      elseif ($offer_answer == 'deny')
       {
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
       }
@@ -125,7 +125,7 @@ 
   }
 }
 
-if($accept_offer)
+if ($accept_offer)
 {
   sn_db_transaction_start();
 
@@ -185,7 +185,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
 {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
@@ -194,7 +194,7 @@ 
 }
 
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
-while($alliance = db_fetch($query))
+while ($alliance = db_fetch($query))
 {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
@@ -213,7 +213,7 @@ 
   WHERE
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
 );
-while($offer = db_fetch($query))
+while ($offer = db_fetch($query))
 {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],

classes/Core/Autoloader.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
   protected static $autoloaderRegistered = false;
 
   protected static function _constructorStatic() {
-    if(!static::$autoloaderRegistered) {
+    if (!static::$autoloaderRegistered) {
       spl_autoload_register(array(__CLASS__, 'autoloader'));
       static::$autoloaderRegistered = true;
     }
@@ -36,17 +36,17 @@ 
   public static function autoloader($class) {
     static::_constructorStatic();
 
-    foreach(static::$folders as $data) {
+    foreach (static::$folders as $data) {
       $theClassFile = $class;
 
-      if($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
+      if ($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
         $theClassFile = substr($class, strlen($data[static::P_PREFIX]));
       }
 
       $classFullFileName = str_replace('\\', '/', $data[static::P_FOLDER] . $theClassFile) . DOT_PHP_EX;
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
         require_once($classFullFileName);
-        if(method_exists($class, '_constructorStatic')) {
+        if (method_exists($class, '_constructorStatic')) {
           $class::_constructorStatic();
         }
       }
@@ -62,13 +62,13 @@ 
 
     $absoluteClassRoot = str_replace('\\', '/', SN_ROOT_PHYSICAL . $absoluteClassRoot);
 
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
       // TODO - throw new \Exception("There is some error when installing autoloader for '{$absoluteClassRoot}' class prefix '{$classPrefix}'");
       return;
     }
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
 
-    if($classPrefix && strrpos($classPrefix, 1) != '\\') {
+    if ($classPrefix && strrpos($classPrefix, 1) != '\\') {
       $classPrefix .= '\\';
     }
 

metamatter.php

Spacing +3 added lines, -3 removed lines

@@ -112,7 +112,7 @@ 
 }
 
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
-array_walk($payment_methods_available, function (&$value, $index) {
+array_walk($payment_methods_available, function(&$value, $index) {
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
 });
 
@@ -223,7 +223,7 @@ 
 if ($request['metamatter'] && $payment_module_request) {
   try {
     $paymentModuleReal = SN::$gc->modules->getModule($payment_module_request);
-    if(!is_object($paymentModuleReal)) {
+    if (!is_object($paymentModuleReal)) {
       throw new Exception('{ Менеджер модулей вернул null вместо платёжного модуля для }' . $payment_module_request, ERR_ERROR);
     }
     /**
@@ -312,7 +312,7 @@ 
   'PLAYER_CURRENCY'              => $player_currency,
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
 
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
   'UNIT_AMOUNT_TEXT'            => HelperString::numberFloorAndFormat($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,

includes/functions/eco_get_build_data.php

Spacing +37 added lines, -37 removed lines

@@ -13,13 +13,13 @@ 
  */
 function eco_get_lab_max_effective_level(&$user, $lab_require)
 {
-  if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
+  if (!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
     $query = DBStaticUnit::db_unit_list_laboratories($user['id']);
-    while($row = db_fetch($query))
+    while ($row = db_fetch($query))
     {
-      if(!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
+      if (!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
       {
         $row += array(
           STRUC_LABORATORY => $level_lab = mrc_get_level($user, $row, STRUC_LABORATORY),
@@ -33,9 +33,9 @@ 
     uasort($user['laboratories_active'], 'eco_lab_sort_effectivness');
   }
 
-  if(!isset($user['research_effective_level'][$lab_require]))
+  if (!isset($user['research_effective_level'][$lab_require]))
   {
-    if($user['user_as_ally'])
+    if ($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
     }
@@ -44,13 +44,13 @@ 
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
 
-      foreach($user['laboratories_active'] as $data)
+      foreach ($user['laboratories_active'] as $data)
       {
-        if($tech_intergalactic <= 0)
+        if ($tech_intergalactic <= 0)
         {
           break;
         }
-        if($data[STRUC_LABORATORY] >= $lab_require)
+        if ($data[STRUC_LABORATORY] >= $lab_require)
         {
           $lab_level['effective_level'] += $data['laboratory_effective_level'];
           $tech_intergalactic--;
@@ -90,8 +90,8 @@ 
   $cost[P_OPTIONS][P_TIME_RAW] = 0;
   $only_dark_matter = 0;
   $cost_in_metal = 0;
-  foreach($unit_data[P_COST] as $resource_id => $resource_amount) {
-    if($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
+  foreach ($unit_data[P_COST] as $resource_id => $resource_amount) {
+    if ($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
       continue;
     }
 
@@ -102,12 +102,12 @@ 
 
     $cost_in_metal += $cost[BUILD_CREATE][$resource_id] * $currentResourceExchange;
 
-    if(in_array($resource_id, $resources_loot)) {
+    if (in_array($resource_id, $resources_loot)) {
       $cost[P_OPTIONS][P_TIME_RAW] += $resource_cost * $currentResourceExchange / $rpg_exchange_deuterium;
       $resource_got = mrc_get_level($user, $planet, $resource_id);
-    } elseif($resource_id == RES_DARK_MATTER) {
+    } elseif ($resource_id == RES_DARK_MATTER) {
       $resource_got = mrc_get_level($user, null, $resource_id);
-    } elseif($resource_id == RES_ENERGY) {
+    } elseif ($resource_id == RES_ENERGY) {
       $resource_got = max(0, $planet['energy_max'] - $planet['energy_used']);
     } else {
       $resource_got = 0;
@@ -119,7 +119,7 @@ 
   }
 
   $resources_normalized = 0;
-  foreach($resources_loot as $resource_id) {
+  foreach ($resources_loot as $resource_id) {
     $resources_normalized += floor(mrc_get_level($user, $planet, $resource_id)) * $config->__get('rpg_exchange_' . pname_resource_name($resource_id));
   }
 
@@ -135,7 +135,7 @@ 
   $cost[P_OPTIONS][P_TIME_RAW] = $cost[P_OPTIONS][P_TIME_RAW] * 60 * 60 / get_game_speed() / 2500;
 
   // TODO - Вынести в отдельную процедуру расчёт стоимости
-  if($only_cost) {
+  if ($only_cost) {
     return $cost;
   }
 
@@ -147,7 +147,7 @@ 
   $cost['RESULT'][BUILD_DESTROY] = BUILD_INDESTRUCTABLE;
 
   $mercenary = 0;
-  if(in_array($unit_id, sn_get_groups('structures'))) {
+  if (in_array($unit_id, sn_get_groups('structures'))) {
     $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_ROBOT) + 1);
     $cost['RESULT'][BUILD_DESTROY] =
       mrc_get_level($user, $planet, $unit_id, false, true)
@@ -157,19 +157,19 @@ 
           )
         : BUILD_NO_UNITS;
     $mercenary = MRC_ENGINEER;
-  } elseif(in_array($unit_id, sn_get_groups('tech'))) {
+  } elseif (in_array($unit_id, sn_get_groups('tech'))) {
     $lab_level = eco_get_lab_max_effective_level($user, intval($unit_data[P_REQUIRE][STRUC_LABORATORY]));
     $cost[RES_TIME][BUILD_CREATE] /= $lab_level;
     $mercenary = MRC_ACADEMIC;
-  } elseif(in_array($unit_id, sn_get_groups('defense'))) {
-    $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1) ;
+  } elseif (in_array($unit_id, sn_get_groups('defense'))) {
+    $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_FORTIFIER;
-  } elseif(in_array($unit_id, sn_get_groups('fleet'))) {
+  } elseif (in_array($unit_id, sn_get_groups('fleet'))) {
     $cost[RES_TIME][BUILD_CREATE] *= pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_ENGINEER;
   }
 
-  if(
+  if (
     // If planet is capital
     $user['id_planet'] == $planet['id']
     &&
@@ -180,11 +180,11 @@ 
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_CREATE] / SN::$gc->config->planet_capital_building_rate;
   }
 
-  if($mercenary) {
+  if ($mercenary) {
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_CREATE] / mrc_modify_value($user, $planet, $mercenary, 1);
   }
 
-  if(in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
+  if (in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_DESTROY] = 0;
   } else {
     $cost[RES_TIME][BUILD_CREATE]  = $cost[RES_TIME][BUILD_CREATE] > 1 ? round($cost[RES_TIME][BUILD_CREATE]) : 1;
@@ -194,7 +194,7 @@ 
   return $cost;
 }
 
-function eco_can_build_unit($user, $planet, $unit_id){$result = null;return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result));}
+function eco_can_build_unit($user, $planet, $unit_id) {$result = null; return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result)); }
 function sn_eco_can_build_unit($user, $planet, $unit_id, &$result) {
   global $config;
 
@@ -202,11 +202,11 @@ 
   $result = $result == BUILD_ALLOWED && eco_unit_busy($user, $planet, $unit_id) ? BUILD_UNIT_BUSY : $result;
 
   $unit_param = get_unit_param($unit_id);
-  if($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
+  if ($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
     $requirement = &$unit_param[P_REQUIRE];
-    if($result == BUILD_ALLOWED && $requirement) {
-      foreach($requirement as $require_id => $require_level) {
-        if(mrc_get_level($user, $planet, $require_id) < $require_level) {
+    if ($result == BUILD_ALLOWED && $requirement) {
+      foreach ($requirement as $require_id => $require_level) {
+        if (mrc_get_level($user, $planet, $require_id) < $require_level) {
           $result = BUILD_REQUIRE_NOT_MEET;
           break;
         }
@@ -223,12 +223,12 @@ 
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
   $planet_que = explode(';', $planet_que);
-  foreach($planet_que as $planet_que_item)
+  foreach ($planet_que as $planet_que_item)
   {
-    if($planet_que_item)
+    if ($planet_que_item)
     {
       list($planet_que_item) = explode(',', $planet_que_item);
-      if(in_array($planet_que_item, $unit_list))
+      if (in_array($planet_que_item, $unit_list))
       {
         $eco_is_builds_in_que = true;
         break;
@@ -239,21 +239,21 @@ 
   return $eco_is_builds_in_que;
 }
 
-function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
+function eco_unit_busy(&$user, &$planet, $unit_id) {$result = null; return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]); }
 function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
 {
   global $config;
 
   $result = isset($result) ? $result : false;
-  if(!$result)
+  if (!$result)
   {
-    if(($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
+    if (($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
     {
       $global_que = que_get($user['id'], $planet['id'], QUE_RESEARCH, false);
-      if(is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
+      if (is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
       {
         $first_element = reset($global_que['ques'][QUE_RESEARCH][$user['id']]);
-        if(is_array($first_element))
+        if (is_array($first_element))
         {
           $result = true;
         }
@@ -263,7 +263,7 @@ 
       //  $result = true;
       //}
     }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    elseif (($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

Braces +6 added lines, -12 removed lines

@@ -2,8 +2,7 @@ 
 
 use Unit\DBStaticUnit;
 
-function eco_lab_sort_effectivness($a, $b)
-{
+function eco_lab_sort_effectivness($a, $b) {
   return $a['laboratory_effective_level'] > $b['laboratory_effective_level'] ? -1 : ($a['laboratory_effective_level'] < $b['laboratory_effective_level'] ? 1 : 0);
 }
 
@@ -13,8 +12,7 @@ 
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
  * @version 1.0
  */
-function eco_get_lab_max_effective_level(&$user, $lab_require)
-{
+function eco_get_lab_max_effective_level(&$user, $lab_require) {
   if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
@@ -40,8 +38,7 @@ 
     if($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
-    }
-    else
+    } else
     {
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
@@ -219,8 +216,7 @@ 
   return $result;
 }
 
-function eco_is_builds_in_que($planet_que, $unit_list)
-{
+function eco_is_builds_in_que($planet_que, $unit_list) {
   $eco_is_builds_in_que = false;
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
@@ -242,8 +238,7 @@ 
 }
 
 function eco_unit_busy(&$user, &$planet, $unit_id){$result = null;return sn_function_call('eco_unit_busy', [&$user, &$planet, $unit_id, &$result]);}
-function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
-{
+function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result) {
   global $config;
 
   $result = isset($result) ? $result : false;
@@ -264,8 +259,7 @@ 
       //{
       //  $result = true;
       //}
-    }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

classes/core_auth.php

Spacing +64 added lines, -64 removed lines

@@ -191,18 +191,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;
         }
@@ -210,7 +210,7 @@ 
     }
 
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
-    if(!$this->player_suggested_name) {
+    if (!$this->player_suggested_name) {
       $max_user_id = db_player_get_max_id(); // 4.5
       // TODO - предлагать имя игрока по локали
 
@@ -219,15 +219,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) {
@@ -251,7 +251,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));
@@ -284,18 +284,18 @@ 
 
     // !self::$is_init ? self::init() : false;
 
-    if(!SN::$gc->modules->countModulesInGroup('auth')) {
+    if (!SN::$gc->modules->countModulesInGroup('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::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) {
+    foreach (SN::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) {
       /**
        * @var auth_abstract $module
        */
@@ -304,10 +304,10 @@ 
 
     // $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(
@@ -315,20 +315,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;
         }
       }
@@ -343,12 +343,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 : ''));
@@ -357,7 +357,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'];
         }
@@ -365,9 +365,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;
@@ -377,9 +377,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
     }
 
@@ -398,21 +398,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);
     }
   }
@@ -423,15 +423,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
     }
 
@@ -439,7 +439,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);
@@ -465,12 +465,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);
         }
       }
@@ -491,7 +491,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;
@@ -504,8 +504,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)
       ) {
@@ -517,7 +517,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'],
@@ -564,7 +564,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);
       }
 
@@ -572,11 +572,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;
         }
       }
@@ -592,7 +592,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']);
@@ -604,7 +604,7 @@ 
 
       sn_db_transaction_commit();
       $this->register_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
 
       // Если старое имя занято
@@ -623,10 +623,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]);
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -647,7 +647,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
@@ -672,7 +672,7 @@ 
     }
 
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       // Берем первого из доступных
       // TODO - default_user
       self::$user = reset($this->accessible_user_row_list);
@@ -696,7 +696,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);
 
@@ -704,12 +704,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'];
@@ -723,13 +723,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;
     }
 
@@ -765,21 +765,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);
@@ -837,7 +837,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);
@@ -850,7 +850,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     SN::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
     }
   }

classes/Fleet/RecordFleet.php

Spacing +9 added lines, -9 removed lines

@@ -76,8 +76,8 @@ 
   public function __construct(GlobalContainer $services = null) {
     parent::__construct($services);
 
-    if(empty(static::$shipInfo)) {
-      foreach(sn_get_groups('fleet') as $unit_id) {
+    if (empty(static::$shipInfo)) {
+      foreach (sn_get_groups('fleet') as $unit_id) {
         static::$shipInfo[$unit_id] = get_unit_param($unit_id);
         static::$shipInfo[$unit_id][P_COST_METAL] = get_unit_cost_in(static::$shipInfo[$unit_id][P_COST]);
       }
@@ -103,7 +103,7 @@ 
    * @inheritdoc
    */
   public function update() {
-    if($this->getShipCount() < 1) {
+    if ($this->getShipCount() < 1) {
       return $this->delete();
     } else {
       return parent::update();
@@ -127,7 +127,7 @@ 
    */
   public function getCostInMetal() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCostInMetal($shipId);
     }
 
@@ -148,7 +148,7 @@ 
    */
   public function getCapacity() {
     $result = 0;
-    foreach($this->shipList as $shipId => $amount) {
+    foreach ($this->shipList as $shipId => $amount) {
       $result += $amount * $this->getShipCapacity($shipId);
     }
 
@@ -165,12 +165,12 @@ 
    */
   public function changeShipCount($shipSnId, $shipCount) {
     !isset($this->shipList[$shipSnId]) ? $this->shipList[$shipSnId] = 0 : false;
-    if($this->shipList[$shipSnId] + $shipCount < 0) {
+    if ($this->shipList[$shipSnId] + $shipCount < 0) {
       throw new \Exception("Trying to deduct more ships [{$shipSnId}] '{$shipCount}' then fleet has {$this->shipList[$shipSnId]}");
     }
 
     $this->shipList[$shipSnId] += $shipCount;
-    if($this->shipList[$shipSnId] <= 0) {
+    if ($this->shipList[$shipSnId] <= 0) {
       unset($this->shipList[$shipSnId]);
     }
 
@@ -185,11 +185,11 @@ 
    * @throws \Exception
    */
   public function changeResource($resourceId, $resourceCount) {
-    if(!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
+    if (!array_key_exists($resourceId, $this->resources) || empty($resourceCount)) {
       return;
     }
 
-    if($this->resources[$resourceId] + $resourceCount < 0) {
+    if ($this->resources[$resourceId] + $resourceCount < 0) {
       throw new \Exception("Trying to deduct more resources [{$resourceId}] '{$resourceCount}' then fleet has {$this->resources[$resourceId]}");
     }