supernova-ws / SuperNova

includes/general.php

Doc Comments +31 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 require_once('general_pname.php');
 
 /**
- * @param       $func_name
+ * @param       string $func_name
  * @param array $func_arg
  *
  * @return mixed
@@ -63,6 +63,9 @@ 
 }
 
 // ----------------------------------------------------------------------------------------------------------------
+/**
+ * @param string $filename
+ */
 function sys_file_read($filename) {
   return @file_get_contents($filename);
 }
@@ -105,7 +108,7 @@ 
 /**
  * Получение курса обмены валюты в серверную валюту
  *
- * @param $currency_symbol
+ * @param string $currency_symbol
  *
  * @return float
  */
@@ -146,7 +149,7 @@ 
  * @param float     $n
  * @param int|bool  $floor
  * @param int|bool  $color
- * @param int|bool  $limit
+ * @param boolean  $limit
  * @param bool|null $style
  *
  * @return array|float|string
@@ -239,6 +242,9 @@ 
   return preg_replace($ListCensure, '*', $String);
 }
 
+/**
+ * @param string $email
+ */
 function is_email($email) {
   return (preg_match("/^[-_.[:alnum:]]+@((([[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]])\.)+(ad|ae|aero|af|ag|ai|al|am|an|ao|aq|ar|arpa|as|at|au|aw|az|ba|bb|bd|be|bf|bg|bh|bi|biz|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|com|coop|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|edu|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gov|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|in|info|int|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mil|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|museum|mv|mw|mx|my|mz|na|name|nc|ne|net|nf|ng|ni|nl|no|np|nr|nt|nu|nz|om|org|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pro|ps|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)$|(([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5])\.){3}([0-9][0-9]?|[0-1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-5]))$/i", $email));
 }
@@ -276,6 +282,9 @@ 
   return floatval(sys_get_param($param_name, $default));
 }
 
+/**
+ * @param string $param_name
+ */
 function sys_get_param_escaped($param_name, $default = '') {
   return db_escape(sys_get_param($param_name, $default));
 }
@@ -444,6 +453,9 @@ 
 }
 
 // Generates random string of $length symbols from $allowed_chars charset
+/**
+ * @param string $allowed_chars
+ */
 function sys_random_string($length = 16, $allowed_chars = SN_SYS_SEC_CHARS_ALLOWED) {
   $allowed_length = strlen($allowed_chars);
 
@@ -548,6 +560,10 @@ 
   return implode(';', $fleet_string);
 }
 
+/**
+ * @param string $title
+ * @param string $body
+ */
 function mymail($email_unsafe, $title, $body, $from = '', $html = false) {
   $from = trim($from ? $from : classSupernova::$config->game_adminEmail);
 
@@ -806,6 +822,9 @@ 
   return serialize($nick_array);
 }
 
+/**
+ * @param string $nick_string
+ */
 function player_nick_uncompact($nick_string) {
   try {
     $result = unserialize($nick_string);
@@ -1047,6 +1066,9 @@ 
   return $ranks;
 }
 
+/**
+ * @param boolean $planet_id
+ */
 function sys_player_new_adjust($user_id, $planet_id) { return sn_function_call(__FUNCTION__, array($user_id, $planet_id, &$result)); }
 
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
@@ -1197,6 +1219,9 @@ 
   return $rates;
 }
 
+/**
+ * @param integer $in_resource
+ */
 function get_unit_cost_in(&$cost, $in_resource = RES_METAL) {
   static $rates;
 
@@ -1363,6 +1388,9 @@ 
   return version_compare(sn_version_compare_extra($ver1), sn_version_compare_extra($ver2));
 }
 
