supernova-ws / SuperNova

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 +99 added lines, -99 removed lines

@@ -7,8 +7,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;
     }
@@ -19,14 +19,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;
@@ -40,8 +40,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]);
@@ -52,7 +52,7 @@ 
 }
 
 function eco_que_arr2str($que_arr) {
-  foreach($que_arr as &$que_item) {
+  foreach ($que_arr as &$que_item) {
     $que_item = implode(',', $que_item);
   }
 
@@ -64,28 +64,28 @@ 
   $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
     }
 
     $unit_id = sys_get_param_int('unit_id');
-    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
     }
 
@@ -93,12 +93,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
       }
     }
     // TODO Разделить очереди для Верфи и Обороны
@@ -108,7 +108,7 @@ 
     // Это нужно, что бы заблокировать пользователя и работу с очередями
     $user = DBStaticUser::db_user_by_id($user['id']);
     // Это нужно, что бы заблокировать планету от списания ресурсов
-    if(isset($planet['id']) && $planet['id']) {
+    if (isset($planet['id']) && $planet['id']) {
       $planet = DBStaticPlanet::db_planet_by_id($planet['id'], true);
     } else {
       $planet['id'] = 0;
@@ -120,12 +120,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:
@@ -133,7 +133,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
@@ -143,33 +143,33 @@ 
     $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
     }
 
     // TODO Переделать eco_unit_busy для всех типов зданий
-    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(GROUP_STR_MISSILES))) {
+      if (in_array($unit_id, $group_missile = sn_get_groups(GROUP_STR_MISSILES))) {
         // 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)));
@@ -177,9 +177,9 @@ 
       $unit_level = $new_unit_level = 0;
     } else {
       $unit_amount = 1;
-      if($que_id == QUE_STRUCTURES) {
+      if ($que_id == QUE_STRUCTURES) {
         $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
         }
       }
@@ -191,10 +191,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;
@@ -203,7 +203,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}");
@@ -211,15 +211,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];
@@ -235,14 +235,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 {
@@ -251,19 +251,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_resources(
@@ -282,7 +282,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;
@@ -292,8 +292,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();
     }
 
@@ -301,7 +301,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,
@@ -309,8 +309,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;
@@ -320,11 +320,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;
     }
 
@@ -335,9 +335,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];
@@ -375,14 +375,14 @@ 
   $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)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planet_id,
       array(
         'que_processed' => SN_TIME_NOW,
       )
     );
-  } elseif(is_numeric($user['id'])) {
+  } elseif (is_numeric($user['id'])) {
     DBStaticUser::db_user_set_by_id(
       $user['id'],
       array(
@@ -417,17 +417,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) {
       DBStaticQue::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'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet;
       }
 
@@ -443,19 +443,19 @@ 
         )
       );
 
-      if(!$clear) {
+      if (!$clear) {
         break;
       }
     }
 
-    if(is_numeric($planet['id'])) {
+    if (is_numeric($planet['id'])) {
       DBStaticPlanet::db_planet_update_set_by_id(
         $planet['id'],
         array(
           'que_processed' => SN_TIME_SQL,
         )
       );
-    } elseif(is_numeric($user['id'])) {
+    } elseif (is_numeric($user['id'])) {
       DBStaticUser::db_user_set_by_id(
         $user['id'],
         array(
@@ -468,7 +468,7 @@ 
   } else {
     sn_db_transaction_rollback();
   }
-  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'));
 }
 
 
@@ -507,21 +507,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) {
   }
 }
 
@@ -545,7 +545,7 @@ 
   $user = DBStaticUser::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]) {
     return $que;
   }
 
@@ -553,12 +553,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 = DBStaticPlanet::db_planet_list_by_user_or_planet($user['id'], $planet);
@@ -567,20 +567,20 @@ 
   }
 
   // Теперь в $time_left лежит время обсчета всех очередей по каждой из планеты
