supernova-ws / SuperNova

galaxy.php

Spacing +30 added lines, -30 removed lines

@@ -18,7 +18,7 @@ 
 $uni_system = sys_get_param_int('system', $planetrow['system']);
 $planet = sys_get_param_int('planet', $planetrow['planet']);
 
-if($mode == 'name') {
+if ($mode == 'name') {
   require_once('includes/includes/uni_rename.php');
 }
 
@@ -39,8 +39,8 @@ 
 
 $flying_fleet_count = FleetList::fleet_count_flying($user['id']);
 
-if($mode == 1) {
-} elseif($mode == 2 || $mode == 3) {
+if ($mode == 1) {
+} elseif ($mode == 2 || $mode == 3) {
   $planet = $planetrow['planet'];
 } else {
   $uni_galaxy = $planetrow['galaxy'];
@@ -66,8 +66,8 @@ 
 $PhalanxRange = GetPhalanxRange($HavePhalanx);
 
 $planet_precache_query = db_planet_list_in_system($uni_galaxy, $uni_system);
-if(!empty($planet_precache_query)) {
-  foreach($planet_precache_query as $planet_row) {
+if (!empty($planet_precache_query)) {
+  foreach ($planet_precache_query as $planet_row) {
     $planet_list[$planet_row['planet']][$planet_row['planet_type']] = $planet_row;
   }
 }
@@ -85,8 +85,8 @@ 
  * @var Fleet[][][] $fleet_list
  */
 $fleet_list = array();
-foreach($system_fleet_list->_container as $objFleetSystem) {
-  if(!$objFleetSystem->isReturning()) {
+foreach ($system_fleet_list->_container as $objFleetSystem) {
+  if (!$objFleetSystem->isReturning()) {
     $fleet_planet = $objFleetSystem->fleet_end_planet;
     $fleet_type = $objFleetSystem->fleet_end_type;
   } else {
@@ -101,7 +101,7 @@ 
 $recycler_info = array();
 $planet_recyclers_orbiting = 0;
 $recyclers_fleet = array();
-foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
   $recycler_info[$recycler_id] = get_ship_data($recycler_id, $user);
   $recyclers_fleet[$recycler_id] = mrc_get_level($user, $planetrow, $recycler_id);
   $planet_recyclers_orbiting += $recyclers_fleet[$recycler_id];
@@ -111,7 +111,7 @@ 
 $fleet_id = 1;
 $fleets = array();
 $config_game_max_planet = $config->game_maxPlanet + 1;
-for($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
+for ($Planet = 1; $Planet < $config_game_max_planet; $Planet++) {
   unset($uni_galaxyRowPlanet);
   unset($uni_galaxyRowMoon);
   unset($uni_galaxyRowUser);
@@ -121,27 +121,27 @@ 
   $uni_galaxyRowPlanet = $planet_list[$Planet][PT_PLANET];
 
   $planet_fleet_id = 0;
-  if($uni_galaxyRowPlanet['destruyed']) {
+  if ($uni_galaxyRowPlanet['destruyed']) {
     CheckAbandonPlanetState($uni_galaxyRowPlanet);
-  } elseif($uni_galaxyRowPlanet['id']) {
-    if($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
+  } elseif ($uni_galaxyRowPlanet['id']) {
+    if ($cached['users'][$uni_galaxyRowPlanet['id_owner']]) {
       $uni_galaxyRowUser = $cached['users'][$uni_galaxyRowPlanet['id_owner']];
     } else {
       $uni_galaxyRowUser = db_user_by_id($uni_galaxyRowPlanet['id_owner']);
       $cached['users'][$uni_galaxyRowUser['id']] = $uni_galaxyRowUser;
     }
 
-    if(!$uni_galaxyRowUser['id']) {
+    if (!$uni_galaxyRowUser['id']) {
       $debug->warning("Planet '{$uni_galaxyRowPlanet['name']}' [{$uni_galaxy}:{$uni_system}:{$Planet}] has no owner!", 'Userless planet', 503);
       $uni_galaxyRowPlanet['destruyed'] = SN_TIME_NOW + 60 * 60 * 24;
       $uni_galaxyRowPlanet['id_owner'] = 0;
       db_planet_set_by_id($uni_galaxyRowPlanet['id'], "id_owner = 0, destruyed = {$uni_galaxyRowPlanet['destruyed']}");
     }
 
-    if($uni_galaxyRowUser['id']) {
+    if ($uni_galaxyRowUser['id']) {
       $planetcount++;
-      if($uni_galaxyRowUser['ally_id']) {
-        if($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
+      if ($uni_galaxyRowUser['ally_id']) {
+        if ($cached['allies'][$uni_galaxyRowUser['ally_id']]) {
           $allyquery = $cached['allies'][$uni_galaxyRowUser['ally_id']];
         } else {
           $allyquery = db_ally_get_by_id($uni_galaxyRowUser['ally_id']);
@@ -150,19 +150,19 @@ 
       }
 
       $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_PLANET]);
-      if(!empty($fleets_to_planet['own']['count'])) {
+      if (!empty($fleets_to_planet['own']['count'])) {
         $planet_fleet_id = $fleet_id;
         $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
         $fleet_id++;
       }
 
       $uni_galaxyRowMoon = $planet_list[$Planet][PT_MOON];
-      if($uni_galaxyRowMoon['destruyed']) {
+      if ($uni_galaxyRowMoon['destruyed']) {
         CheckAbandonPlanetState($uni_galaxyRowMoon);
       } else {
         $moon_fleet_id = 0;
         $fleets_to_planet = flt_get_fleets_to_planet_by_array_of_Fleet($fleet_list[$Planet][PT_MOON]);
-        if(!empty($fleets_to_planet['own']['count'])) {
+        if (!empty($fleets_to_planet['own']['count'])) {
           $moon_fleet_id = $fleet_id;
           $fleets[] = tpl_parse_fleet_sn($fleets_to_planet['own']['total'], $fleet_id);
           $fleet_id++;
@@ -173,10 +173,10 @@ 
 
   $recyclers_incoming_capacity = 0;
   $uni_galaxyRowPlanet['debris'] = $uni_galaxyRowPlanet['debris_metal'] + $uni_galaxyRowPlanet['debris_crystal'];
-  if($uni_galaxyRowPlanet['debris']) {
-    if(!empty($fleet_list[$Planet][PT_DEBRIS])) {
-      foreach($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
-        if($objFleetToDebris->playerOwnerId == $user['id']) {
+  if ($uni_galaxyRowPlanet['debris']) {
+    if (!empty($fleet_list[$Planet][PT_DEBRIS])) {
+      foreach ($fleet_list[$Planet][PT_DEBRIS] as $objFleetToDebris) {
+        if ($objFleetToDebris->playerOwnerId == $user['id']) {
           $recyclers_incoming_capacity += $objFleetToDebris->shipsGetCapacityRecyclers($recycler_info);
         }
       }
@@ -253,21 +253,21 @@ 
 
 tpl_assign_fleet($template, $fleets);
 
-foreach(sn_get_groups('defense_active') as $unit_id) {
+foreach (sn_get_groups('defense_active') as $unit_id) {
   $template->assign_block_vars('defense_active', array(
     'ID'   => $unit_id,
     'NAME' => $lang['tech'][$unit_id],
   ));
 }
 
-foreach($cached['users'] as $PlanetUser) {
-  if(!$PlanetUser) {
+foreach ($cached['users'] as $PlanetUser) {
+  if (!$PlanetUser) {
     continue;
   }
 
   $user_ally = $cached['allies'][$PlanetUser['ally_id']];
-  if(isset($user_ally)) {
-    if($PlanetUser['id'] == $user_ally['ally_owner']) {
+  if (isset($user_ally)) {
+    if ($PlanetUser['id'] == $user_ally['ally_owner']) {
       $user_rank_title = $user_ally['ally_owner_range'];
     } else {
       $ally_ranks = explode(';', $user_ally['ranklist']);
@@ -290,8 +290,8 @@ 
   ));
 }
 
-foreach($cached['allies'] as $PlanetAlly) {
-  if($PlanetAlly) {
+foreach ($cached['allies'] as $PlanetAlly) {
+  if ($PlanetAlly) {
     $template->assign_block_vars('alliances', array(
       'ID'      => $PlanetAlly['id'],
       'NAME_JS' => js_safe_string($PlanetAlly['ally_name']),

includes/classes/Fleet.php

Doc Comments +4 added lines, -2 removed lines

@@ -591,6 +591,9 @@ 
     return max(0, $this->shipsGetCapacity() - $this->resourcesGetTotal());
   }
 
+  /**
+   * @param integer $ship_id
+   */
   public function shipsGetTotalById($ship_id) {
     return $this->unitList->unitsCountById($ship_id);
   }
@@ -705,7 +708,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'])) {
@@ -781,7 +784,6 @@ 
    * Restores fleet or resources to planet
    *
    * @param bool $start
-   * @param bool $only_resources
    * @param int  $result
    *
    * @return int

Spacing +20 added lines, -20 removed lines

@@ -283,7 +283,7 @@ 
   public function dbInsert() {
     // WARNING! MISSION TIMES MUST BE SET WITH set_times() method!
     // TODO - more checks!
-    if(empty($this->_time_launch)) {
+    if (empty($this->_time_launch)) {
       die('Fleet time not set!');
     }
 
@@ -363,7 +363,7 @@ 
     // Записываем изменения в БД
     $this->dbSave();
 
-    if($this->_group_id) {
+    if ($this->_group_id) {
       // TODO: Make here to delete only one AKS - by adding aks_fleet_count to AKS table
       db_fleet_aks_purge();
     }
@@ -434,15 +434,15 @@ 
    */
   // TODO - separate shipList and unitList
   public function unitsSetFromArray($unit_array) {
-    foreach($unit_array as $unit_id => $unit_count) {
+    foreach ($unit_array as $unit_id => $unit_count) {
       $unit_count = floatval($unit_count);
-      if(!$unit_count) {
+      if (!$unit_count) {
         continue;
       }
 
-      if($this->isShip($unit_id)) {
+      if ($this->isShip($unit_id)) {
         $this->unitList->unitSetCount($unit_id, $unit_count);
-      } elseif($this->isResource($unit_id)) {
+      } 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);
@@ -471,7 +471,7 @@ 
   public function parse_missile_db_row($missile_db_row) {
 //    $this->_reset();
 
-    if(empty($missile_db_row) || !is_array($missile_db_row)) {
+    if (empty($missile_db_row) || !is_array($missile_db_row)) {
       return;
     }
 
@@ -607,7 +607,7 @@ 
   public function shipsGetCapacityRecyclers(array $recycler_info) {
     $recyclers_incoming_capacity = 0;
     $fleet_data = $this->shipsGetArray();
-    foreach($recycler_info as $recycler_id => $recycler_data) {
+    foreach ($recycler_info as $recycler_id => $recycler_data) {
       $recyclers_incoming_capacity += $fleet_data[$recycler_id] * $recycler_data['capacity'];
     }
 
@@ -627,7 +627,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if($this->isEmpty()) {
+    if ($this->isEmpty()) {
       return $result;
     }
 
@@ -649,18 +649,18 @@ 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
     // Флот, который возвращается на захваченную планету, пропадает
     // Ship landing is possible only to fleet owner's planet
-    if($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
+    if ($this->getPlayerOwnerId() == $planet_arrival['id_owner']) {
       $db_changeset = array();
 
       $fleet_array = $this->shipsGetArray();
-      foreach($fleet_array as $ship_id => $ship_count) {
-        if($ship_count) {
+      foreach ($fleet_array as $ship_id => $ship_count) {
+        if ($ship_count) {
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $planet_arrival['id']);
         }
       }
 
       // Adjusting ship amount on planet
-      if(!empty($db_changeset)) {
+      if (!empty($db_changeset)) {
         db_changeset_apply($db_changeset);
       }
 
@@ -708,7 +708,7 @@ 
    * @param array $resource_list
    */
   public function resourcesSet($resource_list) {
-    if(!empty($this->propertiesAdjusted['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);
     }
     $this->resourcesAdjust($resource_list, true);
@@ -722,13 +722,13 @@ 
   public function resourcesAdjust($resource_delta_list, $replace_value = false) {
     !is_array($resource_delta_list) ? $resource_delta_list = array() : false;
 
-    foreach($resource_delta_list as $resource_id => $unit_delta) {
-      if(!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
+    foreach ($resource_delta_list as $resource_id => $unit_delta) {
+      if (!UnitResourceLoot::is_in_group($resource_id) || !($unit_delta = floor($unit_delta))) {
         // Not a resource or no resources - continuing
         continue;
       }
 
-      if($replace_value) {
+      if ($replace_value) {
         $this->resource_list[$resource_id] = $unit_delta;
       } else {
         $this->resource_list[$resource_id] += $unit_delta;
@@ -738,7 +738,7 @@ 
       }
 
       // Check for negative unit value
-      if($this->resource_list[$resource_id] < 0) {
+      if ($this->resource_list[$resource_id] < 0) {
         // TODO
         throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
       }
@@ -790,7 +790,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if(!$this->resourcesGetTotal()) {
+    if (!$this->resourcesGetTotal()) {
       return $result;
     }
 
@@ -810,7 +810,7 @@ 
     // TODO - Проверка, что планета всё еще существует на указанных координатах, а не телепортировалась, не удалена хозяином, не уничтожена врагом
 
     // Restoring resources to planet
-    if($this->resourcesGetTotal()) {
+    if ($this->resourcesGetTotal()) {
       $fleet_resources = $this->resourcesGetList();
       db_planet_set_by_id($planet_arrival['id'],
         "`metal` = `metal` + '{$fleet_resources[RES_METAL]}', `crystal` = `crystal` + '{$fleet_resources[RES_CRYSTAL]}', `deuterium` = `deuterium` + '{$fleet_resources[RES_DEUTERIUM]}'");

includes/classes/UnitList.php

Spacing +21 added lines, -21 removed lines

@@ -88,7 +88,7 @@ 
    * @param Unit  $value
    */
   public function offsetSet($offset, $value) {
-    if(isset($this->mapUnitIdToDb[$value->unitId])) {
+    if (isset($this->mapUnitIdToDb[$value->unitId])) {
       classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
@@ -96,7 +96,7 @@ 
   }
 
   public function offsetUnset($offset) {
-    if(!empty($this[$offset]->unitId)) {
+    if (!empty($this[$offset]->unitId)) {
 //      $unit_id = $this[$offset]->unitId;
 //      $this->mapUnitIdToDb[$unit_id] = null;
 //      unset($this->mapUnitIdToDb[$unit_id]);
@@ -118,20 +118,20 @@ 
   public function dbLoad($dbId) {
 //    $this->_reset();
 
-    if($dbId <= 0) {
+    if ($dbId <= 0) {
       return;
     }
 
-    if(!is_object($this->locatedAt)) {
+    if (!is_object($this->locatedAt)) {
       classSupernova::$debug->error('UnitList::dbLoad have no locatedAt field set');
     }
 
     $unit_array = classSupernova::db_get_unit_list_by_location(0, $this->getLocationType(), $this->getLocationDbId());
-    if(!is_array($unit_array)) {
+    if (!is_array($unit_array)) {
       return;
     }
 
-    foreach($unit_array as $unit_db_row) {
+    foreach ($unit_array as $unit_db_row) {
       $unit = $this->_createElement();
       $unit->setLocatedAt($this);
       $unit->dbRowParse($unit_db_row);
@@ -147,25 +147,25 @@ 
   }
 
   public function dbSave() {
-    if(!is_object($this->locatedAt)) {
+    if (!is_object($this->locatedAt)) {
       classSupernova::$debug->error('UnitList::dbSave have no locatedAt field set');
     }
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit_db_id = $unit->dbId;
       $unit->dbSave();
 
-      if($unit->isEmpty()) {
+      if ($unit->isEmpty()) {
         // Removing unit object
         // TODO - change when there will be common bus for all objects
         // ...or should I? If COUNT is empty - it means that object does not exists in DB. So it should be deleted from PHP memory and cache too
         unset($this[$unit_db_id]);
       } else {
-        if($unit->dbId <= 0) {
+        if ($unit->dbId <= 0) {
           classSupernova::$debug->error('Error writing unit to DB');
         }
         // If unit is new then putting unit object to container
-        if(empty($this->_container[$unit->dbId])) {
+        if (empty($this->_container[$unit->dbId])) {
           $this->_container[$unit->dbId] = $unit;
         }
       }
@@ -200,7 +200,7 @@ 
   }
 
   public function unitGetCount($unit_id) {
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
       throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
     }
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -215,14 +215,14 @@ 
    * @param bool $replace_value
    */
   public function unitAdjustCount($unit_id, $unit_count = 0, $replace_value = false) {
-    if(empty($this->mapUnitIdToDb[$unit_id])) {
+    if (empty($this->mapUnitIdToDb[$unit_id])) {
       // If unit not exists - creating one and setting all attributes
       $this->mapUnitIdToDb[$unit_id] = $this->_createElement();
       $this->mapUnitIdToDb[$unit_id]->setUnitId($unit_id);
       $this->mapUnitIdToDb[$unit_id]->setLocatedAt($this);
     }
 
-    if($replace_value) {
+    if ($replace_value) {
       $this->mapUnitIdToDb[$unit_id]->count = $unit_count;
     } else {
       $this->mapUnitIdToDb[$unit_id]->adjustCount($unit_count);
@@ -236,7 +236,7 @@ 
    */
   public function unitsGetArray() {
     $result = array();
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $result[$unit->unitId] = $unit->count;
     }
 
@@ -244,7 +244,7 @@ 
   }
 
   public function unitsCountApplyLossMultiplier($ships_lost_multiplier) {
-    foreach($this->mapUnitIdToDb as $unit_id => $unit) {
+    foreach ($this->mapUnitIdToDb as $unit_id => $unit) {
       $unit->count = floor($unit->count * $ships_lost_multiplier);
     }
   }
@@ -270,8 +270,8 @@ 
 
   public function unitsPropertySumById($unit_id = 0, $propertyName = 'count') {
     $result = 0;
-    foreach($this->mapUnitIdToDb as $unit) {
-      if(!$unit_id || $unit->unitId == $unit_id) {
+    foreach ($this->mapUnitIdToDb as $unit) {
+      if (!$unit_id || $unit->unitId == $unit_id) {
         $result += $unit->$propertyName;
       }
     }
@@ -352,7 +352,7 @@ 
 
     print('</tr>');
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       print('<tr>');
 
       print('<td>');
@@ -403,14 +403,14 @@ 
 
 
   public function unitZeroDbId() {
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit->zeroDbId();
     }
   }
 
 
   public function unitZeroCount() {
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $unit->count = 0;
     }
   }

overview.php

Indentation +27 added lines, -27 removed lines

@@ -1,32 +1,32 @@
 <?php
 /**
- * index.php - overview.php
- *
- * 2.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [-] Removed News frame
- *     [-] Time & Usersonline moved to Top-Frame
- * 2.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [*] Complying with PCG
- * 2.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [+] Redo flying fleet list
- * 2.1 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [+] Planets on planet list now have indication of planet fill
- *     [+] Planets on planet list now have indication when there is enemy fleet flying to planet
- * 2.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [+] Now there is full planet list on right side of screen a-la oGame
- *     [+] Planet list now include icons for buildings/tech/fleet on progress
- * 1.5 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [*] Subplanet timers now use sn_timer.js library
- * 1.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [*] All mainplanet timers now use new sn_timer.js library
- * 1.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [*] Adjusted layouts of player infos
- * 1.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
- *     [*] Adjusted layouts of planet infos
- * 1.1 - Security checks by Gorlum for http://supernova.ws
- * @version 1
- * @copyright 2008 By Chlorel for XNova
- */
+   * index.php - overview.php
+   *
+   * 2.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [-] Removed News frame
+   *     [-] Time & Usersonline moved to Top-Frame
+   * 2.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [*] Complying with PCG
+   * 2.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [+] Redo flying fleet list
+   * 2.1 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [+] Planets on planet list now have indication of planet fill
+   *     [+] Planets on planet list now have indication when there is enemy fleet flying to planet
+   * 2.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [+] Now there is full planet list on right side of screen a-la oGame
+   *     [+] Planet list now include icons for buildings/tech/fleet on progress
+   * 1.5 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [*] Subplanet timers now use sn_timer.js library
+   * 1.4 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [*] All mainplanet timers now use new sn_timer.js library
+   * 1.3 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [*] Adjusted layouts of player infos
+   * 1.2 - copyright (c) 2010 by Gorlum for http://supernova.ws
+   *     [*] Adjusted layouts of planet infos
+   * 1.1 - Security checks by Gorlum for http://supernova.ws
+   * @version 1
+   * @copyright 2008 By Chlorel for XNova
+   */
 
 //define('SN_RENDER_NAVBAR_PLANET', false);
 

Spacing +37 added lines, -37 removed lines

@@ -78,7 +78,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -88,11 +88,11 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
 //      $new_name = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name}'");
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = db_user_by_id($user['id'], true, '*');
@@ -101,15 +101,15 @@ 
 //        $user = $global_data['user'];
 //        $planetrow = $global_data['planet'];
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < $config->planet_capital_cost) {
+        if ($user_dark_matter < $config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -126,16 +126,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -152,7 +152,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -163,7 +163,7 @@ 
         db_planet_set_by_gspt($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], PT_ALL,
           "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}, planet_teleport_next = {$planet_teleport_next}");
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           db_user_set_by_id($user['id'], "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}");
         }
 
@@ -176,17 +176,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           db_planet_set_by_id($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
           db_planet_set_by_parent($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
@@ -196,9 +196,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -213,8 +213,8 @@ 
       $user = db_user_by_id($user['id'], true);
       $planetrow = db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
           $query = '`PLANET_GOVERNOR_LEVEL` + 1';
         } else {
@@ -240,8 +240,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -293,7 +293,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -303,7 +303,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
       $new_name_safe = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name_safe}'");
@@ -333,7 +333,7 @@ 
 
     $planet_count = 0;
     $planets_query = db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -344,16 +344,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -393,7 +393,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? db_planet_by_parent($planetrow['id']) : db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -405,15 +405,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+    foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -421,8 +421,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -436,7 +436,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -448,12 +448,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -510,7 +510,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

includes/vars_combats.php

Spacing +22 added lines, -22 removed lines

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

includes/classes/module.php

Doc Comments +3 added lines

@@ -239,6 +239,9 @@
     }
   }
 
+  /**
+   * @param string $arrayName
+   */
   protected function mergeArraySpecial($arrayName) {
     global $sn_mvc;
 

Spacing +30 added lines, -30 removed lines

@@ -76,7 +76,7 @@ 
     require SN_ROOT_PHYSICAL . 'config.php';
 
     $module_config_array = get_class($this) . '_config';
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
       $this->config = $$module_config_array;
 
       return true;
@@ -94,15 +94,15 @@ 
 
     // TODO: Load configuration from DB. Manifest setting
     // Trying to load configuration from file
-    if(!$config_exists = $this->loadModuleRootConfig()) {
+    if (!$config_exists = $this->loadModuleRootConfig()) {
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
         $config_exists = true;
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+      } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
         $config_exists = true;
       }
 
-      if($config_exists) {
+      if ($config_exists) {
         include($config_filename);
         $module_config_array = $class_module_name . '_config';
         $this->config = $$module_config_array;
@@ -119,7 +119,7 @@ 
 
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
@@ -139,11 +139,11 @@ 
 
   protected function setSystemConstants() {
     // Setting constants - if any
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
       return;
     }
 
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
       defined($constant_name) || define($constant_name, $constant_value);
     }
   }
@@ -155,48 +155,48 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
       return;
     }
 
     $vars_assigned = array();
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
       $sub_vars = explode('[', str_replace(']', '', $var_name));
       $var_name = $sub_vars[0];
 
-      if(!isset($vars_assigned[$var_name])) {
+      if (!isset($vars_assigned[$var_name])) {
         $vars_assigned[$var_name] = true;
         global $$var_name;
       }
 
       $pointer = &$$var_name;
-      if(($n = count($sub_vars)) > 1) {
-        for($i = 1; $i < $n; $i++) {
-          if(defined($sub_vars[$i])) {
+      if (($n = count($sub_vars)) > 1) {
+        for ($i = 1; $i < $n; $i++) {
+          if (defined($sub_vars[$i])) {
             $sub_vars[$i] = constant($sub_vars[$i]);
           }
 
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
             $pointer[$sub_vars[$i]] = array();
           }
           $pointer = &$pointer[$sub_vars[$i]];
         }
       }
 
-      if(!isset($pointer) || !is_array($pointer)) {
+      if (!isset($pointer) || !is_array($pointer)) {
         $pointer = $var_value;
-      } elseif(is_array($$var_name)) {
+      } elseif (is_array($$var_name)) {
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
       }
     }
   }
 
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
-    if(!is_array($menu_patch)) {
+    if (!is_array($menu_patch)) {
       return;
     }
 
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
     }
   }
@@ -205,34 +205,34 @@ 
     // Overriding function if any
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
 
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
   }
 
   protected function mergeNavbarButton() {
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
       return;
     }
 
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
     }
   }
 
   protected function mergeI18N() {
     $arrayName = 'i18n';
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
-      foreach($contentList as &$i18n_file_data) {
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
+      foreach ($contentList as &$i18n_file_data) {
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
           $i18n_file_data['path'] = $this->manifest['root_relative'];
         }
       }
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
       }
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -240,13 +240,13 @@ 
   }
 
   protected function mergeArraySpecial($arrayName) {
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
-      foreach($contentList as $contentName => &$content) {
+      foreach ($contentList as $contentName => &$content) {
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
       }
     }

includes/includes/flt_page3.inc

Spacing +48 added lines, -48 removed lines

@@ -3,7 +3,7 @@ 
 // @version 1.0
 // @copyright 2008 by Chlorel for XNova
 
-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);
 }
 
@@ -19,25 +19,25 @@ 
 
   // Test de coherance de la destination (voir si elle se trouve dans les limites de l'univers connu
   $errorlist = '';
-  if(!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
+  if (!$galaxy || $galaxy > $config->game_maxGalaxy || $galaxy < 1) {
     $errorlist .= $lang['fl_limit_galaxy'];
   }
-  if(!$system || $system > $config->game_maxSystem || $system < 1) {
+  if (!$system || $system > $config->game_maxSystem || $system < 1) {
     $errorlist .= $lang['fl_limit_system'];
   }
-  if(!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE)) {
+  if (!$planet || $planet < 1 || ($planet > $config->game_maxPlanet && $target_mission != MT_EXPLORE)) {
     $errorlist .= $lang['fl_limit_planet'];
   }
-  if($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
+  if ($planetrow['galaxy'] == $galaxy && $planetrow['system'] == $system && $planetrow['planet'] == $planet && $planetrow['planet_type'] == $planet_type) {
     $errorlist .= $lang['fl_ownpl_err'];
   }
-  if(!$planet_type) {
+  if (!$planet_type) {
     $errorlist .= $lang['fl_no_planettype'];
   }
-  if($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
+  if ($planet_type != PT_PLANET && $planet_type != PT_DEBRIS && $planet_type != PT_MOON) {
     $errorlist .= $lang['fl_fleet_err_pl'];
   }
-  if(empty($missiontype[$target_mission])) {
+  if (empty($missiontype[$target_mission])) {
     $errorlist .= $lang['fl_bad_mission'];
   }
 
@@ -46,7 +46,7 @@ 
   $TransDeuterium = max(0, sys_get_param_float('resource2'));
   $StorageNeeded = $TransMetal + $TransCrystal + $TransDeuterium;
 
-  if(!$StorageNeeded && $target_mission == MT_TRANSPORT) {
+  if (!$StorageNeeded && $target_mission == MT_TRANSPORT) {
     $errorlist .= $lang['fl_noenoughtgoods'];
   }
 
@@ -55,41 +55,41 @@ 
   $user = db_user_by_id($user['id'], true);
   $planetrow = db_planet_by_id($planetrow['id'], true);
 
-  if($target_mission == MT_EXPLORE) {
-    if($MaxExpeditions == 0) {
+  if ($target_mission == MT_EXPLORE) {
+    if ($MaxExpeditions == 0) {
       $errorlist .= $lang['fl_expe_notech'];
-    } elseif($FlyingExpeditions >= $MaxExpeditions) {
+    } elseif ($FlyingExpeditions >= $MaxExpeditions) {
       $errorlist .= $lang['fl_expe_max'];
     }
   } else {
-    if($TargetPlanet['id_owner']) {
-      if($target_mission == MT_COLONIZE) {
+    if ($TargetPlanet['id_owner']) {
+      if ($target_mission == MT_COLONIZE) {
         $errorlist .= $lang['fl_colonized'];
       }
 
-      if($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
-        if($target_mission == MT_ATTACK) {
+      if ($TargetPlanet['id_owner'] == $planetrow['id_owner']) {
+        if ($target_mission == MT_ATTACK) {
           $errorlist .= $lang['fl_no_self_attack'];
         }
 
-        if($target_mission == MT_SPY) {
+        if ($target_mission == MT_SPY) {
           $errorlist .= $lang['fl_no_self_spy'];
         }
       } else {
-        if($target_mission == MT_RELOCATE) {
+        if ($target_mission == MT_RELOCATE) {
           $errorlist .= $lang['fl_only_stay_at_home'];
         }
       }
     } else {
-      if($target_mission < MT_COLONIZE) {
+      if ($target_mission < MT_COLONIZE) {
         $errorlist .= $lang['fl_unknow_target'];
       } else {
-        if($target_mission == MT_DESTROY) {
+        if ($target_mission == MT_DESTROY) {
           $errorlist .= $lang['fl_nomoon'];
         }
 
-        if($target_mission == MT_RECYCLE) {
-          if($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
+        if ($target_mission == MT_RECYCLE) {
+          if ($TargetPlanet['debris_metal'] + $TargetPlanet['debris_crystal'] == 0) {
             $errorlist .= $lang['fl_nodebris'];
           }
         }
@@ -98,13 +98,13 @@ 
   }
 
 
-  if(sn_module::$sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
+  if (sn_module::$sn_module['unit_captain']->manifest['active'] && $captain_id = sys_get_param_id('captain_id')) {
     $captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id']);
 //      mrc_get_level($user, $planetrow, UNIT_CAPTAIN, true);
-    if(!$captain) {
+    if (!$captain) {
       $errorlist .= $lang['module_unit_captain_error_no_captain'];
-    } elseif($captain['unit_location_type'] == LOC_PLANET) {
-      if($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
+    } elseif ($captain['unit_location_type'] == LOC_PLANET) {
+      if ($target_mission == MT_RELOCATE && ($arriving_captain = mrc_get_level($user, $TargetPlanet, UNIT_CAPTAIN, true))) {
         $errorlist .= $lang['module_unit_captain_error_captain_already_bound'];
       }
     } else {
@@ -112,14 +112,14 @@ 
     }
   }
 
-  if($errorlist) {
+  if ($errorlist) {
     sn_db_transaction_rollback();
     message("<span class='error'><ul>{$errorlist}</ul></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, false);
   }
 
   // On verifie s'il y a assez de vaisseaux sur la planete !
-  foreach($fleetarray as $Ship => $Count) {
-    if($Count > mrc_get_level($user, $planetrow, $Ship)) {
+  foreach ($fleetarray as $Ship => $Count) {
+    if ($Count > mrc_get_level($user, $planetrow, $Ship)) {
       message("<span class='error'><b>{$lang['fl_fleet_err']}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
     }
   }
@@ -130,10 +130,10 @@ 
   //But is it acs??
   //Well all acs fleets must have a fleet code.
   //The co-ords must be the same as where the acs fleet is going.
-  if($fleet_group && sys_get_param_str('acs_target_mr') == "g{$galaxy}s{$system}p{$planet}t{$planet_type}") {
+  if ($fleet_group && sys_get_param_str('acs_target_mr') == "g{$galaxy}s{$system}p{$planet}t{$planet_type}") {
     //ACS attack must exist (if acs fleet has arrived this will also return false (2 checks in 1!!!)
     $aks = db_acs_get_by_group_id($fleet_group);
-    if(!$aks) {
+    if (!$aks) {
       $fleet_group = 0;
     } else {
       //Also it must be mission type 2
@@ -144,31 +144,31 @@ 
       $planet = $aks['planet'];
       $planet_type = $aks['planet_type'];
     }
-  } elseif($target_mission == MT_AKS) {
+  } elseif ($target_mission == MT_AKS) {
     //Check that a failed acs attack isn't being sent, if it is, make it an attack fleet.
     $target_mission = MT_ATTACK;
   }
 
-  if($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
+  if ($target_mission == MT_COLONIZE || $target_mission == MT_EXPLORE) {
     $TargetPlanet = array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet, 'id_owner' => 0);
   }
   $options = array('fleet_speed_percent' => $speed_percent, 'fleet_group' => $fleet_group, 'resources' => $StorageNeeded);
   $cant_attack = flt_can_attack($planetrow, $TargetPlanet, $fleetarray, $target_mission, $options);
 
-  if($cant_attack !== ATTACK_ALLOWED) {
+  if ($cant_attack !== ATTACK_ALLOWED) {
     message("<span class='error'><b>{$lang['fl_attack_error'][$cant_attack]}</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 99);
   }
 
   $speed_possible = array(10, 9, 8, 7, 6, 5, 4, 3, 2, 1);
-  if(!in_array($speed_percent, $speed_possible)) {
+  if (!in_array($speed_percent, $speed_possible)) {
     message("<span class='error'><b>" . $lang['fl_cheat_speed'] . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
   $mission_time_in_seconds = 0;
   $arrival_time = SN_TIME_NOW + $time_to_travel;
-  if($target_mission == MT_AKS && $aks) {
+  if ($target_mission == MT_AKS && $aks) {
 //    if($fleet_start_time > $aks['ankunft']) {
-    if($arrival_time > $aks['ankunft']) {
+    if ($arrival_time > $aks['ankunft']) {
       message($lang['fl_aks_too_slow'] . 'Fleet arrival: ' . date(FMT_DATE_TIME, $arrival_time) . " AKS arrival: " . date(FMT_DATE_TIME, $aks['ankunft']), $lang['fl_error']);
     }
     $group_sync_delta_time = $aks['ankunft'] - $arrival_time;
@@ -177,11 +177,11 @@ 
     // Set return time to ACS return time + fleet's time to travel
     $return_time = $aks['ankunft'] + $time_to_travel;
   } else {
-    if($target_mission == MT_EXPLORE || $target_mission == MT_HOLD) {
+    if ($target_mission == MT_EXPLORE || $target_mission == MT_HOLD) {
       $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : ($target_mission == MT_HOLD ? 12 : 0);
-      if($max_duration) {
+      if ($max_duration) {
         $mission_time_in_hours = sys_get_param_id('missiontime');
-        if($mission_time_in_hours > $max_duration || $mission_time_in_hours < 1) {
+        if ($mission_time_in_hours > $max_duration || $mission_time_in_hours < 1) {
           $debug->warning('Supplying wrong mission time', 'Hack attempt', 302, array('base_dump' => true));
           die();
         }
@@ -195,19 +195,19 @@ 
   $FleetStorage = 0;
 
   $db_changeset = array();
-  foreach($fleetarray as $Ship => $Count) {
+  foreach ($fleetarray as $Ship => $Count) {
     $FleetStorage += get_unit_param($Ship, P_CAPACITY) * $Count;
     $db_changeset['unit'][] = sn_db_unit_changeset_prepare($Ship, -$Count, $user, $planetrow['id']);
   }
   $FleetStorage -= $consumption;
 
-  if($StorageNeeded > $FleetStorage) {
+  if ($StorageNeeded > $FleetStorage) {
     message("<span class='error'><b>" . $lang['fl_nostoragespa'] . pretty_number($StorageNeeded - $FleetStorage) . "</b></span>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
-  if($planetrow['deuterium'] < $TransDeuterium + $consumption) {
+  if ($planetrow['deuterium'] < $TransDeuterium + $consumption) {
     message("<font color=\"red\"><b>" . $lang['fl_no_deuterium'] . pretty_number($TransDeuterium + $consumption - $planetrow['deuterium']) . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
-  if(($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
+  if (($planetrow['metal'] < $TransMetal) || ($planetrow['crystal'] < $TransCrystal)) {
     message("<font color=\"red\"><b>" . $lang['fl_no_resources'] . "</b></font>", $lang['fl_error'], 'fleet' . DOT_PHP_EX, 2);
   }
 
@@ -237,7 +237,7 @@ 
 
   $template = gettemplate('fleet3', true);
 
-  if(is_array($captain)) {
+  if (is_array($captain)) {
     db_unit_set_by_id($captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$objFleet->dbId}");
   }
 
@@ -250,7 +250,7 @@ 
     'START_LEFT'         => floor($return_time + 1 - SN_TIME_NOW),
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -263,8 +263,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,

includes/includes/flt_page2.inc

Spacing +10 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
     'START_NAME'         => $planetrow['name'],
   );
 
-  if(!empty($TargetPlanet)) {
+  if (!empty($TargetPlanet)) {
     $template_route += array(
       'END_TYPE_TEXT_SH' => $lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
       'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -38,8 +38,8 @@ 
   $template->assign_block_vars('fleets', $template_route);
 
   $sn_groups_fleet = sn_get_groups('fleet');
-  foreach($fleetarray as $ship_id => $ship_count) {
-    if(in_array($ship_id, $sn_groups_fleet) && $ship_count) {
+  foreach ($fleetarray as $ship_id => $ship_count) {
+    if (in_array($ship_id, $sn_groups_fleet) && $ship_count) {
 //      $ship_base_data = get_ship_data($ship_id, $user);
       $template->assign_block_vars('fleets.ships', array(
         'ID'          => $ship_id,
@@ -57,11 +57,10 @@ 
     $fleet_capacity += get_unit_param($Ship, P_CAPACITY) * $Count;
   }
 
-  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) :
-    (isset($missiontype[MT_HOLD]) ? 12 : 0);
-  if($max_duration) {
+  $max_duration = $target_mission == MT_EXPLORE ? get_player_max_expedition_duration($user) : (isset($missiontype[MT_HOLD]) ? 12 : 0);
+  if ($max_duration) {
     $config_game_speed_expedition = ($target_mission == MT_EXPLORE && $config->game_speed_expedition ? $config->game_speed_expedition : 1);
-    for($i = 1; $i <= $max_duration; $i++) {
+    for ($i = 1; $i <= $max_duration; $i++) {
       $template->assign_block_vars('duration', array(
         'ID' => $i,
         'TIME' => pretty_time(ceil($i * 3600 / $config_game_speed_expedition)),
@@ -80,7 +79,7 @@ 
   // $TableTitle = uni_render_planet_full($planetrow) . '&nbsp;=&gt;&nbsp;' . uni_render_planet_full($temp);
 
   $sn_group_resources = sn_get_groups('resources');
-  for($i = 0; $i<3; $i++) {
+  for ($i = 0; $i < 3; $i++) {
     $amount = $planetrow[$sn_group_resources[$i]] - ($i == 2 ? $consumption : 0);
     $template->assign_block_vars('resources', array(
       'ID' => $i,
@@ -90,7 +89,7 @@ 
     ));
   }
 
-  if(sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
+  if (sn_module::$sn_module['unit_captain']->manifest['active'] && ($captain = sn_module::$sn_module['unit_captain']->unit_captain_get($planetrow['id'])) && $captain['unit_location_type'] == LOC_PLANET) {
     $template->assign_vars(array(
       'CAPTAIN_ID' => $captain['unit_id'],
       'CAPTAIN_LEVEL' => $captain['captain_level'],
@@ -111,9 +110,9 @@ 
     // 'TableTitle' => $TableTitle,
 
     'speedallsmin' => sys_get_param_float('speedallsmin'),
-    'speed' => sys_get_param_int('speed') ,
+    'speed' => sys_get_param_int('speed'),
 
-    'fleet_group' => sys_get_param_id('fleet_group') ,
+    'fleet_group' => sys_get_param_id('fleet_group'),
     'acs_target_mr' => sys_get_param_str('acs_target_mr'),
 
     'MAX_DURATION' => $max_duration,

includes/classes/core_auth.php

Spacing +62 added lines, -62 removed lines

@@ -199,18 +199,18 @@ 
     // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ
     // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно
 
-    if(sys_get_param('login_player_register_logout')) {
+    if (sys_get_param('login_player_register_logout')) {
       $this->logout();
     }
 
     $original_suggest = '';
     // Смотрим - есть ли у нас данные от пользователя
-    if(($player_name_submitted = sys_get_param('submit_player_name'))) {
+    if (($player_name_submitted = sys_get_param('submit_player_name'))) {
       // Попытка регистрации нового игрока из данных, введенных пользователем
       $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name');
     } else {
-      foreach($this->providers_authorised as $provider) {
-        if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
+      foreach ($this->providers_authorised as $provider) {
+        if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
           $original_suggest = $provider->player_name_suggest();
           break;
         }
@@ -218,7 +218,7 @@ 
     }
 
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
-    if(!$this->player_suggested_name) {
+    if (!$this->player_suggested_name) {
       $max_user_id = db_player_get_max_id(); // 4.5
       // TODO - предлагать имя игрока по локали
 
@@ -227,15 +227,15 @@ 
         sn_db_transaction_rollback();
         $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
         sn_db_transaction_start();
-      } while(db_player_name_exists($this->player_suggested_name));
+      } while (db_player_name_exists($this->player_suggested_name));
 
     }
 
-    if($player_name_submitted) {
+    if ($player_name_submitted) {
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
-      if($this->register_status == LOGIN_SUCCESS) {
+      if ($this->register_status == LOGIN_SUCCESS) {
         sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-      } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
+      } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
       }
 //      if(self::$login_status != LOGIN_SUCCESS) {
@@ -259,7 +259,7 @@ 
         : false
       );
 
-    if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+    if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
       $prohibited_characters = array_map(function($value) {
         return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -293,27 +293,27 @@ 
     global $lang;
 
     // !self::$is_init ? self::init() : false;
-    if(empty(sn_module::$sn_module_list['auth'])) {
+    if (empty(sn_module::$sn_module_list['auth'])) {
       die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}');
     }
 
     !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false;
     !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false;
-    !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false;
+    !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false;
 
     $this->auth_reset(); // OK v4.5
 
     $this->providers = array();
-    foreach(sn_module::$sn_module_list['auth'] as $module_name => $module) {
+    foreach (sn_module::$sn_module_list['auth'] as $module_name => $module) {
       $this->providers[$module->provider_id] = $module;
     }
 
     // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым!
 
-    foreach($this->providers as $provider_id => $provider) {
+    foreach ($this->providers as $provider_id => $provider) {
       $login_status = $provider->login(); // OK v4.5
       self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? $lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
-      if($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
+      if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
 
         $this->user_id_to_provider = array_replace_recursive(
@@ -321,15 +321,15 @@ 
           // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
           PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
         );
-      } elseif($login_status != LOGIN_UNDEFINED) {
+      } elseif ($login_status != LOGIN_UNDEFINED) {
         $this->provider_error_list[$provider_id] = $login_status;
       }
     }
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // Ни один аккаунт не авторизирован
       // Проверяем - есть ли у нас ошибки в аккаунтах?
-      if(!empty($this->provider_error_list)) {
+      if (!empty($this->provider_error_list)) {
         // Если есть - выводим их
         self::$login_status = reset($this->provider_error_list);
       }
@@ -344,12 +344,12 @@ 
       // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users`
 
       // Остались ли у нас в списке доступные игроки?
-      if(empty($this->accessible_user_row_list)) {
+      if (empty($this->accessible_user_row_list)) {
         // Нет ни одного игрока ни на одном авторизированном аккаунте
         // Надо регать нового игрока
 
         // Сейчас происходит процесс регистрации игрока?
-        if(!$this->is_player_register) {
+        if (!$this->is_player_register) {
           // Нет - отправляем на процесс регистрации
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
           sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
@@ -358,7 +358,7 @@ 
         // Да, есть доступные игроки, которые так же прописаны в базе
         $this->get_active_user(); // 4.5
 
-        if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
+        if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
           $a_user = db_user_by_id($this->is_impersonating);
           $this->impersonator_username = $a_user['username'];
         }
@@ -366,9 +366,9 @@ 
 
         //Прописываем текущего игрока на все авторизированные аккаунты
         // TODO - ИЛИ ВСЕХ ИГРОКОВ??
-        if(empty($this->is_impersonating)) {
-          foreach($this->providers_authorised as $provider_id => $provider) {
-            if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
+        if (empty($this->is_impersonating)) {
+          foreach ($this->providers_authorised as $provider_id => $provider) {
+            if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
               // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
               $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true;
@@ -378,9 +378,9 @@ 
       }
     }
 
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       self::cookie_set(''); // OK 4.5
-    } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
+    } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
       self::cookie_set(self::$user['id']); // OK 4.5
     }
 
@@ -399,21 +399,21 @@ 
    */
   // OK v4.7
   public function logout($redirect = true) {
-    if(!empty($_COOKIE[SN_COOKIE_U_I])) {
+    if (!empty($_COOKIE[SN_COOKIE_U_I])) {
       self::cookie_set($_COOKIE[SN_COOKIE_U_I]);
       self::cookie_set(0, true);
       self::$main_provider->logout();
     } else {
-      foreach($this->providers as $provider_name => $provider) {
+      foreach ($this->providers as $provider_name => $provider) {
         $provider->logout();
       }
 
       self::cookie_set(0);
     }
 
-    if($redirect === true) {
+    if ($redirect === true) {
       sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
-    } elseif($redirect !== false) {
+    } elseif ($redirect !== false) {
       sys_redirect($redirect);
     }
   }
@@ -424,15 +424,15 @@ 
    * @param $user_selected
    */
   public function impersonate($user_selected) {
-    if($_COOKIE[SN_COOKIE_U_I]) {
+    if ($_COOKIE[SN_COOKIE_U_I]) {
       die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
+    if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
       die('You can\'t impersonate - too low level'); // TODO: Log it
     }
 
-    if($this->auth_level_max_local <= $user_selected['authlevel']) {
+    if ($this->auth_level_max_local <= $user_selected['authlevel']) {
       die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it
     }
 
@@ -440,7 +440,7 @@ 
     $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]);
     $account_to_impersonate = new Account(self::$main_provider->db);
     $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']);
-    if(!$account_to_impersonate->is_exists) {
+    if (!$account_to_impersonate->is_exists) {
       die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it
     }
     self::$main_provider->impersonate($account_to_impersonate);
@@ -466,12 +466,12 @@ 
   public function password_check($password_unsafe) {
     $result = false;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
     } else {
-      foreach($this->providers_authorised as $provider_id => $provider) {
-        if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
+      foreach ($this->providers_authorised as $provider_id => $provider) {
+        if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
           $result = $result || $provider->password_check($password_unsafe);
         }
       }
@@ -492,7 +492,7 @@ 
   public function password_change($old_password_unsafe, $new_password_unsafe) {
     global $lang;
 
-    if(empty($this->providers_authorised)) {
+    if (empty($this->providers_authorised)) {
       // TODO - такого быть не может!
       self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
       return false;
@@ -505,8 +505,8 @@ 
     $salt_unsafe = self::password_salt_generate();
 
     $providers_changed_password = array();
-    foreach($this->providers_authorised as $provider_id => $provider) {
-      if(
+    foreach ($this->providers_authorised as $provider_id => $provider) {
+      if (
         !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE)
         || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe)
       ) {
@@ -518,7 +518,7 @@ 
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id);
 
       // Рассылаем уведомления о смене пароля в ЛС
-      foreach($account_translation as $user_id => $provider_info) {
+      foreach ($account_translation as $user_id => $provider_info) {
         // TODO - УКазывать тип аккаунта, на котором сменён пароль
         msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN,
           $lang['sys_administration'], $lang['sys_login_register_message_title'],
@@ -565,7 +565,7 @@ 
       sn_db_transaction_start();
       // Проверить наличие такого имени в истории имён
 
-      if(db_player_name_exists($player_name_unsafe)) {
+      if (db_player_name_exists($player_name_unsafe)) {
         throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR);
       }
 
@@ -573,11 +573,11 @@ 
       $player_language = '';
       $player_email = '';
       // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
-      foreach($this->providers_authorised as $provider) {
-        if(!$player_language && $provider->account->account_language) {
+      foreach ($this->providers_authorised as $provider) {
+        if (!$player_language && $provider->account->account_language) {
           $player_language = $provider->account->account_language;
         }
-        if(!$player_email && $provider->account->account_email) {
+        if (!$player_email && $provider->account->account_email) {
           $player_email = $provider->account->account_email;
         }
       }
@@ -593,7 +593,7 @@ 
       ));
       // Зарегестрировать на него аккаунты из self::$accounts_authorised
       $a_user = self::$user;
-      foreach($this->providers_authorised as $provider) {
+      foreach ($this->providers_authorised as $provider) {
         // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор
         // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
         // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']);
@@ -605,7 +605,7 @@ 
 
       sn_db_transaction_commit();
       $this->register_status = LOGIN_SUCCESS;
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       sn_db_transaction_rollback();
 
       // Если старое имя занято
@@ -624,10 +624,10 @@ 
     // Пробиваем все ИД игроков по базе - есть ли вообще такие записи
     // Вообще-то это не особо нужно - у нас по определению стоят констраинты
     // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров
-    foreach($this->user_id_to_provider as $user_id => $cork) {
+    foreach ($this->user_id_to_provider as $user_id => $cork) {
       $user = db_user_by_id($user_id);
       // Если записи игрока в БД не существует?
-      if(empty($user['id'])) {
+      if (empty($user['id'])) {
         // Удаляем этого и переходим к следующему
         unset($this->user_id_to_provider[$user_id]);
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -648,7 +648,7 @@ 
   // OK v4.5
   protected function get_active_user() {
     // Проверяем куку "текущего игрока" из браузера
-    if(
+    if (
       // Кука не пустая
       ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U])
       // И в куке находится ID
@@ -673,7 +673,7 @@ 
     }
 
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
-    if(empty(self::$user['id'])) {
+    if (empty(self::$user['id'])) {
       // Берем первого из доступных
       // TODO - default_user
       self::$user = reset($this->accessible_user_row_list);
@@ -697,7 +697,7 @@ 
 
     $result = array();
 
-    if($user_id && empty($this->is_impersonating)) {
+    if ($user_id && empty($this->is_impersonating)) {
       // self::db_counter_insert();
       self::$device->db_counter_insert($user_id);
 
@@ -705,12 +705,12 @@ 
 
       sys_user_options_unpack($user);
 
-      if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
+      if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
         $user['banaday'] = 0;
         $user['vacation'] = SN_TIME_NOW;
       }
 
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
 
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -724,9 +724,9 @@ 
       );
     }
 
-    if($extra = $config->security_ban_extra) {
+    if ($extra = $config->security_ban_extra) {
       $extra = explode(',', $extra);
-      array_walk($extra,'trim');
+      array_walk($extra, 'trim');
       in_array(self::$device->device_id, $extra) and die();
     }
 
@@ -762,21 +762,21 @@ 
   protected function register_player_name_validate($player_name_unsafe) {
     // TODO - переделать под RAW-строки
     // Если имя игрока пустое - NO GO!
-    if(trim($player_name_unsafe) == '') {
+    if (trim($player_name_unsafe) == '') {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR);
     }
     // Проверяем, что бы в начале и конце не было пустых символов
-    if($player_name_unsafe != trim($player_name_unsafe)) {
+    if ($player_name_unsafe != trim($player_name_unsafe)) {
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR);
     }
     // Если логин имеет запрещенные символы - NO GO!
-    if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
+    if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
       // TODO - выдавать в сообщение об ошибке список запрещенных символов
       // TODO - заранее извещать игрока, какие символы являются запрещенными
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR);
     }
     // Если логин меньше минимальной длины - NO GO!
-    if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
+    if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
       // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока
       // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR);
@@ -834,7 +834,7 @@ 
   }
 
   protected static function flog($message, $die = false) {
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;
     }
     list($called, $caller) = debug_backtrace(false);
@@ -847,7 +847,7 @@ 
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
 
     classSupernova::log_file("$message - $caller_name");
-    if($die) {
+    if ($die) {
       // pdump($caller);
       // pdump(debug_backtrace(false));
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");

Doc Comments +7 added lines, -1 removed lines

@@ -286,7 +286,6 @@ 
   /**
    * Функция пытается залогиниться по всем известным провайдерам
    *
-   * @param null $result
    */
   public function login() {
     if(empty(sn_module::$sn_module_list['auth'])) {
@@ -823,10 +822,17 @@ 
 
   // OK v4.5
   // TODO - REMEMBER_ME
+
+  /**
+   * @param integer $period
+   */
   protected static function cookie_set($value, $impersonate = false, $period = null) {
     sn_setcookie($impersonate ? SN_COOKIE_U_I : SN_COOKIE_U, $value, $period === null ? SN_TIME_NOW + PERIOD_YEAR : $period, SN_ROOT_RELATIVE);
   }
 
+  /**
+   * @param string $message
+   */
   protected static function flog($message, $die = false) {
     if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
       return;