supernova-ws / SuperNova

buddy.php

Braces +9 added lines, -3 removed lines

@@ -57,9 +57,11 @@ 
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+          // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
+        }
 
           msg_send_simple_message($ex_friend_id, $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_unfriend_title'],
             sprintf($lang['buddy_msg_unfriend_text'], $user['username']));
@@ -67,15 +69,19 @@ 
           db_buddy_delete($buddy_id);
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+          // Player's outcoming request - either denied or waiting
         {
           db_buddy_delete($buddy_id);
+        }
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) {
+          // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], $lang['buddy_msg_deny_title'],
             sprintf($lang['buddy_msg_deny_text'], $user['username']));
+        }
 
           db_buddy_update_status($buddy_id, BUDDY_REQUEST_DENIED);
           sn_db_transaction_commit();

Spacing +20 added lines, -20 removed lines

@@ -9,7 +9,7 @@ 
  *
  * Idea from buddy.php Created by Perberos. All rights reversed (C) 2006
  * */
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('buddy');
 
@@ -17,32 +17,32 @@ 
 try {
   sn_db_transaction_start();
 
-  if($buddy_id = sys_get_param_id('buddy_id')) {
+  if ($buddy_id = sys_get_param_id('buddy_id')) {
     $buddy_row = db_buddy_get_row($buddy_id);
-    if(!is_array($buddy_row)) {
+    if (!is_array($buddy_row)) {
       throw new exception('buddy_err_not_exist', ERR_ERROR);
     }
 
-    switch($mode = sys_get_param_str('mode')) {
+    switch ($mode = sys_get_param_str('mode')) {
       case 'accept':
-        if($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
+        if ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) {
           throw new exception('buddy_err_accept_own', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
+        if ($buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
           throw new exception('buddy_err_accept_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) {
           throw new exception('buddy_err_accept_already', ERR_WARNING);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_DENIED) {
           throw new exception('buddy_err_accept_denied', ERR_ERROR);
         }
 
         db_buddy_update_status($buddy_id, BUDDY_REQUEST_ACTIVE);
-        if(classSupernova::$db->db_affected_rows()) {
+        if (classSupernova::$db->db_affected_rows()) {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], classLocale::$lang['buddy_msg_accept_title'],
             sprintf(classLocale::$lang['buddy_msg_accept_text'], $user['username']));
           sn_db_transaction_commit();
@@ -53,11 +53,11 @@ 
       break;
 
       case 'delete':
-        if($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
+        if ($buddy_row['BUDDY_SENDER_ID'] != $user['id'] && $buddy_row['BUDDY_OWNER_ID'] != $user['id']) {
           throw new exception('buddy_err_delete_alien', ERR_ERROR);
         }
 
-        if($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
+        if ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE) // Existing friendship
         {
           $ex_friend_id = $buddy_row['BUDDY_SENDER_ID'] == $user['id'] ? $buddy_row['BUDDY_OWNER_ID'] : $buddy_row['BUDDY_SENDER_ID'];
 
@@ -67,12 +67,12 @@ 
           db_buddy_delete($buddy_id);
           sn_db_transaction_commit();
           throw new exception('buddy_err_unfriend_none', ERR_NONE);
-        } elseif($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
+        } elseif ($buddy_row['BUDDY_SENDER_ID'] == $user['id']) // Player's outcoming request - either denied or waiting
         {
           db_buddy_delete($buddy_id);
           sn_db_transaction_commit();
           throw new exception('buddy_err_delete_own', ERR_NONE);
-        } elseif($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
+        } elseif ($buddy_row['BUDDY_STATUS'] == BUDDY_REQUEST_WAITING) // Deny incoming request
         {
           msg_send_simple_message($buddy_row['BUDDY_SENDER_ID'], $user['id'], SN_TIME_NOW, MSG_TYPE_PLAYER, $user['username'], classLocale::$lang['buddy_msg_deny_title'],
             sprintf(classLocale::$lang['buddy_msg_deny_text'], $user['username']));
@@ -87,22 +87,22 @@ 
 
   // New request?
   // Checking for user ID - in case if it was request from outside buddy system
-  if($new_friend_id = sys_get_param_id('request_user_id')) {
+  if ($new_friend_id = sys_get_param_id('request_user_id')) {
     $new_friend_row = db_user_by_id($new_friend_id, true, '`id`, `username`');
-  } elseif($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
+  } elseif ($new_friend_name = sys_get_param_str_unsafe('request_user_name')) {
     $new_friend_row = db_user_by_username($new_friend_name, true, '`id`, `username`');
     $new_friend_name = db_escape($new_friend_name);
   }
 
-  if($new_friend_row['id'] == $user['id']) {
+  if ($new_friend_row['id'] == $user['id']) {
     unset($new_friend_row);
     throw new exception('buddy_err_adding_self', ERR_ERROR);
   }
 
   // Checking for user name & request text - in case if it was request to adding new request
-  if(isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
+  if (isset($new_friend_row['id']) && ($new_request_text = sys_get_param_str('request_text'))) {
     $check_relation = db_buddy_check_relation($user, $new_friend_row);
-    if(isset($check_relation['BUDDY_ID'])) {
+    if (isset($check_relation['BUDDY_ID'])) {
       throw new exception('buddy_err_adding_exists', ERR_WARNING);
     }
 
@@ -113,7 +113,7 @@ 
     sn_db_transaction_commit();
     throw new exception('buddy_err_adding_none', ERR_NONE);
   }
-} catch(Exception $e) {
+} catch (Exception $e) {
   $result[] = array(
     'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
     'MESSAGE' => classLocale::$lang[$e->getMessage()],
@@ -123,7 +123,7 @@ 
 sn_db_transaction_rollback();
 
 $query = db_buddy_list_by_user($user['id']);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row['BUDDY_REQUEST'] = sys_bbcodeParse($row['BUDDY_REQUEST']);
 
   $row['BUDDY_ACTIVE'] = $row['BUDDY_STATUS'] == BUDDY_REQUEST_ACTIVE;

includes/alliance/ali_internal_admin_diplomacy.inc

Spacing +20 added lines, -20 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_can_negotiate) {
+if (!$user_can_negotiate) {
   message($lang['Denied_access'], $lang['ali_dip_title']);
 }
 
@@ -15,24 +15,24 @@ 
 
 
 
-if(sys_get_param_str('ali_dip_offer_make')) {
+if (sys_get_param_str('ali_dip_offer_make')) {
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list)) {
     message($lang['ali_dip_err_wrong_offer'], $page_title);
   }
 
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
-  if($alliance_negotiation_contr_ally_id == $user['ally_id']) {
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id']) {
     message($lang['ali_dip_err_same_ally'], $page_title);
   }
 
   $contr_ally_row = db_ally_get_by_id($alliance_negotiation_contr_ally_id);
-  if(!$contr_ally_row) {
+  if (!$contr_ally_row) {
     message($lang['ali_dip_err_no_ally'], $page_title);
   }
 
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
-  if($alliance_negotiation_relation == $relation_current_id) {
+  if ($alliance_negotiation_relation == $relation_current_id) {
     message(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
   }
 
@@ -43,7 +43,7 @@ 
 
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1) {
     sn_db_perform('{{alliance_negotiation}}',
       array(
         'alliance_negotiation_ally_id'         => $user['ally_id'],
@@ -70,33 +70,33 @@ 
   }
 } else {
   $offer_id = sys_get_param_id('offer_id');
-  if($offer_id) {
+  if ($offer_id) {
     $offer_answer = sys_get_param_str('answer');
 
     $negotiation = db_ally_negotiation_get_by_offer_id($offer_id);
-    if(!$negotiation) {
+    if (!$negotiation) {
       message($lang['ali_dip_err_offer_none'], $page_title);
-    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) {
+    } elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id']) {
       // TODO: Add log of hack attempt
       message($lang['ali_dip_err_offer_alien'], $page_title);
-    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
-      if($offer_answer == 'accept') {
+    } elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id']) {
+      if ($offer_answer == 'accept') {
         // TODO: Add log of hack attempt
         message($lang['ali_dip_err_offer_accept_own'], $page_title);
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_delete_by_offer_id($offer_id);
       }
     } else {
-      if($offer_answer == 'accept') {
+      if ($offer_answer == 'accept') {
         $accept_offer = true;
-      } elseif($offer_answer == 'deny') {
+      } elseif ($offer_answer == 'deny') {
         db_ally_negotiation_update_status_1($offer_id);
       }
     }
   }
 }
 
-if($accept_offer) {
+if ($accept_offer) {
   sn_db_transaction_start();
 
   // TODO: Make sn_db_perform() multirow
@@ -125,7 +125,7 @@ 
   sn_db_transaction_commit();
 }
 
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation) {
   $template->assign_block_vars('relation', array(
     'ID'   => $diplomacy_relation_id,
     'TEXT' => $lang['ali_dip_relations'][$diplomacy_relation_id],
@@ -134,7 +134,7 @@ 
 
 
 $query = db_ally_list_get_by_not_user_ally($user);
-while($alliance = db_fetch($query)) {
+while ($alliance = db_fetch($query)) {
   $template->assign_block_vars('alliance', array(
     'ID'   => $alliance['id'],
     'NAME' => js_safe_string($alliance['ally_name']),
@@ -143,7 +143,7 @@ 
 }
 
 $query = db_ally_negotiation_list($user);
-while($offer = db_fetch($query)) {
+while ($offer = db_fetch($query)) {
   $template->assign_block_vars('offer', array(
     'ID'       => $offer['alliance_negotiation_id'],
     'NAME'     => $offer['ally_name'],

includes/alliance/ali_external_search.inc

Spacing +4 added lines, -4 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_search', true);
 
 $ali_search_text = sys_get_param_str('searchtext');
-if($ali_search_text) {
+if ($ali_search_text) {
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
 
   $search = db_ally_search_by_name_or_tag($ali_search_text);
-  if(db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (db_num_rows($search)) {
+    while ($ally_row = db_fetch($search)) {
       $template->assign_block_vars('alliances', array(
         'ID'          => $ally_row['id'],
         'TAG'         => $ally_row['ally_tag'],

includes/functions/geoip.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 
-function geoip_status(){return sn_function_call(__FUNCTION__, array(&$result));}
+function geoip_status() {return sn_function_call(__FUNCTION__, array(&$result)); }
 function sn_geoip_status(&$result) {
   return $result = false;
 }
 
-function geoip_ip_info($ip){return sn_function_call(__FUNCTION__, array($ip, &$result));}
+function geoip_ip_info($ip) {return sn_function_call(__FUNCTION__, array($ip, &$result)); }
 function sn_geoip_ip_info($ip, &$result) {
   return $result = false;
 }

includes/includes/flt_mission_hold.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * @copyright 2008 by Gorlum for Project "SuperNova.WS"
  */
 function flt_mission_hold($mission_data) {
-  if($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) {
+  if ($mission_data->fleet->time_mission_job_complete < SN_TIME_NOW) {
     $mission_data->fleet->mark_fleet_as_returned_and_save();
 
     return CACHE_FLEET;

includes/includes/flt_mission_transport.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
   $source_planet = &$mission_data->src_planet;
   $destination_planet = &$mission_data->dst_planet;
 
-  if(!isset($destination_planet['id']) || !$destination_planet['id_owner']) {
+  if (!isset($destination_planet['id']) || !$destination_planet['id_owner']) {
     $objFleet->mark_fleet_as_returned_and_save();
 
     return CACHE_FLEET;
@@ -31,7 +31,7 @@ 
     $fleet_resources[RES_DEUTERIUM], $lang['Deuterium']);
   msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
 
-  if($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
+  if ($objFleet->target_owner_id <> $objFleet->playerOwnerId) {
     msg_send_simple_message($objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT, $lang['sys_mess_tower'], $lang['sys_mess_transport'], $Message);
   }
 

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 /**
  * Fleet mission "Relocate"
  *
- * @param $mission_data Mission
+ * @param Mission $mission_data Mission
  *
  * @return int
  *

includes/includes/flt_mission_recycle.php

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id'])) {
+  if (empty($destination_planet['id'])) {
     $objFleet->mark_fleet_as_returned();
     $objFleet->flush_changes_to_db();
 
@@ -31,10 +31,10 @@ 
   $OtherFleetCapacity = 0;
 
   $fleet_array = $objFleet->get_unit_list();
-  foreach($fleet_array as $unit_id => $unit_count) {
-    if(in_array($unit_id, sn_get_groups('fleet'))) {
+  foreach ($fleet_array as $unit_id => $unit_count) {
+    if (in_array($unit_id, sn_get_groups('fleet'))) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit_count;
-      if(in_array($unit_id, sn_get_groups('flt_recyclers'))) {
+      if (in_array($unit_id, sn_get_groups('flt_recyclers'))) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -43,33 +43,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->get_resources_amount();
-  if($fleet_resources_amount > $OtherFleetCapacity) {
+  if ($fleet_resources_amount > $OtherFleetCapacity) {
     // Если во флоте есть другие корабли И количество ресурсов больше, чем их ёмкость трюмов - значит часть этих ресурсов лежит в трюмах переработчиков
     // Уменьшаем ёмкость переработчиков на указанную величину
     $RecyclerCapacity -= ($fleet_resources_amount - $OtherFleetCapacity);
   }
 
   $resources_recycled = array();
-  if(($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
+  if (($destination_planet["debris_metal"] + $destination_planet["debris_crystal"]) <= $RecyclerCapacity) {
     $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
     $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
   } else {
-    if(($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
+    if (($destination_planet["debris_metal"] > $RecyclerCapacity / 2) &&
       ($destination_planet["debris_crystal"] > $RecyclerCapacity / 2)
     ) {
       $resources_recycled[RES_METAL] = $RecyclerCapacity / 2;
       $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity / 2;
     } else {
-      if($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
+      if ($destination_planet["debris_metal"] > $destination_planet["debris_crystal"]) {
         $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];
-        if($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
+        if ($destination_planet["debris_metal"] > ($RecyclerCapacity - $resources_recycled[RES_CRYSTAL])) {
           $resources_recycled[RES_METAL] = $RecyclerCapacity - $resources_recycled[RES_CRYSTAL];
         } else {
           $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
         }
       } else {
         $resources_recycled[RES_METAL] = $destination_planet["debris_metal"];
-        if($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
+        if ($destination_planet["debris_crystal"] > ($RecyclerCapacity - $resources_recycled[RES_METAL])) {
           $resources_recycled[RES_CRYSTAL] = $RecyclerCapacity - $resources_recycled[RES_METAL];
         } else {
           $resources_recycled[RES_CRYSTAL] = $destination_planet["debris_crystal"];

includes/classes/UBE/UBEUnit.php

Spacing +15 added lines, -15 removed lines

@@ -50,7 +50,7 @@ 
     parent::setUnitId($unitId);
 
     // Reset combat stats??
-    if($this->_unitId) {
+    if ($this->_unitId) {
       $this->amplify = $this->info[P_AMPLIFY];
       $this->capacity = $this->info[P_CAPACITY];
       $this->price[RES_METAL] = $this->info[P_COST][RES_METAL];
@@ -72,7 +72,7 @@ 
     $this->bonus_attack = $this->info[P_ATTACK];
     $this->bonus_shield = $this->info[P_SHIELD];
     $this->bonus_armor = $this->info[P_ARMOR];
-    if(is_object($this->unit_bonus)) {
+    if (is_object($this->unit_bonus)) {
       $this->bonus_attack = floor($this->bonus_attack * $this->unit_bonus->calcBonus(P_ATTACK));
       $this->bonus_shield = floor($this->bonus_shield * $this->unit_bonus->calcBonus(P_SHIELD));
       $this->bonus_armor = floor($this->bonus_armor * $this->unit_bonus->calcBonus(P_ARMOR));
@@ -80,7 +80,7 @@ 
     $this->randomized_attack = $this->bonus_attack;
     $this->randomized_shield = $this->bonus_shield;
     $this->randomized_armor = $this->bonus_armor;
-    if(!$is_simulator) {
+    if (!$is_simulator) {
       // TODO - randomize attack if is not simulator
       $this->randomized_attack = floor($this->bonus_attack * ($is_simulator ? 1 : mt_rand(UBE_RANDOMIZE_FROM, UBE_RANDOMIZE_TO) / 100));
       $this->randomized_shield = floor($this->bonus_shield * ($is_simulator ? 1 : mt_rand(UBE_RANDOMIZE_FROM, UBE_RANDOMIZE_TO) / 100));
@@ -159,22 +159,22 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function restore_unit($is_simulator) {
-    if($this->_type != UNIT_DEFENCE || $this->units_lost <= 0) {
+    if ($this->_type != UNIT_DEFENCE || $this->units_lost <= 0) {
       return;
     }
 
-    if($is_simulator) {
+    if ($is_simulator) {
       $units_giveback = round($this->units_lost * UBE_DEFENCE_RESTORATION_CHANCE_AVG / 100); // for simulation just return 75% of loss
     } else {
       // Checking - should we trigger mass-restore
-      if($this->units_lost >= UBE_DEFENCE_RESTORATION_MASS_COUNT) {
+      if ($this->units_lost >= UBE_DEFENCE_RESTORATION_MASS_COUNT) {
         // For large amount - mass-restoring defence
         $units_giveback = round($this->units_lost * mt_rand(UBE_DEFENCE_RESTORATION_CHANCE_MIN, UBE_DEFENCE_RESTORATION_CHANCE_MAX) / 100);
       } else {
         // For small amount - restoring defence per single unit
         $units_giveback = 0;
-        for($i = 1; $i <= $this->units_lost; $i++) {
-          if(mt_rand(1, 100) <= UBE_DEFENCE_RESTORATION_CHANCE_AVG) {
+        for ($i = 1; $i <= $this->units_lost; $i++) {
+          if (mt_rand(1, 100) <= UBE_DEFENCE_RESTORATION_CHANCE_AVG) {
             $units_giveback++;
           }
         }
@@ -193,7 +193,7 @@ 
    */
   public function receive_damage($is_simulator) {
     // TODO - Добавить взрывы от полуповрежденных юнитов - т.е. заранее вычислить из убитых юнитов еще количество убитых умножить на вероятность от структуры
-    if($this->_count <= 0) {
+    if ($this->_count <= 0) {
       return;
     }
 
@@ -216,7 +216,7 @@ 
     $this->adjustCount(-$units_lost);
 
     // Проверяем - не взорвался ли текущий юнит
-    while($this->_count > 0 && $this->attack_income > 0) {
+    while ($this->_count > 0 && $this->attack_income > 0) {
       $this->attack_damaged_unit($is_simulator);
     }
 
@@ -241,7 +241,7 @@ 
     $armor_left = $this->pool_armor % $this->randomized_armor;
     // Проверка - не атакуем ли мы целый корабль
     // Такое может быть, если на прошлой итерации поврежденный корабль был взорван и еще осталась входящяя атака
-    if($shield_left == 0 && $armor_left == 0) {
+    if ($shield_left == 0 && $armor_left == 0) {
       $shield_left = $this->randomized_shield;
       $armor_left = $this->randomized_armor;
     }
@@ -255,7 +255,7 @@ 
     // Вычитаем этот дамадж из щитов пула
     $this->pool_shield -= $damage_to_shield;
     // Если весь дамадж был поглощён щитами - выходим
-    if($this->attack_income <= 0) {
+    if ($this->attack_income <= 0) {
       return;
     }
 
@@ -272,7 +272,7 @@ 
     $armor_left -= $damage_to_armor;
 
     // Проверяем - осталась ли броня на текущем корабле и вааще
-    if($this->pool_armor <= 0 || $armor_left <= 0) {
+    if ($this->pool_armor <= 0 || $armor_left <= 0) {
       // Не осталось - корабль уничтожен
       $this->adjustCount(-1);
 
@@ -283,10 +283,10 @@ 
     $armor_left_percent = $armor_left / $this->randomized_armor * 100;
     // Проверяем % здоровья
     // TODO - сделать динамический процент для каждого вида юнитов
-    if($armor_left_percent <= UBE_CRITICAL_DAMAGE_THRESHOLD) {
+    if ($armor_left_percent <= UBE_CRITICAL_DAMAGE_THRESHOLD) {
       // Дамадж пошёл по структуре. Чем более поврежден юнит - тем больше шансов у него взорваться
       $random = $is_simulator ? UBE_CRITICAL_DAMAGE_THRESHOLD / 2 : mt_rand(0, 100);
-      if($random >= $armor_left_percent) {
+      if ($random >= $armor_left_percent) {
         $this->adjustCount(-1);
         $this->unit_count_boom++;
 

includes/classes/UBE/UBEPlayerList.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
       UBE_PLAYER_IS_DEFENDER => array(),
     );
 
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER][$player_id] = $UBEPlayer->getDbRow();
     }
 
@@ -70,8 +70,8 @@ 
    */
   public function get_first_player_on_side($side) {
     $result = null;
-    foreach($this->_container as $player_id => $UBEPlayer) {
-      if($UBEPlayer->getSide() == $side) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
+      if ($UBEPlayer->getSide() == $side) {
         $result = $UBEPlayer;
         break;
       }
@@ -88,7 +88,7 @@ 
    */
   public function get_player_sides() {
     $result = array();
-    foreach($this->_container as $player_id => $UBEPlayer) {
+    foreach ($this->_container as $player_id => $UBEPlayer) {
       $result[$player_id] = $UBEPlayer->getSide() ? UBE_PLAYER_IS_ATTACKER : UBE_PLAYER_IS_DEFENDER;
     }
 
@@ -96,7 +96,7 @@ 
   }
 
   public function ubeLoadPlayersAndSetSideFromFleetIdList(array $added_fleets, UBEFleetList $fleetList, $side = UBE_PLAYER_IS_DEFENDER) {
-    foreach($added_fleets as $fleet_id) {
+    foreach ($added_fleets as $fleet_id) {
       $this->db_load_player_by_id($fleetList[$fleet_id]->owner_id, $side);
     }
   }