supernova-ws / SuperNova

admin/tools.php

Switch Indentation +63 added lines, -63 removed lines

@@ -34,69 +34,69 @@
 }
 
 switch($mode) {
-  case ADM_TOOL_CONFIG_RELOAD:
-    classSupernova::$config->db_loadAll();
-    sys_refresh_tablelist();
-
-    classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
-      classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
-    } else {
-      unset(classSupernova::$config->game_watchlist_array);
-    }
-  break;
-
-  case ADM_TOOL_MD5:
-    $template = gettemplate("admin/md5enc", true);
-    $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
-    $password_length = sys_get_param_int('length', 16);
-    $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
-
-    $template->assign_vars(array(
-      'SEED'   => $password_seed,
-      'LENGTH' => $password_length,
-      'STRING' => htmlentities($string),
-      'MD5'    => md5($string),
-    ));
-    display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
-  break;
-
-  case ADM_TOOL_FORCE_ALL:
-    classSupernova::$config->db_saveItem('db_version', 0);
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_FORCE_LAST:
-    classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
-    require_once('../includes/update.php');
-  break;
-
-  case ADM_TOOL_INFO_PHP:
-    phpinfo();
-  break;
-
-  case ADM_TOOL_INFO_SQL:
-    $template = gettemplate("simple_table", true);
-
-    $status = array(
-      classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
-      classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
-      classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
-    );
-    templateAssignTable($template, 'server', $status);
-
-    templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
-    templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
-
-    $template->assign_vars(array(
-      'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
-      'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
-      'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
-      'TABLE_FOOTER'  => 'test',
-    ));
-
-    display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
-  break;
+    case ADM_TOOL_CONFIG_RELOAD:
+      classSupernova::$config->db_loadAll();
+      sys_refresh_tablelist();
+
+      classSupernova::$config->db_loadItem('game_watchlist');
+      if(classSupernova::$config->game_watchlist) {
+        classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
+      } else {
+        unset(classSupernova::$config->game_watchlist_array);
+      }
+    break;
+
+    case ADM_TOOL_MD5:
+      $template = gettemplate("admin/md5enc", true);
+      $password_seed = sys_get_param_str_unsafe('seed', SN_SYS_SEC_CHARS_ALLOWED);
+      $password_length = sys_get_param_int('length', 16);
+      $string = ($string = sys_get_param_str_unsafe('string')) ? $string : sys_random_string($password_length, $password_seed);
+
+      $template->assign_vars(array(
+        'SEED'   => $password_seed,
+        'LENGTH' => $password_length,
+        'STRING' => htmlentities($string),
+        'MD5'    => md5($string),
+      ));
+      display($template, classLocale::$lang['adm_tools_md5_header'], false, '', true);
+    break;
+
+    case ADM_TOOL_FORCE_ALL:
+      classSupernova::$config->db_saveItem('db_version', 0);
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_FORCE_LAST:
+      classSupernova::$config->db_saveItem('db_version', floor(classSupernova::$config->db_version - 1));
+      require_once('../includes/update.php');
+    break;
+
+    case ADM_TOOL_INFO_PHP:
+      phpinfo();
+    break;
+
+    case ADM_TOOL_INFO_SQL:
+      $template = gettemplate("simple_table", true);
+
+      $status = array(
+        classLocale::$lang['adm_tool_sql_server_version'] => classSupernova::$db->db_get_server_info(),
+        classLocale::$lang['adm_tool_sql_client_version'] => classSupernova::$db->db_get_client_info(),
+        classLocale::$lang['adm_tool_sql_host_info']      => classSupernova::$db->db_get_host_info(),
+      );
+      templateAssignTable($template, 'server', $status);
+
+      templateAssignTable($template, 'status', classSupernova::$db->db_get_server_stat());
+      templateAssignTable($template, 'params', classSupernova::$db->db_core_show_status());
+
+      $template->assign_vars(array(
+        'PAGE_HEADER'   => classLocale::$lang['adm_tool_sql_page_header'],
+        'COLUMN_NAME_1' => classLocale::$lang['adm_tool_sql_param_name'],
+        'COLUMN_NAME_2' => classLocale::$lang['adm_tool_sql_param_value'],
+        'TABLE_FOOTER'  => 'test',
+      ));
+
+      display($template, classLocale::$lang['adm_bn_ttle'], false, '', true);
+    break;
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -9,10 +9,10 @@ 
 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'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -25,7 +25,7 @@ 
  */
 function templateAssignTable($template, $str, $status) {
   $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table'][$str]);
-  foreach($status as $key => $value) {
+  foreach ($status as $key => $value) {
     $template->assign_block_vars('table.row', array(
       'VALUE_1' => $key,
       'VALUE_2' => $value,
@@ -33,13 +33,13 @@ 
   }
 }
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     classSupernova::$config->db_loadAll();
     sys_refresh_tablelist();
 
     classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
+    if (classSupernova::$config->game_watchlist) {
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
     } else {
       unset(classSupernova::$config->game_watchlist_array);

includes/classes/Player.php

Spacing +8 added lines, -8 removed lines

@@ -228,8 +228,8 @@ 
    * @return int|mixed
    */
   public function calcColonyMaxCount($astrotech = -1) {
-    if($astrotech == -1) {
-      if(!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
+    if ($astrotech == -1) {
+      if (!isset($this->_dbRow[UNIT_PLAYER_COLONIES_MAX])) {
 
         $expeditions = get_player_max_expeditons($this->_dbRow);
         $astrotech = mrc_get_level($this->_dbRow, null, TECH_ASTROTECH);
@@ -302,7 +302,7 @@ 
 
 
   public function expeditionsMax() {
-    if($this->expeditionsMax === null) {
+    if ($this->expeditionsMax === null) {
       $this->expeditionsMax = get_player_max_expeditons($this->_dbRow);
     }
 
@@ -310,7 +310,7 @@ 
   }
 
   public function expeditionsFlying() {
-    if($this->expeditionsFlying === null) {
+    if ($this->expeditionsFlying === null) {
       $this->expeditionsFlying = FleetList::fleet_count_flying($this->_dbId, MT_EXPLORE);
     }
 
@@ -319,7 +319,7 @@ 
 
 
   public function fleetsMax() {
-    if($this->fleetMax === null) {
+    if ($this->fleetMax === null) {
       $this->fleetMax = GetMaxFleets($this->_dbRow);
     }
 
@@ -327,7 +327,7 @@ 
   }
 
   public function fleetsFlying() {
-    if($this->fleetFlying === null) {
+    if ($this->fleetFlying === null) {
       $this->fleetFlying = FleetList::fleet_count_flying($this->_dbId);
     }
 
@@ -336,7 +336,7 @@ 
 
 
   public function coloniesMax() {
-    if($this->coloniesMax === null) {
+    if ($this->coloniesMax === null) {
       $this->coloniesMax = get_player_max_colonies($this->_dbRow);
     }
 
@@ -344,7 +344,7 @@ 
   }
 
   public function coloniesCurrent() {
-    if($this->coloniesCurrent === null) {
+    if ($this->coloniesCurrent === null) {
       $this->coloniesCurrent = get_player_current_colonies($this->_dbRow);
     }
 

includes/includes/flt_page5.inc

Spacing +23 added lines, -23 removed lines

@@ -12,7 +12,7 @@ 
 *
 **/
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
@@ -25,7 +25,7 @@ 
 
   $planet_list = array();
 
-  if(is_array($resources_taken))
+  if (is_array($resources_taken))
   {
     $query = implode(',', array_keys($resources_taken));
     $query = " AND `destruyed` = 0 AND `id` IN ({$query})";
@@ -33,16 +33,16 @@ 
     $query = '';
   }
 
-  foreach(sn_get_groups('flt_transports') as $transport_id) {
+  foreach (sn_get_groups('flt_transports') as $transport_id) {
     $transports[$transport_id] = get_unit_param($transport_id, P_CAPACITY);
   }
   arsort($transports);
 
   $planets_db_list = db_planet_list_sorted($user, $planetrow['id'], '*', $query);
   !is_array($planets_db_list) ? $planets_db_list = array() : false;
-  foreach($planets_db_list as $planet_db_data) {
+  foreach ($planets_db_list as $planet_db_data) {
   // begin planet loop
-    if(!$query) {
+    if (!$query) {
       $resources_taken[$planet_db_data['id']] = 1;
     }
     sn_db_transaction_start();
@@ -54,8 +54,8 @@ 
     $planet_id = $planet_db_data['id'];
 
     $planet_resources = 0;
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      if($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      if ($resources_taken[$planet_id] == 1 || $resources_taken[$planet_id][$resource_id]) {
         $planet_resources += floor(mrc_get_level($user, $planet_db_data, $resource_id, true, true)); // $planet_db_data[get_unit_param($resource_id, P_NAME)]);
       }
     }
@@ -86,8 +86,8 @@ 
     $fleet_capacity = 0;
     $ship_loadout = array();
     $fleet = array();
-    foreach($transports as $ship_id => $ship_capacity) {
-      if($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
+    foreach ($transports as $ship_id => $ship_capacity) {
+      if ($ship_count = mrc_get_level($user, $planet_db_data, $ship_id, true, true)) {
         $ship_loadout[$ship_id]['capacity'] = $ship_count * $ship_capacity;
         $ship_loadout[$ship_id]['taken'] = 0;
         $fleet_capacity += $ship_loadout[$ship_id]['capacity'];
@@ -98,9 +98,9 @@ 
 
     $will_take = min($planet_resources, $fleet_capacity);
 
-    foreach($ship_loadout as $ship_id => &$planet_ship) {
+    foreach ($ship_loadout as $ship_id => &$planet_ship) {
       $can_take = min($will_take, $planet_ship['capacity']);
-      if($can_take <= 0) {
+      if ($can_take <= 0) {
         continue;
       }
       $planet_ship['capacity'] -= $can_take;
@@ -108,23 +108,23 @@ 
       $fleet[$ship_id] = ceil($planet_ship['taken'] / $transports[$ship_id]);
 
       $will_take -= $can_take;
-      if($will_take <= 0) {
+      if ($will_take <= 0) {
         break;
       }
     }
 
-    if(!empty($fleet)) {
+    if (!empty($fleet)) {
       $travel_data = flt_travel_data($user, $planetrow, $planet_db_data, $fleet, 10);
       $planet_data['FLEET_SPEED'] = $travel_data['fleet_speed'];
       $planet_data['DISTANCE']    = $travel_data['distance'];
       $planet_data['DURATION']    = $travel_data['duration'];
       $planet_data['CONSUMPTION'] = $travel_data['consumption'];
 
-      if(floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
+      if (floor(mrc_get_level($user, $planet_db_data, RES_DEUTERIUM, true)) >= $planet_data['CONSUMPTION']) {
         $will_take = min($planet_resources, $fleet_capacity) - $planet_data['CONSUMPTION'];
 
-        foreach(sn_get_groups('resources_loot') as $resource_id) {
-          if($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
+        foreach (sn_get_groups('resources_loot') as $resource_id) {
+          if ($resources_taken[$planet_id] != 1 && !$resources_taken[$planet_id][$resource_id]) {
             continue;
           }
 
@@ -133,7 +133,7 @@ 
           $fleet[$resource_id] = min($will_take, $resource_amount);
           $will_take -= $resource_amount;
 
-          if($will_take <= 0) {
+          if ($will_take <= 0) {
             break;
           }
         }
@@ -157,19 +157,19 @@ 
 
 $resources_taken = sys_get_param('resources');
 
-if(!empty($resources_taken))  { // begin processing parameters
+if (!empty($resources_taken)) { // begin processing parameters
   $planet_list = flt_build_gathering($resources_taken);
 
-  foreach($planet_list as $planet_id => $planet_data) {
-    if($planet_data['RESULT'] == FLIGHT_ALLOWED) {
+  foreach ($planet_list as $planet_id => $planet_data) {
+    if ($planet_data['RESULT'] == FLIGHT_ALLOWED) {
       $planet_data['RESULT'] = flt_t_send_fleet($user, $planet_data['PLANET_DB_DATA'], $planetrow, $planet_data['FLEET'], MT_TRANSPORT);
     }
 
     $planet_data['MESSAGE'] = classLocale::$lang['fl_attack_error'][$planet_data['RESULT']];
 
     $template->assign_block_vars('results', $planet_data);
-    if(!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
-      foreach($planet_data['FLEET'] as $unit_id => $amount) {
+    if (!empty($planet_data['FLEET']) && $planet_data['RESULT'] == FLIGHT_ALLOWED) {
+      foreach ($planet_data['FLEET'] as $unit_id => $amount) {
         $template->assign_block_vars('results.units', array(
           'ID'     => $unit_id,
           'NAME'   => classLocale::$lang['tech'][$unit_id],
@@ -182,7 +182,7 @@ 
 
 // Building list of own planets & moons
 $planet_list = flt_build_gathering();
-foreach($planet_list as $planet_data) {
+foreach ($planet_list as $planet_data) {
   $planet_data['DURATION'] = $planet_data['DURATION'] ? pretty_time($planet_data['DURATION']) : classLocale::$lang['flt_no_fuel'];
   $template->assign_block_vars('colonies', $planet_data);
 }

includes/classes/Fleet.php

Doc Comments +5 added lines, -3 removed lines

@@ -972,7 +972,7 @@ 
   /**
    * Set current resource list from array of units
    *
-   * @param array $resource_list
+   * @param integer[] $resource_list
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
@@ -1020,7 +1020,7 @@ 
   }
 
   /**
-   * @param array $rate
+   * @param integer[] $rate
    *
    * @return float
    */
@@ -1051,7 +1051,6 @@ 
    * Restores fleet or resources to planet
    *
    * @param bool $start
-   * @param bool $only_resources
    * @param int  $result
    *
    * @return int
@@ -1205,6 +1204,9 @@ 
   }
 
 
+  /**
+   * @param integer $missionStartTimeStamp
+   */
   protected function renderFleetCoordinates($missionStartTimeStamp = SN_TIME_NOW, $timeMissionJob = 0) {
     $timeToReturn = $this->travelData['duration'] * 2 + $timeMissionJob;
 

Spacing +37 added lines, -37 removed lines

@@ -325,7 +325,7 @@ 
     parent::__construct();
     $this->exists_missions = sn_get_groups('missions');
     $this->allowed_missions = $this->exists_missions;
-    if(empty(static::$snGroupFleet)) {
+    if (empty(static::$snGroupFleet)) {
       static::$snGroupFleet = sn_get_groups('fleet');
       static::$snGroupFleetAndMissiles = sn_get_groups(array('fleet', 'missile'));
       static::$snGroupRecyclers = sn_get_groups('flt_recyclers');
@@ -408,31 +408,31 @@ 
 
     return doquery(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS f " .
+      "SELECT 1 FROM {{fleets}} AS f ".
 
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " .
+      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ".
 
       // Блокировка всех прилетающих и улетающих флотов, если нужно
       // TODO - lock fleets by COORDINATES
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : '').
 
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу планеты-цели
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '').
       // Блокировка планеты-цели
-      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели
 //      ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') .
 
 
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу флота
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '').
       // Блокировка планеты отправления
-      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') .
+      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота
 //      ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') .
 
@@ -449,11 +449,11 @@ 
   public function dbGetLockById($dbId) {
     doquery(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS FLEET0 " .
+      "SELECT 1 FROM {{fleets}} AS FLEET0 ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " .
+      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ".
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -469,9 +469,9 @@ 
         FLEET1.fleet_end_planet = FLEET0.fleet_end_planet
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
-      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " .
+      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET2 ON
         FLEET2.fleet_mess = 1   AND FLEET0.fleet_mess = 0 AND
@@ -481,7 +481,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT2 ON
-        UNIT2.unit_location_type = " . LOC_FLEET . " AND
+        UNIT2.unit_location_type = " . LOC_FLEET." AND
         UNIT2.unit_location_id = FLEET2.fleet_id
       " .
       // Lock fleet owner
@@ -498,11 +498,11 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT3 ON
-        UNIT3.unit_location_type = " . LOC_FLEET . " AND
+        UNIT3.unit_location_type = " . LOC_FLEET." AND
         UNIT3.unit_location_id = FLEET3.fleet_id
       " .
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " .
+      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET4 ON
         FLEET4.fleet_mess = 1   AND FLEET0.fleet_mess = 1 AND
@@ -512,7 +512,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT4 ON
-        UNIT4.unit_location_type = " . LOC_FLEET . " AND
+        UNIT4.unit_location_type = " . LOC_FLEET." AND
         UNIT4.unit_location_id = FLEET4.fleet_id
       " .
       // Lock fleet owner
@@ -534,7 +534,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT5 ON
-        UNIT5.unit_location_type = " . LOC_PLANET . " AND
+        UNIT5.unit_location_type = " . LOC_PLANET." AND
         UNIT5.unit_location_id = PLANETS5.id
       " .
 
@@ -552,7 +552,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT6 ON
-        UNIT6.unit_location_type = " . LOC_PLANET . " AND
+        UNIT6.unit_location_type = " . LOC_PLANET." AND
         UNIT6.unit_location_id = PLANETS6.id
       " .
       "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE"
@@ -671,7 +671,7 @@ 
       } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
-        throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
       }
     }
   }
@@ -801,7 +801,7 @@ 
    * @param int $unit_count
    */
   public function shipSetCount($unit_id, $unit_count = 0) {
-pdump(__CLASS__ . '->' . __FUNCTION__);
+pdump(__CLASS__.'->'.__FUNCTION__);
     $this->shipAdjustCount($unit_id, $unit_count, true);
   }
 
@@ -877,8 +877,8 @@ 
    */
   public function shipsGetCapacityRecyclers($recycler_info) {
     $recyclers_incoming_capacity = 0;
-    foreach($this->shipsIterator() as $unitId => $unit) {
-      if(!empty(static::$snGroupRecyclers[$unitId]) && $unit->count >= 1) {
+    foreach ($this->shipsIterator() as $unitId => $unit) {
+      if (!empty(static::$snGroupRecyclers[$unitId]) && $unit->count >= 1) {
         $recyclers_incoming_capacity += $unit->count * $recycler_info[$unitId]['capacity'];
       }
     }
@@ -1009,7 +1009,7 @@ 
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
-      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
+      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR);
     }
     $this->resourcesAdjust($resource_list, true);
   }
@@ -1043,7 +1043,7 @@ 
       // Check for negative unit value
       if ($this->resource_list[$resource_id] < 0) {
         // TODO
-        throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
+        throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR);
       }
     }
   }
@@ -1211,7 +1211,7 @@ 
   protected function populateTargetPlanetAndOwner() {
     // If vector points to no exact object OR debris - then getting planet on coordinates
     $targetVector = clone $this->targetVector;
-    if($targetVector->type == PT_DEBRIS || $targetVector == PT_NONE) {
+    if ($targetVector->type == PT_DEBRIS || $targetVector == PT_NONE) {
       $targetVector->type = PT_PLANET;
     }
 
@@ -1224,7 +1224,7 @@ 
 
   protected function printErrorIfNoShips() {
     if ($this->unitList->unitsCount() <= 0) {
-      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
+      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5);
     }
   }
 
@@ -1559,8 +1559,8 @@ 
 
   public function fleetSpeed() {
     $maxSpeed = array();
-    foreach($this->shipsIterator() as $ship_id => $unit) {
-      if($unit->count > 0 && !empty(static::$snGroupFleetAndMissiles[$ship_id])) {
+    foreach ($this->shipsIterator() as $ship_id => $unit) {
+      if ($unit->count > 0 && !empty(static::$snGroupFleetAndMissiles[$ship_id])) {
         $single_ship_data = get_ship_data($ship_id, $this->dbOwnerRow);
         $maxSpeed[$ship_id] = $single_ship_data['speed'];
       }
@@ -1592,7 +1592,7 @@ 
       $this->fleetPage2Prepare($planetResourcesWithoutConsumption);
     } catch (Exception $e) {
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1683,7 +1683,7 @@ 
       $validator->validate();
     } catch (Exception $e) {
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1747,7 +1747,7 @@ 
 
 
     if (!empty($this->captain['unit_id'])) {
-      DBStaticUnit::db_unit_set_by_id($this->captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$this->_dbId}");
+      DBStaticUnit::db_unit_set_by_id($this->captain['unit_id'], "`unit_location_type` = ".LOC_FLEET.", `unit_location_id` = {$this->_dbId}");
     }
 
 //    return $this->fleet->acs['ankunft'] - $this->fleet->time_launch >= $this->fleet->travelData['duration'];
@@ -1759,7 +1759,7 @@ 
     $template_result['.']['fleets'][] = $this->renderFleet(SN_TIME_NOW, $timeMissionJob);
 
     $template_result += array(
-      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''),
+      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''),
       'dist'            => pretty_number($this->travelData['distance']),
       'speed'           => pretty_number($this->travelData['fleet_speed']),
       'deute_need'      => pretty_number($this->travelData['consumption']),
@@ -1803,7 +1803,7 @@ 
   protected function resourcesSubstractConsumption($planetResources) {
     !isset($planetResources[RES_DEUTERIUM]) ? $planetResources[RES_DEUTERIUM] = 0 : false;
 
-    if($this->travelData['consumption'] >= 0) {
+    if ($this->travelData['consumption'] >= 0) {
       $planetResources[RES_DEUTERIUM] -= ceil($this->travelData['consumption']);
     }
 

metamatter.php

Spacing +42 added lines, -42 removed lines

@@ -4,9 +4,9 @@ 
 // Может добавить спецстатус "Ответ системы платежа" и парсить дальше getMessage
 // см constants.php
 
-include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
+include_once('common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if(!sn_module_get_active_count('payment')) {
+if (!sn_module_get_active_count('payment')) {
   sys_redirect('dark_matter.php');
   die();
 }
@@ -23,9 +23,9 @@ 
 
 // Таблица скидок
 $prev_discount = 0;
-if(isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
-  foreach(sn_module_payment::$bonus_table as $sum => $discount) {
-    if($discount && $discount != $prev_discount) {
+if (isset(sn_module_payment::$bonus_table) && is_array(sn_module_payment::$bonus_table)) {
+  foreach (sn_module_payment::$bonus_table as $sum => $discount) {
+    if ($discount && $discount != $prev_discount) {
       $template->assign_block_vars('discount', array(
         'SUM'          => $sum,
         'DISCOUNT'     => $discount * 100,
@@ -38,19 +38,19 @@ 
 }
 
 // Результат платежа
-if($payment_id = sys_get_param_id('payment_id')) {
+if ($payment_id = sys_get_param_id('payment_id')) {
   $payment = db_payment_get($payment_id);
-  if($payment && $payment['payment_user_id'] == $user['id']) {
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+  if ($payment && $payment['payment_user_id'] == $user['id']) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
       $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_complete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name'], $payment['payment_dark_matter_gained'])));
     }
-    if($payment['payment_status'] == PAYMENT_STATUS_NONE) {
+    if ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_incomplete'], $payment['payment_dark_matter_paid'], $payment['payment_module_name']),
         'STATUS'  => 1,
       ));
     }
-    if($payment['payment_test']) {
+    if ($payment['payment_test']) {
       $template->assign_block_vars('result', array(
         'MESSAGE' => sprintf(classLocale::$lang['pay_msg_mm_purchase_test']),
         'STATUS'  => -1,
@@ -65,28 +65,28 @@ 
   'metamatter' => sys_get_param_float('metamatter'),
 );
 
-if(!$request['metamatter']) {
+if (!$request['metamatter']) {
   unset($_POST);
 }
 
 $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;
 });
 
 // pdump($payment_methods_available);
 $payment_module_valid = false;
 $payment_module = sys_get_param_str('payment_module');
-foreach(sn_module::$sn_module_list['payment'] as $module_name => $module) {
-  if(!is_object($module) || !$module->manifest['active']) {
+foreach (sn_module::$sn_module_list['payment'] as $module_name => $module) {
+  if (!is_object($module) || !$module->manifest['active']) {
     continue;
   }
 
   lng_include($module_name, $module->manifest['root_relative']);
 
-  foreach(sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
-    foreach($available_methods as $payment_method => $payment_currency) {
-      if(isset($module->manifest['payment_method'][$payment_method])) {
+  foreach (sn_module_payment::$payment_methods as $payment_type_id => $available_methods) {
+    foreach ($available_methods as $payment_method => $payment_currency) {
+      if (isset($module->manifest['payment_method'][$payment_method])) {
         $payment_methods_available[$payment_type_id][$payment_method][$module_name] = $module->manifest['payment_method'][$payment_method];
       }
     }
@@ -97,8 +97,8 @@ 
 
 global $template_result;
 // Доступные платежные методы
-foreach($payment_methods_available as $payment_type_id => $payment_methods) {
-  if(empty($payment_methods)) {
+foreach ($payment_methods_available as $payment_type_id => $payment_methods) {
+  if (empty($payment_methods)) {
     continue;
   }
 
@@ -106,8 +106,8 @@ 
     'ID'   => $payment_type_id,
     'NAME' => classLocale::$lang['pay_methods'][$payment_type_id],
   );
-  foreach($payment_methods as $payment_method_id => $module_list) {
-    if(empty($module_list)) {
+  foreach ($payment_methods as $payment_method_id => $module_list) {
+    if (empty($module_list)) {
       continue;
     }
     $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id] = array(
@@ -118,14 +118,14 @@ 
       'NAME_FORCE' => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['name']),
       'BUTTON'     => isset(sn_module_payment::$payment_methods[$payment_type_id][$payment_method_id]['button']),
     );
-    foreach($module_list as $payment_module_name => $payment_module_method_details) {
+    foreach ($module_list as $payment_module_name => $payment_module_method_details) {
       $template_result['.']['payment'][$payment_type_id]['.']['method'][$payment_method_id]['.']['module'][] = array(
         'MODULE' => $payment_module_name,
       );
     }
   }
 
-  if(empty($template_result['.']['payment'][$payment_type_id]['.'])) {
+  if (empty($template_result['.']['payment'][$payment_type_id]['.'])) {
     unset($template_result['.']['payment'][$payment_type_id]);
   }
 }
@@ -138,19 +138,19 @@ 
 $payment_module_valid = $payment_module_valid && (!$payment_method_selected || isset($payment_methods_available[$payment_type_selected][$payment_method_selected][$module_name]));
 
 // If payment_module invalid - making it empty OR if there is only one payment_module - selecting it
-if($payment_module_valid) {
+if ($payment_module_valid) {
   // $payment_module = $payment_module; // Really - do nothing
-} elseif($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
+} elseif ($payment_type_selected && count($payment_methods_available[$payment_type_selected][$payment_method_selected]) == 1) {
   reset($payment_methods_available[$payment_type_selected][$payment_method_selected]);
   $payment_module = key($payment_methods_available[$payment_type_selected][$payment_method_selected]);
-} elseif(count(sn_module::$sn_module_list['payment']) == 1) {
+} elseif (count(sn_module::$sn_module_list['payment']) == 1) {
   $payment_module = $module_name;
 } else {
   $payment_module = '';
 }
 
-if($payment_type_selected && $payment_method_selected) {
-  foreach($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
+if ($payment_type_selected && $payment_method_selected) {
+  foreach ($payment_methods_available[$payment_type_selected][$payment_method_selected] as $module_name => $temp) {
     $template->assign_block_vars('payment_module', array(
       'ID'          => $module_name,
       'NAME'        => classLocale::$lang["module_{$module_name}_name"],
@@ -159,9 +159,9 @@ 
   }
 }
 
-foreach(classLocale::$lang['pay_currency_list'] as $key => $value) {
+foreach (classLocale::$lang['pay_currency_list'] as $key => $value) {
   $course = get_exchange_rate($key);
-  if(!$course) {
+  if (!$course) {
     continue;
   }
   $template->assign_block_vars('exchange', array(
@@ -176,17 +176,17 @@ 
   ));
 }
 
-if($request['metamatter'] && $payment_module) {
+if ($request['metamatter'] && $payment_module) {
   try {
     // Any possible errors about generating paylink should be raised in module!
     $pay_link = sn_module::$sn_module[$payment_module]->compile_request($request);
 
     // Поддержка дополнительной информации
-    if(is_array($pay_link['RENDER'])) {
-      foreach($pay_link['RENDER'] as $html_data) {
+    if (is_array($pay_link['RENDER'])) {
+      foreach ($pay_link['RENDER'] as $html_data) {
         $template->assign_block_vars('render', $html_data);
-        if(isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
-          foreach($html_data['VALUE'] as $value_id => $value_value) {
+        if (isset($html_data['VALUE']) && is_array($html_data['VALUE'])) {
+          foreach ($html_data['VALUE'] as $value_id => $value_value) {
             $template->assign_block_vars('render.value', array(
               'FIELD' => $value_id,
               'VALUE' => $value_value,
@@ -197,8 +197,8 @@ 
     }
 
     // Поддержка передачи данных для многошаговых платежных систем
-    if(is_array($pay_link['DATA'])) {
-      foreach($pay_link['DATA'] as $key => $value) {
+    if (is_array($pay_link['DATA'])) {
+      foreach ($pay_link['DATA'] as $key => $value) {
         $template->assign_block_vars('pay_link_data', array(
           'FIELD' => $key,
           'VALUE' => $value,
@@ -206,7 +206,7 @@ 
       }
     }
 
-    if(is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
+    if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP'))) {
       // TODO Переделать это под assign_vars_recursive и возвращать пустые строки если нет платежного метода - для унификации формы в темплейте
       $template->assign_vars(array(
         'PAY_LINK_METHOD' => $pay_link['PAY_LINK_METHOD'],
@@ -215,17 +215,17 @@ 
     } else {
       throw new exception(classLocale::$lang['pay_msg_request_paylink_unsupported'], ERR_ERROR);
     }
-  } catch(exception $e) {
+  } catch (exception $e) {
     $template->assign_block_vars('result', $response = array(
       'STATUS'  => $e->getCode(),
       'MESSAGE' => $e->getMessage(),
     ));
-    classSupernova::$debug->warning('Результат операции: код ' . $e->getCode() . ' сообщение "' . $e->getMessage() . '"', 'Ошибка платежа', LOG_INFO_PAYMENT);
+    classSupernova::$debug->warning('Результат операции: код '.$e->getCode().' сообщение "'.$e->getMessage().'"', 'Ошибка платежа', LOG_INFO_PAYMENT);
   }
 }
 
 // Прегенерированные пакеты
-foreach($unit_available_amount_list as $unit_amount => $discount) {
+foreach ($unit_available_amount_list as $unit_amount => $discount) {
   $temp = sn_module_payment::currency_convert($unit_amount, 'MM_', $player_currency);
   $template->assign_block_vars('mm_amount', array(
     'VALUE'            => $unit_amount,
@@ -260,7 +260,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'            => pretty_number($request['metamatter']),
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,

infos.php

Spacing +31 added lines, -31 removed lines

@@ -9,7 +9,7 @@ 
  * @version 1.1
  * @copyright 2008 By Chlorel for XNova
  */
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 function ShowProductionTable($CurrentUser, $CurrentPlanet, $BuildID, $Template) {
   $config_resource_multiplier = game_resource_multiplier();
@@ -47,20 +47,20 @@ 
   ));
 
   $ActualProd = floor($Prod[$BuildID]);
-  if($BuildID != STRUC_MINE_FUSION) {
+  if ($BuildID != STRUC_MINE_FUSION) {
     $ActualNeed = floor($Prod[STRUC_MINE_SOLAR]);
   } else {
     $ActualNeed = floor($Prod[STRUC_MINE_DEUTERIUM]);
   }
 
   $BuildStartLvl = $CurrentBuildtLvl - 2;
-  if($BuildStartLvl < 1) {
+  if ($BuildStartLvl < 1) {
     $BuildStartLvl = 1;
   }
   $Table = '';
   $ProdFirst = 0;
-  for($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
-    if($BuildID != STRUC_MOON_PHALANX) {
+  for ($BuildLevel = $BuildStartLvl; $BuildLevel < $BuildStartLvl + 10; $BuildLevel++) {
+    if ($BuildID != STRUC_MOON_PHALANX) {
       $Prod[STRUC_MINE_METAL] = floor(mrc_modify_value(
         $CurrentUser,
         $CurrentPlanet,
@@ -86,17 +86,17 @@ 
         $config_resource_multiplier_plain * $unit_data[P_UNIT_PRODUCTION][RES_ENERGY]($BuildLevel, 100, $CurrentUser, $CurrentPlanet)
       ));
 
-      $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">" . $BuildLevel . "</font>" : $BuildLevel;
-      if($ProdFirst > 0) {
-        if($BuildID != STRUC_MINE_FUSION) {
-          $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[$BuildID] - $ProdFirst)) . ")</font>";
+      $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
+      if ($ProdFirst > 0) {
+        if ($BuildID != STRUC_MINE_FUSION) {
+          $bloc['build_gain'] = "<font color=\"lime\">(".pretty_number(floor($Prod[$BuildID] - $ProdFirst)).")</font>";
         } else {
-          $bloc['build_gain'] = "<font color=\"lime\">(" . pretty_number(floor($Prod[STRUC_MINE_SOLAR] - $ProdFirst)) . ")</font>";
+          $bloc['build_gain'] = "<font color=\"lime\">(".pretty_number(floor($Prod[STRUC_MINE_SOLAR] - $ProdFirst)).")</font>";
         }
       } else {
         $bloc['build_gain'] = '';
       }
-      if($BuildID != STRUC_MINE_FUSION) {
+      if ($BuildID != STRUC_MINE_FUSION) {
         $bloc['build_prod'] = pretty_number(floor($Prod[$BuildID]));
         $bloc['build_prod_diff'] = pretty_number(floor($Prod[$BuildID] - $ActualProd), true, true);
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_SOLAR]), true, true);
@@ -107,8 +107,8 @@ 
         $bloc['build_need'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM]), true, true);
         $bloc['build_need_diff'] = pretty_number(floor($Prod[STRUC_MINE_DEUTERIUM] - $ActualNeed), true, true);
       }
-      if($ProdFirst == 0) {
-        if($BuildID != STRUC_MINE_FUSION) {
+      if ($ProdFirst == 0) {
+        if ($BuildID != STRUC_MINE_FUSION) {
           $ProdFirst = floor($Prod[$BuildID]);
         } else {
           $ProdFirst = floor($Prod[STRUC_MINE_SOLAR]);
@@ -116,7 +116,7 @@ 
       }
     } else {
       // Cas particulier de la phalange
-      $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">" . $BuildLevel . "</font>" : $BuildLevel;
+      $bloc['build_lvl'] = ($CurrentBuildtLvl == $BuildLevel) ? "<font color=\"#ff0000\">".$BuildLevel."</font>" : $BuildLevel;
       $bloc['build_range'] = ($BuildLevel * $BuildLevel) - 1;
     }
     $Table .= parsetemplate($Template, $bloc);
@@ -133,22 +133,22 @@ 
 
   $str_rapid_from = '';
   $str_rapid_to = '';
-  foreach(sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
+  foreach (sn_get_groups(array('fleet', 'defense_active')) as $enemy_id) {
     $enemy_data = get_unit_param($enemy_id);
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
 
     $rapid = floor($unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability);
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $str_rapid_to .= "{$classLocale['nfo_rf_again']} {$classLocale['tech'][$enemy_id]} <font color=\"#00ff00\">{$rapid}</font><br>";
     }
 
     $rapid = floor($enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability);
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $str_rapid_from .= "{$classLocale['tech'][$enemy_id]} {$classLocale['nfo_rf_from']} <font color=\"#ff0000\">{$rapid}</font><br>";
     }
   }
 
-  if($str_rapid_to && $str_rapid_from) {
+  if ($str_rapid_to && $str_rapid_from) {
     $str_rapid_to .= '<hr>';
   }
 
@@ -156,16 +156,16 @@ 
 }
 
 $unit_id = sys_get_param_id('gid');
-if($unit_id == RES_DARK_MATTER) {
+if ($unit_id == RES_DARK_MATTER) {
   sys_redirect('dark_matter.php');
 }
 
-if($unit_id == RES_METAMATTER) {
+if ($unit_id == RES_METAMATTER) {
   sys_redirect('metamatter.php');
 }
 
 lng_include('infos');
-if(!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
+if (!$unit_id || (!get_unit_param($unit_id) && !isset(classLocale::$lang['info'][$unit_id]))) {
   sys_redirect('index.php?page=techtree');
 }
 
@@ -174,7 +174,7 @@ 
 $unit_data = get_unit_param($unit_id);
 $unit_type = $unit_data['type'];
 
-if($unit_type == UNIT_SHIPS) {
+if ($unit_type == UNIT_SHIPS) {
   $template_result['UNIT_IS_SHIP'] = true;
 
   $ship_data = get_ship_data($unit_id, $user);
@@ -190,7 +190,7 @@ 
   );
 
   $engine_template_info = array();
-  foreach($unit_data['engine'] as $unit_engine_data) {
+  foreach ($unit_data['engine'] as $unit_engine_data) {
     $unit_engine_data = get_engine_data($user, $unit_engine_data);
 
     $engine_template_info[] = array(
@@ -209,7 +209,7 @@ 
 
 
 $sn_data_group_combat = sn_get_groups('combat');
-if(in_array($unit_id, $sn_data_group_combat)) {
+if (in_array($unit_id, $sn_data_group_combat)) {
   $template_result['UNIT_IS_COMBAT'] = true;
 
   $unit_durability = $unit_data['shield'] + $unit_data['armor'];
@@ -217,21 +217,21 @@ 
   $volley_arr = $rapid_to = $rapid_from = array();
   $str_rapid_from = '';
   $str_rapid_to = '';
-  foreach($sn_data_group_combat as $enemy_id) {
+  foreach ($sn_data_group_combat as $enemy_id) {
     $enemy_data = get_unit_param($enemy_id);
     $enemy_durability = $enemy_data['shield'] + $enemy_data['armor'];
 
     $rapid = $unit_data['attack'] * (isset($unit_data['amplify'][$enemy_id]) ? $unit_data['amplify'][$enemy_id] : 1) / $enemy_durability;
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $volley_arr[$enemy_id]['TO'] = floor($rapid);
     }
 
     $rapid = $enemy_data['attack'] * (isset($enemy_data['amplify'][$unit_id]) ? $enemy_data['amplify'][$unit_id] : 1) / $unit_durability;
-    if($rapid >= 1) {
+    if ($rapid >= 1) {
       $volley_arr[$enemy_id]['FROM'] = floor($rapid);
     }
   }
-  foreach($volley_arr as $enemy_id => &$rapid) {
+  foreach ($volley_arr as $enemy_id => &$rapid) {
     $rapid['ENEMY_ID'] = $enemy_id;
     $rapid['ENEMY_NAME'] = classLocale::$lang['tech'][$enemy_id];
   }
@@ -249,13 +249,13 @@ 
 
 }
 
-if(classLocale::$lang['info'][$unit_id]['effect']) {
+if (classLocale::$lang['info'][$unit_id]['effect']) {
   $template_result['UNIT_EFFECT'] = classLocale::$lang['info'][$unit_id]['effect'];
 }
 
-if($unit_data['bonus']) {
+if ($unit_data['bonus']) {
   $unit_bonus = !$unit_data['bonus'] || $unit_data['bonus_type'] == BONUS_ABILITY ? '' : (
-    ($unit_data['bonus'] >= 0 ? '+' : '') . $unit_data['bonus'] . ($unit_data['bonus_type'] == BONUS_PERCENT ? '%' : '')
+    ($unit_data['bonus'] >= 0 ? '+' : '').$unit_data['bonus'].($unit_data['bonus_type'] == BONUS_PERCENT ? '%' : '')
   );
   $template_result['UNIT_BONUS'] = $unit_bonus;
 }

buildings.php

Spacing +4 added lines, -4 removed lines

@@ -14,15 +14,15 @@ 
  * @copyright 2008 by Chlorel for XNova
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 define('SN_RENDER_NAVBAR_PLANET', true);
 
 $mode = sys_get_param_escaped('mode');
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
 
-if($building_sort = sys_get_param_id('sort_elements')) {
-  if(!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
+if ($building_sort = sys_get_param_id('sort_elements')) {
+  if (!empty(classLocale::$lang['player_option_building_sort'][$building_sort])) {
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
   }
@@ -32,7 +32,7 @@ 
 lng_include('buildings');
 lng_include('infos');
 
-sn_sys_sector_buy('buildings.php?mode=' . $mode);
+sn_sys_sector_buy('buildings.php?mode='.$mode);
 
 require_once('includes/includes/eco_bld_structures.php');
 switch ($mode) {

banned.php

Spacing +2 added lines, -2 removed lines

@@ -14,13 +14,13 @@
  */
 
 $allow_anonymous = true;
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('banned_body', true);
 
 $query = db_banned_list_select();
 $i = 0;
-while($ban_row = db_fetch($query)) {
+while ($ban_row = db_fetch($query)) {
   $template->assign_block_vars('banlist', array(
     'USER_NAME'   => $ban_row['ban_user_name'],
     'REASON'      => $ban_row['ban_reason'],

index.php

Spacing +4 added lines, -4 removed lines

@@ -1,15 +1,15 @@
 <?php
 
-if(isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
-  require_once('common.' . substr(strrchr(__FILE__, '.'), 1));
+if (isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
+  require_once('common.'.substr(strrchr(__FILE__, '.'), 1));
 
-  if($sn_page_name) {
+  if ($sn_page_name) {
     // Loading page-specific language files
     global $template;
     !empty(classSupernova::$sn_mvc['model'][$sn_page_name]) ? execute_hooks(classSupernova::$sn_mvc['model'][$sn_page_name], $template, 'model', $sn_page_name) : false;
     !empty(classSupernova::$sn_mvc['view'][$sn_page_name]) ? execute_hooks(classSupernova::$sn_mvc['view'][$sn_page_name], $template, 'view', $sn_page_name) : false;
 
-    if(!empty($template_result) && is_object($template)) {
+    if (!empty($template_result) && is_object($template)) {
       $template->assign_recursive($template_result);
     }
     display($template, '', true, '', defined('IN_ADMIN') && (IN_ADMIN === true), true);