-  if(array_sum($time_left[$user['id']]) == 0) {
+  if (array_sum($time_left[$user['id']]) == 0) {
     return $que;
   }
 
   $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;
     }
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -593,7 +593,7 @@ 
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
 
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
-    if($que_time_left >= $que_item['que_time_left']) {
+    if ($que_time_left >= $que_item['que_time_left']) {
       // Увеличиваем количество отстроенных юнитов
       $unit_processed++;
       // Вычитаем из времени очереди потраченное на постройку время
@@ -606,12 +606,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) {
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
     } else {
       classSupernova::$gc->cacheOperator->db_upd_record_by_id(
@@ -626,15 +626,15 @@ 
       );
     }
 
-    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) {
-      if($planet_id) {
+  foreach ($time_left as $player_id => $planet_data) {
+    foreach ($planet_data as $planet_id => $time_on_planet) {
+      if ($planet_id) {
         // update planet
         classSupernova::$gc->cacheOperator->db_upd_record_by_id(
           LOC_PLANET,
@@ -656,8 +656,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) {
           DBStaticUnit::dbUpdateOrInsertUnit($unit_id, $unit_amount, $user, $planet_id ? $planet_id : null);
         }
       }
@@ -667,38 +667,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::$gc->cacheOperator->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 = DBStaticUnit::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;
                 }
@@ -711,7 +711,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/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 +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
 use Vector\Vector;
 
 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;
@@ -23,7 +23,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -53,10 +53,10 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = DBStaticUser::db_user_by_id($UserID);
-  if ( $TheUser['ally_id'] != 0 ) {
-    $TheAlly = classSupernova::$db->doSelectFetchArray("SELECT * FROM `{{alliance}}` WHERE `id` = '" . $TheUser['ally_id'] . "';");
+  if ($TheUser['ally_id'] != 0) {
+    $TheAlly = classSupernova::$db->doSelectFetchArray("SELECT * FROM `{{alliance}}` WHERE `id` = '".$TheUser['ally_id']."';");
     $TheAlly['ally_members'] -= 1;
-    if ( $TheAlly['ally_members'] > 0 ) {
+    if ($TheAlly['ally_members'] > 0) {
       classSupernova::$db->doUpdateRowSet(
         TABLE_ALLIANCE,
         array(
@@ -77,10 +77,10 @@ 
 
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_owner' => $UserID,));
   classSupernova::$gc->db->doDeleteWhere(TABLE_MESSAGES, array('message_sender' => $UserID,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_NOTES, array('owner' => $UserID,));
   FleetList::db_fleet_list_delete_by_owner($UserID);
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID ,));
-  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID ,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_SENDER_ID' => $UserID,));
+  classSupernova::$gc->db->doDeleteWhere(TABLE_BUDDY, array('BUDDY_OWNER_ID' => $UserID,));
 
 
   classSupernova::$gc->cacheOperator->db_del_record_by_id(LOC_USER, $UserID);
@@ -180,7 +180,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),
@@ -191,28 +191,28 @@ 
   !empty($options['password_encoded_unsafe']) ? $field_set['password'] = $options['password_encoded_unsafe'] : false;
 
   $user_new = classSupernova::$gc->cacheOperator->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 = DBStaticPlanet::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'],
@@ -240,7 +240,7 @@ 
 
   db_player_name_history_replace($user_new['id'], $username_unsafe);
 
-  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['partner_id'], $user_new['id']);
   }
 

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

@@ -8,14 +8,14 @@ 
 use Vector\Vector;
 
 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, classSupernova::$gc->groupFleetAndMissiles)) {
+  if (!empty($fleet)) {
+    foreach ($fleet as $ship_id => $amount) {
+      if ($amount && in_array($ship_id, classSupernova::$gc->groupFleetAndMissiles)) {
         $single_ship_data = get_ship_data($ship_id, $user);
         $speeds[] = $single_ship_data['speed'];
       }
@@ -47,14 +47,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;
       }
 
@@ -82,19 +82,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;
@@ -116,9 +116,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;
@@ -126,12 +126,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'];
   }
 
@@ -140,9 +140,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++;
     }
@@ -159,16 +159,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];
@@ -187,32 +187,32 @@ 
   $resources = 0;
   $ship_ids = classSupernova::$gc->groupFleet;
   $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, classSupernova::$gc->groupRecyclers) ? $ship_count : 0;
       $spies += $ship_id == SHIP_SPY ? $ship_count : 0;
-    } elseif($is_resource) {
+    } elseif ($is_resource) {
       $resources += $ship_count;
     }
   }
@@ -223,7 +223,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;
   }
 
@@ -235,78 +235,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;
     }
 
@@ -314,8 +314,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;
     }
 
@@ -323,19 +323,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;
   }
 