+/**
+ * @param string $name
+ */
 function sn_setcookie($name, $value = null, $expire = null, $path = SN_ROOT_RELATIVE, $domain = null, $secure = null, $httponly = null) {
   $_COOKIE[$name] = $value;
 

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/Fleet.php

Spacing +35 added lines, -35 removed lines

@@ -324,7 +324,7 @@ 
     parent::__construct();
     $this->exists_missions = sn_get_groups('missions');
     $this->allowed_missions = $this->exists_missions;
-    if(empty(static::$snGroupFleet)) {
+    if (empty(static::$snGroupFleet)) {
       static::$snGroupFleet = sn_get_groups('fleet');
       static::$snGroupFleetAndMissiles = sn_get_groups(array('fleet', 'missile'));
       static::$snGroupRecyclers = sn_get_groups('flt_recyclers');
@@ -407,31 +407,31 @@ 
 
     return doquery(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS f " .
+      "SELECT 1 FROM {{fleets}} AS f ".
 
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " .
+      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ".
 
       // Блокировка всех прилетающих и улетающих флотов, если нужно
       // TODO - lock fleets by COORDINATES
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : '').
 
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу планеты-цели
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '').
       // Блокировка планеты-цели
-      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели
 //      ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') .
 
 
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу флота
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '').
       // Блокировка планеты отправления
-      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') .
+      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота
 //      ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') .
 
@@ -448,11 +448,11 @@ 
   public function dbGetLockById($dbId) {
     doquery(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS FLEET0 " .
+      "SELECT 1 FROM {{fleets}} AS FLEET0 ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " .
+      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ".
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -468,9 +468,9 @@ 
         FLEET1.fleet_end_planet = FLEET0.fleet_end_planet
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
-      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " .
+      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET2 ON
         FLEET2.fleet_mess = 1   AND FLEET0.fleet_mess = 0 AND
@@ -480,7 +480,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT2 ON
-        UNIT2.unit_location_type = " . LOC_FLEET . " AND
+        UNIT2.unit_location_type = " . LOC_FLEET." AND
         UNIT2.unit_location_id = FLEET2.fleet_id
       " .
       // Lock fleet owner
@@ -497,11 +497,11 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT3 ON
-        UNIT3.unit_location_type = " . LOC_FLEET . " AND
+        UNIT3.unit_location_type = " . LOC_FLEET." AND
         UNIT3.unit_location_id = FLEET3.fleet_id
       " .
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " .
+      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET4 ON
         FLEET4.fleet_mess = 1   AND FLEET0.fleet_mess = 1 AND
@@ -511,7 +511,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT4 ON
-        UNIT4.unit_location_type = " . LOC_FLEET . " AND
+        UNIT4.unit_location_type = " . LOC_FLEET." AND
         UNIT4.unit_location_id = FLEET4.fleet_id
       " .
       // Lock fleet owner
@@ -533,7 +533,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT5 ON
-        UNIT5.unit_location_type = " . LOC_PLANET . " AND
+        UNIT5.unit_location_type = " . LOC_PLANET." AND
         UNIT5.unit_location_id = PLANETS5.id
       " .
 
@@ -551,7 +551,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT6 ON
-        UNIT6.unit_location_type = " . LOC_PLANET . " AND
+        UNIT6.unit_location_type = " . LOC_PLANET." AND
         UNIT6.unit_location_id = PLANETS6.id
       " .
       "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE"
@@ -670,7 +670,7 @@ 
       } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
-        throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), ERR_ERROR);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), ERR_ERROR);
       }
     }
   }
@@ -800,7 +800,7 @@ 
    * @param int $unit_count
    */
   public function shipSetCount($unit_id, $unit_count = 0) {
-pdump(__CLASS__ . '->' . __FUNCTION__);
+pdump(__CLASS__.'->'.__FUNCTION__);
     $this->shipAdjustCount($unit_id, $unit_count, true);
   }
 
@@ -876,8 +876,8 @@ 
    */
   public function shipsGetCapacityRecyclers($recycler_info) {
     $recyclers_incoming_capacity = 0;
-    foreach($this->shipsIterator() as $unitId => $unit) {
-      if(!empty(static::$snGroupRecyclers[$unitId]) && $unit->count >= 1) {
+    foreach ($this->shipsIterator() as $unitId => $unit) {
+      if (!empty(static::$snGroupRecyclers[$unitId]) && $unit->count >= 1) {
         $recyclers_incoming_capacity += $unit->count * $recycler_info[$unitId]['capacity'];
       }
     }
@@ -1008,7 +1008,7 @@ 
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
-      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
+      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR);
     }
     $this->resourcesAdjust($resource_list, true);
   }
@@ -1042,7 +1042,7 @@ 
       // Check for negative unit value
       if ($this->resource_list[$resource_id] < 0) {
         // TODO
-        throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
+        throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR);
       }
     }
   }
@@ -1215,7 +1215,7 @@ 
 
   protected function printErrorIfNoShips() {
     if ($this->unitList->unitsCount() <= 0) {
-      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
+      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5);
     }
   }
 
