supernova-ws / SuperNova

includes/includes/sys_stat.php

Spacing +30 added lines, -30 removed lines

@@ -39,23 +39,23 @@ 
 
   $sta_update_msg = db_escape($sta_update_msg);
 
-  if($next_step) {
+  if ($next_step) {
     $sta_update_step++;
   }
   $sta_update_msg = "Update in progress. Step {$sta_update_step}/14: {$sta_update_msg}.";
 
   classSupernova::$config->db_saveItem('var_stat_update_msg', $sta_update_msg);
-  if($next_step) {
+  if ($next_step) {
     classSupernova::$debug->warning($sta_update_msg, 'Stat update', LOG_INFO_STAT_PROCESS);
   }
 }
 
 function sys_stat_calculate_flush(&$data, $force = false) {
-  if(count($data) < 25 && !$force) {
+  if (count($data) < 25 && !$force) {
     return;
   }
 
-  if(!empty($data)) {
+  if (!empty($data)) {
     doquery('REPLACE INTO {{statpoints}}
       (`id_owner`, `id_ally`, `stat_type`, `stat_code`, `tech_points`, `tech_count`, `build_points`, `build_count`,
        `defs_points`, `defs_count`, `fleet_points`, `fleet_count`, `res_points`, `res_count`, `total_points`,
@@ -95,11 +95,11 @@ 
   $user_list = DBStaticUser::db_user_list('', true, 'id, dark_matter, metal, crystal, deuterium, user_as_ally, ally_id');
   $row_num = count($user_list);
   // while($player = db_fetch($query))
-  foreach($user_list as $player) {
-    if($i++ % 100 == 0) {
+  foreach ($user_list as $player) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating players stats (player {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $player['id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $player['id'], $user_skip_list)) {
       continue;
     }
 
@@ -109,7 +109,7 @@ 
     // $points[$user_id][UNIT_RESOURCES] += $resources;
 
     // А здесь мы фильтруем пользователей по $user_skip_list - далее не нужно этого делать, потому что
-    if(!isset($user_skip_list[$user_id])) {
+    if (!isset($user_skip_list[$user_id])) {
       $user_allies[$user_id] = $player['ally_id'];
     }
   }
@@ -123,11 +123,11 @@ 
   $i = 0;
   $query = DBStaticPlanet::db_planet_list_resources_by_owner();
   $row_num = db_num_rows($query);
-  while($planet = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($planet = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating planets stats (planet {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
+    if (array_key_exists($user_id = $planet['id_owner'], $user_skip_list)) {
       continue;
     }
 
@@ -142,8 +142,8 @@ 
   $i = 0;
   $query = FleetList::dbQueryAllId();
   $row_num = db_num_rows($query);
-  while($fleet_row = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($fleet_row = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating flying fleets stats (fleet {$i}/{$row_num})", false);
     }
     $objFleet = new Fleet();
@@ -151,14 +151,14 @@ 
     // К тому же при включённом кэшировании это быстро забъёт кэш холодными данными
     // $objFleet->_reset();
     $objFleet->dbRowParse($fleet_row);
-    if(array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
+    if (array_key_exists($user_id = $objFleet->playerOwnerId, $user_skip_list)) {
       continue;
     }
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
       $counts[$user_id][UNIT_SHIPS] += $unit->count;
 
-      if(!isset($unit_cost_cache[$unit_id][0])) {
+      if (!isset($unit_cost_cache[$unit_id][0])) {
         $unit_cost_cache[$unit_id][0] = get_unit_param($unit_id, P_COST);
       }
       $unit_cost_data = &$unit_cost_cache[$unit_id][0];
@@ -178,11 +178,11 @@ 
   $i = 0;
   $query = DBStaticUnit::db_unit_list_stat_calculate();
   $row_num = db_num_rows($query);
-  while($unit = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($unit = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating unit stats (unit {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $unit['unit_player_id'], $user_skip_list)) {
       continue;
     }
 
@@ -196,11 +196,11 @@ 
   $i = 0;
   $query = DBStaticQue::db_que_list_stat();
   $row_num = db_num_rows($query);
-  while($que_item = db_fetch($query)) {
-    if($i++ % 100 == 0) {
+  while ($que_item = db_fetch($query)) {
+    if ($i++ % 100 == 0) {
       sta_set_time_limit("calculating ques stats (que item {$i}/{$row_num})", false);
     }
-    if(array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
+    if (array_key_exists($user_id = $que_item['que_player_id'], $user_skip_list)) {
       continue;
     }
     $que_unit_amount = $que_item['que_unit_amount'];
@@ -219,7 +219,7 @@ 
 
   sta_set_time_limit('posting new user stats to DB');
   $data = array();
-  foreach($user_allies as $user_id => $ally_id) {
+  foreach ($user_allies as $user_id => $ally_id) {
     // $counts[UNIT_RESOURCES] дублирует $points[UNIT_RESOURCES], поэтому $points не заполняем, а берем $counts и делим на 1000
     $points[$user_id][UNIT_RESOURCES] = $counts[$user_id][UNIT_RESOURCES] / 1000;
     $points[$user_id] = array_map('floor', $points[$user_id]);
@@ -231,10 +231,10 @@ 
     $user_points = array_sum($points[$user_id]);
     $user_counts = array_sum($counts[$user_id]);
 
-    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}'," .
-      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}'," .
-      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}'," .
-      "{$user_points},{$user_counts}," . SN_TIME_NOW . ")";
+    $data[] = $q = "({$user_id},{$ally_id},1,1,'{$points[$user_id][UNIT_TECHNOLOGIES]}','{$counts[$user_id][UNIT_TECHNOLOGIES]}',".
+      "'{$points[$user_id][UNIT_STRUCTURES]}','{$counts[$user_id][UNIT_STRUCTURES]}','{$user_defence_points}','{$user_defence_counts}',".
+      "'{$points[$user_id][UNIT_SHIPS]}','{$counts[$user_id][UNIT_SHIPS]}','{$points[$user_id][UNIT_RESOURCES]}','{$counts[$user_id][UNIT_RESOURCES]}',".
+      "{$user_points},{$user_counts},".SN_TIME_NOW.")";
 
     sys_stat_calculate_flush($data);
   }
@@ -254,7 +254,7 @@ 
         SUM(u.`tech_points`)+aus.`tech_points`, SUM(u.`tech_count`)+aus.`tech_count`, SUM(u.`build_points`)+aus.`build_points`, SUM(u.`build_count`)+aus.`build_count`,
         SUM(u.`defs_points`)+aus.`defs_points`, SUM(u.`defs_count`)+aus.`defs_count`, SUM(u.`fleet_points`)+aus.`fleet_points`, SUM(u.`fleet_count`)+aus.`fleet_count`,
         SUM(u.`res_points`)+aus.`res_points`, SUM(u.`res_count`)+aus.`res_count`, SUM(u.`total_points`)+aus.`total_points`, SUM(u.`total_count`)+aus.`total_count`,
-        " . SN_TIME_NOW . ", NULL, u.`id_ally`, 2, 1,
+        " . SN_TIME_NOW.", NULL, u.`id_ally`, 2, 1,
         a.tech_rank, a.build_rank, a.defs_rank, a.fleet_rank, a.res_rank, a.total_rank
       FROM {{statpoints}} AS u
         JOIN {{alliance}} AS al ON al.id = u.id_ally
@@ -275,7 +275,7 @@ 
 
   // Updating player's ranks
   sta_set_time_limit("updating ranks for players");
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating player rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 1));
@@ -283,7 +283,7 @@ 
 
   sta_set_time_limit("updating ranks for Alliances");
   // --- Updating Allie's ranks
-  foreach($rankNames as $rankName) {
+  foreach ($rankNames as $rankName) {
     sta_set_time_limit("updating Alliances rank '{$rankName}'", false);
     doquery($qryResetRowNum);
     doquery(sprintf($qryFormat, $rankName, 2));

includes/functions/sys_bbcode.php

Spacing +7 added lines, -7 removed lines

@@ -103,23 +103,23 @@
 
   !empty(classSupernova::$config->url_faq) ? $msg = str_replace('faq://', classSupernova::$config->url_faq, $msg) : false;
 
-  foreach(classSupernova::$design['bbcodes'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach (classSupernova::$design['bbcodes'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $html) {
+    foreach ($replaces as $key => $html) {
       $msg = preg_replace(''.$key.'', $html, $msg);
     }
   }
 
-  foreach(classSupernova::$design['smiles'] as $auth_level => $replaces) {
-    if($auth_level > $author_auth) {
+  foreach (classSupernova::$design['smiles'] as $auth_level => $replaces) {
+    if ($auth_level > $author_auth) {
       continue;
     }
 
-    foreach($replaces as $key => $imgName) {
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
+    foreach ($replaces as $key => $imgName) {
+      $msg = preg_replace("#".addcslashes($key, '()[]{}')."#isU", "<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">", $msg);
     }
   }
 

admin/userlist.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 define('INSIDE', true);
 define('INSTALL', false);
 define('IN_ADMIN', true);
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $user;
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -39,10 +39,10 @@ 
 $sort = sys_get_param_int('sort', SORT_ID);
 $sort = $sort_fields[$sort] ? $sort : SORT_ID;
 
-if(($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
+if (($action = sys_get_param_int('action')) && ($user_id = sys_get_param_id('uid'))) {
   $user_selected = DBStaticUser::db_user_by_id($user_id, false, 'id, username, authlevel');
-  if($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
-    switch($action) {
+  if ($user_selected['authlevel'] < $user['authlevel'] && $user['authlevel'] >= 3) {
+    switch ($action) {
       case ACTION_DELETE:
         DeleteSelectedUser($user_id);
         sys_redirect("{$_SERVER['SCRIPT_NAME']}?sort={$sort}");
@@ -62,20 +62,20 @@ 
 $template = gettemplate('admin/userlist', true);
 
 $multi_ip = array();
-foreach(DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
+foreach (DBStaticUser::db_user_list_admin_multiaccounts() as $ip) {
   $multi_ip[$ip['user_lastip']] = $ip['ip_count'];
 }
 
 $geoip = geoip_status();
 $count = 0;
-foreach(DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row ) {
+foreach (DBStaticUser::db_user_list_admin_sorted($sort_fields[$sort], $is_players_online_page) as $user_row) {
   $count++;
-  if($user_row['banaday']) {
+  if ($user_row['banaday']) {
     $ban_details = db_ban_list_get_details($user_row);
   }
 
   $geoip_info = $geoip ? geoip_ip_info(ip2longu($user_row['user_lastip'])) : array();
-  foreach($geoip_info as $key => $value) {
+  foreach ($geoip_info as $key => $value) {
     $geoip_info[strtoupper($key)] = $value;
     unset($geoip_info[$key]);
   }

includes/vars/vars_mission_checks.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
   'checkSpeedPercentOld'       => FLIGHT_FLEET_SPEED_WRONG,
   'checkTargetInUniverse'      => FLIGHT_VECTOR_BEYOND_UNIVERSE,
   'checkTargetNotSource'       => FLIGHT_VECTOR_SAME_SOURCE,
-  'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN,  // tODO
+  'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN, // tODO
   'checkTargetNoVacation'      => FLIGHT_PLAYER_VACATION,
   'checkFleetNotEmpty'         => FLIGHT_SHIPS_NO_SHIPS,
   // 'checkUnitsPositive'         => FLIGHT_SHIPS_NEGATIVE, // Unused - 'cause it's not allowed to put negative units into Unit class

includes/vars/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, null, TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/vars/vars_combats.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
   ),
   SHIP_CARGO_BIG => array(
     'name' => 'big_ship_cargo',
@@ -55,7 +55,7 @@ 
     'shield' => 25,
     'armor' => 1200,
     'attack' => 5,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -83,7 +83,7 @@ 
     'shield' => 50,
     'armor' => 3000,
     'attack' => 10,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -111,7 +111,7 @@ 
     'shield' => 200,
     'armor' => 70000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250, ),
+    'amplify' => array(SHIP_SPY => 100, SHIP_SATTELITE_SOLAR => 250,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -140,7 +140,7 @@ 
     'shield' => 100,
     'armor' => 3000,
     'attack' => 50,
-    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -168,7 +168,7 @@ 
     'shield' => 10,
     'armor' => 1600,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050, ),
+    'amplify' => array(SHIP_SPY => 500.05, SHIP_SATTELITE_SOLAR => 1050,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -196,7 +196,7 @@ 
     'shield' =>  0.01,
     'armor' => 100,
     'attack' =>  0.01,
-    'amplify' => array( SHIP_SPY => 1,),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -220,7 +220,7 @@ 
       'factor' => 1,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor);},
+      RES_ENERGY => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 4 + 20) * $level * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
 
@@ -229,7 +229,7 @@ 
     'shield' => 10,
     'armor' => 200,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 1, ),
+    'amplify' => array(SHIP_SPY => 1,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -261,7 +261,7 @@ 
     'shield' => 10,
     'armor' => 400,
     'attack' => 50,
-    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 16.4, SHIP_SPY => 10.001, SHIP_SATTELITE_SOLAR => 21,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_CHEMICAL,
@@ -290,7 +290,7 @@ 
     'shield' => 25,
     'armor' => 1000,
     'attack' => 150,
-    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7, ),
+    'amplify' => array(SHIP_CARGO_SMALL => 8.2, SHIP_SPY => 3.33367, SHIP_SATTELITE_SOLAR => 7,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -349,7 +349,7 @@ 
     'shield' =>  50,
     'armor' => 2700,
     'attack' => 400,
-    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5, ),
+    'amplify' => array(SHIP_SMALL_FIGHTER_LIGHT => 6.15, SHIP_SPY => 1.25013, SHIP_SATTELITE_SOLAR => 2.625, UNIT_DEF_TURRET_MISSILE => 5.5,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_ION,
@@ -408,7 +408,7 @@ 
     'shield' =>  200,
     'armor' =>  6000,
     'attack' => 1000,
-    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76, ),
+    'amplify' => array(SHIP_SPY => 0.50005, SHIP_SATTELITE_SOLAR => 1.05, UNIT_DEF_TURRET_MISSILE => 1.76,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -504,7 +504,7 @@ 
     'shield' =>  500,
     'armor' => 11000,
     'attack' => 2000,
-    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125, ),
+    'amplify' => array(SHIP_SPY => 0.25003, SHIP_SATTELITE_SOLAR => 0.525, SHIP_LARGE_BATTLESHIP => 7.4, UNIT_DEF_TURRET_LASER_SMALL => 1.125,),
     'engine' => array(
       array(
         'tech' => TECH_ENGINE_HYPER,
@@ -608,7 +608,7 @@ 
     'shield' => 20,
     'armor' => 200,
     'attack' => 80,
-    'amplify' => array(SHIP_SPY => 7, ),
+    'amplify' => array(SHIP_SPY => 7,),
   ),
   UNIT_DEF_TURRET_LASER_SMALL => array(
     'name' => 'small_laser',
@@ -626,7 +626,7 @@ 
     'shield' => 25,
     'armor' => 200,
     'attack' => 100,
-    'amplify' => array(SHIP_SPY => 5, ),
+    'amplify' => array(SHIP_SPY => 5,),
   ),
   UNIT_DEF_TURRET_LASER_BIG => array(
     'name' => 'big_laser',
@@ -644,7 +644,7 @@ 
     'shield' => 100,
     'armor' => 800,
     'attack' => 250,
-    'amplify' => array(SHIP_SPY => 2, ),
+    'amplify' => array(SHIP_SPY => 2,),
   ),
   UNIT_DEF_TURRET_GAUSS => array(
     'name' => 'gauss_canyon',
@@ -662,7 +662,7 @@ 
     'armor' => 3500,
     'shield' => 200,
     'attack' => 1100,
-    'amplify' => array(SHIP_SPY => 0.5, ),
+    'amplify' => array(SHIP_SPY => 0.5,),
   ),
   UNIT_DEF_TURRET_ION => array(
     'name' => 'ionic_canyon',
@@ -680,7 +680,7 @@ 
     'shield' => 500,
     'armor' => 800,
     'attack' => 150,
-    'amplify' => array(SHIP_SPY => 3.3, ),
+    'amplify' => array(SHIP_SPY => 3.3,),
   ),
   UNIT_DEF_TURRET_PLASMA => array(
     'name' => 'buster_canyon',
@@ -698,7 +698,7 @@ 
     'shield' => 300,
     'armor' => 10000,
     'attack' => 3000,
-    'amplify' => array(SHIP_SPY => 0.17, ),
+    'amplify' => array(SHIP_SPY => 0.17,),
   ),
 
   UNIT_DEF_SHIELD_SMALL => array(
@@ -718,7 +718,7 @@ 
     'shield' => 2000,
     'armor' => 2000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_BIG => array(
     'name' => 'big_protection_shield',
@@ -737,7 +737,7 @@ 
     'shield' => 2000,
     'armor' => 10000,
     'attack' => 1,
-    'amplify' => array(SHIP_SPY => 500, ),
+    'amplify' => array(SHIP_SPY => 500,),
   ),
   UNIT_DEF_SHIELD_PLANET => array(
     'name'      => 'planet_protector',

includes/vars/vars_menu.php

Spacing +12 added lines, -12 removed lines

@@ -104,21 +104,21 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_STRUCTURES]',
-    'LINK'  => 'buildings.php?mode=' . QUE_STRUCTURES,
+    'LINK'  => 'buildings.php?mode='.QUE_STRUCTURES,
     'ICON'  => true,
   ),
   'menu_planet_shipyard'   => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Shipyard',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_FLEET,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_FLEET,
     'ICON'  => true,
   ),
   'menu_planet_defense'    => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Defense',
-    'LINK'  => 'buildings.php?mode=' . SUBQUE_DEFENSE,
+    'LINK'  => 'buildings.php?mode='.SUBQUE_DEFENSE,
     'ICON'  => true,
   ),
   'menu_planet_resources'  => array(
@@ -147,7 +147,7 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Research',
-    'LINK'  => 'buildings.php?mode=' . QUE_RESEARCH,
+    'LINK'  => 'buildings.php?mode='.QUE_RESEARCH,
     'ICON'  => true,
   ),
   'menu_empire_techtree' => array(
@@ -233,14 +233,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_MERCENARIES]',
-    'LINK'  => 'officer.php?mode=' . UNIT_MERCENARIES,
+    'LINK'  => 'officer.php?mode='.UNIT_MERCENARIES,
     'ICON'  => true,
   ),
   'menu_empire_schematics'  => array(
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'tech[UNIT_PLANS]',
-    'LINK'  => 'officer.php?mode=' . UNIT_PLANS,
+    'LINK'  => 'officer.php?mode='.UNIT_PLANS,
     'ICON'  => true,
   ),
   'menu_empire_artifacts'   => array(
@@ -270,14 +270,14 @@ 
     'LEVEL' => 'submenu',
     'TYPE'  => 'lang',
     'ITEM'  => 'Chat',
-    'LINK'  => 'index.php?page=chat&mode=' . CHAT_MODE_COMMON,
+    'LINK'  => 'index.php?page=chat&mode='.CHAT_MODE_COMMON,
     'ICON'  => true,
   ),
   'menu_ally_chat'     => array(
     'LEVEL'    => 'submenu',
     'TYPE'     => 'lang',
     'ITEM'     => 'AllyChat',
-    'LINK'     => 'index.php?page=chat&mode=' . CHAT_MODE_ALLY,
+    'LINK'     => 'index.php?page=chat&mode='.CHAT_MODE_ALLY,
     'ICON'     => true,
     'DISABLED' => classSupernova::$config->game_mode == GAME_BLITZ,
   ),
@@ -458,8 +458,8 @@ 
   ),
   'menu_admin_version_info'  => array(
     'TYPE' => 'text',
-    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '') . '<div class="' .
-      $sn_version_check_class[classSupernova::$config->server_updater_check_result] . '">' . classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result] . '</div>',
+    'ITEM' => (classSupernova::$config->server_updater_check_last ? date(FMT_DATE, classSupernova::$config->server_updater_check_last) : '').'<div class="'.
+      $sn_version_check_class[classSupernova::$config->server_updater_check_result].'">'.classLocale::$lang['adm_opt_ver_response_short'][classSupernova::$config->server_updater_check_result].'</div>',
   ),
 
   'USER_AUTHLEVEL_NAME'      => array(
@@ -547,13 +547,13 @@ 
   'menu_admin_planet_list_planets' => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_pltlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_PLANET,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_PLANET,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_list_moons'   => array(
     'TYPE'       => 'lang',
     'ITEM'       => 'adm_moonlst',
-    'LINK'       => 'admin/adm_planet_list.php?planet_type=' . PT_MOON,
+    'LINK'       => 'admin/adm_planet_list.php?planet_type='.PT_MOON,
     'AUTH_LEVEL' => 3,
   ),
   'menu_admin_planet_moon_add'     => array(

includes/alliance/ali_external_search.inc

Spacing +4 added lines, -4 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_search', true);
 
 $ali_search_text = sys_get_param_str('searchtext');
-if($ali_search_text) {
+if ($ali_search_text) {
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
 
   $search = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
-  if(classSupernova::$db->db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (classSupernova::$db->db_num_rows($search)) {
+    while ($ally_row = db_fetch($search)) {
       $template->assign_block_vars('alliances', array(
         'ID'          => $ally_row['id'],
         'TAG'         => $ally_row['ally_tag'],

tests.int/FleetTest.php

Spacing +5 added lines, -5 removed lines

@@ -5,7 +5,7 @@ 
 define('SN_IN_FLEET', true);
 define('SN_RENDER_NAVBAR_PLANET', true);
 
-include('../common.' . substr(strrchr(__FILE__, '.'), 1));
+include('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // TODO - Переместить это куда-нибудь
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
@@ -192,8 +192,8 @@ 
 //  break;
     }
 
-    if($exceptionCode !== null) {
-      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</span><br />');
+    if ($exceptionCode !== null) {
+      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</span><br />');
       print('<div style="color: red; font-size: 200%;">NO EXCEPTION RAISED</div>');
       pdie();
     } else {
@@ -203,8 +203,8 @@ 
     if ($exceptionCode !== null && $e->getCode() === $exceptionCode) {
 //      print('<span style="color: darkgreen;">Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - passed</span><br />');
     } else {
-      print('<div style="color: red; font-size: 200%;">Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</div>');
-      print('<div style="color: red; font-size: 200%;">Got Exception [' . $e->getCode() . ']: "' . $e->getMessage() . '"/"' . classLocale::$lang['fl_attack_error'][$e->getCode()] . '" . "</div>');
+      print('<div style="color: red; font-size: 200%;">Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</div>');
+      print('<div style="color: red; font-size: 200%;">Got Exception ['.$e->getCode().']: "'.$e->getMessage().'"/"'.classLocale::$lang['fl_attack_error'][$e->getCode()].'" . "</div>');
       throw $e;
     }
   }