supernova-ws / SuperNova

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

@@ -16,9 +16,9 @@
    * @param int              $type
    */
   public function __construct($galaxy = 0, $system = 0, $planet = 0, $type = PT_NONE) {
-    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 = $galaxy;

includes/functions/uni_functions.php

Doc Comments +3 added lines, -1 removed lines

@@ -1,5 +1,8 @@ 
 <?php
 
+/**
+ * @param double $planet_sectors
+ */
 function uni_create_planet_get_density($position_data, $user_row, $planet_sectors) {
   $density_list = sn_get_groups('planet_density');
   $density_min = reset($density_list);
@@ -341,7 +344,6 @@ 
 
 /**
  * @param Vector $vector
- * @param string $prefix
  *
  * @return bool
  */

fleet.php

Spacing +4 added lines, -4 removed lines

@@ -7,9 +7,9 @@ 
 
 // TODO - Переместить это куда-нибудь
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
-if($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
+if ($fleet_ship_sort = sys_get_param_id('sort_elements') && $fleet_page == 0) {
   define('IN_AJAX', true);
-  if(!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
+  if (!empty(classLocale::$lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT, $fleet_ship_sort);
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE, sys_get_param_id('fleet_ship_sort_inverse', 0));
     classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
@@ -72,7 +72,7 @@ 
 //}
 
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 3:
 
   case 2:
@@ -90,7 +90,7 @@ 
 
 $objFleet5->fleetPage0Prepare();
 
-switch($fleet_page) {
+switch ($fleet_page) {
   case 1:
     $objFleet5->fleetPage1($planet_type);
   break;

includes/classes/Fleet.php

Spacing +86 added lines, -87 removed lines

@@ -307,9 +307,9 @@ 
   public function tplRenderAvailableShips($playerRow, $planetRow) {
     $record_index = 0;
     $ship_list = array();
-    foreach(sn_get_groups('fleet') as $n => $unit_id) {
+    foreach (sn_get_groups('fleet') as $n => $unit_id) {
       $unit_level = mrc_get_level($playerRow, $planetRow, $unit_id, false, true);
-      if($unit_level <= 0) {
+      if ($unit_level <= 0) {
         continue;
       }
       $ship_data = get_ship_data($unit_id, $playerRow);
@@ -337,8 +337,8 @@ 
   public function tplSortShipList(&$ship_list) {
     $fleet_ship_sort = classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT];
     $fleet_ship_sort_inverse = classSupernova::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE];
-    if($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
-      switch($fleet_ship_sort) {
+    if ($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
+      switch ($fleet_ship_sort) {
         case PLAYER_OPTION_SORT_NAME:
           $fleet_ship_sort_field = 'NAME';
         break;
@@ -356,7 +356,7 @@ 
         break;
       }
       $fleet_ship_sort_inverse_a = $fleet_ship_sort_inverse ? -1 : 1;
-      usort($ship_list, function ($a, $b) use ($fleet_ship_sort_field, $fleet_ship_sort_inverse_a) {
+      usort($ship_list, function($a, $b) use ($fleet_ship_sort_field, $fleet_ship_sort_inverse_a) {
         return $a[$fleet_ship_sort_field] < $b[$fleet_ship_sort_field] ? -1 * $fleet_ship_sort_inverse_a : (
         $a[$fleet_ship_sort_field] > $b[$fleet_ship_sort_field] ? 1 * $fleet_ship_sort_inverse_a : 0
         );
@@ -378,7 +378,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!');
     }
 
@@ -587,7 +587,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();
     }
@@ -654,18 +654,18 @@ 
    */
   // TODO - separate shipList and unitList
   public function unitsSetFromArray($unit_array) {
-    if(empty($unit_array) || !is_array($unit_array)) {
+    if (empty($unit_array) || !is_array($unit_array)) {
       return;
     }
-    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);
@@ -694,7 +694,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;
     }
 
@@ -857,7 +857,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'];
     }
 
@@ -877,7 +877,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if($this->isEmpty()) {
+    if ($this->isEmpty()) {
       return $result;
     }
 
@@ -899,18 +899,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);
       }
 
@@ -958,7 +958,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);
@@ -972,13 +972,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;
@@ -988,7 +988,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);
       }
@@ -1040,7 +1040,7 @@ 
     sn_db_transaction_check(true);
 
     // Если флот уже обработан - не существует или возращается - тогда ничего не делаем
-    if(!$this->resourcesGetTotal()) {
+    if (!$this->resourcesGetTotal()) {
       return $result;
     }
 
@@ -1060,7 +1060,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]}'");
@@ -1112,11 +1112,11 @@ 
 
   protected function populateTargetPlanet() {
     $targetPlanetCoords = $this->targetVector;
-    if($this->mission_type != MT_NONE) {
+    if ($this->mission_type != MT_NONE) {
       $this->restrictTargetTypeByMission();
 
       // If current planet type is not allowed on mission - switch planet type
-      if(empty($this->allowed_planet_types[$this->targetVector->type])) {
+      if (empty($this->allowed_planet_types[$this->targetVector->type])) {
         $targetPlanetCoords->type = reset($this->allowed_planet_types);
       }
     }
@@ -1125,14 +1125,14 @@ 
   }
 
   protected function restrictTargetTypeByMission() {
-    if($this->_mission_type == MT_MISSILE) {
+    if ($this->_mission_type == MT_MISSILE) {
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET);
-    } elseif($this->_mission_type == MT_COLONIZE || $this->_mission_type == MT_EXPLORE) {
+    } elseif ($this->_mission_type == MT_COLONIZE || $this->_mission_type == MT_EXPLORE) {
       // TODO - PT_NONE
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET);
-    } elseif($this->_mission_type == MT_RECYCLE) {
+    } elseif ($this->_mission_type == MT_RECYCLE) {
       $this->allowed_planet_types = array(PT_DEBRIS => PT_DEBRIS);
-    } elseif($this->_mission_type == MT_DESTROY) {
+    } elseif ($this->_mission_type == MT_DESTROY) {
       $this->allowed_planet_types = array(PT_MOON => PT_MOON);
     } else {
       $this->allowed_planet_types = array(PT_PLANET => PT_PLANET, PT_MOON => PT_MOON);
@@ -1169,7 +1169,7 @@ 
 
     lng_include('overview');
 
-    if(empty($this->dbSourcePlanetRow)) {
+    if (empty($this->dbSourcePlanetRow)) {
       message(classLocale::$lang['fl_noplanetrow'], classLocale::$lang['fl_error']);
     }
 
@@ -1178,11 +1178,11 @@ 
     $ship_list = $this->tplRenderAvailableShips($this->dbOwnerRow, $this->dbSourcePlanetRow);
     $this->tplSortShipList($ship_list);
 
-    foreach($ship_list as $ship_data) {
+    foreach ($ship_list as $ship_data) {
       $template->assign_block_vars('ships', $ship_data);
     }
 
-    foreach(classLocale::$lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
+    foreach (classLocale::$lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
       $template->assign_block_vars('ship_sort_list', array(
         'VALUE' => $sort_id,
         'TEXT'  => $sort_text,
@@ -1238,7 +1238,7 @@ 
     $template = gettemplate('fleet1', true);
 
 
-    foreach($this->allowed_planet_types as $possible_planet_type_id) {
+    foreach ($this->allowed_planet_types as $possible_planet_type_id) {
       $template->assign_block_vars('possible_planet_type_id', array(
         'ID'         => $possible_planet_type_id,
         'NAME'       => classLocale::$lang['sys_planet_type'][$possible_planet_type_id],
@@ -1251,7 +1251,7 @@ 
       'START_COORDS'       => uni_render_coordinates($this->dbSourcePlanetRow),
       'START_NAME'         => $this->dbSourcePlanetRow['name'],
     );
-    if(!empty($this->dbTargetRow)) {
+    if (!empty($this->dbTargetRow)) {
       $template_route += array(
         'END_TYPE_TEXT_SH' => classLocale::$lang['sys_planet_type_sh'][$this->dbTargetRow['planet_type']],
         'END_COORDS'       => uni_render_coordinates($this->dbTargetRow),
@@ -1264,13 +1264,13 @@ 
     $fleet = array();
     $this->unitList->unitsRender($page, $fleet, $template);
 
-    if(empty($fleet['fleetarray'])) {
+    if (empty($fleet['fleetarray'])) {
       message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
     }
 
     // Building list of shortcuts
     $query = db_note_list_select_by_owner_and_planet($this->dbOwnerRow);
-    while($shortcut = db_fetch($query)) {
+    while ($shortcut = db_fetch($query)) {
       $template->assign_block_vars('shortcut', array(
         'NAME'           => $shortcut['title'],
         'GALAXY'         => $shortcut['galaxy'],
@@ -1285,9 +1285,9 @@ 
 
     // Building list of own planets & moons
     $colonies = db_planet_list_sorted($this->dbOwnerRow);
-    if(count($colonies) > 1) {
-      foreach($colonies as $row) {
-        if($row['id'] == $this->dbSourcePlanetRow['id']) {
+    if (count($colonies) > 1) {
+      foreach ($colonies as $row) {
+        if ($row['id'] == $this->dbSourcePlanetRow['id']) {
           continue;
         }
 
@@ -1303,10 +1303,10 @@ 
     }
 
     $aks_madnessred = db_acs_get_list();
-    while($row = db_fetch($aks_madnessred)) {
+    while ($row = db_fetch($aks_madnessred)) {
       $members = explode(',', $row['eingeladen']);
-      foreach($members as $a => $b) {
-        if($b == $this->dbOwnerRow['id']) {
+      foreach ($members as $a => $b) {
+        if ($b == $this->dbOwnerRow['id']) {
           $template->assign_block_vars('acss', array(
             'ID'         => $row['id'],
             'NAME'       => $row['name'],
@@ -1344,7 +1344,7 @@ 
 
 
     // Is it exploration - fleet sent beyond of system?
-    if($this->targetVector->planet > classSupernova::$config->game_maxPlanet) {
+    if ($this->targetVector->planet > classSupernova::$config->game_maxPlanet) {
       $this->allowed_missions = array(MT_EXPLORE => MT_EXPLORE,);
 
       // TODO - check for only spies in fleet
@@ -1354,18 +1354,18 @@ 
     unset($this->allowed_missions[MT_EXPLORE]);
     // No exploration beyond this point
 
-    if(!uni_vector_valid($this->targetVector)) {
+    if (!uni_vector_valid($this->targetVector)) {
       throw new Exception('LANG_INVALID_COORDINATES');
     }
 
     // Is it colonization - fleet sent to empty place?
-    if(empty($this->dbTargetRow)) {
+    if (empty($this->dbTargetRow)) {
       // Only planet can be destination for colonization
-      if(!$this->targetVector->type == PT_PLANET) {
+      if (!$this->targetVector->type == PT_PLANET) {
         throw new Exception('LANG_INVALID_COLONIZATION_TYPE_ONLY_PLANET_CAN_BE_COLONIZED');
       }
       // Colonization fleet should have at least one colonizer
-      if(!$this->unitList->unitsCountById(SHIP_COLONIZER) <= 0) {
+      if (!$this->unitList->unitsCountById(SHIP_COLONIZER) <= 0) {
         throw new Exception('LANG_INVALID_COLONIZATION_TYPE_ONLY_PLANET_CAN_BE_COLONIZED', ATTACK_NO_COLONIZER);
       }
 
@@ -1385,15 +1385,15 @@ 
 
     $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
 
-    if($TargetPlanet['id_owner']) {
+    if ($TargetPlanet['id_owner']) {
       $UsedPlanet = true;
-      if($TargetPlanet['id_owner'] == $user['id']) {
+      if ($TargetPlanet['id_owner'] == $user['id']) {
         $YourPlanet = true;
       }
     }
 
-    if(!$UsedPlanet) {
-      if($fleetarray[SHIP_COLONIZER]) {
+    if (!$UsedPlanet) {
+      if ($fleetarray[SHIP_COLONIZER]) {
         $missiontype[MT_COLONIZE] = classLocale::$lang['type_mission'][MT_COLONIZE];
         $target_mission = MT_COLONIZE;
         $planet_type = PT_PLANET;
@@ -1402,24 +1402,24 @@ 
       }
     } else {
       $recyclers = 0;
-      foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+      foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
         $recyclers += $fleetarray[$recycler_id];
       }
-      if($recyclers > 0 && $planet_type == PT_DEBRIS) {
+      if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
         $target_mission = MT_RECYCLE;
         $missiontype[MT_RECYCLE] = classLocale::$lang['type_mission'][MT_RECYCLE];
-      } elseif($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-        if($YourPlanet) {
+      } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+        if ($YourPlanet) {
           $missiontype[MT_RELOCATE] = classLocale::$lang['type_mission'][MT_RELOCATE];
           $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
         } else {
           // Not Your Planet
-          if($fleetarray[SHIP_SPY]) {
+          if ($fleetarray[SHIP_SPY]) {
             // Only spy missions if any spy
             $missiontype[MT_SPY] = classLocale::$lang['type_mission'][MT_SPY];
           } else {
             // If no spies...
-            if($fleet_group_mr) {
+            if ($fleet_group_mr) {
               $missiontype[MT_AKS] = classLocale::$lang['type_mission'][MT_AKS];
             } else {
               $missiontype[MT_ATTACK] = classLocale::$lang['type_mission'][MT_ATTACK];
@@ -1427,7 +1427,7 @@ 
 
               $missiontype[MT_HOLD] = classLocale::$lang['type_mission'][MT_HOLD];
 
-              if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+              if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                 $missiontype[MT_DESTROY] = classLocale::$lang['type_mission'][MT_DESTROY];
               }
             }
@@ -1466,23 +1466,23 @@ 
     $UsedPlanet = false;
     $YourPlanet = false;
     $missiontype = array();
-    if($planet > classSupernova::$config->game_maxPlanet) {
+    if ($planet > classSupernova::$config->game_maxPlanet) {
       $target_mission = MT_EXPLORE;
       $missiontype[MT_EXPLORE] = classLocale::$lang['type_mission'][MT_EXPLORE];
-    } elseif($galaxy && $system && $planet) {
+    } elseif ($galaxy && $system && $planet) {
       $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
 
       $TargetPlanet = db_planet_by_gspt($galaxy, $system, $planet, $check_type);
 
-      if($TargetPlanet['id_owner']) {
+      if ($TargetPlanet['id_owner']) {
         $UsedPlanet = true;
-        if($TargetPlanet['id_owner'] == $user['id']) {
+        if ($TargetPlanet['id_owner'] == $user['id']) {
           $YourPlanet = true;
         }
       }
 
-      if(!$UsedPlanet) {
-        if($fleetarray[SHIP_COLONIZER]) {
+      if (!$UsedPlanet) {
+        if ($fleetarray[SHIP_COLONIZER]) {
           $missiontype[MT_COLONIZE] = classLocale::$lang['type_mission'][MT_COLONIZE];
           $target_mission = MT_COLONIZE;
           $planet_type = PT_PLANET;
@@ -1491,24 +1491,24 @@ 
         }
       } else {
         $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+        foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
           $recyclers += $fleetarray[$recycler_id];
         }
-        if($recyclers > 0 && $planet_type == PT_DEBRIS) {
+        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
           $target_mission = MT_RECYCLE;
           $missiontype[MT_RECYCLE] = classLocale::$lang['type_mission'][MT_RECYCLE];
-        } elseif($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if($YourPlanet) {
+        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+          if ($YourPlanet) {
             $missiontype[MT_RELOCATE] = classLocale::$lang['type_mission'][MT_RELOCATE];
             $missiontype[MT_TRANSPORT] = classLocale::$lang['type_mission'][MT_TRANSPORT];
           } else {
             // Not Your Planet
-            if($fleetarray[SHIP_SPY]) {
+            if ($fleetarray[SHIP_SPY]) {
               // Only spy missions if any spy
               $missiontype[MT_SPY] = classLocale::$lang['type_mission'][MT_SPY];
             } else {
               // If no spies...
-              if($fleet_group_mr) {
+              if ($fleet_group_mr) {
                 $missiontype[MT_AKS] = classLocale::$lang['type_mission'][MT_AKS];
               } else {
                 $missiontype[MT_ATTACK] = classLocale::$lang['type_mission'][MT_ATTACK];
@@ -1516,7 +1516,7 @@ 
 
                 $missiontype[MT_HOLD] = classLocale::$lang['type_mission'][MT_HOLD];
 
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                if ($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
                   $missiontype[MT_DESTROY] = classLocale::$lang['type_mission'][MT_DESTROY];
                 }
               }
@@ -1534,7 +1534,7 @@ 
 
     try {
       $this->restrictMission();
-      if(!$target_mission && is_array($missiontype)) {
+      if (!$target_mission && is_array($missiontype)) {
         $target_mission = MT_ATTACK;
       }
 
@@ -1549,13 +1549,13 @@ 
       $consumption = $travel_data['consumption'];
 
       return array($ship_amount, $planet_type, $duration);
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       die($e->getMessage());
     }
 
     $template = gettemplate('fleet2', true);
 
-    foreach($missiontype as $key => $value) {
+    foreach ($missiontype as $key => $value) {
       $template->assign_block_vars('missions', array(
         'ID'      => $key,
         'NAME'    => $value,
@@ -1571,7 +1571,7 @@ 
       'START_NAME'         => $planetrow['name'],
     );
 
-    if(!empty($TargetPlanet)) {
+    if (!empty($TargetPlanet)) {
       $template_route += array(
         'END_TYPE_TEXT_SH' => classLocale::$lang['sys_planet_type_sh'][$TargetPlanet['planet_type']],
         'END_COORDS'       => uni_render_coordinates($TargetPlanet),
@@ -1582,8 +1582,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,
@@ -1597,15 +1597,14 @@ 
     }
 
     $fleet_capacity = 0;
-    foreach($fleetarray as $Ship => $Count) {
+    foreach ($fleetarray as $Ship => $Count) {
       $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 && classSupernova::$config->game_speed_expedition ? classSupernova::$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)),
@@ -1614,7 +1613,7 @@ 
     }
 
     $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,
@@ -1624,7 +1623,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'],

includes/classes/UnitList.php

Spacing +25 added lines, -25 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]);
@@ -117,20 +117,20 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
 //    $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->dbRowParse($unit_db_row);
 
@@ -145,25 +145,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;
         }
       }
@@ -201,7 +201,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;
@@ -216,14 +216,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);
@@ -237,7 +237,7 @@ 
    */
   public function unitsGetArray() {
     $result = array();
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $result[$unit->unitId] = $unit->count;
     }
 
@@ -245,7 +245,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);
     }
   }
@@ -271,8 +271,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;
       }
     }
@@ -292,18 +292,18 @@ 
      * @var Fleet $objFleet
      */
     $objFleet = $this->getLocatedAt();
-    if(empty($objFleet)) {
+    if (empty($objFleet)) {
       throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
     }
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       $ship_id = $unit->unitId;
       $ship_count = $unit->count;
-      if(!UnitShip::is_in_group($ship_id) || $ship_count <= 0) {
+      if (!UnitShip::is_in_group($ship_id) || $ship_count <= 0) {
         continue;
       }
 
-      if($ship_count > mrc_get_level($objFleet->dbOwnerRow, $objFleet->dbSourcePlanetRow, $ship_id, false, true)) {
+      if ($ship_count > mrc_get_level($objFleet->dbOwnerRow, $objFleet->dbSourcePlanetRow, $ship_id, false, true)) {
         $page .= classLocale::$lang['fl_noenought'];
       } else {
         $fleet['fleetarray'][$ship_id] = $ship_count;
@@ -396,7 +396,7 @@ 
 
     print('</tr>');
 
-    foreach($this->mapUnitIdToDb as $unit) {
+    foreach ($this->mapUnitIdToDb as $unit) {
       print('<tr>');
 
       print('<td>');
@@ -447,14 +447,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;
     }
   }

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);
     }