supernova-ws / SuperNova

includes/db/db_queries_unit.php

Doc Comments +6 added lines

@@ -64,11 +64,17 @@
   return classSupernova::db_upd_record_by_id(LOC_UNIT, $unit_id, $set);
 }
 
+/**
+ * @param string $set
+ */
 function db_unit_set_insert($set)
 {
   return classSupernova::db_ins_record(LOC_UNIT, $set);
 }
 
+/**
+ * @param integer $unit_location_type
+ */
 function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0)
 {
   return classSupernova::db_del_record_list(LOC_UNIT,

Spacing +13 added lines, -13 removed lines

@@ -21,13 +21,13 @@ 
 
 function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
   $query = doquery(
-    "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-    ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-    ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+    "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+    ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+    ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
     'GROUP BY `unit_snid`'
   );
   $result = array();
-  while($row = db_fetch($query)) {
+  while ($row = db_fetch($query)) {
     $result[$row['unit_snid']] = $row;
   }
 
@@ -44,8 +44,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . db_unit_time_restrictions() .
-    " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".db_unit_time_restrictions().
+    " LIMIT 1".
     ($for_update ? ' FOR UPDATE' : '')
   , true);
 }
@@ -57,7 +57,7 @@ 
 {
   return doquery("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
 }
 
 function db_unit_set_by_id($unit_id, $set)
@@ -78,8 +78,8 @@ 
 function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id, $unit_snid = 0)
 {
   return classSupernova::db_del_record_list(LOC_UNIT,
-    "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}" .
-    ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
+    "`unit_location_type` = {$unit_location_type} AND `unit_location_id` = {$unit_location_id}".
+    ($user_id = idval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
     ($unit_snid = idval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : ''));
 }
 
@@ -90,7 +90,7 @@ 
   return doquery(
     "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . db_unit_time_restrictions().
     " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
   );
 }
@@ -104,7 +104,7 @@ 
 
 function db_unit_list_admin_delete_mercenaries_finished()
 {
-  return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ") AND unit_type = " . UNIT_MERCENARIES);
+  return doquery("DELETE FROM {{unit}} WHERE unit_time_finish IS NOT NULL AND unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.") AND unit_type = ".UNIT_MERCENARIES);
 }
 
 function db_unit_list_admin_set_mercenaries_expire_time($default_length)
@@ -112,8 +112,8 @@ 
   return doquery(
     "UPDATE {{unit}}
     SET
-      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW . "),
-      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length) . ")
+      unit_time_start = FROM_UNIXTIME(" . SN_TIME_NOW."),
+      unit_time_finish = FROM_UNIXTIME(" . (SN_TIME_NOW + $default_length).")
     WHERE unit_type = " . UNIT_MERCENARIES
   );
 }

includes/functions/eco_get_build_data.php

Doc Comments +4 added lines

@@ -10,6 +10,7 @@ 
  *
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
  * @version 1.0
+ * @param integer $lab_require
  */
 function eco_get_lab_max_effective_level(&$user, $lab_require)
 {
@@ -193,6 +194,9 @@ 
   return $result;
 }
 
+/**
+ * @param integer[] $unit_list
+ */
 function eco_is_builds_in_que($planet_que, $unit_list)
 {
   $eco_is_builds_in_que = false;

includes/functions/eco_queue.php

Doc Comments +6 added lines

@@ -55,6 +55,9 @@ 
 }
 
 
+/**
+ * @param integer $build_mode
+ */
 function que_build($user, $planet, $build_mode = BUILD_CREATE, $redirect = true) {
   global $lang, $config;
 
@@ -378,6 +381,9 @@ 
   return classSupernova::db_que_list_by_type_location($user_id, $planet_id, $que_type, $for_update);
 }
 
