supernova-ws / SuperNova

captcha.php

Spacing +9 added lines, -9 removed lines

@@ -2,16 +2,16 @@
 // Captcha code for registration - really didn't work alot :(
 
 session_start();
-$en=100;
-$boy=25;
-$sayi = mt_rand(0,9999999);
+$en = 100;
+$boy = 25;
+$sayi = mt_rand(0, 9999999);
 $_SESSION['captcha'] = $sayi;
-$tuval = imagecreatetruecolor($en,$boy);
-$b = imagecolorallocate($tuval,175,238,238);
-$s = imagecolorallocate($tuval,0,0,0);
-imagefill($tuval,0,0,$s);
-imageline($tuval,20,50,$en,$boy,$b);
-imagestring($tuval,3,27,7,$sayi,$b);
+$tuval = imagecreatetruecolor($en, $boy);
+$b = imagecolorallocate($tuval, 175, 238, 238);
+$s = imagecolorallocate($tuval, 0, 0, 0);
+imagefill($tuval, 0, 0, $s);
+imageline($tuval, 20, 50, $en, $boy, $b);
+imagestring($tuval, 3, 27, 7, $sayi, $b);
 Header("content-type:image/gif");
 imagegif($tuval);
 imagedestroy($tuval);

jumpgate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +20 added lines, -20 removed lines

@@ -10,34 +10,34 @@ 
  * @copyright 2008 By Chlorel for XNova
  */
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('fleet');
 
