supernova-ws / SuperNova

includes/classes/DbSqlHelper.php

Spacing +3 added lines, -3 removed lines

@@ -15,13 +15,13 @@
    * @return string
    */
   public static function quoteComment($comment) {
-    if($comment == '') {
+    if ($comment == '') {
       return '';
     }
 
-    $comment = str_replace(array('/*', '*/'), '__',$comment);
+    $comment = str_replace(array('/*', '*/'), '__', $comment);
 
-    return "\r\n/*" . $comment . "*/";
+    return "\r\n/*".$comment."*/";
   }
 
 }

includes/functions/flt_mission_missile.php

Spacing +5 added lines, -5 removed lines

@@ -77,8 +77,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal'] = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal'] = floor($metal); // Metal scraps
   $return['crystal'] = floor($crystal); // Crystal scraps
 
   return $return;
@@ -148,7 +148,7 @@ 
         }
 
         if (!empty($message)) {
-          $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
+          $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
 
           DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
         }
@@ -165,8 +165,8 @@ 
 
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
 
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
     }
     DBStaticFleetMissile::db_missile_delete($fleetRow);
   }

messages.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 $template = gettemplate('viewreport', true);
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);

blitz_register.php

Spacing +28 added lines, -28 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 global $user;
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
   !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -18,16 +18,16 @@ 
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
 
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   sn_db_transaction_start();
   $user = DBStaticUser::db_user_by_id($user['id'], true);
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       db_blitz_reg_insert($user, $current_round);
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
     }
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
     db_blitz_reg_delete($user, $current_round);
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
   }