+/**
+ * @param integer $unit_id
+ */
 function que_add_unit($unit_id, $user = array(), $planet = array(), $build_data, $unit_level = 0, $unit_amount = 1, $build_mode = BUILD_CREATE) {
   // TODO Унифицировать проверки
 

Spacing +98 added lines, -98 removed lines

@@ -2,8 +2,8 @@ 
 
 function que_get_unit_que($unit_id) {
   $que_type = false;
-  foreach(sn_get_groups('ques') as $que_id => $que_data) {
-    if(in_array($unit_id, $que_data['unit_list'])) {
+  foreach (sn_get_groups('ques') as $que_id => $que_data) {
+    if (in_array($unit_id, $que_data['unit_list'])) {
       $que_type = $que_id;
       break;
     }
@@ -14,14 +14,14 @@ 
 
 
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
-  if(empty($que_data)) {
+  if (empty($que_data)) {
     $que_data = sn_get_groups('ques');
     $que_data = $que_data[$que_id];
   }
 
 
   $que_length = 1;
-  switch($que_id) {
+  switch ($que_id) {
     case QUE_RESEARCH:
       $que_length = classSupernova::$config->server_que_length_research + mrc_get_level($user, null, UNIT_PREMIUM); // TODO - вынести в модуль
     break;
@@ -35,8 +35,8 @@ 
 
 function eco_que_str2arr($que_str) {
   $que_arr = explode(';', $que_str);
-  foreach($que_arr as $que_index => &$que_item) {
-    if($que_item) {
+  foreach ($que_arr as $que_index => &$que_item) {
+    if ($que_item) {
       $que_item = explode(',', $que_item);
     } else {
       unset($que_arr[$que_index]);
@@ -47,7 +47,7 @@ 
 }
 
 function eco_que_arr2str($que_arr) {
-  foreach($que_arr as &$que_item) {
+  foreach ($que_arr as &$que_item) {
     $que_item = implode(',', $que_item);
   }
 
@@ -59,14 +59,14 @@ 
   $classLocale = classLocale::$lang;
 
   $is_autoconvert = false;
-  if($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
+  if ($build_mode == BUILD_AUTOCONVERT || sys_get_param_int('auto_convert')) {
     $build_mode = BUILD_CREATE;
     $is_autoconvert = true;
   }
 
   $unit_amount_qued = 0;
   try {
-    if(!$user['id']) {
+    if (!$user['id']) {
       throw new exception('{Нет идентификатора пользователя - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -77,16 +77,16 @@ 
       foreach($unit_list as $unit_id => $unit_amount) if($unit_amount) break;
     }
     */
-    if(!$unit_id) {
+    if (!$unit_id) {
       throw new exception('{Нет идентификатора юнита - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
     $que_id = que_get_unit_que($unit_id);
-    if(!$que_id) {
+    if (!$que_id) {
       throw new exception('{Неправильный тип очереди - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
+    if ($build_mode == BUILD_DESTROY && $que_id != QUE_STRUCTURES) {
       throw new exception('{Уничтожать можно только здания на планете}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -94,12 +94,12 @@ 
     $que_data = $que_data[$que_id];
 
     // TODO Переделать под подочереди
-    if($que_id == QUE_STRUCTURES) {
+    if ($que_id == QUE_STRUCTURES) {
       $sn_groups_build_allow = sn_get_groups('build_allow');
       $que_data['unit_list'] = $sn_groups_build_allow[$planet['planet_type']];
 
-      if(!isset($que_data['unit_list'][$unit_id])) {
-        throw new exception('{Это здание нельзя строить на ' . ($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
+      if (!isset($que_data['unit_list'][$unit_id])) {
+        throw new exception('{Это здание нельзя строить на '.($planet['planet_type'] == PT_PLANET ? 'планете' : 'луне'), ERR_ERROR); // TODO EXCEPTION
       }
     }
     /*
@@ -119,7 +119,7 @@ 
     // Это нужно, что бы заблокировать пользователя и работу с очередями
     $user = db_user_by_id($user['id']);
     // Это нужно, что бы заблокировать планету от списания ресурсов
-    if(isset($planet['id']) && $planet['id']) {
+    if (isset($planet['id']) && $planet['id']) {
       $planet = db_planet_by_id($planet['id'], true);
     } else {
       $planet['id'] = 0;
@@ -131,12 +131,12 @@ 
     $in_que = &$que['in_que'][$que_id][$user['id']][$planet_id];
     $que_max_length = que_get_max_que_length($user, $planet, $que_id, $que_data);
     // TODO Добавить вызовы функций проверок текущей и максимальной длин очередей
-    if(count($in_que) >= $que_max_length) {
+    if (count($in_que) >= $que_max_length) {
       throw new exception('{Все слоты очереди заняты}', ERR_ERROR); // TODO EXCEPTION
     }
 
     // TODO Отдельно посмотреть на уничтожение зданий - что бы можно было уничтожать их без планов
-    switch(eco_can_build_unit($user, $planet, $unit_id)) {
+    switch (eco_can_build_unit($user, $planet, $unit_id)) {
       case BUILD_ALLOWED:
       break;
       case BUILD_UNIT_BUSY:
@@ -144,7 +144,7 @@ 
       break; // TODO EXCEPTION eco_bld_msg_err_laboratory_upgrading
       // case BUILD_REQUIRE_NOT_MEET:
       default:
-        if($build_mode == BUILD_CREATE) {
+        if ($build_mode == BUILD_CREATE) {
           throw new exception('{Требования не удовлетворены}', ERR_ERROR);
         }
       break; // TODO EXCEPTION eco_bld_msg_err_requirements_not_meet
@@ -154,14 +154,14 @@ 
     $unit_amount_qued = $unit_amount;
     $units_qued = isset($in_que[$unit_id]) ? $in_que[$unit_id] : 0;
     $unit_level = mrc_get_level($user, $planet, $unit_id, true, true) + $units_qued;
-    if($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
-      if($unit_level >= $unit_max) {
+    if ($unit_max = get_unit_param($unit_id, P_MAX_STACK)) {
+      if ($unit_level >= $unit_max) {
         throw new exception('{Максимальное количество юнитов данного типа уже достигнуто или будет достигнуто по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
       }
       $unit_amount = max(0, min($unit_amount, $unit_max - $unit_level));
     }
 
-    if($unit_amount < 1) {
+    if ($unit_amount < 1) {
       throw new exception('{Неправильное количество юнитов - сообщите Администрации}', ERR_ERROR); // TODO EXCEPTION
     }
 
@@ -170,21 +170,21 @@ 
     //  {
     //    die('Unit busy'); // TODO EXCEPTION
     //  }
-    if(get_unit_param($unit_id, P_STACKABLE)) {
+    if (get_unit_param($unit_id, P_STACKABLE)) {
       // TODO Поле 'max_Lot_size' для ограничения размера стэка в очереди - то ли в юниты, то ли в очередь
-      if(in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
+      if (in_array($unit_id, $group_missile = sn_get_groups('missile'))) {
         // TODO Поле 'container' - указывает на родительску структуру, в которой хранится данный юнит и по вместительности которой нужно применять размер юнита
         $used_silo = 0;
-        foreach($group_missile as $missile_id) {
+        foreach ($group_missile as $missile_id) {
           $missile_qued = isset($in_que[$missile_id]) ? $in_que[$missile_id] : 0;
           $used_silo += (mrc_get_level($user, $planet, $missile_id, true, true) + $missile_qued) * get_unit_param($missile_id, P_UNIT_SIZE);
         }
         $free_silo = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY) - $used_silo;
-        if($free_silo <= 0) {
+        if ($free_silo <= 0) {
           throw new exception('{Ракетная шахта уже заполнена или будет заполнена по окончанию очереди}', ERR_ERROR); // TODO EXCEPTION
         }
         $unit_size = get_unit_param($unit_id, P_UNIT_SIZE);
-        if($free_silo < $unit_size) {
+        if ($free_silo < $unit_size) {
           throw new exception("{В ракетной шахте нет места для {$classLocale['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
         }
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -192,10 +192,10 @@ 
       $unit_level = $new_unit_level = 0;
     } else {
       $unit_amount = 1;
-      if($que_id == QUE_STRUCTURES) {
+      if ($que_id == QUE_STRUCTURES) {
         // if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $que['sectors'][$planet['id']] <= 0)
         $sectors_qued = is_array($in_que) ? array_sum($in_que) : 0;
-        if($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
+        if ($build_mode == BUILD_CREATE && eco_planet_fields_max($planet) - $planet['field_current'] - $sectors_qued <= 0) {
           throw new exception('{Не хватает секторов на планете}', ERR_ERROR); // TODO EXCEPTION
         }
         // И что это я такое написал? Зачем?
@@ -212,10 +212,10 @@ 
 
     $exchange = array();
     $market_get_autoconvert_cost = market_get_autoconvert_cost();
-    if($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
+    if ($is_autoconvert && $build_data[BUILD_AUTOCONVERT]) {
       $dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
-        throw new exception("{Нет хватает " . ($market_get_autoconvert_cost - $dark_matter) . "ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $market_get_autoconvert_cost) {
+        throw new exception("{Нет хватает ".($market_get_autoconvert_cost - $dark_matter)."ТМ на постройки с автоконвертацией ресурсов}", ERR_ERROR); // TODO EXCEPTION
       }
 
       !get_unit_param($unit_id, P_STACKABLE) ? $unit_amount = 1 : false;
@@ -224,7 +224,7 @@ 
       $resource_exchange_rates = array();
       $resource_diff = array();
       $all_positive = true;
-      foreach($resources_loot as $resource_id) {
+      foreach ($resources_loot as $resource_id) {
         $resource_db_name = pname_resource_name($resource_id);
         $resource_got[$resource_id] = floor(mrc_get_level($user, $planet, $resource_id));
         $resource_exchange_rates[$resource_id] = classSupernova::$config->__get("rpg_exchange_{$resource_db_name}");
@@ -232,15 +232,15 @@ 
         $all_positive = $all_positive && ($resource_diff[$resource_id] > 0);
       }
       // Нужна автоконвертация
-      if($all_positive) {
+      if ($all_positive) {
         $is_autoconvert = false;
       } else {
-        foreach($resource_diff as $resource_diff_id => &$resource_diff_amount) {
-          if($resource_diff_amount >= 0) {
+        foreach ($resource_diff as $resource_diff_id => &$resource_diff_amount) {
+          if ($resource_diff_amount >= 0) {
             continue;
           }
-          foreach($resource_diff as $resource_got_id => &$resource_got_amount) {
-            if($resource_got_amount <= 0) {
+          foreach ($resource_diff as $resource_got_id => &$resource_got_amount) {
+            if ($resource_got_amount <= 0) {
               continue;
             }
             $current_exchange = $resource_exchange_rates[$resource_got_id] / $resource_exchange_rates[$resource_diff_id];
@@ -256,14 +256,14 @@ 
         }
 
         $is_autoconvert_ok = true;
-        foreach($resource_diff as $resource_diff_amount2) {
-          if($resource_diff_amount2 < 0) {
+        foreach ($resource_diff as $resource_diff_amount2) {
+          if ($resource_diff_amount2 < 0) {
             $is_autoconvert_ok = false;
             break;
           }
         }
 
-        if($is_autoconvert_ok) {
+        if ($is_autoconvert_ok) {
           $build_data['RESULT'][$build_mode] = BUILD_ALLOWED;
           $build_data['CAN'][$build_mode] = $unit_amount;
         } else {
@@ -272,19 +272,19 @@ 
       }
     }
     $unit_amount = min($build_data['CAN'][$build_mode], $unit_amount);
-    if($unit_amount <= 0) {
+    if ($unit_amount <= 0) {
       throw new exception('{Не хватает ресурсов}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($new_unit_level < 0) {
+    if ($new_unit_level < 0) {
       throw new exception('{Нельзя уничтожить больше юнитов, чем есть}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
+    if ($build_data['RESULT'][$build_mode] != BUILD_ALLOWED) {
       throw new exception('{Строительство блокировано}', ERR_ERROR); // TODO EXCEPTION
     }
 
-    if($is_autoconvert) {
+    if ($is_autoconvert) {
       ksort($exchange);
       ksort($resource_got);
       db_change_units($user, $planet, array(
@@ -299,7 +299,7 @@ 
     }
 
     $unit_amount_qued = 0;
-    while($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
+    while ($unit_amount > 0 && count($que['ques'][$que_id][$user['id']][$planet_id]) < $que_max_length) {
       $place = min($unit_amount, MAX_FLEET_OR_DEFS_PER_ROW);
       que_add_unit($unit_id, $user, $planet, $build_data, $new_unit_level, $place, $build_mode);
       $unit_amount -= $place;
@@ -309,8 +309,8 @@ 
 
     sn_db_transaction_commit();
 
-    if($redirect) {
-      sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
+    if ($redirect) {
+      sys_redirect("{$_SERVER['PHP_SELF']}?mode=".sys_get_param_str('mode')."&ally_id=".sys_get_param_id('ally_id'));
       die();
     }
 
@@ -318,7 +318,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => '{Строительство начато}',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $operation_result = array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -326,8 +326,8 @@ 
     );
   }
 
-  if(!empty($operation_result['MESSAGE'])) {
-    $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . classLocale::$lang['tech'][$unit_id] . ']';
+  if (!empty($operation_result['MESSAGE'])) {
+    $operation_result['MESSAGE'] .= ' '.($unit_amount_qued ? $unit_amount_qued : $unit_amount).'x['.classLocale::$lang['tech'][$unit_id].']';
   }
 
   return $operation_result;
@@ -337,11 +337,11 @@ 
 function que_recalculate($old_que) {
   $new_que = array();
 
-  if(!is_array($old_que['items'])) {
+  if (!is_array($old_que['items'])) {
     return $new_que;
   }
-  foreach($old_que['items'] as $row) {
-    if(!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
+  foreach ($old_que['items'] as $row) {
+    if (!isset($row) || !$row || $row['que_unit_amount'] <= 0) {
       continue;
     }
 
@@ -352,9 +352,9 @@ 
 
     $last_id = count($new_que['items']) - 1;
 
-    if($row['que_planet_id']) {
+    if ($row['que_planet_id']) {
       $new_que['planets'][$row['que_planet_id']][$row['que_type']][] = &$new_que['items'][$last_id];
-    } elseif($row['que_type'] == QUE_RESEARCH) {
+    } elseif ($row['que_type'] == QUE_RESEARCH) {
       $new_que['players'][$row['que_player_id']][$row['que_type']][] = &$new_que['items'][$last_id];
     }
     $new_que['ques'][$row['que_type']][$row['que_player_id']][intval($row['que_planet_id'])][] = &$new_que['items'][$last_id];
@@ -389,9 +389,9 @@ 
   $que_type = que_get_unit_que($unit_id);
   $planet_id_origin = $planet['id'] ? $planet['id'] : 'NULL';
   $planet_id = $que_type == QUE_RESEARCH ? 'NULL' : $planet_id_origin;
-  if(is_numeric($planet_id)) {
+  if (is_numeric($planet_id)) {
     db_planet_set_by_id($planet_id, "`que_processed` = UNIX_TIMESTAMP(NOW())");
-  } elseif(is_numeric($user['id'])) {
+  } elseif (is_numeric($user['id'])) {
     db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
   }
 
@@ -421,17 +421,17 @@ 
   $planet['id'] = $planet['id'] && $que_type !== QUE_RESEARCH ? $planet['id'] : 0;
   $global_que = que_get($user['id'], $planet['id'], $que_type, true);
 
-  if(!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
+  if (!empty($global_que['ques'][$que_type][$user['id']][$planet['id']])) {
     $que = array_reverse($global_que['ques'][$que_type][$user['id']][$planet['id']]);
 
-    foreach($que as $que_item) {
+    foreach ($que as $que_item) {
       db_que_delete_by_id($que_item['que_id']);
 
-      if($que_item['que_planet_id_origin']) {
+      if ($que_item['que_planet_id_origin']) {
         $planet['id'] = $que_item['que_planet_id_origin'];
       }
 
-      if(!isset($planets_locked[$planet['id']])) {
+      if (!isset($planets_locked[$planet['id']])) {
         $planets_locked[$planet['id']] = $planet['id'] ? db_planet_by_id($planet['id'], true) : $planet;
       }
 
@@ -443,14 +443,14 @@ 
         RES_DEUTERIUM => $build_data[RES_DEUTERIUM] * $que_item['que_unit_amount'],
       ));
 
-      if(!$clear) {
+      if (!$clear) {
         break;
       }
     }
 
-    if(is_numeric($planet['id'])) {
+    if (is_numeric($planet['id'])) {
       db_planet_set_by_id($planet['id'], "`que_processed` = UNIX_TIMESTAMP(NOW())");
-    } elseif(is_numeric($user['id'])) {
+    } elseif (is_numeric($user['id'])) {
       db_user_set_by_id($user['id'], '`que_processed` = UNIX_TIMESTAMP(NOW())');
     }
 
@@ -459,7 +459,7 @@ 
     sn_db_transaction_rollback();
   }
 //die();
-  header("Location: {$_SERVER['PHP_SELF']}?mode={$que_type}" . "&ally_id=" . sys_get_param_id('ally_id'));
+  header("Location: {$_SERVER['PHP_SELF']}?mode={$que_type}"."&ally_id=".sys_get_param_id('ally_id'));
 }
 
 
@@ -498,21 +498,21 @@ 
   // TODO: Переделать для $que_type === false
   $planet['id'] = $planet['id'] ? $planet['id'] : 0;
 
-  if(!is_array($que)) {
+  if (!is_array($que)) {
     $que = que_get($user['id'], $planet['id'], $que_type);
   }
 
-  if(is_array($que) && isset($que['items'])) {
+  if (is_array($que) && isset($que['items'])) {
     $que = $que['ques'][$que_type][$user['id']][$planet['id']];
   }
 
-  if($que) {
-    foreach($que as $que_element) {
+  if ($que) {
+    foreach ($que as $que_element) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_element, $short_names));
     }
   }
 
-  if($que_type == QUE_RESEARCH) {
+  if ($que_type == QUE_RESEARCH) {
   }
 }
 
@@ -538,7 +538,7 @@ 
   $user = db_user_by_id($user['id'], true);
 
   $time_left[$user['id']][0] = max(0, $on_time - $user['que_processed']);
-  if($planet === null && !$time_left[$user['id']][0]) {
+  if ($planet === null && !$time_left[$user['id']][0]) {
     // TODO
     return $que;
   }
@@ -547,12 +547,12 @@ 
   $que_type_id = $planet === null ? QUE_RESEARCH : false;
   $planet = intval(is_array($planet) ? $planet['id'] : $planet); // В $planet у нас теперь только её ID или шаблон null/0/false
   $que = que_get($user['id'], $planet, $que_type_id, true);
-  if(empty($que['items'])) {
+  if (empty($que['items'])) {
     return $que;
   }
 
   $planet_list = array();
-  if($planet !== null) {
+  if ($planet !== null) {
     // Если нужно изменять данные на планетах - блокируем планеты и получаем данные о них
     // TODO - от них не надо ничего, кроме ID и que_processed
     $planet_row = db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -561,21 +561,21 @@ 
   }
 
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
-  if(array_sum($time_left[$user['id']]) == 0) {
+  if (array_sum($time_left[$user['id']]) == 0) {
     return $que;
   }
 
   $db_changeset = array();
   $unit_changes = array();
-  foreach($que['items'] as &$que_item) {
+  foreach ($que['items'] as &$que_item) {
     $que_player_id = &$que_item['que_player_id'];
     $que_planet_id = intval($que_item['que_planet_id']);
 
     $que_time_left = &$que['time_left'][$que_player_id][$que_planet_id][$que_item['que_type']];
-    if(!isset($que_time_left)) {
+    if (!isset($que_time_left)) {
       $que_time_left = $time_left[$que_player_id][$que_planet_id];
     }
-    if($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
+    if ($que_time_left <= 0 || $que_item['que_unit_amount'] <= 0) {
       continue;
     }
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -588,7 +588,7 @@ 
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
 
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
-    if($que_time_left >= $que_item['que_time_left']) {
+    if ($que_time_left >= $que_item['que_time_left']) {
       // Увеличиваем количество отстроенных юнитов
       $unit_processed++;
       // Вычитаем из времени очереди потраченное на постройку время
@@ -601,12 +601,12 @@ 
     $que_item['que_unit_amount'] -= $unit_processed;
 
     // Если еще остались юниты - значит ВСЁ оставшееся время приходится на достройку следующего юнита
-    if($que_item['que_unit_amount'] > 0) {
+    if ($que_item['que_unit_amount'] > 0) {
       $que_item['que_time_left'] = $que_item['que_time_left'] - $que_time_left;
       $que_time_left = 0;
     }
 
-    if($que_item['que_unit_amount'] <= 0) {
+    if ($que_item['que_unit_amount'] <= 0) {
       $db_changeset['que'][] = array(
         'action'  => SQL_OP_DELETE,
         P_VERSION => 1,
@@ -632,14 +632,14 @@ 
       );
     }
 
-    if($unit_processed) {
+    if ($unit_processed) {
       $unit_processed_delta = $unit_processed * ($que_item['que_unit_mode'] == BUILD_CREATE ? 1 : -1);
       $unit_changes[$que_player_id][$que_planet_id][$que_item['que_unit_id']] += $unit_processed_delta;
     }
   }
 
-  foreach($time_left as $player_id => $planet_data) {
-    foreach($planet_data as $planet_id => $time_on_planet) {
+  foreach ($time_left as $player_id => $planet_data) {
+    foreach ($planet_data as $planet_id => $time_on_planet) {
       $table = $planet_id ? 'planets' : 'users';
       $id = $planet_id ? $planet_id : $player_id;
       $db_changeset[$table][] = array(
@@ -655,8 +655,8 @@ 
         ),
       );
 
-      if(is_array($unit_changes[$player_id][$planet_id])) {
-        foreach($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
+      if (is_array($unit_changes[$player_id][$planet_id])) {
+        foreach ($unit_changes[$player_id][$planet_id] as $unit_id => $unit_amount) {
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
         }
       }
@@ -666,38 +666,38 @@ 
   $que = que_recalculate($que);
 
   // TODO: Re-enable quests for Alliances
-  if(!empty($unit_changes) && !$user['user_as_ally']) {
+  if (!empty($unit_changes) && !$user['user_as_ally']) {
     $quest_list = qst_get_quests($user['id']);
     $quest_triggers = qst_active_triggers($quest_list);
     $quest_rewards = array();
 
 
     $xp_incoming = array();
-    foreach($unit_changes as $user_id => $planet_changes) {
-      foreach($planet_changes as $planet_id => $changes) {
+    foreach ($unit_changes as $user_id => $planet_changes) {
+      foreach ($planet_changes as $planet_id => $changes) {
         $planet_this = $planet_id ? classSupernova::db_get_record_by_id(LOC_PLANET, $planet_id) : array();
-        foreach($changes as $unit_id => $unit_value) {
+        foreach ($changes as $unit_id => $unit_value) {
           $que_id = que_get_unit_que($unit_id);
           $unit_level_new = mrc_get_level($user, $planet_this, $unit_id, false, true) + $unit_value;
-          if($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
+          if ($que_id == QUE_STRUCTURES || $que_id == QUE_RESEARCH) {
             $build_data = eco_get_build_data($user, $planet_this, $unit_id, $unit_level_new - 1);
             $build_data = $build_data[BUILD_CREATE];
-            foreach(sn_get_groups('resources_loot') as $resource_id) {
+            foreach (sn_get_groups('resources_loot') as $resource_id) {
               $xp_incoming[$que_id] += $build_data[$resource_id]; // TODO - добавить конверсию рейтов обмена
             }
           }
 
-          if(is_array($quest_triggers)) {
+          if (is_array($quest_triggers)) {
             // TODO: Check mutiply condition quests
             $quest_trigger_list = array_keys($quest_triggers, $unit_id);
-            if(is_array($quest_trigger_list)) {
-              foreach($quest_trigger_list as $quest_id) {
+            if (is_array($quest_trigger_list)) {
+              foreach ($quest_trigger_list as $quest_id) {
                 $quest_unit_level = $unit_level_new;
-                if(get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
+                if (get_unit_param($unit_id, P_UNIT_TYPE) == UNIT_SHIPS) {
                   $quest_unit_level = db_unit_count_by_user_and_type_and_snid($user_id, 0, $unit_id);
                   $quest_unit_level = $quest_unit_level[$unit_id]['qty'];
                 }
-                if($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
+                if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $quest_unit_level) {
                   $quest_rewards[$quest_id][$user_id][$planet_id] = $quest_list[$quest_id]['quest_rewards_list'];
                   $quest_list[$quest_id]['quest_status_status'] = QUEST_STATUS_COMPLETE;
                 }
@@ -710,7 +710,7 @@ 
     // TODO: Изменить начисление награды за квесты на ту планету, на которой происходил ресеч
     qst_reward($user, $quest_rewards, $quest_list);
 
-    foreach($xp_incoming as $que_id => $xp) {
+    foreach ($xp_incoming as $que_id => $xp) {
       rpg_level_up($user, $que_id == QUE_RESEARCH ? RPG_TECH : RPG_STRUCTURE, $xp / 1000);
     }
   }

includes/functions/msg_send_simple_message.php

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
   return $list;
 }
 
+/**
+ * @param integer $message_type
+ */
 function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false)
 {
   global $config, $user, $sn_message_class_list;

Spacing +14 added lines, -14 removed lines

@@ -22,10 +22,10 @@ 
 
   $list = '';
   $query = db_user_list(
-    "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+    "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
     false, 'id, username');
   // while ($u = db_fetch($query))
-  foreach($query as $u) {
+  foreach ($query as $u) {
     $sendList[] = $u['id'];
     $list .= "<br>{$u['username']} ";
   }
@@ -38,17 +38,17 @@ 
 function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false) {
   global $user, $sn_message_class_list;
 
-  if(!$owners) {
+  if (!$owners) {
     return;
   }
 
   $timestamp = $timestamp ? $timestamp : SN_TIME_NOW;
   $sender = intval($sender);
-  if(!is_array($owners)) {
+  if (!is_array($owners)) {
     $owners = array($owners);
   }
 
-  if(!$escaped) {
+  if (!$escaped) {
     $from = db_escape($from);
     $subject = db_escape($subject);
     $text = db_escape($text);
@@ -63,8 +63,8 @@ 
 
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
 
-  if($owners[0] == '*') {
-    if($user['authlevel'] < 3) {
+  if ($owners[0] == '*') {
+    if ($user['authlevel'] < 3) {
       return false;
     }
     // TODO Добавить $timestamp - рассылка может быть и отсроченной
@@ -73,26 +73,26 @@ 
     $owners = array();
   } else {
     $insert_values = array();
-    $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
+    $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
 
-    foreach($owners as $owner) {
-      if($user['id'] != $owner) {
+    foreach ($owners as $owner) {
+      if ($user['id'] != $owner) {
         $owner_row = db_user_by_id($owner);
       } else {
         $owner_row = $user;
       }
       sys_user_options_unpack($owner_row);
 
-      if($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
+      if ($force || !$message_class_switchable || $owner_row["opt_{$message_class_name}"]) {
         $insert_values[] = sprintf($insert_template, $owner);
       }
 
-      if($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
+      if ($message_class_email && classSupernova::$config->game_email_pm && $owner_row["opt_email_{$message_class_name}"]) {
         @$result = mymail($owner_row['email'], $subject, $text_unescaped, '', true);
       }
     }
 
-    if(empty($insert_values)) {
+    if (empty($insert_values)) {
       return;
     }
 
@@ -100,7 +100,7 @@ 
   }
   db_user_list_set_mass_mail($owners, "`{$message_class_name}` = `{$message_class_name}` + 1, `{$message_class_name_total}` = `{$message_class_name_total}` + 1");
 
-  if(in_array($user['id'], $owners) || $owners[0] == '*') {
+  if (in_array($user['id'], $owners) || $owners[0] == '*') {
     $user[$message_class_name]++;
     $user[$message_class_name_total]++;
   }

includes/functions/sys_user.php

Doc Comments +3 added lines

@@ -141,6 +141,9 @@
   ");
 }
 
+/**
+ * @param string $email_unsafe
+ */
 function player_create($username_unsafe, $email_unsafe, $options) {
   sn_db_transaction_check(true);
 

Spacing +27 added lines, -27 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 function sys_user_vacation($user) {
-  if(sys_get_param_str('vacation') == 'leave') {
+  if (sys_get_param_str('vacation') == 'leave') {
     if ($user['vacation'] < SN_TIME_NOW) {
       $user['vacation'] = 0;
       $user['vacation_next'] = SN_TIME_NOW + classSupernova::$config->player_vacation_timeout;
@@ -15,7 +15,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -45,33 +45,33 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = DBStaticUser::db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
-    $TheAlly = doquery ( "SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';", '', true );
+  if ($TheUser['ally_id'] != 0) {
+    $TheAlly = doquery("SELECT * FROM `{{alliance}}` WHERE `id` = '".$TheUser['ally_id']."';", '', true);
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
-      doquery ( "UPDATE `{{alliance}}` SET `ally_members` = '" . $TheAlly['ally_members'] . "' WHERE `id` = '" . $TheAlly['id'] . "';");
+    if ($TheAlly['ally_members'] > 0) {
+      doquery("UPDATE `{{alliance}}` SET `ally_members` = '".$TheAlly['ally_members']."' WHERE `id` = '".$TheAlly['id']."';");
     } else {
-      doquery ( "DELETE FROM `{{alliance}}` WHERE `id` = '" . $TheAlly['id'] . "';");
-      doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '" . $TheAlly['id'] . "';");
+      doquery("DELETE FROM `{{alliance}}` WHERE `id` = '".$TheAlly['id']."';");
+      doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '2' AND `id_owner` = '".$TheAlly['id']."';");
     }
   }
-  doquery ( "DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{statpoints}}` WHERE `stat_type` = '1' AND `id_owner` = '".$UserID."';");
 
   db_planet_list_delete_by_owner($UserID);
 
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '".$UserID."';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '".$UserID."';");
+  doquery("DELETE FROM `{{notes}}` WHERE `owner` = '".$UserID."';");
   FleetList::db_fleet_list_delete_by_owner($UserID);
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';");
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '".$UserID."';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '".$UserID."';");
+  doquery("DELETE FROM `{{annonce}}` WHERE `user` = '".$UserID."';");
 
 
   classSupernova::db_del_record_by_id(LOC_USER, $UserID);
-  doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
+  doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
   classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->db_loadItem('users_amount') - 1);
   sn_db_transaction_commit();
 }
@@ -87,7 +87,7 @@ 
   $ban_current = DBStaticUser::db_user_by_id($banned['id'], false, 'banaday');
   $ban_until = ($ban_current['banaday'] ? $ban_current['banaday'] : SN_TIME_NOW) + $term;
 
-  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = {$ban_until} " . ($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
+  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = {$ban_until} ".($is_vacation ? ", `vacation` = '{$ban_until}' " : ''));
 
   $banned['username'] = db_escape($banned['username']);
   $banner['username'] = db_escape($banner['username']);
@@ -105,7 +105,7 @@ 
  * @param string $reason
  */
 function sys_admin_player_ban_unset($banner, $banned, $reason = '') {
-  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = 0, `vacation` = " . SN_TIME_NOW . "");
+  DBStaticUser::db_user_set_by_id($banned['id'], "`banaday` = 0, `vacation` = ".SN_TIME_NOW."");
 
   $banned['username'] = db_escape($banned['username']);
   $banner['username'] = db_escape($banner['username']);
@@ -134,7 +134,7 @@ 
 
     'total_points' => $options['total_points'] = empty($options['total_points']) ? 0 : $options['total_points'],
 
-    'options' => (empty($options['options']) ? $player_options_string : $options['options']) . (empty($options['options_extra']) ? '' : $options['options_extra']),
+    'options' => (empty($options['options']) ? $player_options_string : $options['options']).(empty($options['options_extra']) ? '' : $options['options_extra']),
 
     'galaxy' => $options['galaxy'] = intval($options['galaxy'] ? $options['galaxy'] : 0),
     'system' => $options['system'] = intval($options['system'] ? $options['system'] : 0),
@@ -145,28 +145,28 @@ 
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
 
   $user_new = classSupernova::db_ins_field_set(LOC_USER, $field_set);
-  if(!($options['galaxy'] && $options['system'] && $options['planet'])) {
+  if (!($options['galaxy'] && $options['system'] && $options['planet'])) {
     $options['galaxy'] = classSupernova::$config->LastSettedGalaxyPos;
     $options['system'] = classSupernova::$config->LastSettedSystemPos;
-    $segment_size = floor(Vector::$knownPlanets/ 3);
+    $segment_size = floor(Vector::$knownPlanets / 3);
     $segment = floor(classSupernova::$config->LastSettedPlanetPos / $segment_size);
     $segment++;
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
     // $new_planet_id = 0;
-    while(true) {
-      if($options['planet'] > Vector::$knownPlanets) {
+    while (true) {
+      if ($options['planet'] > Vector::$knownPlanets) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > Vector::$knownSystems) {
+      if ($options['system'] > Vector::$knownSystems) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
-      $options['galaxy'] > Vector::$knownGalaxies? $options['galaxy'] = 1 : false;
+      $options['galaxy'] > Vector::$knownGalaxies ? $options['galaxy'] = 1 : false;
 
       $galaxy_row = db_planet_by_gspt($options['galaxy'], $options['system'], $options['planet'], PT_PLANET, true, 'id');
-      if(!$galaxy_row['id']) {
+      if (!$galaxy_row['id']) {
         classSupernova::$config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -189,7 +189,7 @@ 
   $username_safe = db_escape($username_unsafe);
   db_player_name_history_replace($user_new, $username_safe);
 
-  if(!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = DBStaticUser::db_user_by_id($options['partner_id'], true))) {
     db_referral_insert($options, $user_new);
   }
 

includes/functions/uni_functions.php

Doc Comments +3 added lines

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @param double $planet_sectors
+ */
 function uni_create_planet_get_density($position_data, $user_row, $planet_sectors) {
   $density_list = sn_get_groups('planet_density');
   $density_min = reset($density_list);

Braces +3 added lines, -1 removed lines

@@ -253,9 +253,11 @@
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if(!isset($planet_row['id'])) {
+    // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
+  }
     // Если текущей планеты не существует - выставляем Столицу
     if(!isset($planet_row['id'])) {
       $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');

Spacing +39 added lines, -39 removed lines

@@ -7,12 +7,12 @@ 
 
   $possible_cores = array();
   $probability = 0;
-  foreach($density_list as $possible_core_id => $core_data) {
-    if(!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($density_list as $possible_core_id => $core_data) {
+    if (!$core_data[UNIT_PLANET_DENSITY_RARITY]) {
       continue;
     }
 
-    if(
+    if (
       // Core type exists
       in_array($possible_core_id, $position_data['core_types'])
       // Limit core type with planet sector count
@@ -33,8 +33,8 @@ 
 
   $random = mt_rand(1, $probability);
   $selected_core = null;
-  foreach($possible_cores as $core_type => $core_info) {
-    if($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
+  foreach ($possible_cores as $core_type => $core_info) {
+    if ($random <= $core_info[UNIT_PLANET_DENSITY_RARITY]) {
       $selected_core = $core_info;
       break;
     }
@@ -57,7 +57,7 @@ 
 function uni_create_planet($Galaxy, $System, $Position, $PlanetOwnerID, $planet_name_unsafe = '', $HomeWorld = false, $options = array()) {
   $Position = intval($Position);
 
-  if(!isset($options['skip_check']) && db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
+  if (!isset($options['skip_check']) && db_planet_by_gspt($Galaxy, $System, $Position, PT_PLANET, true, '`id`')) {
     return false;
   }
 
@@ -66,11 +66,11 @@ 
 
   $planet_generator = sn_get_groups('planet_generator');
 
-  if($HomeWorld) {
+  if ($HomeWorld) {
     $position_data = $planet_generator[0];
   } else {
     $position_data = $planet_generator[$Position >= UNIVERSE_RANDOM_PLANET_START || $Position < 1 ? UNIVERSE_RANDOM_PLANET_START : $Position];
-    if($Position >= UNIVERSE_RANDOM_PLANET_START) {
+    if ($Position >= UNIVERSE_RANDOM_PLANET_START) {
       // Корректируем температуру для планеты-странника
       $position_data['t_max_max'] -= UNIVERSE_RANDOM_PLANET_TEMPERATURE_DECREASE * ($Position - UNIVERSE_RANDOM_PLANET_START);
     }
@@ -78,7 +78,7 @@ 
 
   $planet_images = sn_get_groups('planet_images');
   $planet_image = $position_data['planet_images'][mt_rand(0, count($position_data['planet_images']) - 1)];
-  $planet_image .= 'planet' . $planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
+  $planet_image .= 'planet'.$planet_images[$planet_image][mt_rand(0, count($planet_images[$planet_image]) - 1)];
 
   $t_max = sn_rand_gauss_range($position_data['t_max_min'], $position_data['t_max_max'], true, 1.3, true);
   $t_min = $t_max - sn_rand_gauss_range($position_data['t_delta_min'], $position_data['t_delta_max'], true, 1.3, true);
@@ -89,7 +89,7 @@ 
 
   $core_info = uni_create_planet_get_density($position_data, $user_row, $planet_sectors);
 
-  $planet_name_unsafe = $user_row['username'] . ' ' . ($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
+  $planet_name_unsafe = $user_row['username'].' '.($planet_name_unsafe ? $planet_name_unsafe : classLocale::$lang['sys_colo_defaultname']);
 
   $planet['name'] = db_escape(strip_tags(trim($planet_name_unsafe)));
   $planet['id_owner'] = $PlanetOwnerID;
@@ -170,15 +170,15 @@ 
   $moon_name = '';
   $moon_row = array();
   $moon = db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_MOON, false, 'id');
-  if(!$moon['id']) {
+  if (!$moon['id']) {
     $moon_planet = db_planet_by_gspt($pos_galaxy, $pos_system, $pos_planet, PT_PLANET, true, '`id`, `temp_min`, `temp_max`, `name`, `debris_metal`, `debris_crystal`');
 
-    if($moon_planet['id']) {
+    if ($moon_planet['id']) {
       $base_storage_size = BASE_STORAGE_SIZE;
 
-      if(!$moon_chance) {
+      if (!$moon_chance) {
         $size = mt_rand(1100, 8999);
-      } elseif($moon_chance <= 100) {
+      } elseif ($moon_chance <= 100) {
         $size = mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999);
       } else {
         $size = $moon_chance;
@@ -194,22 +194,22 @@ 
 
       $field_max = ceil($size / 1000);
 
-      if(isset($options['image']) && $options['image']) {
+      if (isset($options['image']) && $options['image']) {
         $moon_image = $options['image'];
       } else {
         $moon_image = 'mond';
       }
 
       $moon_row = classSupernova::db_ins_record(LOC_PLANET,
-        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = " . SN_TIME_NOW . ", `image` = '{$moon_image}',
-          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = " . PT_MOON . ",
+        "`id_owner` = '{$user_id}', `parent_planet` = '{$moon_planet['id']}', `name` = '{$moon_name_safe}', `last_update` = ".SN_TIME_NOW.", `image` = '{$moon_image}',
+          `galaxy` = '{$pos_galaxy}', `system` = '{$pos_system}', `planet` = '{$pos_planet}', `planet_type` = ".PT_MOON.",
           `diameter` = '{$size}', `field_max` = '{$field_max}', `density` = 2500, `density_index` = 2, `temp_min` = '{$temp_min}', `temp_max` = '{$temp_max}',
           `metal` = '0', `metal_perhour` = '0', `metal_max` = '{$base_storage_size}',
           `crystal` = '0', `crystal_perhour` = '0', `crystal_max` = '{$base_storage_size}',
           `deuterium` = '0', `deuterium_perhour` = '0', `deuterium_max` = '{$base_storage_size}'"
       );
 
-      if($update_debris) {
+      if ($update_debris) {
         $debris_spent = $moon_chance * 1000000;
         $metal_spent = round(min($moon_planet['debris_metal'], $debris_spent * mt_rand(50, 75) / 100));
         $crystal_spent = min($moon_planet['debris_crystal'], $debris_spent - $metal_spent);
@@ -244,28 +244,28 @@ 
   $planet_row['id'] = $user['current_planet'];
 
   // Пытаемся переключить на новую планету
-  if(($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
+  if (($selected_planet = sys_get_param_id('cp')) && $selected_planet != $user['current_planet']) {
     $planet_row = db_planet_by_id_and_owner($selected_planet, $user['id'], false, 'id');
   } else {
     $planet_row = db_planet_by_id($planet_row['id']);
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  if(!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
+  if (!isset($planet_row['id'])) // || $planet_row['id'] != $user['current_planet']
   {
     $planet_row = db_planet_by_id_and_owner($user['current_planet'], $user['id'], false, 'id');
     // Если текущей планеты не существует - выставляем Столицу
-    if(!isset($planet_row['id'])) {
+    if (!isset($planet_row['id'])) {
       $planet_row = db_planet_by_id_and_owner($user['id_planet'], $user['id'], false, 'id');
       // Если и столицы не существует - значит что-то очень не так с записью пользователя
-      if(!isset($planet_row['id'])) {
+      if (!isset($planet_row['id'])) {
         classSupernova::$debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
       }
     }
   }
 
   // Если производилось переключение планеты - делаем запись в юзере
-  if($user['current_planet'] != $planet_row['id']) {
+  if ($user['current_planet'] != $planet_row['id']) {
     db_user_set_by_id($user['id'], "`current_planet` = '{$planet_row['id']}'");
     $user['current_planet'] = $planet_row['id'];
   }
@@ -282,7 +282,7 @@ 
 
 // ----------------------------------------------------------------------------------------------------------------
 function uni_render_coordinates($from, $prefix = '') {
-  return "[{$from[$prefix . 'galaxy']}:{$from[$prefix . 'system']}:{$from[$prefix . 'planet']}]";
+  return "[{$from[$prefix.'galaxy']}:{$from[$prefix.'system']}:{$from[$prefix.'planet']}]";
 }
 
 function uni_render_planet($from) {
@@ -290,17 +290,17 @@ 
 }
 
 function uni_render_planet_full($from, $prefix = '', $html_safe = true, $include_id = false) {
-  if(!$from['id']) {
+  if (!$from['id']) {
     $result = classLocale::$lang['sys_planet_expedition'];
   } else {
     $from_planet_id = $include_id ? (
-      'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '
+      'ID {'.($from['id'] ? $from['id'] : ($from[$prefix.'planet_id'] ? $from[$prefix.'planet_id'] : 0)).'} '
     ) : '';
 
-    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix . 'type'] ? $from[$prefix . 'type'] : 0);
-    $from_planet_type = ($from_planet_type ? ' ' . classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
+    $from_planet_type = $from['planet_type'] ? $from['planet_type'] : ($from[$prefix.'type'] ? $from[$prefix.'type'] : 0);
+    $from_planet_type = ($from_planet_type ? ' '.classLocale::$lang['sys_planet_type_sh'][$from_planet_type] : '');
 
-    $result = $from_planet_id . uni_render_coordinates($from, $prefix) . $from_planet_type . ($from['name'] ? ' ' . $from['name'] : '');
+    $result = $from_planet_id.uni_render_coordinates($from, $prefix).$from_planet_type.($from['name'] ? ' '.$from['name'] : '');
     $result = $html_safe ? str_replace(' ', '&nbsp;', htmlentities($result, ENT_COMPAT, 'UTF-8')) : $result;
   }
 
@@ -308,11 +308,11 @@ 
 }
 
 function uni_render_coordinates_url($from, $prefix = '', $page = 'galaxy.php') {
-  return $page . (strpos($page, '?') === false ? '?' : '&') . "galaxy={$from[$prefix . 'galaxy']}&system={$from[$prefix . 'system']}&planet={$from[$prefix . 'planet']}";
+  return $page.(strpos($page, '?') === false ? '?' : '&')."galaxy={$from[$prefix.'galaxy']}&system={$from[$prefix.'system']}&planet={$from[$prefix.'planet']}";
 }
 
 function uni_render_coordinates_href($from, $prefix = '', $mode = 0, $fleet_type = '') {
-  return '<a href="' . uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}") . '"' . ($fleet_type ? " {$fleet_type}" : '') . '>' . uni_render_coordinates($from, $prefix) . '</a>';
+  return '<a href="'.uni_render_coordinates_url($from, $prefix, "galaxy.php?mode={$mode}").'"'.($fleet_type ? " {$fleet_type}" : '').'>'.uni_render_coordinates($from, $prefix).'</a>';
 }
 
 function uni_get_time_to_jump($moon_row) {
@@ -340,30 +340,30 @@ 
   $coordinates["{$prefix}planet"] = intval($coordinates["{$prefix}planet"]);
 
   return
-    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies&&
-    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems&&
+    isset($coordinates["{$prefix}galaxy"]) && $coordinates["{$prefix}galaxy"] > 0 && $coordinates["{$prefix}galaxy"] <= Vector::$knownGalaxies &&
+    isset($coordinates["{$prefix}system"]) && $coordinates["{$prefix}system"] > 0 && $coordinates["{$prefix}system"] <= Vector::$knownSystems &&
     isset($coordinates["{$prefix}planet"]) && $coordinates["{$prefix}planet"] > 0 && $coordinates["{$prefix}planet"] <= Vector::$knownPlanets;
 }
 
 function uni_planet_teleport_check($user, $planetrow, $new_coordinates = null) {
   try {
-    if($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
+    if ($planetrow['planet_teleport_next'] && $planetrow['planet_teleport_next'] > SN_TIME_NOW) {
       throw new exception(classLocale::$lang['ov_teleport_err_cooldown'], ERR_ERROR);
     }
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->planet_teleport_cost) {
       throw new exception(classLocale::$lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
     }
 
     // TODO: Replace quick-check with using gathered flying fleet data
-    if(FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
+    if (FleetList::fleet_count_incoming($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'])) {
       throw new exception(classLocale::$lang['ov_teleport_err_fleet'], ERR_ERROR);
     }
 
-    if(is_array($new_coordinates)) {
+    if (is_array($new_coordinates)) {
       $new_coordinates['planet_type'] = PT_PLANET;
       $incoming = db_planet_by_vector($new_coordinates, '', true, 'id');
-      if($incoming['id']) {
+      if ($incoming['id']) {
         throw new exception(classLocale::$lang['ov_teleport_err_destination_busy'], ERR_ERROR);
       }
     }
@@ -372,7 +372,7 @@ 
       'result'  => ERR_NONE,
       'message' => '',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     $response = array(
       'result'  => $e->getCode(),
       'message' => $e->getMessage(),

includes/general/math.php

Doc Comments +2 added lines, -2 removed lines

@@ -37,11 +37,11 @@
 /**
  * @param float      $range_start - Начало диапазона
  * @param float      $range_end - Конец диапазона
- * @param bool|int  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
+ * @param boolean  $round - До скольки знаков округлять результат. False - не округлять, True - округлять до целого, 1 - округлять до десятков, 2 - до сотен итд
  * @param int        $strict - В сколько сигм надо уложить результат
  * @param bool|false $cut_extreme - надо ли обрезать крайние значения. Например, при $strict = 2 их слишком много
  *
- * @return float|int
+ * @return double
  */
 function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
   if($cut_extreme) {

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 function geometry_progression_sum($n, $b1, $q) {
-  return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
+  return $q != 1 ? ($b1 * (pow($q, $n) - 1) / ($q - 1)) : ($n * $b1);
 }
 
 function sn_floor($value)
@@ -43,8 +43,8 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
-  if($cut_extreme) {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
+  if ($cut_extreme) {
     $range_start--;
     $range_end++;
   }
@@ -60,7 +60,7 @@ 
 {
   $args = func_get_args();
 
-  switch(func_num_args())
+  switch (func_num_args())
   {
     case 0:
       // trigger_error('median() requires at least one parameter',E_USER_WARNING);
@@ -72,7 +72,7 @@ 
     // fallthrough
 
     default:
-      if(!is_array($args))
+      if (!is_array($args))
       {
         // trigger_error('median() requires a list of numbers to operate on or an array of numbers', E_USER_NOTICE);
         return false;
@@ -83,9 +83,9 @@ 
       $n = count($args);
       $h = intval($n / 2);
 
-      if($n % 2 == 0)
+      if ($n % 2 == 0)
       {
-        $median = ($args[$h] + $args[$h-1]) / 2;
+        $median = ($args[$h] + $args[$h - 1]) / 2;
       }
       else
       {
@@ -103,49 +103,49 @@ 
 }
 function linear_calc(&$linear, $from = 0, $logProcess = false)
 {
-  for($i = $from; $i < count($linear); $i++)
+  for ($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if ($logProcess) pdump($linear, 'Нормализовано по х'.$from);
 
-  for($i = $from + 1; $i < count($linear); $i++)
+  for ($i = $from + 1; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if ($logProcess) pdump($linear, 'Подставили х'.$from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $logProcess);
   }
 
-  if($from)
+  if ($from)
   {
-    for($i = 0; $i < $from; $i++)
+    for ($i = 0; $i < $from; $i++)
     {
       $eq = &$linear[$i];
-      for($j = count($eq) - 1; $j >= $from; $j--)
+      for ($j = count($eq) - 1; $j >= $from; $j--)
       {
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
+    if ($logProcess) pdump($linear, 'Подставили обратно х'.$from);
   }
   else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($logProcess) pdump($linear, 'Результат'.$from);
+    foreach ($linear as $index => &$eq)
     {
-      pdump($eq[count($linear)], 'x' . $index);
+      pdump($eq[count($linear)], 'x'.$index);
     }
   }
 }

Braces +14 added lines, -8 removed lines

@@ -86,8 +86,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -111,7 +110,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +122,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +141,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($logProcess) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
+    if($logProcess) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/includes/flt_functions.php

Doc Comments +3 added lines

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @return double
+ */
 function flt_fleet_speed($user, $fleet)
 {
   if (!is_array($fleet))

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, sn_get_groups(array('fleet', 'missile')))) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -51,14 +51,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;
       }
 
@@ -86,19 +86,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;
@@ -120,9 +120,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;
@@ -130,12 +130,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 = 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'];
   }
 
@@ -144,9 +144,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++;
     }
@@ -163,16 +163,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];
@@ -191,32 +191,32 @@ 
   $resources = 0;
   $ship_ids = sn_get_groups('fleet');
   $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, sn_get_groups('flt_recyclers')) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -227,7 +227,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;
   }
 
@@ -239,78 +239,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 = 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;
     }
 
@@ -318,8 +318,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;
     }
 
@@ -327,19 +327,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 = 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;
   }
 
@@ -347,8 +347,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;
@@ -358,66 +358,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);
   }
 
@@ -444,7 +444,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;
@@ -455,7 +455,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;
   }
@@ -478,14 +478,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;
     }
   }
@@ -524,16 +524,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_spy.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
   }
 }
 
+/**
+ * @param string $group_name
+ */
 function flt_spy_scan($target_planet, $group_name, $section_title, $target_user = array())
 {
   global $lang;

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(sn_get_groups('fleet'), $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(sn_get_groups('fleet') as $unit_id) {
+    foreach (sn_get_groups('fleet') 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 @@ 
 
     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);
 
       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 @@ 
     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();