-if($TargetPlanet = sys_get_param_id('jmpto'))
+if ($TargetPlanet = sys_get_param_id('jmpto'))
 {
   sn_db_transaction_start();
   DBStaticUser::db_user_by_id($user['id'], true, 'id');
   $planetrow = DBStaticPlanet::db_planet_by_id($planetrow['id'], true);
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
   {
     $TargetGate = DBStaticPlanet::db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
     {
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
-      if(!$NextDestTime)
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
+      if (!$NextDestTime)
       {
         $ship_list = sys_get_param('ships');
         $jumpMade = false;
-        foreach($ship_list as $ship_id => $ship_count)
+        foreach ($ship_list as $ship_id => $ship_count)
         {
-          if(!in_array($ship_id, Fleet::$snGroupFleet))
+          if (!in_array($ship_id, Fleet::$snGroupFleet))
           {
             continue;
           }
 
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
-          if($ship_count)
+          if ($ship_count)
           {
             $jumpMade = true;
             DBStaticUnit::dbUpdateOrInsertUnit($ship_id, -$ship_count, $user, $planetrow['id']);
@@ -45,39 +45,39 @@ 
           }
         }
         // Dit monsieur, y avait quelque chose a envoyer ???
-        if($jumpMade)
+        if ($jumpMade)
         {
-          DBStaticPlanet::db_planet_update_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
-          DBStaticPlanet::db_planet_update_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
+          DBStaticPlanet::db_planet_update_set_by_id($TargetGate['id'], "`last_jump_time` = ".SN_TIME_NOW."");
+          DBStaticPlanet::db_planet_update_set_by_id($planetrow['id'], "`last_jump_time` = ".SN_TIME_NOW."");
 
           DBStaticUser::db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
 
           $planetrow['last_jump_time'] = SN_TIME_NOW;
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
+          $RetMessage = classLocale::$lang['gate_jump_done']." - ".pretty_time(uni_get_time_to_jump($planetrow));
         } else {
           $RetMessage = classLocale::$lang['gate_wait_data'];
         }
       } else {
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
+        $RetMessage = classLocale::$lang['gate_wait_dest']." - ".pretty_time($NextDestTime);
       }
     } else {
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
     }
   } else {
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
+    $RetMessage = classLocale::$lang['gate_wait_star']." - ".pretty_time($NextJumpTime);
   }
   sn_db_transaction_commit();
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
 } else {
   $template = gettemplate('jumpgate', true);
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
   {
     $Combo = '';
     $MoonList = DBStaticPlanet::db_planet_list_moon_other($user['id'], $planetrow['id']);
     // while($CurMoon = db_fetch($MoonList))
-    foreach($MoonList as $CurMoon)
+    foreach ($MoonList as $CurMoon)
     {
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
       {
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
         $template->assign_block_vars('moon', array(
@@ -91,9 +91,9 @@ 
       }
     }
 
-    foreach(Fleet::$snGroupFleet as $Ship)
+    foreach (Fleet::$snGroupFleet as $Ship)
     {
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
       {
         continue;
       }

simulator.php

Braces +2 added lines, -4 removed lines

@@ -21,8 +21,7 @@ 
 
   $sym_defender = $unpacked['D'];
   $sym_attacker = $unpacked['A'];
-}
-else
+} else
 {
   $sym_defender = array(0 => $sym_defender);
   $sym_attacker = array(1 => $sym_attacker);
@@ -56,8 +55,7 @@ 
   $template = gettemplate('ube_combat_report', true);
   $template->assign_recursive($template_result);
   display($template, '', false, '', false, false, true);
-}
-else
+} else
 {
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);

Spacing +8 added lines, -8 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if(sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
+if (sys_get_param_int('BE_DEBUG') && !defined('BE_DEBUG'))
 {
   define('BE_DEBUG', true);
 }
@@ -14,7 +14,7 @@ 
 $sym_defender = $_POST['defender'] ? $_POST['defender'] : array();
 $sym_attacker = $_POST['attacker'] ? $_POST['attacker'] : array();
 
-if($replay)
+if ($replay)
 {
   $unpacked = sn_ube_simulator_decode_replay($replay);
 
@@ -27,7 +27,7 @@ 
   $sym_attacker = array(1 => $sym_attacker);
 }
 
-if($_POST['submit'] || $execute)
+if ($_POST['submit'] || $execute)
 {
   $replay = sn_ube_simulator_encode_replay($sym_defender, 'D');
   $replay .= sn_ube_simulator_encode_replay($sym_attacker, 'A');
@@ -40,9 +40,9 @@ 
   $template = gettemplate('simulator', true);
   $techs_and_officers = array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR, MRC_ADMIRAL);
 
-  foreach($techs_and_officers as $tech_id)
+  foreach ($techs_and_officers as $tech_id)
   {
-    if(!$sym_attacker[1][$tech_id])
+    if (!$sym_attacker[1][$tech_id])
     {
       $sym_attacker[1][$tech_id] = mrc_get_level($user, null, $tech_id);
     }
@@ -56,14 +56,14 @@ 
     UNIT_GOVERNORS => array(MRC_FORTIFIER),
     UNIT_DEFENCE => sn_get_groups('defense_active'),
   );
-  foreach($show_groups as $unit_group_id => $unit_group)
+  foreach ($show_groups as $unit_group_id => $unit_group)
   {
     $template->assign_block_vars('simulator', array(
       'GROUP' => $unit_group_id,
       'NAME' => classLocale::$lang['tech'][$unit_group_id],
     ));
 
-    foreach($unit_group as $unit_id)
+    foreach ($unit_group as $unit_id)
     {
       $tab++;
 

admin/statbuilder.php

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
   doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_id} LIMIT 1;");
 
   message(str_replace('%s', $ally_tag_raw, $lang['ally_been_maked']), str_replace('%s', $ally_tag_raw, $lang['ally_maked']));
-}
-else
+} else
 {
   $page .= parsetemplate(gettemplate('ali_external_make'), $lang);
 }

Spacing +5 added lines, -5 removed lines

@@ -9,18 +9,18 @@
  * @copyright 2008 by Chlorel for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
-require_once('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require_once('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
-if(SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_end'))
+if (SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_admin_forced') && SN_TIME_NOW >= classSupernova::$config->db_loadAll('var_stat_update_end'))
 {
   classSupernova::$config->db_saveItem('var_stat_update_admin_forced', SN_TIME_NOW + 120);
 

admin/planet_compensate.php

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

Spacing +25 added lines, -25 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
@@ -25,7 +25,7 @@ 
 $username_unsafe = sys_get_param_str_unsafe('username');
 $username = sys_get_param_escaped('username');
 
-if($galaxy_src)
+if ($galaxy_src)
 {
   sn_db_transaction_start();
   $errors = array();
@@ -35,41 +35,41 @@ 
   $planet = sys_o_get_updated($owner, array('galaxy' => $galaxy_src, 'system' => $system_src, 'planet' => $planet_src, 'planet_type' => 1), SN_TIME_NOW);
   $que    = $planet['que'];
   $planet = $planet['planet'];
-  if(!$planet)
+  if (!$planet)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_0'];
   }
 
-  if($planet['destruyed'])
+  if ($planet['destruyed'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_1'];
   }
 
-  if($planet['id_owner'] != $owner['id'] || !$username)
+  if ($planet['id_owner'] != $owner['id'] || !$username)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_4'];
   }
 
   $destination = sys_o_get_updated($owner, array('galaxy' => $galaxy_dst, 'system' => $system_dst, 'planet' => $planet_dst, 'planet_type' => 1), SN_TIME_NOW);
   $destination = $destination['planet'];
-  if(!$destination)
+  if (!$destination)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_2'];
   }
 
-  if($planet['id'] == $destination['id'])
+  if ($planet['id'] == $destination['id'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_5'];
   }
 
-  if($planet['id_owner'] != $destination['id_owner'])
+  if ($planet['id_owner'] != $destination['id_owner'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_3'];
   }
 
-  if(!empty($errors))
+  if (!empty($errors))
   {
-    foreach($errors as $error)
+    foreach ($errors as $error)
     {
       $template->assign_block_vars('error', array(
         'TEXT' => $error,
@@ -83,14 +83,14 @@ 
     killer_add_planet($planet);
 
     $moon = db_planet_by_gspt($galaxy_src, $system_src, $planet_src, PT_MOON, true);
-    if($moon)
+    if ($moon)
     {
       $moon = sys_o_get_updated($owner, $moon, SN_TIME_NOW);
       $moon = $moon['planet'];
       killer_add_planet($moon);
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id)
+    foreach (sn_get_groups('resources_loot') as $resource_id)
     {
       $resource_name = pname_resource_name($resource_id);
       $template->assign_var("{$resource_name}_cost", $final_cost[$resource_id]);
@@ -98,13 +98,13 @@ 
       $template->assign_var("{$resource_name}_bonus", $final_cost[$resource_id]);
     }
 
-    if($_GET['btn_confirm'])
+    if ($_GET['btn_confirm'])
     {
       $time = SN_TIME_NOW + PERIOD_DAY;
 
       db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']);
       db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}");
-      if($moon)
+      if ($moon)
       {
         db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']);
         db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}");
@@ -131,7 +131,7 @@ 
   'username' => $username,
 ));
 
-display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true );
+display(parsetemplate($template), classLocale::$lang['adm_pl_comp_title'], false, '', true);
 
 function killer_add_planet($planet)
 {
@@ -146,34 +146,34 @@ 
   }
   */
 
-  foreach(sn_get_groups('structures') as $unit_id)
+  foreach (sn_get_groups('structures') as $unit_id)
   {
     $build_level = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($build_level > 0)
+    if ($build_level > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
       $build_factor = $unit_cost['factor'] != 1 ? (1 - pow($unit_cost['factor'], $build_level)) / (1 - $unit_cost['factor']) : $unit_cost['factor'];
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $build_factor) : 0;
       }
     }
   }
 
-  foreach(sn_get_groups(array('defense', 'fleet')) as $unit_id)
+  foreach (sn_get_groups(array('defense', 'fleet')) as $unit_id)
   {
     $unit_count = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($unit_count > 0)
+    if ($unit_count > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $unit_count) : 0;
       }
     }
   }
 
-  foreach($sn_group_resources_loot as $resource_id)
+  foreach ($sn_group_resources_loot as $resource_id)
   {
     $final_cost[$resource_id] += floor(mrc_get_level($user, $planet, $resource_id, true, true));
   }

includes/classes/Bonus.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
   /**
    * Добавляет юнит к списку бонусов
    *
-   * @param $unit_id
+   * @param integer $unit_id
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
@@ -67,7 +67,7 @@ 
    *
    * Выдает финальный бонус в виде множителя
    *
-   * @param string|int $param - ИД бонуса
+   * @param string $param - ИД бонуса
    *
    * @return float
    */

Spacing +7 added lines, -7 removed lines

@@ -28,12 +28,12 @@ 
    * @param $unit_level
    */
   public function add_unit_by_snid($unit_id, $unit_level) {
-    if(!$unit_level) {
+    if (!$unit_level) {
       return;
     }
 
-    foreach(static::$_bonus_group as $param_name => $unit_list) {
-      if(!empty($unit_list[$unit_id])) {
+    foreach (static::$_bonus_group as $param_name => $unit_list) {
+      if (!empty($unit_list[$unit_id])) {
         // Простейший вариант - мультипликатор по базе
         // Общий мультипликатор добавляется в конец
         $this->grants[$param_name][$unit_id] = $unit_level;
@@ -82,16 +82,16 @@ 
 //    $this->grants[$param_name][$unit_id] = $unit_level * get_unit_param($unit_id, P_BONUS_VALUE) / 100;;
     $value_add = floatval($base_value);
     $cumulative = 1.0; // Для случая BONUS_PERCENT
-    if(!empty($this->grants[$param]) && is_array($this->grants[$param])) {
-      foreach($this->grants[$param] as $unit_id => $unit_level) {
+    if (!empty($this->grants[$param]) && is_array($this->grants[$param])) {
+      foreach ($this->grants[$param] as $unit_id => $unit_level) {
         $unit_bonus = 0;
-        if($unit_id < 0) {
+        if ($unit_id < 0) {
           // Meta-unit - leave as is
         } else {
           // TODO - Подумать, что будет при смешивании разных бонусов и как этого избежать
           $bonus_value = get_unit_param($unit_id, P_BONUS_VALUE);
           $bonus_type = get_unit_param($unit_id, P_BONUS_TYPE);
-          switch($bonus_type) {
+          switch ($bonus_type) {
             case BONUS_PERCENT:
               $unit_bonus = $unit_level * $bonus_value / 100;
               $cumulative += $unit_bonus;

includes/classes/UBE/UBE.php

Doc Comments +2 added lines, -2 removed lines

@@ -464,7 +464,7 @@ 
    * Преобразовывает данные симулятора в данные для расчета боя
    *
    * @param     $side_info
-   * @param     $attacker
+   * @param     boolean $attacker
    * @param int $player_id
    *
    * @version 41a6.22
@@ -572,7 +572,7 @@ 
   }
 
   /**
-   * @param $template
+   * @param null|template $template
    *
    * @return template
    */

Spacing +48 added lines, -49 removed lines

@@ -147,7 +147,7 @@ 
     $this->players->db_load_player_by_id($player_id, UBE_PLAYER_IS_DEFENDER);
 
     $player_db_row = $this->players[$player_id]->getDbRow();
-    if($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
+    if ($fortifier_level = mrc_get_level($player_db_row, $this->combatMission->dst_planet, MRC_FORTIFIER)) {
       $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $fortifier_level);
     }
 
@@ -179,7 +179,7 @@ 
     $this->rounds[0] = new UBERound(0);
     $this->rounds[0]->make_snapshot($this->fleet_list);
 
-    for($round = 1; $round <= 10; $round++) {
+    for ($round = 1; $round <= 10; $round++) {
       // Проводим раунд
       defined('DEBUG_UBE') ? print("Round {$round}<br>") : false;
 
@@ -192,7 +192,7 @@ 
 
       // Анализируем итоги текущего раунда и готовим данные для следующего
       $this->combat_result = $this->fleet_list->ubeAnalyzeFleetOutcome($round);
-      if($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
+      if ($this->combat_result != UBE_COMBAT_RESULT_DRAW) {
         break;
       }
 
@@ -221,11 +221,11 @@ 
     // Генерируем результат боя
     $this->fleet_list->ube_analyze_fleets($this->is_simulator, $this->debris, $this->resource_exchange_rates);
 
-    if(!$this->is_ube_loaded) {
+    if (!$this->is_ube_loaded) {
       $this->moon_calculator->calculate_moon($this);
 
       // Лутаем ресурсы - если аттакер выиграл
-      if($this->combat_result == UBE_COMBAT_RESULT_WIN) {
+      if ($this->combat_result == UBE_COMBAT_RESULT_WIN) {
         $this->sn_ube_combat_analyze_loot();
       }
     }
@@ -245,7 +245,7 @@ 
       RES_DEUTERIUM => 0,
     );
 
-    if(
+    if (
       (($planet_resource_total = $this->fleet_list[0]->get_resources_amount()) > 0)
       &&
       (($total_capacity = $this->fleet_list->ube_get_capacity_attackers()) > 0)
@@ -257,9 +257,9 @@ 
       $planet_lootable_percent = $planet_lootable / $planet_resource_total;
 
       // Вычисляем сколько ресурсов вывезено
-      foreach($this->fleet_list->_container as $fleet_id => $fleet) {
+      foreach ($this->fleet_list->_container as $fleet_id => $fleet) {
         $looted_in_metal = 0;
-        foreach($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
+        foreach ($this->fleet_list[0]->resource_list as $resource_id => $resource_amount) {
           // Вычисляем какой процент общей емкости трюмов атакующих будет задействован
           $fleet_lootable_percent = $fleet->fleet_capacity / $total_capacity;
           $looted = floor($resource_amount * $planet_lootable_percent * $fleet_lootable_percent);
@@ -325,16 +325,16 @@ 
     $destination_user_id = $this->fleet_list[0]->owner_id;
 
     // Обновляем поле обломков на планете
-    if(!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
+    if (!$this->is_admin_in_combat && $this->debris->debris_total() > 0) {
       db_planet_set_by_gspt($this->ube_planet_info[PLANET_GALAXY], $this->ube_planet_info[PLANET_SYSTEM], $this->ube_planet_info[PLANET_PLANET], PT_PLANET,
-        "`debris_metal` = `debris_metal` + " . $this->debris->debris_get_resource(RES_METAL) . ", `debris_crystal` = `debris_crystal` + " . $this->debris->debris_get_resource(RES_CRYSTAL)
+        "`debris_metal` = `debris_metal` + ".$this->debris->debris_get_resource(RES_METAL).", `debris_crystal` = `debris_crystal` + ".$this->debris->debris_get_resource(RES_CRYSTAL)
       );
     }
 
-    foreach($this->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->fleet_list->_container as $fleet_id => $UBEFleet) {
       $ship_count_lost = $UBEFleet->unit_list->unitCountLost();
 
-      if($fleet_id) {
+      if ($fleet_id) {
         // Флот
         $UBEFleet->db_save_combat_result_fleet($this->is_small_fleet_recce, $this->moon_calculator->get_reapers_status());
       } else {
@@ -342,19 +342,19 @@ 
 
         // Сохраняем изменения ресурсов - если они есть
         $resource_delta = $UBEFleet->ube_combat_result_calculate_resources();
-        if(!empty($resource_delta)) {
+        if (!empty($resource_delta)) {
           $temp = array();
-          foreach($resource_delta as $resource_id => $resource_amount) {
+          foreach ($resource_delta as $resource_id => $resource_amount) {
             $resource_db_name = pname_resource_name($resource_id);
             $temp[] = "`{$resource_db_name}` = `{$resource_db_name}` + ({$resource_amount})";
           }
           db_planet_set_by_id($this->ube_planet_info[PLANET_ID], implode(',', $temp));
         }
 
-        if($ship_count_lost) {
+        if ($ship_count_lost) {
           $db_changeset = array();
           $planet_row_cache = $this->players[$destination_user_id]->getDbRow();
-          foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+          foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($UBEUnit->unitId, -$UBEUnit->units_lost, $planet_row_cache, $this->ube_planet_info[PLANET_ID]);
           }
           db_changeset_apply($db_changeset);
@@ -365,7 +365,7 @@ 
     // TODO: Связать сабы с флотами констраинтами ON DELETE SET NULL
     // Для САБов
     $fleet_group_id_list = $this->fleet_list->ube_get_groups();
-    if(!empty($fleet_group_id_list)) {
+    if (!empty($fleet_group_id_list)) {
       $fleet_group_id_list = implode(',', $fleet_group_id_list);
       db_acs_delete_by_list($fleet_group_id_list);
     }
@@ -374,19 +374,19 @@ 
 
     $bashing_list = array();
     $players_sides = $this->players->get_player_sides();
-    foreach($players_sides as $player_id => $player_side) {
-      if($player_side != UBE_PLAYER_IS_ATTACKER) {
+    foreach ($players_sides as $player_id => $player_side) {
+      if ($player_side != UBE_PLAYER_IS_ATTACKER) {
         continue;
       }
-      if($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
+      if ($this->moon_calculator->get_status() != UBE_MOON_DESTROY_SUCCESS) {
         $bashing_list[] = "({$player_id}, {$this->ube_planet_info[PLANET_ID]}, {$this->combat_timestamp})";
       }
-      if($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
+      if ($this->mission_type_id == MT_ATTACK && $this->is_defender_active_player) {
         $str_loose_or_win = $this->combat_result == UBE_COMBAT_RESULT_WIN ? 'raidswin' : 'raidsloose';
         db_user_set_by_id($player_id, "`xpraid` = `xpraid` + 1, `raids` = `raids` + 1, `{$str_loose_or_win}` = `{$str_loose_or_win}` + 1");
       }
     }
-    if(!empty($bashing_list)) {
+    if (!empty($bashing_list)) {
       $bashing_list = implode(',', $bashing_list);
       db_bashing_insert($bashing_list);
     }
@@ -413,20 +413,19 @@ 
       $planet_info[PLANET_SYSTEM],
       $planet_info[PLANET_PLANET],
       htmlentities($planet_info[PLANET_NAME], ENT_COMPAT, 'UTF-8'),
-      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' :
-        ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
+      classLocale::$lang[$this->combat_result == UBE_COMBAT_RESULT_WIN ? 'ube_report_info_outcome_win' : ($this->combat_result == UBE_COMBAT_RESULT_DRAW ? 'ube_report_info_outcome_draw' : 'ube_report_info_outcome_loss')]
     );
 
     $text_defender = '';
     $debris = $this->debris->get_debris();
-    foreach($debris as $resource_id => $resource_amount) {
-      if($resource_id == RES_DEUTERIUM) {
+    foreach ($debris as $resource_id => $resource_amount) {
+      if ($resource_id == RES_DEUTERIUM) {
         continue;
       }
 
-      $text_defender .= "{$classLocale['tech'][$resource_id]}: " . pretty_number($resource_amount) . '<br />';
+      $text_defender .= "{$classLocale['tech'][$resource_id]}: ".pretty_number($resource_amount).'<br />';
     }
-    if($text_defender) {
+    if ($text_defender) {
       $text_defender = "{$classLocale['ube_report_msg_body_debris']}{$text_defender}<br />";
     }
 
@@ -436,8 +435,8 @@ 
 
     // TODO: Оптимизировать отсылку сообщений - отсылать пакетами
     $player_sides = $this->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
-      $message = $text_common . ($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender);
+    foreach ($player_sides as $player_id => $player_side) {
+      $message = $text_common.($this->is_small_fleet_recce && ($player_side == UBE_PLAYER_IS_ATTACKER) ? classLocale::$lang['ube_report_msg_body_sfr'] : $text_defender);
       msg_send_simple_message($player_id, '', $this->combat_timestamp, MSG_TYPE_COMBAT, classLocale::$lang['sys_mess_tower'], classLocale::$lang['sys_mess_attack_report'], $message);
     }
 
@@ -473,11 +472,11 @@ 
     $player_id = $player_id == -1 ? $this->players->count() : $player_id;
     $fleet_id = $player_id; // FOR SIMULATOR!
 
-    if(empty($this->players[$player_id])) {
+    if (empty($this->players[$player_id])) {
       $this->players[$player_id] = new UBEPlayer();
     }
 
-    foreach($side_info as $fleet_data) {
+    foreach ($side_info as $fleet_data) {
       $this->players[$player_id]->name = $player_id;
       $this->players[$player_id]->setSide($attacker);
 
@@ -485,32 +484,32 @@ 
       $this->fleet_list[$fleet_id] = $objFleet;
 
       $this->fleet_list[$fleet_id]->owner_id = $player_id;
-      foreach($fleet_data as $unit_id => $unit_count) {
-        if(!$unit_count) {
+      foreach ($fleet_data as $unit_id => $unit_count) {
+        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->fleet_list[$fleet_id]->unit_list->unitAdjustCount($unit_id, $unit_count);
-        } elseif($unit_type == UNIT_RESOURCES) {
+        } elseif ($unit_type == UNIT_RESOURCES) {
           $this->fleet_list[$fleet_id]->resource_list[$unit_id] = $unit_count;
-        } elseif($unit_type == UNIT_TECHNOLOGIES) {
-          if($unit_id == TECH_WEAPON) {
+        } elseif ($unit_type == UNIT_TECHNOLOGIES) {
+          if ($unit_id == TECH_WEAPON) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_WEAPON, $unit_count);
-          } elseif($unit_id == TECH_SHIELD) {
+          } elseif ($unit_id == TECH_SHIELD) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_SHIELD, $unit_count);
-          } elseif($unit_id == TECH_ARMOR) {
+          } elseif ($unit_id == TECH_ARMOR) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(TECH_ARMOR, $unit_count);
           }
-        } elseif($unit_type == UNIT_GOVERNORS) {
-          if($unit_id == MRC_FORTIFIER) {
+        } elseif ($unit_type == UNIT_GOVERNORS) {
+          if ($unit_id == MRC_FORTIFIER) {
             // Фортифаер даёт бонус ко всему
             $this->planet_bonus->add_unit_by_snid(MRC_FORTIFIER, $unit_count);
           }
-        } elseif($unit_type == UNIT_MERCENARIES) {
-          if($unit_id == MRC_ADMIRAL) {
+        } elseif ($unit_type == UNIT_MERCENARIES) {
+          if ($unit_id == MRC_ADMIRAL) {
             $this->players[$player_id]->player_bonus->add_unit_by_snid(MRC_ADMIRAL, $unit_count);
           }
         }
@@ -565,7 +564,7 @@ 
 
     $ube->sn_ube_message_send();
 
-    defined('DEBUG_UBE') ? die('DIE at ' . __FILE__ . ' ' . __LINE__) : false;
+    defined('DEBUG_UBE') ? die('DIE at '.__FILE__.' '.__LINE__) : false;
 
     return false;
   }
@@ -580,7 +579,7 @@ 
 
     $ube_report = new UBEReport();
     $ube = $ube_report->sn_ube_report_load(sys_get_param_str('cypher'));
-    if($ube != UBE_REPORT_NOT_FOUND) {
+    if ($ube != UBE_REPORT_NOT_FOUND) {
       $ube_report->sn_ube_report_generate($ube, $template_result);
 
       $template = gettemplate('ube_combat_report', $template);
@@ -608,9 +607,9 @@ 
     $ube->sn_ube_combat();
     $ube_report = new UBEReport();
 
-    if(sys_get_param_str('reload')) {
+    if (sys_get_param_str('reload')) {
       $ube_new = $ube_report->sn_ube_report_load($ube->get_cypher()); // $combat_data = sn_ube_report_load($combat_data[UBE_REPORT_CYPHER]);
-      if($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
+      if ($ube_new != UBE_REPORT_NOT_FOUND && is_object($ube_new)) {
         $ube = $ube_new;
       }
     }
@@ -658,7 +657,7 @@ 
     $this->debris->load_from_report_row($report_row);
 
     $query = doquery("SELECT * FROM {{ube_report_player}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-    while($player_row = db_fetch($query)) {
+    while ($player_row = db_fetch($query)) {
       $this->players->init_player_from_report_info($player_row);
     }
 

includes/classes/UBE/UBEFleetList.php

Doc Comments +3 added lines

@@ -278,6 +278,9 @@
     return count($this->ube_side_present_at_round_start);
   }
 
+  /**
+   * @param integer $round
+   */
   public function ubeAnalyzeFleetOutcome($round) {
     $this->ube_actualize_sides();
 

Spacing +23 added lines, -23 removed lines

@@ -82,13 +82,13 @@ 
    */
   public function ube_db_load_fleets_outcome($report_row) {
     $query = doquery("SELECT * FROM {{ube_report_outcome_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $fleet_id = $row['ube_report_outcome_fleet_fleet_id'];
       $this[$fleet_id]->load_outcome_from_report_row($row);
     }
 
     $query = doquery("SELECT * FROM {{ube_report_outcome_unit}} WHERE `ube_report_id` = {$report_row['ube_report_id']} ORDER BY `ube_report_outcome_unit_sort_order`");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $fleet_id = $row['ube_report_outcome_unit_fleet_id'];
       $this[$fleet_id]->load_unit_outcome_from_row($row);
     }
@@ -108,7 +108,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $result[$UBEFleet->is_attacker][] = array(
         'ID'          => $fleet_id,
         'NAME'        => $ube->players[$UBEFleet->owner_id]->name,
@@ -131,11 +131,11 @@ 
    */
   public function ube_analyze_fleets($is_simulator, UBEDebris $debris, array $resource_exchange_rates) {
     // Генерируем результат боя
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       // Инициализируем массив результатов для флота
 //      $this->init_fleet_outcome_and_link_to_side($UBEFleet);
 
-      foreach($UBEFleet->unit_list->_container as $UBEUnit) {
+      foreach ($UBEFleet->unit_list->_container as $UBEUnit) {
         $UBEUnit->ube_analyze_unit($is_simulator);
       }
 
@@ -152,10 +152,10 @@ 
       $this->resources_lost_in_metal = array(
         RES_METAL => 0,
       );
-      foreach($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) {
+      foreach ($UBEFleet->resources_lost_on_units as $resource_id => $resource_amount) {
         $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id];
       }
-      foreach($UBEFleet->cargo_dropped as $resource_id => $resource_amount) {
+      foreach ($UBEFleet->cargo_dropped as $resource_id => $resource_amount) {
         $UBEFleet->resources_lost_in_metal[RES_METAL] += $resource_amount * $resource_exchange_rates[$resource_id];
       }
     }
@@ -166,8 +166,8 @@ 
    */
   public function ube_get_groups() {
     $result = array();
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->group_id) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->group_id) {
         $result[$UBEFleet->group_id] = $UBEFleet->group_id;
       }
     }
@@ -180,8 +180,8 @@ 
    */
   public function ube_get_capacity_attackers() {
     $result = 0;
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->is_attacker) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->is_attacker) {
         $result += $UBEFleet->fleet_capacity;
       }
     }
@@ -195,7 +195,7 @@ 
    */
   public function ube_db_load_from_report_row(array $report_row, UBE $ube) {
     $query = doquery("SELECT * FROM {{ube_report_fleet}} WHERE `ube_report_id` = {$report_row['ube_report_id']}");
-    while($fleet_row = db_fetch($query)) {
+    while ($fleet_row = db_fetch($query)) {
       $objFleet = new UBEFleet();
       $objFleet->load_from_report($fleet_row, $ube);
       $this[$objFleet->db_id] = $objFleet;
@@ -209,20 +209,20 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ube_prepare_for_next_round($is_simulator) {
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $UBEFleet->prepare_for_next_round($is_simulator);
     }
 
     // Суммируем данные по атакующим и защитникам
     $this->ube_total[UBE_PLAYER_IS_ATTACKER]->_reset();
     $this->ube_total[UBE_PLAYER_IS_DEFENDER]->_reset();
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $this->ube_total[$UBEFleet->is_attacker]->add_unit_stats_array($UBEFleet->total_stats);
     }
 //pvar_dump($this->ube_total);
 
     // Высчитываем долю атаки, приходящейся на юнит равную отношению брони юнита к общей броне - крупные цели атакуют чаще
-    foreach($this->_container as $fleet_id => $UBEFleet) {
+    foreach ($this->_container as $fleet_id => $UBEFleet) {
       $UBEFleet->calculate_unit_partial_data($this->ube_total[$UBEFleet->is_attacker]);
     }
   }
@@ -236,7 +236,7 @@ 
    */
   public function ube_calculate_attack_results(UBE $ube) {
     // Каждый флот атакует все
-    foreach($this->_container as $attack_fleet_data) {
+    foreach ($this->_container as $attack_fleet_data) {
       defined('DEBUG_UBE') ? print("Fleet {$attack_fleet_data->db_id} attacks<br /><div style='margin-left: 30px;'>") : false;
 
       $attack_fleet_data->attack_fleets($this, $ube->is_simulator);
@@ -251,8 +251,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ube_actualize_sides() {
-    foreach($this->_container as $UBEFleet) {
-      if($UBEFleet->get_unit_count() > 0) {
+    foreach ($this->_container as $UBEFleet) {
+      if ($UBEFleet->get_unit_count() > 0) {
         $this->ube_side_present_at_round_start[$UBEFleet->is_attacker] = 1;
       }
     }
@@ -265,8 +265,8 @@ 
    */
   public function ube_calculate_attack_reapers() {
     $reapers = 0;
-    foreach($this->_container as $fleet_id => $UBERoundFleetCombat) {
-      if($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) {
+    foreach ($this->_container as $fleet_id => $UBERoundFleetCombat) {
+      if ($UBERoundFleetCombat->is_attacker == UBE_PLAYER_IS_ATTACKER) {
         $reapers += $UBERoundFleetCombat->unit_list->unitCountReapers();
       }
     }
@@ -283,10 +283,10 @@ 
 
     $result = UBE_COMBAT_RESULT_DRAW;
     // Проверяем результат боя
-    if($this->ube_get_sides_count() == 0 || $round >= 10) {
+    if ($this->ube_get_sides_count() == 0 || $round >= 10) {
       // Если кого-то не осталось или не осталось обоих - заканчиваем цикл
       $result = UBE_COMBAT_RESULT_DRAW_END;
-    } elseif($this->ube_get_sides_count() == 1) {
+    } elseif ($this->ube_get_sides_count() == 1) {
       // Если осталась одна сторона - она и выиграла
       $result = isset($this->ube_side_present_at_round_start[UBE_PLAYER_IS_ATTACKER]) ? UBE_COMBAT_RESULT_WIN : UBE_COMBAT_RESULT_LOSS;
     }
@@ -303,7 +303,7 @@ 
    * @version 41a6.16
    */
   public function ubeInitGetAttackers(Fleet $objFleet, UBEPlayerList $players) {
-    if($objFleet->group_id) {
+    if ($objFleet->group_id) {
       $fleets_added = $this->dbLoadWhere("`fleet_group` = {$objFleet->group_id}");
     } else {
       $this->ube_insert_from_Fleet($objFleet);

includes/functions/int_fleet_events.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,8 +69,8 @@
 
 /**
  * @param Fleet $objFleet
- * @param       $ov_label
- * @param       $planet_end_type
+ * @param       integer $ov_label
+ * @param       integer $planet_end_type
  *
  * @return mixed
  */

Spacing +11 added lines, -11 removed lines

@@ -6,26 +6,26 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if($objFleetList->count() <= 0) {
+  if ($objFleetList->count() <= 0) {
     return;
   }
 
-  foreach($objFleetList->_container as $objFleet) {
+  foreach ($objFleetList->_container as $objFleet) {
     $planet_start_type = $objFleet->fleet_start_type == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = db_planet_by_gspt($objFleet->fleet_start_galaxy, $objFleet->fleet_start_system, $objFleet->fleet_start_planet, $planet_start_type, false, 'name');
     $objFleet->fleet_start_name = $planet_start['name'];
 
     $planet_end_type = $objFleet->fleet_end_type == PT_MOON ? PT_MOON : PT_PLANET;
-    if($objFleet->fleet_end_planet > Vector::$knownPlanets) {
+    if ($objFleet->fleet_end_planet > Vector::$knownPlanets) {
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_exploration'];
-    } elseif($objFleet->mission_type == MT_COLONIZE) {
+    } elseif ($objFleet->mission_type == MT_COLONIZE) {
       $objFleet->fleet_end_name = classLocale::$lang['ov_fleet_colonization'];
     } else {
       $planet_end = db_planet_by_gspt($objFleet->fleet_end_galaxy, $objFleet->fleet_end_system, $objFleet->fleet_end_planet, $planet_end_type, false, 'name');
       $objFleet->fleet_end_name = $planet_end['name'];
     }
 
-    if($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
+    if ($objFleet->time_arrive_to_target > SN_TIME_NOW && !$objFleet->isReturning() && $objFleet->mission_type != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -39,11 +39,11 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 0, $planet_end_type);
     }
 
-    if($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
+    if ($objFleet->time_mission_job_complete > SN_TIME_NOW && !$objFleet->isReturning() && $planet_scanned === false && $objFleet->mission_type != MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $objFleet->time_return_to_source > SN_TIME_NOW && $objFleet->mission_type != MT_MISSILE && ($objFleet->isReturning() || ($objFleet->mission_type != MT_RELOCATE && $objFleet->mission_type != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $objFleet->playerOwnerId == $user['id'])
@@ -59,7 +59,7 @@ 
       $fleet_events[] = flt_register_event_objFleet($objFleet, 2, $planet_end_type);
     }
 
-    if($objFleet->mission_type == MT_MISSILE) {
+    if ($objFleet->mission_type == MT_MISSILE) {
       $fleet_events[] = flt_register_event_objFleet($objFleet, 3, $planet_end_type);
     }
   }
@@ -79,7 +79,7 @@ 
 
   $is_this_planet = false;
 
-  switch($objFleet->ov_label = $ov_label) {
+  switch ($objFleet->ov_label = $ov_label) {
     case 0:
       $objFleet->event_time = $objFleet->time_arrive_to_target;
       $is_this_planet = (
@@ -110,9 +110,9 @@ 
 
   }
 
-  $objFleet->ov_this_planet = $is_this_planet;// || $planet_scanned != false;
+  $objFleet->ov_this_planet = $is_this_planet; // || $planet_scanned != false;
 
-  if($objFleet->playerOwnerId == $user['id']) {
+  if ($objFleet->playerOwnerId == $user['id']) {
     $user_data = $user;
   } else {
     $user_data = db_user_by_id($objFleet->playerOwnerId);