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

Doc Comments +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
   /**
    * UniverseVector constructor.
    *
-   * @param int|string       $galaxy
-   * @param int|Vector|array $system
+   * @param integer       $galaxy
+   * @param integer $system
    * @param int              $planet
    * @param int              $type
    */

Spacing +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
   public $type = PT_NONE;
 
   public static function _staticInit() {
-    if(static::$_isStaticInit) {
+    if (static::$_isStaticInit) {
       return;
     }
     static::$knownGalaxies = intval(classSupernova::$config->game_maxGalaxy);
@@ -33,9 +33,9 @@ 
   public function __construct($galaxy = 0, $system = 0, $planet = 0, $type = PT_NONE) {
     // static::_staticInit();
 
-    if(is_string($galaxy) && $galaxy == VECTOR_READ_VECTOR && is_object($system) && $system instanceof Vector) {
+    if (is_string($galaxy) && $galaxy == VECTOR_READ_VECTOR && is_object($system) && $system instanceof Vector) {
       $this->readFromVector($system);
-    } elseif(is_string($galaxy) && $galaxy == VECTOR_READ_PARAMS && is_array($system)) {
+    } elseif (is_string($galaxy) && $galaxy == VECTOR_READ_PARAMS && is_array($system)) {
       $this->readFromParamFleets($system);
     } else {
       $this->galaxy = intval($galaxy);
@@ -74,11 +74,11 @@ 
    * @param Vector $vector
    */
   public function distance($vector) {
-    if($this->galaxy != $vector->galaxy) {
+    if ($this->galaxy != $vector->galaxy) {
       $distance = abs($this->galaxy - $vector->galaxy) * classSupernova::$config->uni_galaxy_distance;
-    } elseif($this->system != $vector->system) {
+    } elseif ($this->system != $vector->system) {
       $distance = abs($this->system - $vector->system) * 5 * 19 + 2700;
-    } elseif($this->planet != $vector->planet) {
+    } elseif ($this->planet != $vector->planet) {
       $distance = abs($this->planet - $vector->planet) * 5 + 1000;
       // TODO - uncomment
 //    } elseif($this->type != PT_NONE && $vector->type != PT_NONE && $this->type == $vector->type) {
@@ -101,12 +101,12 @@ 
    * @param array $coordinates
    */
   public static function convertToVector($coordinates, $prefix = '') {
-    $galaxy = !empty($coordinates[$prefix . 'galaxy']) ? intval($coordinates[$prefix . 'galaxy']) : 0;
-    $system = !empty($coordinates[$prefix . 'system']) ? intval($coordinates[$prefix . 'system']) : 0;
-    $planet = !empty($coordinates[$prefix . 'planet']) ? intval($coordinates[$prefix . 'planet']) : 0;
-    $type = !empty($coordinates[$prefix . 'type'])
-      ? intval($coordinates[$prefix . 'type'])
-      : (!empty($coordinates[$prefix . 'planet_type']) ? intval($coordinates[$prefix . 'planet_type']) : 0);
+    $galaxy = !empty($coordinates[$prefix.'galaxy']) ? intval($coordinates[$prefix.'galaxy']) : 0;
+    $system = !empty($coordinates[$prefix.'system']) ? intval($coordinates[$prefix.'system']) : 0;
+    $planet = !empty($coordinates[$prefix.'planet']) ? intval($coordinates[$prefix.'planet']) : 0;
+    $type = !empty($coordinates[$prefix.'type'])
+      ? intval($coordinates[$prefix.'type'])
+      : (!empty($coordinates[$prefix.'planet_type']) ? intval($coordinates[$prefix.'planet_type']) : 0);
 
     return new static($galaxy, $system, $planet, $type);
   }

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

Doc Comments +4 added lines

@@ -324,6 +324,10 @@
    * @return int|mixed
    */
   // TODO - REDO!!!!
+
+  /**
+   * @return double
+   */
   function flt_fleet_speed($user) {
     $speeds = array();
     if(!empty($this->mapUnitIdToDb)) {

Spacing +7 added lines, -7 removed lines

@@ -89,7 +89,7 @@ 
    */
   public function offsetSet($offset, $value) {
     if (isset($this->mapUnitIdToDb[$value->unitId])) {
-      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
+      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId '.$value->unitId.' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
     parent::offsetSet($offset, $value);
@@ -202,7 +202,7 @@ 
 
   public function unitGetCount($unit_id) {
     if (empty($this->mapUnitIdToDb[$unit_id])) {
-      throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
+      throw new Exception('Unit ['.$unit_id.'] is not exists in UnitList');
     }
 
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -321,7 +321,7 @@ 
      */
     $objFleet = $this->getLocatedAt();
     if (empty($objFleet)) {
-      throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
+      throw new Exception('No fleet owner on UnitList::unitsRender() in '.__FILE__.'@'.__LINE__);
     }
 
     $tplShips = array();
@@ -464,8 +464,8 @@ 
 
   // TODO - DEBUG - REMOVE =============================================================================================
   public function _dump() {
-    print(__FILE__ . ':' . __LINE__ . "<br />");
-    print("Located at " . $this->getLocationDbId() . " type " . $this->getLocationType() . "<br />");
+    print(__FILE__.':'.__LINE__."<br />");
+    print("Located at ".$this->getLocationDbId()." type ".$this->getLocationType()."<br />");
 
     print('<table border="1">');
     print('<tr>');
@@ -521,11 +521,11 @@ 
 
       print('<td>');
       $type = $unit->getType();
-      print("[{$type}] " . classLocale::$lang['tech'][$type]);
+      print("[{$type}] ".classLocale::$lang['tech'][$type]);
       print('</td>');
 
       print('<td>');
-      print("[{$unit->unitId}] " . classLocale::$lang['tech'][$unit->unitId]);
+      print("[{$unit->unitId}] ".classLocale::$lang['tech'][$unit->unitId]);
       print('</td>');
 
       print('<td>');

includes/general.php

Doc Comments +27 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 require_once('general_pname.php');
 
 /**
- * @param       $func_name
+ * @param       string $func_name
  * @param array $func_arg
  *
  * @return mixed
@@ -63,6 +63,9 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 // Fonction de lecture / ecriture / exploitation de templates
+/**
+ * @param string $filename
+ */
 function sys_file_read($filename) {
   return @file_get_contents($filename);
 }
@@ -105,7 +108,7 @@ 
 /**
  * Получение курса обмены валюты в серверную валюту
  *
- * @param $currency_symbol
+ * @param string $currency_symbol
  *
  * @return float
  */
@@ -146,7 +149,7 @@ 
  * @param float     $n
  * @param int|bool  $floor
  * @param int|bool  $color
- * @param int|bool  $limit
+ * @param boolean  $limit
  * @param bool|null $style
  *
  * @return array|float|string
@@ -247,6 +250,9 @@ 
   return preg_replace($ListCensure, '*', $String);
 }
 
+/**
+ * @param string $email
+ */
 function is_email($email) {
   return (preg_match("/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]))$/i", $email));
 }
@@ -283,6 +289,9 @@ 
   return floatval(sys_get_param($param_name, $default));
 }
 
+/**
+ * @param string $param_name
+ */
 function sys_get_param_escaped($param_name, $default = '') {
   return db_escape(sys_get_param($param_name, $default));
 }
@@ -515,6 +524,9 @@ 
 }
 
 // Generates random string of $length symbols from $allowed_chars charset
+/**
+ * @param string $allowed_chars
+ */
 function sys_random_string($length = 16, $allowed_chars = SN_SYS_SEC_CHARS_ALLOWED) {
   $allowed_length = strlen($allowed_chars);
 
@@ -619,6 +631,9 @@ 
   return implode(';', $fleet_string);
 }
 
+/**
+ * @param string $body
+ */
 function mymail($email_unsafe, $title, $body, $from = '', $html = false) {
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
@@ -873,6 +888,9 @@ 
   return serialize($nick_array);
 }
 
+/**
+ * @param string $nick_string
+ */
 function player_nick_uncompact($nick_string) {
   try {
     $result = unserialize($nick_string);
@@ -1120,6 +1138,9 @@ 
   return $ranks;
 }
 
+/**
+ * @param boolean $planet_id
+ */
 function sys_player_new_adjust($user_id, $planet_id) { return sn_function_call(__FUNCTION__, array($user_id, $planet_id, &$result)); }
 
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
@@ -1430,6 +1451,9 @@ 
   return version_compare(sn_version_compare_extra($ver1), sn_version_compare_extra($ver2));
 }
 
+/**
+ * @param string $name
+ */
 function sn_setcookie($name, $value = null, $expire = null, $path = SN_ROOT_RELATIVE, $domain = null, $secure = null, $httponly = null) {
   $_COOKIE[$name] = $value;
 

Spacing +165 added lines, -165 removed lines

@@ -20,24 +20,24 @@ 
 function sn_function_call($func_name, $func_arg = array()) {
   // All data in classSupernova::$functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
 
-  if(is_array(classSupernova::$functions[$func_name]) && !is_callable(classSupernova::$functions[$func_name])) {
+  if (is_array(classSupernova::$functions[$func_name]) && !is_callable(classSupernova::$functions[$func_name])) {
     // Chain-callable functions should be made as following:
     // 1. Never use incomplete calls with parameters "by default"
     // 2. Reserve last parameter for cumulative result
     // 3. Use same format for original value and cumulative result (if there is original value)
     // 4. Honor cumulative result
     // 5. Return cumulative result
-    foreach(classSupernova::$functions[$func_name] as $func_chain_name) {
+    foreach (classSupernova::$functions[$func_name] as $func_chain_name) {
       // По идее - это уже тут не нужно, потому что оно все должно быть callable к этому моменту
       // Но для старых модулей...
-      if(is_callable($func_chain_name)) {
+      if (is_callable($func_chain_name)) {
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
     }
   } else {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
-    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_' . $func_name);
-    if(is_callable($func_name)) {
+    $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_'.$func_name);
+    if (is_callable($func_name)) {
       $result = call_user_func_array($func_name, $func_arg);
     }
   }
@@ -52,9 +52,9 @@ 
  * @param string $page_name - имя страницы, для которого должен был быть выполнен хук
  */
 function execute_hooks(&$hook_list, &$template, $hook_type = null, $page_name = null) {
-  if(!empty($hook_list)) {
-    foreach($hook_list as $hook) {
-      if(is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
+  if (!empty($hook_list)) {
+    foreach ($hook_list as $hook) {
+      if (is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
         $template = call_user_func($hook_call, $template, $hook_type, $page_name);
       }
     }
@@ -111,7 +111,7 @@ 
  */
 function get_exchange_rate($currency_symbol) {
   $currency_symbol = strtolower($currency_symbol);
-  $config_field = 'payment_currency_exchange_' . $currency_symbol;
+  $config_field = 'payment_currency_exchange_'.$currency_symbol;
 
   // Заворачиваем получение стоимости ММ через перекрываемую процедуру
   $exchange_rate = floatval($currency_symbol == 'mm_' ? get_mm_cost() : classSupernova::$config->$config_field);
@@ -153,9 +153,9 @@ 
  */
 function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null) {
   $n = floatval($n);
-  if(is_int($floor)) {
+  if (is_int($floor)) {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
-  } elseif($floor === true) {
+  } elseif ($floor === true) {
     $n = floor($n);
     $floor = 0;
   } else {
@@ -165,14 +165,14 @@ 
   $ret = $n;
 
   $suffix = '';
-  if($limit) {
-    if($ret > 0) {
-      while($ret > $limit) {
+  if ($limit) {
+    if ($ret > 0) {
+      while ($ret > $limit) {
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
     } else {
-      while($ret < -$limit) {
+      while ($ret < -$limit) {
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
@@ -182,16 +182,16 @@ 
   $ret = number_format($ret, $floor, ',', '.');
   $ret .= $suffix;
 
-  if($color !== false) {
-    if($color === true) {
+  if ($color !== false) {
+    if ($color === true) {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
-    } elseif($color >= 0) {
+    } elseif ($color >= 0) {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
     } else {
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
 
-    if(!isset($style)) {
+    if (!isset($style)) {
       $ret = "<span class='{$class}'>{$ret}</span>";
     } else {
       $ret = $style ? $ret = $class : $ret = array('text' => $ret, 'class' => $class);
@@ -320,11 +320,11 @@ 
 
 function sys_get_param_phone($param_name, $default = '') {
   $phone_raw = sys_get_param_str_unsafe($param_name, $default = '');
-  if($phone_raw) {
+  if ($phone_raw) {
     $phone = $phone_raw[0] == '+' ? '+' : '';
-    for($i = 0; $i < strlen($phone_raw); $i++) {
+    for ($i = 0; $i < strlen($phone_raw); $i++) {
       $ord = ord($phone_raw[$i]);
-      if($ord >= 48 && $ord <= 57) {
+      if ($ord >= 48 && $ord <= 57) {
         $phone .= $phone_raw[$i];
       }
     }
@@ -341,14 +341,14 @@ 
 }
 
 function CheckAbandonPlanetState(&$planet) {
-  if($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW) {
+  if ($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW) {
     db_planet_delete_by_id($planet['id']);
   }
 }
 
 function eco_get_total_cost($unit_id, $unit_level) {
   static $rate, $sn_group_resources_all, $sn_group_resources_loot;
-  if(!$rate) {
+  if (!$rate) {
     $sn_group_resources_all = sn_get_groups('resources_all');
     $sn_group_resources_loot = sn_get_groups('resources_loot');
 
@@ -358,19 +358,19 @@ 
   }
 
   $unit_cost_data = get_unit_param($unit_id, 'cost');
-  if(!is_array($unit_cost_data)) {
+  if (!is_array($unit_cost_data)) {
     return array('total' => 0);
   }
   $factor = isset($unit_cost_data['factor']) ? $unit_cost_data['factor'] : 1;
   $cost_array = array(BUILD_CREATE => array(), 'total' => 0);
   $unit_level = $unit_level > 0 ? $unit_level : 0;
-  foreach($unit_cost_data as $resource_id => $resource_amount) {
-    if(!in_array($resource_id, $sn_group_resources_all)) {
+  foreach ($unit_cost_data as $resource_id => $resource_amount) {
+    if (!in_array($resource_id, $sn_group_resources_all)) {
       continue;
     }
 //    $cost_array[BUILD_CREATE][$resource_id] = $resource_amount * ($factor == 1 ? $unit_level : ((pow($factor, $unit_level) - $factor) / ($factor - 1)));
     $cost_array[BUILD_CREATE][$resource_id] = round($resource_amount * ($factor == 1 ? $unit_level : ((1 - pow($factor, $unit_level)) / (1 - $factor))));
-    if(in_array($resource_id, $sn_group_resources_loot)) {
+    if (in_array($resource_id, $sn_group_resources_loot)) {
       $cost_array['total'] += $cost_array[BUILD_CREATE][$resource_id] * $rate[$resource_id];
     }
   }
@@ -454,19 +454,19 @@ 
   $mercenary_level = 0;
   $unit_db_name = pname_resource_name($unit_id);
 
-  if(in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
+  if (in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
     $unit = classSupernova::db_get_unit_by_location($user['id'], LOC_USER, $user['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
+  } elseif (in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
     $unit = classSupernova::db_get_unit_by_location(isset($user['id']) ? $user['id'] : $planet['id_owner'], LOC_PLANET, $planet['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups('governors'))) {
+  } elseif (in_array($unit_id, sn_get_groups('governors'))) {
     $mercenary_level = $unit_id == $planet['PLANET_GOVERNOR_ID'] ? $planet['PLANET_GOVERNOR_LEVEL'] : 0;
-  } elseif($unit_id == RES_DARK_MATTER) {
+  } elseif ($unit_id == RES_DARK_MATTER) {
     $mercenary_level = $user[$unit_db_name] + ($plain || $user['user_as_ally'] ? 0 : classSupernova::$auth->account->account_metamatter);
-  } elseif($unit_id == RES_METAMATTER) {
+  } elseif ($unit_id == RES_METAMATTER) {
     $mercenary_level = classSupernova::$auth->account->account_metamatter; //$user[$unit_db_name];
-  } elseif(in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
+  } elseif (in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
     $mercenary_level = !empty($planet) ? $planet[$unit_db_name] : $user[$unit_db_name];
   }
 
@@ -476,19 +476,19 @@ 
 function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) { return sn_function_call(__FUNCTION__, array(&$user, $planet, $mercenaries, $value)); }
 
 function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null) {
-  if(!is_array($mercenaries)) {
+  if (!is_array($mercenaries)) {
     $mercenaries = array($mercenaries);
   }
 
   $base_value = isset($base_value) ? $base_value : $value;
 
-  foreach($mercenaries as $mercenary_id) {
+  foreach ($mercenaries as $mercenary_id) {
     $mercenary_level = mrc_get_level($user, $planet, $mercenary_id);
 
     $mercenary = get_unit_param($mercenary_id);
     $mercenary_bonus = $mercenary['bonus'];
 
-    switch($mercenary['bonus_type']) {
+    switch ($mercenary['bonus_type']) {
       case BONUS_PERCENT_CUMULATIVE:
         $value *= 1 + $mercenary_level * $mercenary_bonus / 100;
       break;
@@ -519,7 +519,7 @@ 
   $allowed_length = strlen($allowed_chars);
 
   $random_string = '';
-  for($i = 0; $i < $length; $i++) {
+  for ($i = 0; $i < $length; $i++) {
     $random_string .= $allowed_chars[mt_rand(0, $allowed_length - 1)];
   }
 
@@ -539,12 +539,12 @@ 
 
   $options = '';
   $option_list = array();
-  foreach($user_option_list as $option_group_id => $option_group) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
     $option_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value) {
-      if(!isset($user[$option_name])) {
+    foreach ($option_group as $option_name => $option_value) {
+      if (!isset($user[$option_name])) {
         $user[$option_name] = $option_value;
-      } elseif($user[$option_name] == '') {
+      } elseif ($user[$option_name] == '') {
         $user[$option_name] = 0;
       }
       $options .= "{$option_name}^{$user[$option_name]}|";
@@ -564,16 +564,16 @@ 
   $option_list = array();
   $option_string_list = explode('|', $user['options']);
 
-  foreach($option_string_list as $option_string) {
+  foreach ($option_string_list as $option_string) {
     list($option_name, $option_value) = explode('^', $option_string);
     $option_list[$option_name] = $option_value;
   }
 
   $final_list = array();
-  foreach($user_option_list as $option_group_id => $option_group) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
     $final_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value) {
-      if(!isset($option_list[$option_name])) {
+    foreach ($option_group as $option_name => $option_value) {
+      if (!isset($option_list[$option_name])) {
         $option_list[$option_name] = $option_value;
       }
       $user[$option_name] = $final_list[$option_group_id][$option_name] = $option_list[$option_name];
@@ -587,12 +587,12 @@ 
 
 function sys_unit_str2arr($fleet_string) {
   $fleet_array = array();
-  if(!empty($fleet_string)) {
+  if (!empty($fleet_string)) {
     $arrTemp = explode(';', $fleet_string);
-    foreach($arrTemp as $temp) {
-      if($temp) {
+    foreach ($arrTemp as $temp) {
+      if ($temp) {
         $temp = explode(',', $temp);
-        if(!empty($temp[0]) && !empty($temp[1])) {
+        if (!empty($temp[0]) && !empty($temp[1])) {
           $fleet_array[$temp[0]] += $temp[1];
         }
       }
@@ -604,13 +604,13 @@ 
 
 function sys_unit_arr2str($unit_list) {
   $fleet_string = array();
-  if(isset($unit_list)) {
-    if(!is_array($unit_list)) {
+  if (isset($unit_list)) {
+    if (!is_array($unit_list)) {
       $unit_list = array($unit_list => 1);
     }
 
-    foreach($unit_list as $unit_id => $unit_count) {
-      if($unit_id && $unit_count) {
+    foreach ($unit_list as $unit_id => $unit_count) {
+      if ($unit_id && $unit_count) {
         $fleet_string[] = "{$unit_id},{$unit_count}";
       }
     }
@@ -623,8 +623,8 @@ 
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
   $head = '';
-  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain') . "; charset=utf-8 \r\n";
-  $head .= "Date: " . date('r') . " \r\n";
+  $head .= "Content-Type: text/".($html ? 'html' : 'plain')."; charset=utf-8 \r\n";
+  $head .= "Date: ".date('r')." \r\n";
   $classConfig = classSupernova::$config;
   $head .= "Return-Path: {$classConfig->game_adminEmail} \r\n";
   $head .= "From: {$from} \r\n";
@@ -636,11 +636,11 @@ 
   $body = str_replace("\r\n", "\n", $body);
   $body = str_replace("\n", "\r\n", $body);
 
-  if($html) {
-    $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
+  if ($html) {
+    $body = '<html><head><base href="'.SN_ROOT_VIRTUAL.'"></head><body>'.nl2br($body).'</body></html>';
   }
 
-  $title = '=?UTF-8?B?' . base64_encode($title) . '?=';
+  $title = '=?UTF-8?B?'.base64_encode($title).'?=';
 
   return @mail($email_unsafe, $title, $body, $head);
 }
@@ -656,14 +656,14 @@ 
   $classLocale = classLocale::$lang;
 
   return
-    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '') .
-    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '') .
-    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '') .
+    ($full || $time ? "{$time} {$classLocale['sys_day']}&nbsp;" : '').
+    ($full || $hours ? "{$hours} {$classLocale['sys_hrs']}&nbsp;" : '').
+    ($full || $minutes ? "{$minutes} {$classLocale['sys_min']}&nbsp;" : '').
     ($full || !$time || $seconds ? "{$seconds} {$classLocale['sys_sec']}" : '');
 }
 
 function sys_time_human_system($time) {
-  return $time ? date(FMT_DATE_TIME_SQL, $time) . " ({$time}), " . sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
+  return $time ? date(FMT_DATE_TIME_SQL, $time)." ({$time}), ".sys_time_human(SN_TIME_NOW - $time) : '{NEVER}';
 }
 
 function sys_redirect($url) {
@@ -680,21 +680,21 @@ 
 }
 
 function sn_ali_fill_user_ally(&$user) {
-  if(!$user['ally_id']) {
+  if (!$user['ally_id']) {
     return;
   }
 
-  if(!isset($user['ally'])) {
+  if (!isset($user['ally'])) {
     $user['ally'] = db_ally_get_by_id($user['ally_id']);
   }
 
-  if(!isset($user['ally']['player'])) {
+  if (!isset($user['ally']['player'])) {
     $user['ally']['player'] = db_user_by_id($user['ally']['ally_user_id'], true, '*', false);
   }
 }
 
 function sn_get_url_contents($url) {
-  if(function_exists('curl_init')) {
+  if (function_exists('curl_init')) {
     $crl = curl_init();
     $timeout = 5;
     curl_setopt($crl, CURLOPT_URL, $url);
@@ -729,10 +729,10 @@ 
 
 function get_ship_data($ship_id, $user) {
   $ship_data = array();
-  if(in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
-    foreach(get_unit_param($ship_id, 'engine') as $engine_info) {
+  if (in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
+    foreach (get_unit_param($ship_id, 'engine') as $engine_info) {
       $tech_level = intval(mrc_get_level($user, null, $engine_info['tech']));
-      if(empty($ship_data) || $tech_level >= $engine_info['min_level']) {
+      if (empty($ship_data) || $tech_level >= $engine_info['min_level']) {
         $ship_data = $engine_info;
         $ship_data['tech_level'] = $tech_level;
       }
@@ -744,7 +744,7 @@ 
   return $ship_data;
 }
 
-if(!function_exists('strptime')) {
+if (!function_exists('strptime')) {
   function strptime($date, $format) {
     $masks = array(
       '%d' => '(?P<d>[0-9]{2})',
@@ -756,13 +756,13 @@ 
       // usw..
     );
 
-    $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
-    if(preg_match($rexep, $date, $out)) {
+    $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,
       );
@@ -777,7 +777,7 @@ 
 function sn_sys_sector_buy($redirect = 'overview.php') {
   global $user, $planetrow;
 
-  if(!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
+  if (!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
     return;
   }
 
@@ -790,9 +790,9 @@ 
 //  $planetrow = $planetrow['planet'];
   $sector_cost = eco_get_build_data($user, $planetrow, UNIT_SECTOR, mrc_get_level($user, $planetrow, UNIT_SECTOR), true);
   $sector_cost = $sector_cost[BUILD_CREATE][RES_DARK_MATTER];
-  if($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
+  if ($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
     $planet_name_text = uni_render_planet($planetrow);
-    if(rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf(classLocale::$lang['sys_sector_purchase_log'],
+    if (rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf(classLocale::$lang['sys_sector_purchase_log'],
         $user['username'], $user['id'], $planet_name_text, classLocale::$lang['sys_planet_type'][$planetrow['planet_type']], $planetrow['id'], $sector_cost)
     )) {
       $sector_db_name = pname_resource_name(UNIT_SECTOR);
@@ -807,32 +807,32 @@ 
 }
 
 function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '') {
-  if(isset($handler_list) && is_array($handler_list) && !empty($handler_list)) {
-    foreach($handler_list as $function_name => $function_data) {
-      if(is_string($function_data)) {
+  if (isset($handler_list) && is_array($handler_list) && !empty($handler_list)) {
+    foreach ($handler_list as $function_name => $function_data) {
+      if (is_string($function_data)) {
         $override_with = &$function_data;
-      } elseif(isset($function_data['callable'])) {
+      } elseif (isset($function_data['callable'])) {
         $override_with = &$function_data['callable'];
       }
 
       $overwrite = $override_with[0] == '*';
-      if($overwrite) {
+      if ($overwrite) {
         $override_with = substr($override_with, 1);
       }
 
-      if(($point_position = strpos($override_with, '.')) === false && $class_module_name) {
+      if (($point_position = strpos($override_with, '.')) === false && $class_module_name) {
         $override_with = array($class_module_name, $override_with);
-      } elseif($point_position == 0) {
+      } elseif ($point_position == 0) {
         $override_with = substr($override_with, 1);
-      } elseif($point_position > 0) {
+      } elseif ($point_position > 0) {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
 
-      if($overwrite) {
+      if ($overwrite) {
         $functions[$function_name] = array();
-      } elseif(!isset($functions[$function_name])) {
+      } elseif (!isset($functions[$function_name])) {
         $functions[$function_name] = array();
-        $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
+        $sn_function_name = 'sn_'.$function_name.($sub_type ? '_'.$sub_type : '');
         $functions[$function_name][] = $sn_function_name;
       }
 
@@ -846,15 +846,15 @@ 
 function player_nick_render_to_html($result, $options = false) {
   // TODO - обрабатывать разные случаи: $user, $render_nick_array, $string
 
-  if(is_string($result) && strpos($result, ':{i:')) {
+  if (is_string($result) && strpos($result, ':{i:')) {
     $result = player_nick_uncompact($result);
   }
 
-  if(is_array($result)) {
-    if(isset($result['id'])) {
+  if (is_array($result)) {
+    if (isset($result['id'])) {
       $result = player_nick_render_current_to_array($result, $options);
     }
-    if(!isset($result[NICK_HTML])) {
+    if (!isset($result[NICK_HTML])) {
       $result = player_nick_render_array_to_html($result);
     }
     unset($result[NICK_HTML]);
@@ -877,7 +877,7 @@ 
   try {
     $result = unserialize($nick_string);
     // ksort($result); // Всегда ksort-ый в player_nick_compact()
-  } catch(exception $e) {
+  } catch (exception $e) {
     $result = strpos($nick_string, ':{i:') ? null : $nick_string; // fallback if it is already string - for old chat strings, for example
   }
 
@@ -890,20 +890,20 @@ 
   global $user;
 
   // ALL STRING ARE UNSAFE!!!
-  if(isset($nick_array[NICK_BIRTHSDAY])) {
+  if (isset($nick_array[NICK_BIRTHSDAY])) {
     $result[NICK_BIRTHSDAY] = '<img src="design/images/birthday.png" />';
   }
 
-  if(isset($nick_array[NICK_VACATION])) {
+  if (isset($nick_array[NICK_VACATION])) {
     $result[NICK_VACATION] = '<img src="design/images/icon_vacation.png" />';
   }
 
-  if(isset($nick_array[NICK_GENDER])) {
-    $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
+  if (isset($nick_array[NICK_GENDER])) {
+    $result[NICK_GENDER] = '<img src="'.($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH).'images/gender_'.$nick_array[NICK_GENDER].'.png" />';
   }
 
-  if(isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
-    switch($nick_array[NICK_AUTH_LEVEL]) {
+  if (isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
+    switch ($nick_array[NICK_AUTH_LEVEL]) {
       case 4:
         $highlight = classSupernova::$config->chat_highlight_developer;
       break;
@@ -924,21 +924,21 @@ 
         $highlight = isset($nick_array[NICK_PREMIUM]) ? classSupernova::$config->chat_highlight_premium : '';
     }
 
-    if($highlight) {
+    if ($highlight) {
       list($result[NICK_HIGHLIGHT], $result[NICK_HIGHLIGHT_END]) = explode('$1', $highlight);
     }
     // $result = preg_replace("#(.+)#", $highlight, $result);
   }
 
-  if(isset($nick_array[NICK_CLASS])) {
-    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] . '>';
+  if (isset($nick_array[NICK_CLASS])) {
+    $result[NICK_CLASS] = '<span '.$nick_array[NICK_CLASS].'>';
     $result[NICK_CLASS_END] = '</span>';
   }
 
   $result[NICK_NICK] = sys_safe_output($nick_array[NICK_NICK]);
 
-  if(isset($nick_array[NICK_ALLY])) {
-    $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
+  if (isset($nick_array[NICK_ALLY])) {
+    $result[NICK_ALLY] = '['.sys_safe_output($nick_array[NICK_ALLY]).']';
   }
 
   $result[NICK_HTML] = true;
@@ -961,32 +961,32 @@ 
   */
 
 
-  if($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
+  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW).date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
     $result[NICK_BIRTHSDAY] = '';
   }
 
-  if($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
+  if ($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
     $result[NICK_GENDER] = $render_user['gender'] == GENDER_UNKNOWN ? 'unknown' : ($render_user['gender'] == GENDER_FEMALE ? 'female' : 'male');
   }
 
-  if(($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
+  if (($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
     $result[NICK_VACATION] = $render_user['vacation'];
   }
 
-  if($options === true || (isset($options['color']) && $options['color'])) {
-    if($user_auth_level = $render_user['authlevel']) {
+  if ($options === true || (isset($options['color']) && $options['color'])) {
+    if ($user_auth_level = $render_user['authlevel']) {
       $result[NICK_AUTH_LEVEL] = $user_auth_level;
     }
-    if($user_premium = mrc_get_level($render_user, null, UNIT_PREMIUM)) {
+    if ($user_premium = mrc_get_level($render_user, null, UNIT_PREMIUM)) {
       $result[NICK_PREMIUM] = $user_premium;
     }
   }
 
-  if((isset($options['class']) && $options['class'])) {
-    $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_CLASS] : '') . $options['class'];
+  if ((isset($options['class']) && $options['class'])) {
+    $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' '.$result_options[NICK_CLASS] : '').$options['class'];
   }
 
-  if($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
+  if ($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
     $result[NICK_ALLY] = $render_user['ally_tag'];
   }
 
@@ -1002,25 +1002,25 @@ 
 
   $user_skip_list = array();
 
-  if(classSupernova::$config->stats_hide_admins) {
+  if (classSupernova::$config->stats_hide_admins) {
     $user_skip_list[] = '`authlevel` > 0';
   }
 
-  if(classSupernova::$config->stats_hide_player_list) {
+  if (classSupernova::$config->stats_hide_player_list) {
     $temp = explode(',', classSupernova::$config->stats_hide_player_list);
-    foreach($temp as $user_id) {
+    foreach ($temp as $user_id) {
       $user_id = floatval($user_id);
-      if($user_id) {
-        $user_skip_list[] = '`id` = ' . $user_id;
+      if ($user_id) {
+        $user_skip_list[] = '`id` = '.$user_id;
       }
     }
   }
 
-  if(!empty($user_skip_list)) {
+  if (!empty($user_skip_list)) {
     $user_skip_list = implode(' OR ', $user_skip_list);
     $user_skip_query = db_user_list($user_skip_list);
-    if(!empty($user_skip_query)) {
-      foreach($user_skip_query as $user_skip_row) {
+    if (!empty($user_skip_query)) {
+      foreach ($user_skip_query as $user_skip_row) {
         $result[$user_skip_row['id']] = $user_skip_row['id'];
       }
     }
@@ -1062,7 +1062,7 @@ 
  */
 function sn_sn_get_groups($groups, &$result) {
   $result = is_array($result) ? $result : array();
-  foreach($groups = is_array($groups) ? $groups : array($groups) as $group_name) {
+  foreach ($groups = is_array($groups) ? $groups : array($groups) as $group_name) {
     $result += is_array($a_group = get_unit_param(UNIT_GROUP, $group_name)) ? $a_group : array();
   }
 
@@ -1088,8 +1088,8 @@ 
   $sn_data_unit = get_unit_param($unit_id);
 
   $result = is_array($result) ? $result : array();
-  if($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && classSupernova::$config->empire_mercenary_temporary)) {
-    foreach($sn_data_unit[$field] as $require_id => $require_level) {
+  if ($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && classSupernova::$config->empire_mercenary_temporary)) {
+    foreach ($sn_data_unit[$field] as $require_id => $require_level) {
       $level_got = mrc_get_level($user, $planetrow, $require_id);
       $level_basic = mrc_get_level($user, $planetrow, $require_id, false, true);
       $result[] = array(
@@ -1113,16 +1113,16 @@ 
 
   $ranks = array();
 
-  if($ally['ranklist']) {
+  if ($ally['ranklist']) {
     $str_ranks = explode(';', $ally['ranklist']);
-    foreach($str_ranks as $str_rank) {
-      if(!$str_rank) {
+    foreach ($str_ranks as $str_rank) {
+      if (!$str_rank) {
         continue;
       }
 
       $tmp = explode(',', $str_rank);
       $rank_id = count($ranks);
-      foreach($ally_rights as $key => $value) {
+      foreach ($ally_rights as $key => $value) {
         $ranks[$rank_id][$value] = $tmp[$key];
       }
     }
@@ -1138,8 +1138,8 @@ 
 }
 
 function array_merge_recursive_numeric($array1, $array2) {
-  if(!empty($array2) && is_array($array2)) {
-    foreach($array2 as $key => $value) {
+  if (!empty($array2) && is_array($array2)) {
+    foreach ($array2 as $key => $value) {
 //    if(!isset($array1[$key]) || !is_array($array1[$key])) {
 //      $array1[$key] = $value;
 //    } else {
@@ -1154,7 +1154,7 @@ 
 
 function sn_sys_array_cumulative_sum(&$array) {
   $accum = 0;
-  foreach($array as &$value) {
+  foreach ($array as &$value) {
     $accum += $value;
     $value = $accum;
   }
@@ -1164,7 +1164,7 @@ 
   $sn_data_density = sn_get_groups('planet_density');
   $density_price_chart = array();
 
-  foreach($sn_data_density as $density_id => $density_data) {
+  foreach ($sn_data_density as $density_id => $density_data) {
     // Отсекаем записи с RARITY = 0 - служебные записи и супер-ядра
     $density_data[UNIT_PLANET_DENSITY_RARITY] ? $density_price_chart[$density_id] = $density_data[UNIT_PLANET_DENSITY_RARITY] : false;
   }
@@ -1172,7 +1172,7 @@ 
 
   $total_rarity = array_sum($density_price_chart);
 
-  foreach($density_price_chart as &$density_data) {
+  foreach ($density_price_chart as &$density_data) {
     $density_data = ceil($total_rarity / $density_data * $planet_row['field_max'] * PLANET_DENSITY_TO_DARK_MATTER_RATE);
   }
 
@@ -1180,16 +1180,16 @@ 
 }
 
 function sn_sys_planet_core_transmute(&$user, &$planetrow) {
-  if(!sys_get_param_str('transmute')) {
+  if (!sys_get_param_str('transmute')) {
     return array();
   }
 
   try {
-    if($planetrow['planet_type'] != PT_PLANET) {
+    if ($planetrow['planet_type'] != PT_PLANET) {
       throw new exception(classLocale::$lang['ov_core_err_not_a_planet'], ERR_ERROR);
     }
 
-    if($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
+    if ($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
       throw new exception(classLocale::$lang['ov_core_err_same_density'], ERR_WARNING);
     }
 
@@ -1203,7 +1203,7 @@ 
     $planet_density_index = $planetrow['density_index'];
 
     $density_price_chart = planet_density_price_chart($planetrow);
-    if(!isset($density_price_chart[$new_density_index])) {
+    if (!isset($density_price_chart[$new_density_index])) {
       // Hack attempt
       throw new exception(classLocale::$lang['ov_core_err_denisty_type_wrong'], ERR_ERROR);
     }
@@ -1212,13 +1212,13 @@ 
     // $transmute_cost = get_unit_param(UNIT_PLANET_DENSITY, 'cost');
     // $transmute_cost = $transmute_cost[RES_DARK_MATTER] * $density_price_chart[$new_density_index];
     $transmute_cost = $density_price_chart[$new_density_index];
-    if($user_dark_matter < $transmute_cost) {
+    if ($user_dark_matter < $transmute_cost) {
       throw new exception(classLocale::$lang['ov_core_err_no_dark_matter'], ERR_ERROR);
     }
 
     $sn_data_planet_density = sn_get_groups('planet_density');
-    foreach($sn_data_planet_density as $key => $value) {
-      if($key == $new_density_index) {
+    foreach ($sn_data_planet_density as $key => $value) {
+      if ($key == $new_density_index) {
         break;
       }
       $prev_density_index = $key;
@@ -1249,7 +1249,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => sprintf(classLocale::$lang['ov_core_err_none'], classLocale::$lang['uni_planet_density_types'][$planet_density_index], classLocale::$lang['uni_planet_density_types'][$new_density_index], $new_density),
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $result = array(
       'STATUS'  => $e->getCode(),
@@ -1262,8 +1262,8 @@ 
 
 function sn_module_get_active_count($group = '*') {
   $active_modules = 0;
-  if(isset(sn_module::$sn_module_list[$group]) && is_array(sn_module::$sn_module_list[$group])) {
-    foreach(sn_module::$sn_module_list[$group] as $payment_module) {
+  if (isset(sn_module::$sn_module_list[$group]) && is_array(sn_module::$sn_module_list[$group])) {
+    foreach (sn_module::$sn_module_list[$group] as $payment_module) {
       $active_modules += $payment_module->manifest['active'];
     }
   }
@@ -1274,7 +1274,7 @@ 
 function get_resource_exchange() {
   static $rates;
 
-  if(!$rates) {
+  if (!$rates) {
     $rates = array(
       RES_METAL       => 'rpg_exchange_metal',
       RES_CRYSTAL     => 'rpg_exchange_crystal',
@@ -1282,7 +1282,7 @@ 
       RES_DARK_MATTER => 'rpg_exchange_darkMatter',
     );
 
-    foreach($rates as &$rate) {
+    foreach ($rates as &$rate) {
       $rate = classSupernova::$config->$rate;
     }
   }
@@ -1293,12 +1293,12 @@ 
 function get_unit_cost_in(&$cost, $in_resource = RES_METAL) {
   static $rates;
 
-  if(!$rates) {
+  if (!$rates) {
     $rates = get_resource_exchange();
   }
 
   $metal_cost = 0;
-  foreach($cost as $resource_id => $resource_value) {
+  foreach ($cost as $resource_id => $resource_value) {
     $metal_cost += $rates[$resource_id] * $resource_value;
   }
 
@@ -1321,8 +1321,8 @@ 
  * @return float|int
  */
 function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0) {
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX])) {
       $astrotech = mrc_get_level($user, null, TECH_ASTROTECH);
       $user[UNIT_PLAYER_EXPEDITIONS_MAX] = $astrotech >= 1 ? floor(sqrt($astrotech - 1)) : 0;
     }
@@ -1338,8 +1338,8 @@ 
 }
 
 function get_player_max_colonies(&$user, $astrotech = -1) {
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
 
       $expeditions = get_player_max_expeditons($user);
       $astrotech = mrc_get_level($user, null, TECH_ASTROTECH);
@@ -1384,10 +1384,10 @@ 
 
   // pdump($powerup_unit, '$powerup_unit');
   $level_current = $term_original = $time_left = 0;
-  if($is_upgrade) {
+  if ($is_upgrade) {
     $time_finish = strtotime($powerup_unit['unit_time_finish']);
     $time_left = max(0, $time_finish - SN_TIME_NOW);
-    if($time_left > 0) {
+    if ($time_left > 0) {
       $term_original = $time_finish - strtotime($powerup_unit['unit_time_start']);
       $level_current = $powerup_unit['unit_level'];
     }
@@ -1395,22 +1395,22 @@ 
 
   $level_max = $level_max > $powerup_data[P_MAX_STACK] ? $level_max : $powerup_data[P_MAX_STACK];
   $original_cost = 0;
-  for($i = 1; $i <= $level_max; $i++) {
+  for ($i = 1; $i <= $level_max; $i++) {
     $base_cost = eco_get_total_cost($powerup_id, $i);
     $base_cost = $base_cost[BUILD_CREATE][RES_DARK_MATTER];
-    foreach($sn_powerup_buy_discounts as $period => $discount) {
+    foreach ($sn_powerup_buy_discounts as $period => $discount) {
       $upgrade_price = floor($base_cost * $discount * $period / PERIOD_MONTH);
       $result[$i][$period] = $upgrade_price;
       $original_cost = $is_upgrade && $i == $level_current && $period <= $term_original ? $upgrade_price : $original_cost;
     }
   }
 
-  if($is_upgrade && $time_left) {
+  if ($is_upgrade && $time_left) {
     $term_original = round($term_original / PERIOD_DAY);
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
 
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
       $value -= $cost_left;
     });
   }
@@ -1465,8 +1465,8 @@ 
 }
 
 function print_rr($var, $capture = false) {
-  $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
-  if($capture) {
+  $print = '<pre>'.htmlspecialchars(print_r($var, true)).'</pre>';
+  if ($capture) {
     return $print;
   } else {
     print($print);
@@ -1545,8 +1545,8 @@ 
  * @return mixed
  */
 function sortUnitRenderedList(&$ListToSort, $sort_option, $sort_option_inverse) {
-  if($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-    switch($sort_option) {
+  if ($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+    switch ($sort_option) {
       case PLAYER_OPTION_SORT_NAME:
         $sort_option_field = 'NAME';
       break;
@@ -1567,7 +1567,7 @@ 
       break;
     }
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
-    usort($ListToSort, function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
+    usort($ListToSort, function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
       );

includes/vars.php

Spacing +20 added lines, -20 removed lines

@@ -333,26 +333,26 @@ 
     // Each mission will filter only necessary checks and do it in this order
     'mission_checks' => array(
       // Cheap checks - class Fleet already have all this info internally
-      'checkSenderNoVacation'        => FLIGHT_PLAYER_VACATION_OWN,                           //+
-      'checkTargetNoVacation'        => FLIGHT_PLAYER_VACATION,                                  //+
-      'checkFleetNotEmpty'           => FLIGHT_SHIPS_NO_SHIPS,                                //+
+      'checkSenderNoVacation'        => FLIGHT_PLAYER_VACATION_OWN, //+
+      'checkTargetNoVacation'        => FLIGHT_PLAYER_VACATION, //+
+      'checkFleetNotEmpty'           => FLIGHT_SHIPS_NO_SHIPS, //+
       // FLIGHT_MISSION_UNKNOWN
       // FLIGHT_RESOURCES_FORBIDDEN
-      'checkSpeedPercentOld'         => FLIGHT_FLEET_SPEED_WRONG,                             //+
-      'checkTargetNotSource'         => FLIGHT_VECTOR_SAME_SOURCE,                            //+
+      'checkSpeedPercentOld'         => FLIGHT_FLEET_SPEED_WRONG, //+
+      'checkTargetNotSource'         => FLIGHT_VECTOR_SAME_SOURCE, //+
       'checkTargetInUniverse'        => FLIGHT_VECTOR_BEYOND_UNIVERSE,
-      'checkUnitsPositive'           => FLIGHT_SHIPS_NEGATIVE,                                //+
+      'checkUnitsPositive'           => FLIGHT_SHIPS_NEGATIVE, //+
       'checkOnlyFleetUnits'          => FLIGHT_SHIPS_UNIT_WRONG,
-      'checkOnlyFlyingUnits'         => FLIGHT_SHIPS_UNMOVABLE,                               //+
-      'checkResourcesPositive'       => FLIGHT_RESOURCES_NEGATIVE,                            //+
-      'checkNotTooFar'               => FLIGHT_FLEET_TOO_FAR,                                //+
-      'checkEnoughCapacity'          => FLIGHT_FLEET_OVERLOAD,                                //+
+      'checkOnlyFlyingUnits'         => FLIGHT_SHIPS_UNMOVABLE, //+
+      'checkResourcesPositive'       => FLIGHT_RESOURCES_NEGATIVE, //+
+      'checkNotTooFar'               => FLIGHT_FLEET_TOO_FAR, //+
+      'checkEnoughCapacity'          => FLIGHT_FLEET_OVERLOAD, //+
       // Medium checks - currently requires access to DB but potentially doesn't
-      'checkSourceEnoughShips'       => FLIGHT_SHIPS_NOT_ENOUGH,                              //+
-      'checkSourceEnoughFuel'        => FLIGHT_RESOURCES_FUEL_NOT_ENOUGH,                     //+
-      'checkSourceEnoughResources'   => FLIGHT_RESOURCES_NOT_ENOUGH,                          //+
+      'checkSourceEnoughShips'       => FLIGHT_SHIPS_NOT_ENOUGH, //+
+      'checkSourceEnoughFuel'        => FLIGHT_RESOURCES_FUEL_NOT_ENOUGH, //+
+      'checkSourceEnoughResources'   => FLIGHT_RESOURCES_NOT_ENOUGH, //+
       // Heavy checks - will absolutely require DB access
-      'checkEnoughFleetSlots'        => FLIGHT_FLEET_NO_SLOTS,                                //+
+      'checkEnoughFleetSlots'        => FLIGHT_FLEET_NO_SLOTS, //+
 
       // Vector targeting space beyond MaxPlanet forces MT_EXPLORE mission
       'checkKnownSpace'              => array(
@@ -362,7 +362,7 @@ 
           'checkNotOnlySpies'   => FLIGHT_SHIPS_NOT_ONLY_SPIES,
           'checkNoMissiles'     => FLIGHT_SHIPS_NO_MISSILES,
           'forceMissionExplore' => array(
-            true  => FLIGHT_ALLOWED,                                                         //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_BEYOND_SYSTEM,
           ),
         ),
@@ -377,7 +377,7 @@ 
           'checkNoMissiles'      => FLIGHT_SHIPS_NO_MISSILES,
           'checkTargetIsPlanet'  => FLIGHT_MISSION_COLONIZE_NOT_PLANET,
           'forceMissionColonize' => array(
-            true  => FLIGHT_ALLOWED,                                                         //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_NO_TARGET,
           ),
         ),
@@ -388,11 +388,11 @@ 
       'checkTargetIsDebris'          => array(
         true => array(
           // Recycle mission checks
-          'checkHaveRecyclers'  => FLIGHT_SHIPS_NO_RECYCLERS,             //+
+          'checkHaveRecyclers'  => FLIGHT_SHIPS_NO_RECYCLERS, //+
           'checkNoMissiles'     => FLIGHT_SHIPS_NO_MISSILES,
-          'checkDebrisExists'   => FLIGHT_MISSION_RECYCLE_NO_DEBRIS,    //+
+          'checkDebrisExists'   => FLIGHT_MISSION_RECYCLE_NO_DEBRIS, //+
           'forceMissionRecycle' => array(
-            true  => FLIGHT_ALLOWED,                                                                           //+
+            true  => FLIGHT_ALLOWED, //+
             false => FLIGHT_VECTOR_TARGET_DEBRIS,
           ),
         ),
@@ -488,7 +488,7 @@ 
 
 
       // Check for multiaccount
-      'checkMultiAccount'            => FLIGHT_PLAYER_SAME_IP,                                  //+
+      'checkMultiAccount'            => FLIGHT_PLAYER_SAME_IP, //+
       // TODO - check for moratorium
 
 

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 +29 added lines, -29 removed lines

@@ -397,31 +397,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 " : '') .
 
@@ -438,11 +438,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 ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -458,9 +458,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
@@ -470,7 +470,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
@@ -487,11 +487,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
@@ -501,7 +501,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
@@ -523,7 +523,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
       " .
 
@@ -541,7 +541,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"
@@ -660,7 +660,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), ERR_ERROR);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), ERR_ERROR);
       }
     }
   }
@@ -985,7 +985,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);
   }
@@ -1019,7 +1019,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);
       }
     }
   }
@@ -1190,7 +1190,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);
     }
   }
 
@@ -1637,7 +1637,7 @@ 
 
     if ($errorlist) {
       sn_db_transaction_rollback();
-      message("<span class='error'><ul>{$errorlist}</ul></span>", classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
+      message("<span class='error'><ul>{$errorlist}</ul></span>", classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, false);
     }
 
     //Normally... unless its acs...
@@ -1669,7 +1669,7 @@ 
     if ($this->_mission_type == MT_ACS && $aks) {
       $acsTimeToArrive = $aks['ankunft'] - SN_TIME_NOW;
       if ($acsTimeToArrive < $this->travelData['duration']) {
-        message(classLocale::$lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, SN_TIME_NOW + $this->travelData['duration']) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), classLocale::$lang['fl_error']);
+        message(classLocale::$lang['fl_aks_too_slow'].'Fleet arrival: '.date(FMT_DATE_TIME, SN_TIME_NOW + $this->travelData['duration'])." AKS arrival: ".date(FMT_DATE_TIME, $aks['ankunft']), classLocale::$lang['fl_error']);
       }
       // Set time to travel to ACS' TTT
       $this->travelData['duration'] = $acsTimeToArrive;
@@ -1711,14 +1711,14 @@ 
 
 
     if (!empty($captain['unit_id'])) {
-      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$this->_dbId}");
+      db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = ".LOC_FLEET.", `unit_location_id` = {$this->_dbId}");
     }
 
 
     $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']),

includes/classes/FleetValidator.php

Indentation +2 added lines, -2 removed lines

@@ -190,8 +190,8 @@
 
 
     /**
-   * @return bool
-   */
+     * @return bool
+     */
   protected function checkEnoughCapacity($includeResources = true) {
     $checkVia = $this->fleet->travelData['consumption'];
     $checkVia = ceil(($includeResources ? array_sum($this->fleet->resource_list) : 0) + $checkVia);

Spacing +1 added lines, -1 removed lines

@@ -802,7 +802,7 @@
    * @return bool
    */
   protected function checkCaptainNotRelocating() {
-    if($this->fleet->mission_type == MT_RELOCATE) {
+    if ($this->fleet->mission_type == MT_RELOCATE) {
       $arriving_captain = mrc_get_level($this->fleet->dbOwnerRow, $this->fleet->dbTargetRow, UNIT_CAPTAIN, true);
     } else {
       $arriving_captain = false;