@@ -343,8 +343,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;
@@ -354,66 +354,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);
   }
 
@@ -440,7 +440,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;
@@ -451,7 +451,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;
   }
@@ -473,14 +473,14 @@ 
   $sn_group_fleet = classSupernova::$gc->groupFleet;
   $sn_group_resources_loot = sn_get_groups('resources_loot');
   $planetRowFieldChanges = 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)) {
       DBStaticUnit::dbUpdateOrInsertUnit($unit_id, -$amount, $user, $from['id']);
-    } elseif(in_array($unit_id, $sn_group_resources_loot)) {
+    } elseif (in_array($unit_id, $sn_group_resources_loot)) {
       $planetRowFieldChanges[$unit_id] -= $amount;
     }
   }
@@ -512,16 +512,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 +24 added lines, -24 removed lines

@@ -15,8 +15,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;
     }
   }
@@ -26,8 +26,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>";
     }
 
@@ -56,14 +56,14 @@ 
 
   $objFleet = $mission_data->fleet;
 
-  if(empty($target_user_row['id']) || empty($spying_user_row['id'])) {
+  if (empty($target_user_row['id']) || empty($spying_user_row['id'])) {
     $objFleet->markReturnedAndSave();
 
     return;
   }
 
   $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;
@@ -81,26 +81,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(classSupernova::$gc->groupFleet, $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: Наемники, губернаторы, артефакты и прочее имперское
@@ -108,13 +108,13 @@ 
     $simulator_link = sn_ube_simulator_encode_replay($combat_pack, 'D');
 
     $target_unit_list = 0;
-    foreach(classSupernova::$gc->groupFleet as $unit_id) {
+    foreach (classSupernova::$gc->groupFleet 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 {
@@ -131,10 +131,10 @@ 
 
     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);
@@ -156,7 +156,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/mrc_mercenary.php

Doc Comments +4 added lines

@@ -26,6 +26,10 @@
   return true;
 }
 
+/**
+ * @param integer $mode
+ * @param integer $mercenary_id
+ */
 function mrc_mercenary_hire($mode, $user, $mercenary_id) {
   global $config, $lang, $sn_powerup_buy_discounts;
 

Spacing +24 added lines, -24 removed lines

@@ -4,13 +4,13 @@ 
 
 function mrc_officer_accessible(&$user, $mercenary_id) {
   $mercenary_info = get_unit_param($mercenary_id);
-  if(classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
+  if (classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
     return true;
   }
 
-  if(isset($mercenary_info[P_REQUIRE])) {
-    foreach($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
-      if(mrc_get_level($user, null, $unit_id) < $unit_level) {
+  if (isset($mercenary_info[P_REQUIRE])) {
+    foreach ($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
+      if (mrc_get_level($user, null, $unit_id) < $unit_level) {
         return false;
       }
     }
@@ -26,35 +26,35 @@ 
     $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
     $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
     $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-    if(!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
+    if (!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_mercenary'], ERR_ERROR);
     }
 
-    if(!mrc_officer_accessible($user, $mercenary_id)) {
+    if (!mrc_officer_accessible($user, $mercenary_id)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_requirements'], ERR_ERROR);
     }
 
     $mercenary_level = sys_get_param_int('mercenary_level');
-    if($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
+    if ($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_level'], ERR_ERROR);
     }
 
-    if($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
+    if ($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_period'], ERR_ERROR);
     }
 
     sn_db_transaction_start();
 
     $mercenary_level_old = mrc_get_level($user, $planetrow, $mercenary_id, true, true);
-    if(classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
+    if (classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
       throw new Exception(classLocale::$lang['mrc_msg_error_already_hired'], ERR_ERROR); // Can't hire already hired temp mercenary - dismiss first
-    } elseif(classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
+    } elseif (classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
       throw new Exception('', ERR_NONE); // Can't dismiss (!$mercenary_level) not hired (!$mercenary_level_old) temp mercenary. But no error
     }
 
-    if($mercenary_level) {
+    if ($mercenary_level) {
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
-      if(!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
+      if (!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
         $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
         $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
       }
@@ -64,13 +64,13 @@ 
     }
     $darkmater_cost *= $cost_alliance_multiplyer;
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
       throw new Exception(classLocale::$lang['mrc_msg_error_no_resource'], ERR_ERROR);
     }
 
-    if(($darkmater_cost && $mercenary_level) || !$is_permanent) {
+    if (($darkmater_cost && $mercenary_level) || !$is_permanent) {
       $unit_row = db_unit_by_location($user['id'], LOC_USER, $user['id'], $mercenary_id);
-      if(is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
+      if (is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
         $dismiss_full_cost = eco_get_total_cost($mercenary_id, $unit_row['unit_level']);
         $dismiss_full_cost = $dismiss_full_cost[BUILD_CREATE][RES_DARK_MATTER];
 
@@ -83,7 +83,7 @@ 
       db_unit_list_delete($user['id'], LOC_USER, $user['id'], $mercenary_id);
     }
 
-    if($darkmater_cost && $mercenary_level) {
+    if ($darkmater_cost && $mercenary_level) {
       db_unit_set_insert(
         "unit_player_id = {$user['id']},
         unit_location_type = " . LOC_USER . ",
@@ -100,7 +100,7 @@ 
     }
     sn_db_transaction_commit();
     sys_redirect($_SERVER['REQUEST_URI']);
-  } 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,
@@ -118,7 +118,7 @@ 
   $mode = in_array($mode, array(UNIT_MERCENARIES, UNIT_PLANS)) ? $mode : UNIT_MERCENARIES;
   $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
 
-  if($mercenary_id = sys_get_param_int('mercenary_id')) {
+  if ($mercenary_id = sys_get_param_int('mercenary_id')) {
     $operation_result = mrc_mercenary_hire($mode, $user, $mercenary_id);
   }
 
@@ -126,11 +126,11 @@ 
 
   $template = gettemplate('mrc_mercenary_hire', true);
 
-  if(!empty($operation_result)) {
+  if (!empty($operation_result)) {
     $template->assign_block_vars('result', $operation_result);
   }
 
-  foreach($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
+  foreach ($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
     $template->assign_block_vars('period', array(
       'LENGTH'   => $hire_period,
       'TEXT'     => classLocale::$lang['mrc_period_list'][$hire_period],
@@ -142,12 +142,12 @@ 
   $user_dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
   $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
   $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-  foreach(sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
+  foreach (sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
     {
       $mercenary = get_unit_param($mercenary_id);
       $mercenary_bonus = $mercenary['bonus'];
       $mercenary_bonus = $mercenary_bonus >= 0 ? "+{$mercenary_bonus}" : "{$mercenary_bonus}";
-      switch($mercenary['bonus_type']) {
+      switch ($mercenary['bonus_type']) {
         case BONUS_PERCENT:
           $mercenary_bonus = "{$mercenary_bonus}% ";
         break;
@@ -164,7 +164,7 @@ 
       $mercenary_level = mrc_get_level($user, null, $mercenary_id, false, true);
       $mercenary_level_bonus = max(0, mrc_get_level($user, null, $mercenary_id) - $mercenary_level);
       $total_cost_old = 0;
-      if($is_permanent) {
+      if ($is_permanent) {
         $total_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level);
         $total_cost_old = $total_cost_old[BUILD_CREATE][RES_DARK_MATTER] * $cost_alliance_multiplyer;
       }
@@ -193,7 +193,7 @@ 
       ));
 
       $upgrade_cost = 1;
-      for($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
+      for ($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
         $total_cost = eco_get_total_cost($mercenary_id, $i);
         $total_cost[BUILD_CREATE][RES_DARK_MATTER] *= $cost_alliance_multiplyer;
         $upgrade_cost = $total_cost[BUILD_CREATE][RES_DARK_MATTER] - $total_cost_old;

docs/txt2html.php

Braces +22 added lines, -26 removed lines

@@ -2,7 +2,9 @@ 
 
 function dump($value,$varname = "",$level=0,$dumper = "")
 {
-  if ($varname) $varname .= " = ";
+  if ($varname) {
+    $varname .= " = ";
+  }
 
   if ($level==-1)
   {
@@ -13,7 +15,9 @@ 
     $trans["\0"]='⊕';
     return strtr(htmlspecialchars($value),$trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level==0) {
+    $dumper = '<pre>' . $varname;
+  }
 
   $type = gettype($value);
   $dumper .= $type;
@@ -22,9 +26,9 @@ 
   {
     $dumper .= '('.strlen($value).')';
     $value = dump($value,"",-1);
-  }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  } elseif ($type=='boolean') {
+    $value= ($value?'true':'false');
+  } elseif ($type=='object')
   {
     $props= get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +38,7 @@ 
       $dumper .= dump($value->$key,"",$level+1);
     }
     $value= '';
-  }
-  elseif ($type=='array')
+  } elseif ($type=='array')
   {
     $dumper .= '('.count($value).')';
     foreach($value as $key=>$val)
@@ -46,7 +49,9 @@ 
     $value= '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level==0) {
+    $dumper .= '</pre>';
+  }
   return $dumper;
 }
 
@@ -70,8 +75,7 @@ 
 if(substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
-}
-else
+} else
 {
   $path_prefix = '';
 }
@@ -119,8 +123,7 @@ 
       $buffer['name'] = $chapter[0];
     }
     $prev_chapter_is_header = true;
-  }
-  else
+  } else
   {
     $prev_chapter_is_header = false;
     foreach($chapter as &$note)
@@ -150,8 +153,7 @@ 
           if(!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
-          }
-          else
+          } else
           {
             $note_out['lines'][] = $buf_str;
           }
@@ -228,36 +230,31 @@ 
             if($matches[2])
             {
               buf_print("<ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("<ul>\r\n");
             }
             buf_print('<li>');
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
-          }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
             if(array_pop($depth))
             {
               buf_print("</ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("</ul>\r\n");
             }
             $last_spaces = $matches[1];
             buf_print('<li>');
-          }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
           {
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
-            }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -274,8 +271,7 @@ 
         if(array_pop($depth))
         {
           buf_print("</ol>\r\n");
-        }
-        else
+        } else
         {
           buf_print("</ul>\r\n");
         }

Spacing +61 added lines, -61 removed lines

@@ -1,58 +1,58 @@ 
 <?php
 
-function dump($value,$varname = "",$level=0,$dumper = "")
+function dump($value, $varname = "", $level = 0, $dumper = "")
 {
   if ($varname) $varname .= " = ";
 
-  if ($level==-1)
+  if ($level == -1)
   {
-    $trans[' ']='&there4;';
-    $trans["\t"]='&rArr;';
-    $trans["\n"]='&para;;';
-    $trans["\r"]='&lArr;';
-    $trans["\0"]='&oplus;';
-    return strtr(htmlspecialchars($value),$trans);
+    $trans[' '] = '&there4;';
+    $trans["\t"] = '&rArr;';
+    $trans["\n"] = '&para;;';
+    $trans["\r"] = '&lArr;';
+    $trans["\0"] = '&oplus;';
+    return strtr(htmlspecialchars($value), $trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level == 0) $dumper = '<pre>'.$varname;
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if ($type=='string')
+  if ($type == 'string')
   {
     $dumper .= '('.strlen($value).')';
-    $value = dump($value,"",-1);
+    $value = dump($value, "", -1);
   }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  elseif ($type == 'boolean') $value = ($value ? 'true' : 'false');
+  elseif ($type == 'object')
   {
-    $props= get_class_vars(get_class($value));
+    $props = get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
-    foreach($props as $key=>$val)
+    foreach ($props as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).$key.' => ';
-      $dumper .= dump($value->$key,"",$level+1);
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
+      $dumper .= dump($value->$key, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
-  elseif ($type=='array')
+  elseif ($type == 'array')
   {
     $dumper .= '('.count($value).')';
-    foreach($value as $key=>$val)
+    foreach ($value as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).dump($key,"",-1).' => ';
-      $dumper .= dump($val,"",$level+1);
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, "", -1).' => ';
+      $dumper .= dump($val, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level == 0) $dumper .= '</pre>';
   return $dumper;
 }
 
 function pdump($value, $varname = '')
 {
-  print('<span style="text-align: left">' . dump($value, $varname) . '</span>');
+  print('<span style="text-align: left">'.dump($value, $varname).'</span>');
 }
 
 function debug($value, $varname = '')
@@ -67,7 +67,7 @@ 
   $output_buffer .= $string;
 }
 
-if(substr(getcwd(), -4) != 'docs')
+if (substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
 }
@@ -80,22 +80,22 @@ 
 
 $filename = 'changelog';
 
-$input =  file_get_contents($path_prefix . $filename . '.txt');
+$input = file_get_contents($path_prefix.$filename.'.txt');
 //$input = iconv('CP1251', 'UTF-8', $input);
 
 $input = preg_replace("/\r\n\d\d\d\d\-\d\d\-\d\d\ \d\d\:\d\d/", "[D] $0", $input);
 
-while(strpos($input, "\r\n\r\n") !== false)
+while (strpos($input, "\r\n\r\n") !== false)
 {
   $input = str_replace("\r\n\r\n", "\r\n", $input);
 }
-while(strpos($input, "~~~") !== false)
+while (strpos($input, "~~~") !== false)
 {
   $input = str_replace("~~~", "~~", $input);
 }
 $input = str_replace("\r\n~~", "~~", $input);
 
-while(strpos($input, "===") !== false)
+while (strpos($input, "===") !== false)
 {
   $input = str_replace("===", "==", $input);
 }
@@ -106,13 +106,13 @@ 
 $prev_chapter_is_header = false;
 $output = array();
 $buffer = array();
-foreach($input as &$chapter)
+foreach ($input as &$chapter)
 {
   $chapter = preg_split("/(\r\n[\[])/", $chapter, -1, PREG_SPLIT_NO_EMPTY); // , PREG_SPLIT_DELIM_CAPTURE
 
-  if(count($chapter) == 1 && !$prev_chapter_is_header)
+  if (count($chapter) == 1 && !$prev_chapter_is_header)
   {
-    if(!empty($chapter))
+    if (!empty($chapter))
     {
       $output[] = $buffer;
       $buffer = array();
@@ -123,7 +123,7 @@ 
   else
   {
     $prev_chapter_is_header = false;
-    foreach($chapter as &$note)
+    foreach ($chapter as &$note)
     {
       $note = explode("\r\n", $note);
       $new_note = true;
@@ -131,13 +131,13 @@ 
 
       $note_out = array();
 
-      foreach($note as &$line)
+      foreach ($note as &$line)
       {
-        if(!$line)
+        if (!$line)
         {
           continue;
         }
-        if($new_note)
+        if ($new_note)
         {
           // 78 - 3 = 75
           $note_out['style'] = $line[0];
@@ -145,9 +145,9 @@ 
         }
 
         $buf_str .= $line;
-        if(mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
+        if (mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
         {
-          if(!isset($note_out['name']))
+          if (!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
           }
@@ -201,31 +201,31 @@ 
   'D' => 'date',
 );
 
-foreach($output as $chapter)
+foreach ($output as $chapter)
 {
-  if(!$chapter)
+  if (!$chapter)
   {
     continue;
   }
 
   buf_print("<h1>{$chapter['name']}</h1>\r\n");
-  foreach($chapter['content'] as $block)
+  foreach ($chapter['content'] as $block)
   {
-    buf_print("<div class=\"{$styles[$block['style']]}\">" . ($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
-    buf_print(preg_replace("/\s{2,10}/", " ", $block['name']) . '<br />');
-    if(isset($block['lines']))
+    buf_print("<div class=\"{$styles[$block['style']]}\">".($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
+    buf_print(preg_replace("/\s{2,10}/", " ", $block['name']).'<br />');
+    if (isset($block['lines']))
     {
       $last_spaces = '';
       $depth = array();
-      foreach($block['lines'] as $line)
+      foreach ($block['lines'] as $line)
       {
-        if(preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
+        if (preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
         {
           //$line = strlen($matches[1]) . '/' . $matches[2] . '/' . $matches[3];
           $line = $matches[3];
-          if(strlen($matches[1]) > strlen($last_spaces))
+          if (strlen($matches[1]) > strlen($last_spaces))
           {
-            if($matches[2])
+            if ($matches[2])
             {
               buf_print("<ol>\r\n");
             }
@@ -237,9 +237,9 @@ 
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
           }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          elseif (strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
-            if(array_pop($depth))
+            if (array_pop($depth))
             {
               buf_print("</ol>\r\n");
             }
@@ -250,14 +250,14 @@ 
             $last_spaces = $matches[1];
             buf_print('<li>');
           }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          elseif (strlen($last_spaces) == strlen($matches[1]))
           {
-            if($matches[2] == '' && $depth[count($depth) - 1] != '')
+            if ($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
             }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            elseif ($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -267,11 +267,11 @@ 
           }
         }
         $line = preg_replace("/\s{2,10}/", " ", $line);
-        buf_print($line . "<br />\r\n");
+        buf_print($line."<br />\r\n");
       }
-      while(count($depth))
+      while (count($depth))
       {
-        if(array_pop($depth))
+        if (array_pop($depth))
         {
           buf_print("</ol>\r\n");
         }
@@ -286,11 +286,11 @@ 
 }
 buf_print("</body>\r\n</html>\r\n");
 
-$html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
-if($html != $output_buffer)
+$html = file_get_contents($path_prefix.'html/'.$filename.'.html');
+if ($html != $output_buffer)
 {
-  file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
-  if(!$path_prefix)
+  file_put_contents($path_prefix.'html/'.$filename.'.html', $output_buffer);
+  if (!$path_prefix)
   {
     print($output_buffer);
   }

stat.php

Indentation +30 added lines, -30 removed lines

@@ -50,52 +50,52 @@
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
 
 $stat_types = array(
-   STAT_TOTAL => array(
-     'type' => 'total',
-   ),
+    STAT_TOTAL => array(
+      'type' => 'total',
+    ),
 
-   STAT_FLEET => array(
-     'type' => 'fleet',
-   ),
+    STAT_FLEET => array(
+      'type' => 'fleet',
+    ),
 
-   STAT_TECH => array(
-     'type' => 'tech',
-   ),
+    STAT_TECH => array(
+      'type' => 'tech',
+    ),
 
-   STAT_BUILDING => array(
-     'type' => 'build',
-   ),
+    STAT_BUILDING => array(
+      'type' => 'build',
+    ),
 
-   STAT_DEFENSE => array(
-     'type' => 'defs',
-   ),
+    STAT_DEFENSE => array(
+      'type' => 'defs',
+    ),
 
-   STAT_RESOURCE => array(
-     'type' => 'res',
-   ),
+    STAT_RESOURCE => array(
+      'type' => 'res',
+    ),
 
-   STAT_RAID_TOTAL => array(
-     'type' => 'raids',
-   ),
+    STAT_RAID_TOTAL => array(
+      'type' => 'raids',
+    ),
 
-   STAT_RAID_WON => array(
-     'type' => 'raidswin',
-   ),
+    STAT_RAID_WON => array(
+      'type' => 'raidswin',
+    ),
 
-   STAT_RAID_LOST => array(
-     'type' => 'raidsloose',
-   ),
+    STAT_RAID_LOST => array(
+      'type' => 'raidsloose',
+    ),
 
   STAT_LVL_BUILDING => array(
-     'type' => 'lvl_minier',
+      'type' => 'lvl_minier',
   ),
 
   STAT_LVL_TECH => array(
-     'type' => 'player_rpg_tech_level',
+      'type' => 'player_rpg_tech_level',
   ),
 
   STAT_LVL_RAID => array(
-     'type' => 'lvl_raid',
+      'type' => 'lvl_raid',
   ),
 );
 stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common);

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
   global $who;
 
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
-  foreach($array as $key => $value) {
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
+  foreach ($array as $key => $value) {
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
       continue;
     }
 
@@ -28,7 +28,7 @@ 
 
 $allow_anonymous = true;
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('stat');
 
@@ -44,7 +44,7 @@ 
 $subject_list = array(
   1 => array('header' => classLocale::$lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => classLocale::$lang['stat_allys']);
 }
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -113,7 +113,7 @@ 
 
 $page_count = floor($record_count / 100);
 $pages = array();
-for($i = 0; $i <= $page_count; $i++) {
+for ($i = 0; $i <= $page_count; $i++) {
   $first_element = $i * 100 + 1;
   $last_element = $first_element + 99;
   $pages[$first_element] = array(
@@ -133,7 +133,7 @@ 
   );
 //pdump($row);
 
-  if($who == 1) {
+  if ($who == 1) {
     $row_stat['ALLY_NAME'] = $row['ally_name'];
     $row_stat['ALLY_ID'] = $row['ally_id'];
     empty($row['username']) ? $row['username'] = $row['name'] : false;

scheduler.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
 
 // require_once('includes/includes/scheduler_process.php');
 
-if(($result = scheduler_process()) && !defined('IN_ADMIN')) {
+if (($result = scheduler_process()) && !defined('IN_ADMIN')) {
   $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
   print(json_encode($result));
 }
 
-if(!defined('IN_ADMIN')) {
+if (!defined('IN_ADMIN')) {
   die();
 }