@@ -1550,8 +1550,8 @@ 
 
   public function fleetSpeed() {
     $maxSpeed = PHP_INT_MAX;
-    foreach($this->shipsIterator() as $ship_id => $unit) {
-      if($unit->count > 0 && empty(static::$snGroupFleetAndMissiles[$ship_id])) {
+    foreach ($this->shipsIterator() as $ship_id => $unit) {
+      if ($unit->count > 0 && empty(static::$snGroupFleetAndMissiles[$ship_id])) {
         $single_ship_data = get_ship_data($ship_id, $this->dbOwnerRow);
         $maxSpeed = min($maxSpeed, $single_ship_data['speed']);
       }
@@ -1574,7 +1574,7 @@ 
     } catch (Exception $e) {
 
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1663,7 +1663,7 @@ 
       $validator->validate();
     } catch (Exception $e) {
       // TODO - MESSAGE BOX
-      if($e instanceof ExceptionFleetInvalid) {
+      if ($e instanceof ExceptionFleetInvalid) {
         sn_db_transaction_rollback();
         pdie(classLocale::$lang['fl_attack_error'][$e->getCode()]);
       } else {
@@ -1724,7 +1724,7 @@ 
 
 
     if (!empty($this->captain['unit_id'])) {
-      DBStaticUnit::db_unit_set_by_id($this->captain['unit_id'], "`unit_location_type` = " . LOC_FLEET . ", `unit_location_id` = {$this->_dbId}");
+      DBStaticUnit::db_unit_set_by_id($this->captain['unit_id'], "`unit_location_type` = ".LOC_FLEET.", `unit_location_id` = {$this->_dbId}");
     }
 
 //    return $this->fleet->acs['ankunft'] - $this->fleet->time_launch >= $this->fleet->travelData['duration'];
@@ -1736,7 +1736,7 @@ 
     $template_result['.']['fleets'][] = $this->renderFleet(SN_TIME_NOW, $timeMissionJob);
 
     $template_result += array(
-      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''),
+      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''),
       'dist'            => pretty_number($this->travelData['distance']),
       'speed'           => pretty_number($this->travelData['fleet_speed']),
       'deute_need'      => pretty_number($this->travelData['consumption']),

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,
 

includes/includes/flt_functions.php

Spacing +78 added lines, -78 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
 function flt_fleet_speed($user, $fleet) {
-  if(!is_array($fleet)) {
+  if (!is_array($fleet)) {
     $fleet = array($fleet => 1);
   }
 
   $speeds = array();
-  if(!empty($fleet)) {
-    foreach($fleet as $ship_id => $amount) {
-      if($amount && in_array($ship_id, Fleet::$snGroupFleetAndMissiles)) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, Fleet::$snGroupFleetAndMissiles)) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -40,14 +40,14 @@ 
 
   $game_fleet_speed = flt_server_flight_speed_multiplier();
   $fleet_speed = flt_fleet_speed($user_row, $fleet_array);
-  if(!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
+  if (!empty($fleet_array) && $fleet_speed && $game_fleet_speed) {
     $speed_percent = $speed_percent ? max(min($speed_percent, 10), 1) : 10;
     $real_speed = $speed_percent * sqrt($fleet_speed);
 
     $duration = max(1, round((35000 / $speed_percent * sqrt($distance * 10 / $fleet_speed) + 10) / $game_fleet_speed));
 
-    foreach($fleet_array as $ship_id => $ship_count) {
-      if(!$ship_id || !$ship_count) {
+    foreach ($fleet_array as $ship_id => $ship_count) {
+      if (!$ship_id || !$ship_count) {
         continue;
       }
 
@@ -75,19 +75,19 @@ 
 function flt_bashing_check($user, $enemy, $planet_dst, $mission, $flight_duration, $fleet_group = 0) {
   $config_bashing_attacks = classSupernova::$config->fleet_bashing_attacks;
   $config_bashing_interval = classSupernova::$config->fleet_bashing_interval;
-  if(!$config_bashing_attacks) {
+  if (!$config_bashing_attacks) {
     // Bashing allowed - protection disabled
     return FLIGHT_ALLOWED;
   }
 
   $bashing_result = FLIGHT_MISSION_ATTACK_BASHING;
-  if($user['ally_id'] && $enemy['ally_id']) {
+  if ($user['ally_id'] && $enemy['ally_id']) {
     $relations = ali_relations($user['ally_id'], $enemy['ally_id']);
-    if(!empty($relations)) {
+    if (!empty($relations)) {
       $relations = $relations[$enemy['ally_id']];
-      switch($relations['alliance_diplomacy_relation']) {
+      switch ($relations['alliance_diplomacy_relation']) {
         case ALLY_DIPLOMACY_WAR:
-          if(SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
+          if (SN_TIME_NOW - $relations['alliance_diplomacy_time'] <= classSupernova::$config->fleet_bashing_war_delay) {
             $bashing_result = FLIGHT_MISSION_ATTACK_BASHING_WAR_DELAY;
           } else {
             return FLIGHT_ALLOWED;
@@ -109,9 +109,9 @@ 
 
   // Retrieving flying fleets
   $objFleetsBashing = FleetList::dbGetFleetListBashing($user['id'], $planet_dst);
-  foreach($objFleetsBashing->_container as $fleetBashing) {
+  foreach ($objFleetsBashing->_container as $fleetBashing) {
     // Checking for ACS - each ACS count only once
-    if($fleetBashing->group_id) {
+    if ($fleetBashing->group_id) {
       $bashing_list["{$user['id']}_{$fleetBashing->group_id}"] = $fleetBashing->time_arrive_to_target;
     } else {
       $bashing_list[] = $fleetBashing->time_arrive_to_target;
@@ -119,12 +119,12 @@ 
   }
 
   // Check for joining to ACS - if there are already fleets in ACS no checks should be done
-  if($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
+  if ($mission == MT_ACS && $bashing_list["{$user['id']}_{$fleet_group}"]) {
     return FLIGHT_ALLOWED;
   }
 
   $query = DBStaticFleetBashing::db_bashing_list_get($user, $planet_dst, $time_limit);
-  while($bashing_row = db_fetch($query)) {
+  while ($bashing_row = db_fetch($query)) {
     $bashing_list[] = $bashing_row['bashing_time'];
   }
 
@@ -133,9 +133,9 @@ 
   $last_attack = 0;
   $wave = 0;
   $attack = 1;
-  foreach($bashing_list as &$bash_time) {
+  foreach ($bashing_list as &$bash_time) {
     $attack++;
-    if($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
+    if ($bash_time - $last_attack > $config_bashing_interval || $attack > $config_bashing_attacks) {
       $attack = 1;
       $wave++;
     }
@@ -152,16 +152,16 @@ 
   //TODO: try..catch
   global $user;
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     return $result = FLIGHT_PLAYER_VACATION_OWN;
   }
 
-  if(empty($fleet) || !is_array($fleet)) {
+  if (empty($fleet) || !is_array($fleet)) {
     return $result = FLIGHT_SHIPS_NO_SHIPS;
   }
 
   $sn_groups_mission = sn_get_groups('missions');
-  if(!isset($sn_groups_mission[$mission])) {
+  if (!isset($sn_groups_mission[$mission])) {
     return $result = FLIGHT_MISSION_UNKNOWN;
   }
   $sn_data_mission = $sn_groups_mission[$mission];
@@ -180,32 +180,32 @@ 
   $resources = 0;
   $ship_ids = Fleet::$snGroupFleet;
   $resource_ids = sn_get_groups('resources_loot');
-  foreach($fleet as $ship_id => $ship_count) {
+  foreach ($fleet as $ship_id => $ship_count) {
     $is_ship = in_array($ship_id, $ship_ids);
     $is_resource = in_array($ship_id, $resource_ids);
-    if(!$is_ship && !$is_resource) {
+    if (!$is_ship && !$is_resource) {
       // TODO Спецобработчик для Капитана и модулей
 //      return FLIGHT_SHIPS_UNIT_WRONG;
     }
 
-    if($ship_count < 0) {
+    if ($ship_count < 0) {
       return $result = $is_ship ? FLIGHT_SHIPS_NEGATIVE : FLIGHT_RESOURCES_NEGATIVE;
     }
 
-    if($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
+    if ($ship_count > mrc_get_level($user, $planet_src, $ship_id)) {
       // TODO FLIGHT_MISSION_MISSILE_NO_MISSILES
       return $result = $is_ship ? FLIGHT_SHIPS_NOT_ENOUGH_OR_RESOURCES : FLIGHT_RESOURCES_NOT_ENOUGH;
     }
 
-    if($is_ship) {
+    if ($is_ship) {
       $single_ship_data = get_ship_data($ship_id, $user);
-      if($single_ship_data[P_SPEED] <= 0) {
+      if ($single_ship_data[P_SPEED] <= 0) {
         return $result = FLIGHT_SHIPS_UNMOVABLE;
       }
       $ships += $ship_count;
       $recyclers += in_array($ship_id, Fleet::$snGroupRecyclers) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -216,7 +216,7 @@ 
     }
   */
 
-  if(isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
+  if (isset($options['resources']) && $options['resources'] > 0 && !(isset($sn_data_mission['transport']) && $sn_data_mission['transport'])) {
     return $result = FLIGHT_RESOURCES_FORBIDDEN;
   }
 
@@ -228,78 +228,78 @@ 
   */
 
   $speed = $options['fleet_speed_percent'];
-  if($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
+  if ($speed && ($speed != intval($speed) || $speed < 1 || $speed > 10)) {
     return $result = FLIGHT_FLEET_SPEED_WRONG;
   }
 
   $travel_data = flt_travel_data($user, $planet_src, $planet_dst, $fleet, $options['fleet_speed_percent']);
 
 
-  if(mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
+  if (mrc_get_level($user, $planet_src, RES_DEUTERIUM) < $fleet[RES_DEUTERIUM] + $travel_data['consumption']) {
     return $result = FLIGHT_RESOURCES_FUEL_NOT_ENOUGH;
   }
 
-  if($travel_data['consumption'] > $travel_data['capacity']) {
+  if ($travel_data['consumption'] > $travel_data['capacity']) {
     return $result = FLIGHT_FLEET_TOO_FAR;
   }
 
-  if($travel_data['hold'] < $resources) {
+  if ($travel_data['hold'] < $resources) {
     return $result = FLIGHT_FLEET_OVERLOAD;
   }
 
   $fleet_start_time = SN_TIME_NOW + $travel_data['duration'];
 
   $fleet_group = $options['fleet_group'];
-  if($fleet_group) {
-    if($mission != MT_ACS) {
+  if ($fleet_group) {
+    if ($mission != MT_ACS) {
       return $result = FLIGHT_MISSION_IMPOSSIBLE;
     };
 
     $acs = DBStaticFleetACS::db_acs_get_by_group_id($fleet_group);
-    if(!$acs['id']) {
+    if (!$acs['id']) {
       return $result = FLIGHT_MISSION_ACS_NOT_EXISTS;
     }
 
-    if($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
+    if ($planet_dst['galaxy'] != $acs['galaxy'] || $planet_dst['system'] != $acs['system'] || $planet_dst['planet'] != $acs['planet'] || $planet_dst['planet_type'] != $acs['planet_type']) {
       return $result = FLIGHT_MISSION_ACS_WRONG_TARGET;
     }
 
-    if($fleet_start_time > $acs['ankunft']) {
+    if ($fleet_start_time > $acs['ankunft']) {
       return $result = FLIGHT_MISSION_ACS_TOO_LATE;
     }
   }
 
   $flying_fleets = $options['flying_fleets'];
-  if(!$flying_fleets) {
+  if (!$flying_fleets) {
     $flying_fleets = FleetList::fleet_count_flying($user['id']);
   }
-  if(GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
+  if (GetMaxFleets($user) <= $flying_fleets && $mission != MT_MISSILE) {
     return $result = FLIGHT_FLEET_NO_SLOTS;
   }
 
   // В одиночку шпионские зонды могут летать только в миссии Шпионаж, Передислокация и Транспорт
-  if($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
+  if ($ships && $spies && $spies == $ships && !($mission == MT_SPY || $mission == MT_RELOCATE || $mission == MT_TRANSPORT)) {
     return $result = FLIGHT_SHIPS_NOT_ONLY_SPIES;
   }
 
   // Checking for no planet
-  if(!$planet_dst['id_owner']) {
-    if($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
+  if (!$planet_dst['id_owner']) {
+    if ($mission == MT_COLONIZE && !$fleet[SHIP_COLONIZER]) {
       return $result = FLIGHT_SHIPS_NO_COLONIZER;
     }
 
-    if($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
+    if ($mission == MT_EXPLORE || $mission == MT_COLONIZE) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_VECTOR_NO_TARGET;
   }
 
-  if($mission == MT_RECYCLE) {
-    if($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
+  if ($mission == MT_RECYCLE) {
+    if ($planet_dst['debris_metal'] + $planet_dst['debris_crystal'] <= 0) {
       return $result = FLIGHT_MISSION_RECYCLE_NO_DEBRIS;
     }
-    if($recyclers <= 0) {
+    if ($recyclers <= 0) {
       return $result = FLIGHT_SHIPS_NO_RECYCLERS;
     }
 
@@ -307,8 +307,8 @@ 
   }
 
   // Got planet. Checking if it is ours
-  if($planet_dst['id_owner'] == $user['id']) {
-    if($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
+  if ($planet_dst['id_owner'] == $user['id']) {
+    if ($mission == MT_TRANSPORT || $mission == MT_RELOCATE) {
       return $result = FLIGHT_ALLOWED;
     }
 
@@ -316,19 +316,19 @@ 
   }
 
   // No, planet not ours. Cutting mission that can't be send to not-ours planet
-  if($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
+  if ($mission == MT_RELOCATE || $mission == MT_COLONIZE || $mission == MT_EXPLORE) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
   $enemy = DBStaticUser::db_user_by_id($planet_dst['id_owner']);
   // We cannot attack or send resource to users in VACATION mode
-  if($enemy['vacation'] && $mission != MT_RECYCLE) {
+  if ($enemy['vacation'] && $mission != MT_RECYCLE) {
     return $result = FLIGHT_PLAYER_VACATION;
   }
 
   // Multi IP protection
   // TODO: Here we need a procedure to check proxies
-  if(sys_is_multiaccount($user, $enemy)) {
+  if (sys_is_multiaccount($user, $enemy)) {
     return $result = FLIGHT_PLAYER_SAME_IP;
   }
 
@@ -336,8 +336,8 @@ 
   $enemy_points = $enemy['total_points'];
 
   // Is it transport? If yes - checking for buffing to prevent mega-alliance destroyer
-  if($mission == MT_TRANSPORT) {
-    if($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
+  if ($mission == MT_TRANSPORT) {
+    if ($user_points >= $enemy_points || classSupernova::$config->allow_buffing) {
       return $result = FLIGHT_ALLOWED;
     } else {
       return $result = FLIGHT_PLAYER_BUFFING;
@@ -347,66 +347,66 @@ 
   // Only aggresive missions passed to this point. HOLD counts as passive but aggresive
 
   // Is it admin with planet protection?
-  if($planet_dst['id_level'] > $user['authlevel']) {
+  if ($planet_dst['id_level'] > $user['authlevel']) {
     return $result = FLIGHT_PLAYER_ADMIN;
   }
 
   // Okay. Now skipping protection checks for inactive longer then 1 week
-  if(!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
-    if(
+  if (!$enemy['onlinetime'] || $enemy['onlinetime'] >= (SN_TIME_NOW - 60 * 60 * 24 * 7)) {
+    if (
       ($enemy_points <= classSupernova::$config->game_noob_points && $user_points > classSupernova::$config->game_noob_points)
       ||
       (classSupernova::$config->game_noob_factor && $user_points > $enemy_points * classSupernova::$config->game_noob_factor)
     ) {
-      if($mission != MT_HOLD) {
+      if ($mission != MT_HOLD) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
-      if($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
+      if ($mission == MT_HOLD && !($user['ally_id'] && $user['ally_id'] == $enemy['ally_id'] && classSupernova::$config->ally_help_weak)) {
         return $result = FLIGHT_PLAYER_NOOB;
       }
     }
   }
 
   // Is it HOLD mission? If yes - there should be ally deposit
-  if($mission == MT_HOLD) {
-    if(mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
+  if ($mission == MT_HOLD) {
+    if (mrc_get_level($user, $planet_dst, STRUC_ALLY_DEPOSIT)) {
       return $result = FLIGHT_ALLOWED;
     }
 
     return $result = FLIGHT_MISSION_HOLD_NO_ALLY_DEPOSIT;
   }
 
-  if($mission == MT_SPY) {
+  if ($mission == MT_SPY) {
     return $result = $spies >= 1 ? FLIGHT_ALLOWED : FLIGHT_MISSION_SPY_NO_SPIES;
   }
 
   // Is it MISSILE mission?
-  if($mission == MT_MISSILE) {
+  if ($mission == MT_MISSILE) {
     $sn_data_mip = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
-    if(mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
+    if (mrc_get_level($user, $planet_src, STRUC_SILO) < $sn_data_mip[P_REQUIRE][STRUC_SILO]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_SILO;
     }
 
-    if(!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
+    if (!$fleet[UNIT_DEF_MISSILE_INTERPLANET]) {
       return $result = FLIGHT_MISSION_MISSILE_NO_MISSILES;
     }
 
     $distance = abs($planet_dst['system'] - $planet_src['system']);
     $mip_range = flt_get_missile_range($user);
-    if($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
+    if ($distance > $mip_range || $planet_dst['galaxy'] != $planet_src['galaxy']) {
       return $result = FLIGHT_MISSION_MISSILE_TOO_FAR;
     }
 
-    if(isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
+    if (isset($options['target_structure']) && $options['target_structure'] && !in_array($options['target_structure'], sn_get_groups('defense_active'))) {
       return $result = FLIGHT_MISSION_MISSILE_WRONG_STRUCTURE;
     }
   }
 
-  if($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
+  if ($mission == MT_DESTROY && $planet_dst['planet_type'] != PT_MOON) {
     return $result = FLIGHT_MISSION_IMPOSSIBLE;
   }
 
-  if($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
+  if ($mission == MT_ATTACK || $mission == MT_ACS || $mission == MT_DESTROY) {
     return $result = flt_bashing_check($user, $enemy, $planet_dst, $mission, $travel_data['duration'], $fleet_group);
   }
 
@@ -433,7 +433,7 @@ 
   $from = $from['planet'];
 
   $can_attack = flt_can_attack($from, $to, $fleet_REAL_array, $mission, $options);
-  if($can_attack != FLIGHT_ALLOWED) {
+  if ($can_attack != FLIGHT_ALLOWED) {
     $internal_transaction ? sn_db_transaction_rollback() : false;
 
     return $can_attack;
@@ -444,7 +444,7 @@ 
   $travel_data = flt_travel_data($user, $from, $to, $fleet_REAL_array, $options['fleet_speed_percent']);
 
   $time_on_mission = 0;
-  if($mission == MT_EXPLORE || $mission == MT_HOLD) {
+  if ($mission == MT_EXPLORE || $mission == MT_HOLD) {
     // TODO - include some checks about maximum and minumum stay_duration
     $time_on_mission = $options['stay_time'] * 3600;
   }
@@ -467,14 +467,14 @@ 
   $sn_group_resources_loot = sn_get_groups('resources_loot');
   $db_changeset = array();
   $planet_row_changed_fields = array();
-  foreach($fleet_REAL_array as $unit_id => $amount) {
-    if(!$amount || !$unit_id) {
+  foreach ($fleet_REAL_array as $unit_id => $amount) {
+    if (!$amount || !$unit_id) {
       continue;
     }
 
-    if(in_array($unit_id, $sn_group_fleet)) {
+    if (in_array($unit_id, $sn_group_fleet)) {
       $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, -$amount, $user, $from['id']);
-    } elseif(in_array($unit_id, $sn_group_resources_loot)) {
+    } elseif (in_array($unit_id, $sn_group_resources_loot)) {
       $planet_row_changed_fields[pname_resource_name($unit_id)]['delta'] -= $amount;
     }
   }
@@ -513,16 +513,16 @@ 
 
   $ship_data = array();
   $fleet_array = array();
-  foreach($ship_list as $transport_id => $cork) {
+  foreach ($ship_list as $transport_id => $cork) {
     $ship_data[$transport_id] = flt_travel_data($user, $from, $to, array($transport_id => 1), 10);
   }
   uasort($ship_data, 'flt_calculate_ship_to_transport_sort');
 
   $fleet_capacity = 0;
   $fuel_total = $fuel_left = mrc_get_level($user, $from, RES_DEUTERIUM);
-  foreach($ship_data as $transport_id => &$ship_info) {
+  foreach ($ship_data as $transport_id => &$ship_info) {
     $ship_loaded = min($ship_list[$transport_id], ceil($resource_amount / $ship_info['hold']), floor($fuel_left / $ship_info['consumption']));
-    if($ship_loaded) {
+    if ($ship_loaded) {
       $fleet_array[$transport_id] = $ship_loaded;
       $resource_amount -= min($resource_amount, $ship_info['hold'] * $ship_loaded);
       $fuel_left -= $ship_info['consumption'] * $ship_loaded;

includes/includes/flt_mission_recycle.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 function flt_mission_recycle($mission_data) {
   $objFleet = $mission_data->fleet;
   $destination_planet = &$mission_data->dst_planet;
-  if(empty($destination_planet['id'])) {
+  if (empty($destination_planet['id'])) {
     $objFleet->markReturned();
     $objFleet->dbSave();
 
@@ -22,10 +22,10 @@ 
   $RecyclerCapacity = 0;
   $OtherFleetCapacity = 0;
 
-  foreach($objFleet->shipsIterator() as $unit_id => $unit) {
-    if(in_array($unit_id, Fleet::$snGroupFleet)) {
+  foreach ($objFleet->shipsIterator() as $unit_id => $unit) {
+    if (in_array($unit_id, Fleet::$snGroupFleet)) {
       $capacity = get_unit_param($unit_id, P_CAPACITY) * $unit->count;
-      if(in_array($unit_id, Fleet::$snGroupRecyclers)) {
+      if (in_array($unit_id, Fleet::$snGroupRecyclers)) {
         $RecyclerCapacity += $capacity;
       } else {
         $OtherFleetCapacity += $capacity;
@@ -34,33 +34,33 @@ 
   }
 
   $fleet_resources_amount = $objFleet->resourcesGetTotal();
-  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/includes/flt_mission_spy.php

Spacing +25 added lines, -25 removed lines

@@ -11,8 +11,8 @@ 
  */
 // ----------------------------------------------------------------------------------------------------------------
 function coe_compress_add_units($unit_group, $target_planet, &$compress_data, $target_user = array()) {
-  foreach($unit_group as $unit_id) {
-    if(($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
+  foreach ($unit_group as $unit_id) {
+    if (($unit_count = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
       $compress_data[$unit_id] = $unit_count;
     }
   }
@@ -22,8 +22,8 @@ 
   $classLocale = classLocale::$lang;
 
   $result = "<tr><td class=\"c\" colspan=\"4\">{$section_title}</td></tr>";
-  foreach(sn_get_groups($group_name) as $unit_id) {
-    if(($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
+  foreach (sn_get_groups($group_name) as $unit_id) {
+    if (($unit_amount = mrc_get_level($target_user, $target_planet, $unit_id, false, true)) > 0) {
       $result .= "<tr><td align=\"left\" colspan=\"3\">{$classLocale['tech'][$unit_id]}</td><td align=\"right\">{$unit_amount}</td></tr>";
     }
 
@@ -55,14 +55,14 @@ 
 
   $objFleet = $mission_data->fleet;
 
-  if(empty($target_user_row['id']) || empty($target_planet_row['id']) || empty($spying_user_row['id'])) {
+  if (empty($target_user_row['id']) || empty($target_planet_row['id']) || empty($spying_user_row['id'])) {
     $objFleet->markReturnedAndSave();
 
     return $result;
   }
 
   $spy_probes = $objFleet->shipsGetTotalById(SHIP_SPY);
-  if($spy_probes > 0) {
+  if ($spy_probes > 0) {
     $TargetSpyLvl = GetSpyLevel($target_user_row);
     $CurrentSpyLvl = GetSpyLevel($spying_user_row);
     $spy_diff_empire = $CurrentSpyLvl - $TargetSpyLvl;
@@ -80,26 +80,26 @@ 
     $spy_message .= " ({$classLocale['Player_']} '{$target_user_row['username']}') {$classLocale['On_']} ";
     $spy_message .= date(FMT_DATE_TIME, $objFleet->time_arrive_to_target);
     $spy_message .= "</td></tr><tr>";
-    $spy_message .= "<td width=220>{$classLocale['sys_metal']}</td><td width=220 align=right>" . pretty_number($target_planet_row['metal']) . "</td>";
-    $spy_message .= "<td width=220>{$classLocale['sys_crystal']}</td></td><td width=220 align=right>" . pretty_number($target_planet_row['crystal']) . "</td>";
+    $spy_message .= "<td width=220>{$classLocale['sys_metal']}</td><td width=220 align=right>".pretty_number($target_planet_row['metal'])."</td>";
+    $spy_message .= "<td width=220>{$classLocale['sys_crystal']}</td></td><td width=220 align=right>".pretty_number($target_planet_row['crystal'])."</td>";
     $spy_message .= "</tr><tr>";
-    $spy_message .= "<td width=220>{$classLocale['sys_deuterium']}</td><td width=220 align=right>" . pretty_number($target_planet_row['deuterium']) . "</td>";
-    $spy_message .= "<td width=220>{$classLocale['sys_energy']}</td><td width=220 align=right>" . pretty_number($target_planet_row['energy_max']) . "</td>";
+    $spy_message .= "<td width=220>{$classLocale['sys_deuterium']}</td><td width=220 align=right>".pretty_number($target_planet_row['deuterium'])."</td>";
+    $spy_message .= "<td width=220>{$classLocale['sys_energy']}</td><td width=220 align=right>".pretty_number($target_planet_row['energy_max'])."</td>";
     $spy_message .= "</tr>";
-    if($spy_diff >= 2) {
-      $spy_message .= "<div class='spy_medium'>" . flt_spy_scan($target_planet_row, 'fleet', classLocale::$lang['tech'][UNIT_SHIPS], $target_user_row) . "</div>";
+    if ($spy_diff >= 2) {
+      $spy_message .= "<div class='spy_medium'>".flt_spy_scan($target_planet_row, 'fleet', classLocale::$lang['tech'][UNIT_SHIPS], $target_user_row)."</div>";
       coe_compress_add_units(Fleet::$snGroupFleet, $target_planet_row, $combat_pack[0]);
     }
-    if($spy_diff >= 3) {
-      $spy_message .= "<div class='spy_medium'>" . flt_spy_scan($target_planet_row, 'defense', classLocale::$lang['tech'][UNIT_DEFENCE], $target_user_row) . "</div>";
+    if ($spy_diff >= 3) {
+      $spy_message .= "<div class='spy_medium'>".flt_spy_scan($target_planet_row, 'defense', classLocale::$lang['tech'][UNIT_DEFENCE], $target_user_row)."</div>";
       coe_compress_add_units(sn_get_groups('defense_active'), $target_planet_row, $combat_pack[0]);
     }
-    if($spy_diff >= 5) {
-      $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'structures', classLocale::$lang['tech'][UNIT_STRUCTURES], $target_user_row) . "</div>";
+    if ($spy_diff >= 5) {
+      $spy_message .= "<div class='spy_long'>".flt_spy_scan($target_planet_row, 'structures', classLocale::$lang['tech'][UNIT_STRUCTURES], $target_user_row)."</div>";
     }
 
-    if($spy_diff_empire >= 0) {
-      $spy_message .= "<div class='spy_long'>" . flt_spy_scan($target_planet_row, 'tech', classLocale::$lang['tech'][UNIT_TECHNOLOGIES], $target_user_row) . "</div>";
+    if ($spy_diff_empire >= 0) {
+      $spy_message .= "<div class='spy_long'>".flt_spy_scan($target_planet_row, 'tech', classLocale::$lang['tech'][UNIT_TECHNOLOGIES], $target_user_row)."</div>";
       coe_compress_add_units(array(TECH_WEAPON, TECH_SHIELD, TECH_ARMOR), $target_planet_row, $combat_pack[0], $target_user_row);
     }
     // TODO: Наемники, губернаторы, артефакты и прочее имперское
@@ -107,13 +107,13 @@ 
     $simulator_link = sn_ube_simulator_encode_replay($combat_pack, 'D');
 
     $target_unit_list = 0;
-    foreach(Fleet::$snGroupFleet as $unit_id) {
+    foreach (Fleet::$snGroupFleet as $unit_id) {
       $target_unit_list += max(0, mrc_get_level($target_user_row, $target_planet_row, $unit_id, false, true));
     }
 
     $spy_detected = $spy_probes * $target_unit_list / 4 * pow(2, $TargetSpyLvl - $CurrentSpyLvl);
 
-    if(mt_rand(0, 99) > $spy_detected) {
+    if (mt_rand(0, 99) > $spy_detected) {
       $spy_outcome_str = sprintf(classLocale::$lang['sys_mess_spy_detect_chance'], $spy_detected);
       $spy_detected = false;
     } else {
@@ -130,16 +130,16 @@ 
 
     DBStaticMessages::msg_send_simple_message($spying_user_row['id'], '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, classLocale::$lang['sys_mess_qg'], classLocale::$lang['sys_mess_spy_report'], $spy_message);
 
-    $target_message = "{$classLocale['sys_mess_spy_ennemyfleet']} {$spying_planet_row['name']} " . uni_render_coordinates_href($spying_planet_row, '', 3);
-    $target_message .= " {$classLocale['sys_mess_spy_seen_at']} {$target_planet_row['name']} " . uni_render_coordinates($target_planet_row);
+    $target_message = "{$classLocale['sys_mess_spy_ennemyfleet']} {$spying_planet_row['name']} ".uni_render_coordinates_href($spying_planet_row, '', 3);
+    $target_message .= " {$classLocale['sys_mess_spy_seen_at']} {$target_planet_row['name']} ".uni_render_coordinates($target_planet_row);
 
-    if($spy_detected) {
+    if ($spy_detected) {
       $debris_planet_id = $target_planet_row['planet_type'] == PT_PLANET ? $target_planet_row['id'] : $target_planet_row['parent_planet'];
 
       $spy_cost = get_unit_param(SHIP_SPY, P_COST);
 
       DBStaticPlanet::db_planet_set_by_id($debris_planet_id,
-        "`debris_metal` = `debris_metal` + " . floor($spy_probes * $spy_cost[RES_METAL] * 0.3) . ", `debris_crystal` = `debris_crystal` + " . floor($spy_probes * $spy_cost[RES_CRYSTAL] * 0.3));
+        "`debris_metal` = `debris_metal` + ".floor($spy_probes * $spy_cost[RES_METAL] * 0.3).", `debris_crystal` = `debris_crystal` + ".floor($spy_probes * $spy_cost[RES_CRYSTAL] * 0.3));
 
       $target_message .= "<br />{$classLocale['sys_mess_spy_destroyed_enemy']}";
 
@@ -150,7 +150,7 @@ 
     DBStaticMessages::msg_send_simple_message($objFleet->target_owner_id, '', $objFleet->time_arrive_to_target, MSG_TYPE_SPY, classLocale::$lang['sys_mess_spy_control'], classLocale::$lang['sys_mess_spy_activity'], $target_message);
   }
 
-  if($spy_detected) {
+  if ($spy_detected) {
     $objFleet->dbDelete();
   } else {
     $objFleet->markReturnedAndSave();

includes/includes/flt_mission_relocate.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
   $destination_planet = &$mission_data->dst_planet;
 
-  if(empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
+  if (empty($destination_planet['id_owner']) || $objFleet->playerOwnerId != $destination_planet['id_owner']) {
     $objFleet->markReturnedAndSave();
 
     return CACHE_FLEET;
@@ -27,9 +27,9 @@ 
       $fleet_resources[RES_METAL], classLocale::$lang['Metal'],
       $fleet_resources[RES_CRYSTAL], classLocale::$lang['Crystal'],
       $fleet_resources[RES_DEUTERIUM], classLocale::$lang['Deuterium']
-    ) . '<br />' . classLocale::$lang['sys_relocate_mess_user'];
-  foreach($objFleet->shipsIterator() as $ship_id => $ship) {
-    $Message .= classLocale::$lang['tech'][$ship_id] . ' - ' . $ship->count . '<br />';
+    ).'<br />'.classLocale::$lang['sys_relocate_mess_user'];
+  foreach ($objFleet->shipsIterator() as $ship_id => $ship) {
+    $Message .= classLocale::$lang['tech'][$ship_id].' - '.$ship->count.'<br />';
   }
   DBStaticMessages::msg_send_simple_message(
     $objFleet->playerOwnerId, '', $objFleet->time_arrive_to_target, MSG_TYPE_TRANSPORT,