@@ -42,17 +42,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = db_blitz_reg_get_random_id($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
-      $blitz_name = 'Игрок' . $next_id;
+      $blitz_name = 'Игрок'.$next_id;
       $blitz_password = sys_random_string(8);
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     DBStaticUser::db_player_list_blitz_delete_players();
     DBStaticPlanet::db_planets_purge();
@@ -74,7 +74,7 @@ 
     $system = $system_step;
     $planet = round(Vector::$knownPlanets / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -94,7 +94,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= Vector::$knownSystems) {
+      if (($system += $system_step) >= Vector::$knownSystems) {
         $galaxy++;
         $system = $system_step;
       }
@@ -104,13 +104,13 @@ 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
     // pdump($imported_string);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
         db_blitz_reg_update_results($blitz_result_data, $current_round);
       }
@@ -118,14 +118,14 @@ 
     $blitz_result = array();
   }
 
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
-    foreach(DBStaticUser::db_player_list_export_blitz_info() as $row) {
+    foreach (DBStaticUser::db_player_list_export_blitz_info() as $row) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = db_blitz_reg_get_player_list($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -133,13 +133,13 @@ 
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       sn_db_transaction_start();
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -148,14 +148,14 @@ 
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
-        if($reward) {
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -170,12 +170,12 @@ 
 
 $player_registered = false;
 $query = db_blitz_reg_get_player_list_and_users($current_round);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID'                       => $row['id'],
@@ -188,7 +188,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

includes/classes/DBMysqliStatementIterator.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     $fields[0] = &$this->_result;
 
-    while($field = mysqli_fetch_field($data)) {
+    while ($field = mysqli_fetch_field($data)) {
       $fields[] = &$out[$field->name];
     }
 

includes/classes/UBE/ContainerArrayOfObject.php

Spacing +6 added lines, -6 removed lines

@@ -19,8 +19,8 @@ 
    * @param array  $arguments
    */
   public function __call($method_name, array $arguments) {
-    foreach($this->_container as $object) {
-      if(is_object($object) && method_exists($object, $method_name)) {
+    foreach ($this->_container as $object) {
+      if (is_object($object) && method_exists($object, $method_name)) {
         call_user_func_array(array($object, $method_name), $arguments);
       }
     }
@@ -35,8 +35,8 @@ 
    */
   public function getSumProperty($property_name) {
     $result = 0.0;
-    foreach($this->_container as $object) {
-      if(is_object($object) && property_exists($object, $property_name)) {
+    foreach ($this->_container as $object) {
+      if (is_object($object) && property_exists($object, $property_name)) {
         $result += $object->$property_name;
       }
     }
@@ -52,8 +52,8 @@ 
    * @return mixed
    */
   public function aggregateByMethod($method_name, &$result) {
-    foreach($this->_container as $object) {
-      if(is_object($object) && method_exists($object, $method_name)) {
+    foreach ($this->_container as $object) {
+      if (is_object($object) && method_exists($object, $method_name)) {
         call_user_func(array($object, $method_name), $result);
       }
     }

includes/classes/UnitList.php

Spacing +8 added lines, -8 removed lines

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

includes/classes/UBE/UBEFleet.php

Spacing +64 added lines, -64 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_ID],
-      "'" . db_escape($this->UBE_PLANET[PLANET_NAME]) . "'",
-      (int)$this->UBE_PLANET[PLANET_GALAXY],
-      (int)$this->UBE_PLANET[PLANET_SYSTEM],
-      (int)$this->UBE_PLANET[PLANET_PLANET],
-      (int)$this->UBE_PLANET[PLANET_TYPE],
-
-      (float)$this->resource_list[RES_METAL],
-      (float)$this->resource_list[RES_CRYSTAL],
-      (float)$this->resource_list[RES_DEUTERIUM],
-
-      (float)$this->fleet_bonus->calcBonus(P_ATTACK),
-      (float)$this->fleet_bonus->calcBonus(P_SHIELD),
-      (float)$this->fleet_bonus->calcBonus(P_ARMOR),
+      (float) $this->UBE_PLANET[PLANET_ID],
+      "'".db_escape($this->UBE_PLANET[PLANET_NAME])."'",
+      (int) $this->UBE_PLANET[PLANET_GALAXY],
+      (int) $this->UBE_PLANET[PLANET_SYSTEM],
+      (int) $this->UBE_PLANET[PLANET_PLANET],
+      (int) $this->UBE_PLANET[PLANET_TYPE],
+
+      (float) $this->resource_list[RES_METAL],
+      (float) $this->resource_list[RES_CRYSTAL],
+      (float) $this->resource_list[RES_DEUTERIUM],
+
+      (float) $this->fleet_bonus->calcBonus(P_ATTACK),
+      (float) $this->fleet_bonus->calcBonus(P_SHIELD),
+      (float) $this->fleet_bonus->calcBonus(P_ARMOR),
     );
   }
 
@@ -189,13 +189,13 @@ 
     $this->owner_id = $objFleet->playerOwnerId;
     $this->group_id = $objFleet->group_id;
 
-    foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-      if(!$unit->count) {
+    foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+      if (!$unit->count) {
         continue;
       }
 
       $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
-      if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+      if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
         $this->unit_list->unitAdjustCount($unit_id, $unit->count);
       }
     }
@@ -231,13 +231,13 @@ 
 //      }
 //    }
 
-    foreach($sn_group_combat as $unit_id) {
-      if($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
+    foreach ($sn_group_combat as $unit_id) {
+      if ($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
       $this->resource_list[$resource_id] = floor(mrc_get_level($player_db_row, $planet_row, $resource_id));
     }
 
@@ -296,27 +296,27 @@ 
       $ube_report_id,
       $this->db_id,
 
-      (float)$this->resources_lost_on_units[RES_METAL],
-      (float)$this->resources_lost_on_units[RES_CRYSTAL],
-      (float)$this->resources_lost_on_units[RES_DEUTERIUM],
-      (float)$this->cargo_dropped[RES_METAL],
-      (float)$this->cargo_dropped[RES_CRYSTAL],
-      (float)$this->cargo_dropped[RES_DEUTERIUM],
-      (float)$this->resources_looted[RES_METAL],
-      (float)$this->resources_looted[RES_CRYSTAL],
-      (float)$this->resources_looted[RES_DEUTERIUM],
-      (float)$this->resources_lost_in_metal[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_CRYSTAL],
+      (float) $this->resources_lost_on_units[RES_DEUTERIUM],
+      (float) $this->cargo_dropped[RES_METAL],
+      (float) $this->cargo_dropped[RES_CRYSTAL],
+      (float) $this->cargo_dropped[RES_DEUTERIUM],
+      (float) $this->resources_looted[RES_METAL],
+      (float) $this->resources_looted[RES_CRYSTAL],
+      (float) $this->resources_looted[RES_DEUTERIUM],
+      (float) $this->resources_lost_in_metal[RES_METAL],
     );
   }
 
   public function report_render_outcome_side_fleet() {
     $UBE_DEFENCE_RESTORE = array();
     $UBE_UNITS_LOST = array();
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_restored) {
         $UBE_DEFENCE_RESTORE[$UBEUnit->unitId] = $UBEUnit->units_restored;
       }
-      if($UBEUnit->units_lost) {
+      if ($UBEUnit->units_lost) {
         $UBE_UNITS_LOST[$UBEUnit->unitId] = $UBEUnit->units_lost;
       }
     }
@@ -341,16 +341,16 @@ 
    */
   protected function report_render_outcome_side_fleet_line(&$array, $lang_header_index) {
     $result = array();
-    if(!empty($array)) {
-      foreach($array as $unit_id => $unit_count) {
-        if($unit_count) {
+    if (!empty($array)) {
+      foreach ($array as $unit_id => $unit_count) {
+        if ($unit_count) {
           $result[] = array(
             'NAME' => classLocale::$lang['tech'][$unit_id],
             'LOSS' => pretty_number($unit_count),
           );
         }
       }
-      if($lang_header_index && count($result)) {
+      if ($lang_header_index && count($result)) {
         array_unshift($result, array('NAME' => classLocale::$lang[$lang_header_index]));
       }
     }
@@ -363,16 +363,16 @@ 
     $fleet_id = $this->db_id;
 
     $unit_sort_order = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_lost || $UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_lost || $UBEUnit->units_restored) {
         $unit_sort_order++;
         $sql_perform_report_unit[] = array(
           $ube_report_id,
           $fleet_id,
 
           $UBEUnit->unitId,
-          (float)$UBEUnit->units_restored,
-          (float)$UBEUnit->units_lost,
+          (float) $UBEUnit->units_restored,
+          (float) $UBEUnit->units_lost,
 
           $unit_sort_order,
         );
@@ -388,9 +388,9 @@ 
   function ube_combat_result_calculate_resources() {
     $resource_delta_fleet = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      $resource_change = (float)$this->resources_looted[$resource_id] + (float)$this->cargo_dropped[$resource_id];
-      if($resource_change) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      $resource_change = (float) $this->resources_looted[$resource_id] + (float) $this->cargo_dropped[$resource_id];
+      if ($resource_change) {
         $resource_delta_fleet[$resource_id] = -($resource_change);
       }
     }
@@ -423,12 +423,12 @@ 
     );
 
     $this->fleet_capacity = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $this->fleet_capacity += $UBEUnit->capacity * $UBEUnit->getCount();
 
-      if($UBEUnit->units_lost) {
-        foreach($UBEUnit->price as $resource_id => $unit_resource_price) {
-          if(!$unit_resource_price) {
+      if ($UBEUnit->units_lost) {
+        foreach ($UBEUnit->price as $resource_id => $unit_resource_price) {
+          if (!$unit_resource_price) {
             continue;
           }
 
@@ -436,7 +436,7 @@ 
           $this->resources_lost_on_units[$resource_id] += $resources_lost;
           // Если это корабль - прибавляем потери к обломкам на орбите
           // TODO - опция выбрасывания обороны в обломки
-          if($UBEUnit->getType() == UNIT_SHIPS) {
+          if ($UBEUnit->getType() == UNIT_SHIPS) {
             $this->resources_lost_on_ships[$resource_id] += $resources_lost;
           }
         }
@@ -448,11 +448,11 @@ 
 
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
+    if ($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
       $drop_share = 1 - $this->fleet_capacity / $fleet_total_resources; // Какая часть ресурсов выброшена
-      foreach($this->resource_list as $resource_id => &$resource_amount) {
+      foreach ($this->resource_list as $resource_id => &$resource_amount) {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount) {
+        if (!$resource_amount) {
           continue;
         }
 
@@ -473,19 +473,19 @@ 
     $objFleet2->setDbId($this->db_id);
 
     // Если это была миссия Уничтожения И звезда смерти взорвалась И мы работаем с аттакерами - значит все аттакеры умерли
-    if($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
+    if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
       $objFleet2->dbDelete();
-    } elseif($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
+    } elseif ($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
       $objFleet2->dbDelete();
     } else {
-      if($ship_count_lost) {
+      if ($ship_count_lost) {
         // Просматриваем результаты изменения флотов
-        foreach($this->unit_list->_container as $UBEUnit) {
+        foreach ($this->unit_list->_container as $UBEUnit) {
           // Перебираем аутком на случай восстановления юнитов
 //          if(($units_left = $UBEUnit->getCount() - (float)$UBEUnit->units_lost) > 0) {
 //            $fleet_real_array[$UBEUnit->unitId] = $units_left;
 //          };
-          if(floatval($UBEUnit->units_lost) != 0) {
+          if (floatval($UBEUnit->units_lost) != 0) {
             $objFleet2->shipAdjustCount($UBEUnit->unitId, floatval($UBEUnit->units_lost));
           };
         }
@@ -495,7 +495,7 @@ 
       $objFleet2->resourcesAdjust($resource_delta_fleet);
 
       // Если защитник и не РМФ - отправляем флот назад
-      if($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
+      if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
         $objFleet2->markReturned();
       }
       $objFleet2->dbSave();
@@ -525,7 +525,7 @@ 
   public function calculate_unit_partial_data(UBEASA $side_ASA) {
     $this->fleet_share_of_side_armor = $this->total_stats[P_ARMOR] / $side_ASA->getArmor();
 
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $UBEUnit->share_of_side_armor = $UBEUnit->pool_armor / $side_ASA->getArmor();
     }
   }
@@ -537,9 +537,9 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function attack_fleets(UBEFleetList $fleet_list, $is_simulator) {
-    foreach($fleet_list->_container as $defending_fleet) {
+    foreach ($fleet_list->_container as $defending_fleet) {
       // Не атакуются флоты на своей стороне
-      if($this->is_attacker == $defending_fleet->is_attacker) {
+      if ($this->is_attacker == $defending_fleet->is_attacker) {
         continue;
       }
       $this->attack_fleet($defending_fleet, $is_simulator);
@@ -555,12 +555,12 @@ 
   public function attack_fleet(UBEFleet $defending_fleet, $is_simulator) {
     UBEDebug::unit_dump_header();
 
-    foreach($this->unit_list->_container as $attacking_unit_pool) {
+    foreach ($this->unit_list->_container as $attacking_unit_pool) {
       UBEDebug::unit_dump($attacking_unit_pool, 'attacker');
 
       // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-      foreach($defending_fleet->unit_list->_container as $defending_unit_pool) {
-        if($defending_unit_pool->isEmpty()) {
+      foreach ($defending_fleet->unit_list->_container as $defending_unit_pool) {
+        if ($defending_unit_pool->isEmpty()) {
           continue;
         }
 

includes/functions/tpl_helpers.php

Spacing +30 added lines, -30 removed lines

@@ -2,8 +2,8 @@ 
 
 // Compare function to sort fleet in time order
 function tpl_assign_fleet_compare($a, $b) {
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET']) {
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT']) {
       return 0;
     }
 
@@ -19,17 +19,17 @@ 
  * @param string   $js_name
  */
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets') {
-  if(!$fleets) {
+  if (!$fleets) {
     return;
   }
 
   usort($fleets, 'tpl_assign_fleet_compare');
 
-  foreach($fleets as $fleet_data) {
+  foreach ($fleets as $fleet_data) {
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
 
-    if($fleet_data['ships']) {
-      foreach($fleet_data['ships'] as $ship_data) {
+    if ($fleet_data['ships']) {
+      foreach ($fleet_data['ships'] as $ship_data) {
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
       }
     }
@@ -50,8 +50,8 @@ 
     'DEUTERIUM' => $fleet[RES_DEUTERIUM],
   );
 
-  foreach($fleet as $ship_id => $ship_amount) {
-    if(in_array($ship_id, Fleet::$snGroupFleet)) {
+  foreach ($fleet as $ship_id => $ship_amount) {
+    if (in_array($ship_id, Fleet::$snGroupFleet)) {
       $single_ship_data = get_ship_data($ship_id, $user_data);
       $return['ships'][$ship_id] = array(
         'ID'          => $ship_id,
@@ -90,11 +90,11 @@ 
 
   $result = array();
 
-  if(!$user_data) {
+  if (!$user_data) {
     $user_data = $user;
   }
 
-  if(!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
+  if (!$objFleet->isReturning() && $objFleet->mission_type == MT_ACS) {
     $aks = DBStaticFleetACS::db_acs_get_by_group_id($objFleet->group_id);
   }
 
@@ -113,7 +113,7 @@ 
     'MISSION'      => $objFleet->mission_type,
     'MISSION_NAME' => classLocale::$lang['type_mission'][$objFleet->mission_type],
     'ACS'          => !empty($aks['name']) ? $aks['name'] : (!empty($objFleet->group_id) ? $objFleet->group_id : ''),
-    'AMOUNT'       => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()) . (array_sum($fleet_resources) ? '+' : '')) : '?',
+    'AMOUNT'       => $spy_level >= 4 ? (pretty_number($objFleet->shipsGetTotal()).(array_sum($fleet_resources) ? '+' : '')) : '?',
 
     'METAL'     => $spy_level >= 8 ? $fleet_resources[RES_METAL] : 0,
     'CRYSTAL'   => $spy_level >= 8 ? $fleet_resources[RES_CRYSTAL] : 0,
@@ -135,14 +135,14 @@ 
     'STAY_LEFT' => floor($objFleet->time_mission_job_complete + 1 - SN_TIME_NOW),
   );
 
-  if(property_exists($objFleet, 'fleet_start_name')) {
+  if (property_exists($objFleet, 'fleet_start_name')) {
     $result['START_NAME'] = $objFleet->fleet_start_name;
   }
-  if(property_exists($objFleet, 'fleet_end_name')) {
+  if (property_exists($objFleet, 'fleet_end_name')) {
     $result['END_NAME'] = $objFleet->fleet_end_name;
   }
 
-  if(property_exists($objFleet, 'event_time')) {
+  if (property_exists($objFleet, 'event_time')) {
     $result['fleet'] = array_merge($result['fleet'], array(
       'OV_LABEL'        => $objFleet->ov_label,
       'EVENT_TIME_TEXT' => property_exists($objFleet, 'event_time') ? date(FMT_DATE_TIME, $objFleet->event_time + SN_CLIENT_TIME_DIFF) : '',
@@ -153,9 +153,9 @@ 
 
   $ship_id = 0;
   $result['ships'] = array();
-  if($spy_level >= 6) {
-    foreach($objFleet->shipsIterator() as $ship_sn_id => $ship) {
-      if($spy_level >= 10) {
+  if ($spy_level >= 6) {
+    foreach ($objFleet->shipsIterator() as $ship_sn_id => $ship) {
+      if ($spy_level >= 10) {
         $single_ship_data = get_ship_data($ship_sn_id, $user_data);
         $result['ships'][$ship_sn_id] = array(
           'ID'          => $ship_sn_id,
@@ -188,8 +188,8 @@ 
 function tpl_parse_planet_que($que, $planet, $que_id) {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
-  if(!empty($que_hangar)) {
-    foreach($que_hangar as $que_item) {
+  if (!empty($que_hangar)) {
+    foreach ($que_hangar as $que_item) {
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
     }
@@ -249,10 +249,10 @@ 
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
   );
 
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']])) {
     $result['building_que'] = array();
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
-    foreach($building_que as $que_element) {
+    foreach ($building_que as $que_element) {
       $result['building_que'][] = que_tpl_parse_element($que_element);
     }
   }
@@ -271,19 +271,19 @@ 
   static $snGroupFleet;
   !$snGroupFleet ? $snGroupFleet = Fleet::$snGroupFleet : false;
 
-  if(empty($array_of_Fleet)) {
+  if (empty($array_of_Fleet)) {
     return false;
   }
 
   $fleet_list = array();
-  foreach($array_of_Fleet as $fleet) {
-    if($fleet->playerOwnerId == $user['id']) {
-      if($fleet->mission_type == MT_MISSILE) {
+  foreach ($array_of_Fleet as $fleet) {
+    if ($fleet->playerOwnerId == $user['id']) {
+      if ($fleet->mission_type == MT_MISSILE) {
         continue;
       }
       $fleet_ownage = 'own';
     } else {
-      switch($fleet->mission_type) {
+      switch ($fleet->mission_type) {
         case MT_ATTACK:
         case MT_ACS:
         case MT_DESTROY:
@@ -300,9 +300,9 @@ 
 
     $fleet_list[$fleet_ownage]['fleets'][$fleet->dbId] = $fleet;
 
-    if($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
-      foreach($fleet->shipsIterator() as $ship_id => $ship) {
-        if(!empty($snGroupFleet[$ship_id])) {
+    if ($fleet->isReturning() || (!$fleet->isReturning() && $fleet->mission_type == MT_RELOCATE) || ($fleet->target_owner_id != $user['id'])) {
+      foreach ($fleet->shipsIterator() as $ship_id => $ship) {
+        if (!empty($snGroupFleet[$ship_id])) {
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship->count;
         }
       }
@@ -319,7 +319,7 @@ 
   return $fleet_list;
 }
 
-function tpl_set_resource_info(template &$template, $planet_row, $fleets_to_planet = array(), $round = 0) {
+function tpl_set_resource_info(template & $template, $planet_row, $fleets_to_planet = array(), $round = 0) {
   $template->assign_vars(array(
     'RESOURCE_ROUNDING' => $round,