supernova-ws / SuperNova

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 +92 added lines, -92 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;
     }
@@ -16,14 +16,14 @@ 
 function que_get_max_que_length($user, $planet, $que_id, $que_data = null) {
   global $config;
 
-  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 = $config->server_que_length_research + mrc_get_level($user, '', UNIT_PREMIUM); // TODO - вынести в модуль
     break;
@@ -37,8 +37,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]);
@@ -48,7 +48,7 @@ 
 }
 
 function eco_que_arr2str($que_arr) {
-  foreach($que_arr as &$que_item) {
+  foreach ($que_arr as &$que_item) {
     $que_item = implode(',', $que_item);
   }
   return implode(';', $que_arr);
@@ -59,14 +59,14 @@ 
   global $lang, $config;
 
   $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,11 +94,11 @@ 
     $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])) {
+      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,17 +131,17 @@ 
     $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: throw new exception('{Строение занято}', ERR_ERROR); 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
@@ -151,14 +151,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
     }
 
@@ -174,21 +174,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("{В ракетной шахте нет места для {$lang['tech'][$unit_id]}}", ERR_ERROR); // TODO EXCEPTION
         }
         $unit_amount = max(0, min($unit_amount, floor($free_silo / $unit_size)));
@@ -196,10 +196,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
         }
@@ -217,9 +217,9 @@ 
 
     $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) {
+      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
       }
 
@@ -229,7 +229,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] = $config->__get("rpg_exchange_{$resource_db_name}");
@@ -237,15 +237,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];
@@ -261,14 +261,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 {
@@ -277,19 +277,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(
@@ -304,7 +304,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;
@@ -314,7 +314,7 @@ 
 
     sn_db_transaction_commit();
 
-    if($redirect) {
+    if ($redirect) {
       sys_redirect("{$_SERVER['PHP_SELF']}?mode=" . sys_get_param_str('mode') . "&ally_id=" . sys_get_param_id('ally_id'));
       die();
     }
@@ -323,7 +323,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,
@@ -331,7 +331,7 @@ 
     );
   }
 
-  if(!empty($operation_result['MESSAGE'])) {
+  if (!empty($operation_result['MESSAGE'])) {
     $operation_result['MESSAGE'] .= ' ' . ($unit_amount_qued ? $unit_amount_qued : $unit_amount) . 'x[' . $lang['tech'][$unit_id] . ']';
   }
 
@@ -345,11 +345,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;
     }
 
@@ -360,9 +360,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];
@@ -397,9 +397,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())');
   }
 
@@ -429,17 +429,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;
       }
 
@@ -451,15 +451,15 @@ 
         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())');
     }
 
@@ -504,21 +504,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) {
     // TODO Исправить
 //    $template->assign_var('RESEARCH_ONGOING', count($global_que[QUE_RESEARCH][0]) >= $config->server_que_length_research);
   }
@@ -546,7 +546,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;
   }
@@ -555,12 +555,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);
@@ -569,21 +569,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;
     }
     // Дальше мы идем, если только осталось время в очереди И юниты к постройке
@@ -596,7 +596,7 @@ 
     // Теперь работаем с остатком времени на юните. Оно не может быть равно или меньше нуля
 
     // Если времени в очереди осталось не меньше, чем время текущего юнита - значит мы достроили юнит
-    if($que_time_left >= $que_item['que_time_left']) {
+    if ($que_time_left >= $que_item['que_time_left']) {
       // Увеличиваем количество отстроенных юнитов
       $unit_processed++;
       // Вычитаем из времени очереди потраченное на постройку время
@@ -609,12 +609,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,
@@ -640,14 +640,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(
@@ -663,8 +663,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);
         }
       }
@@ -674,33 +674,33 @@ 
   $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($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $unit_level_new) {
+            if (is_array($quest_trigger_list)) {
+              foreach ($quest_trigger_list as $quest_id) {
+                if ($quest_list[$quest_id]['quest_status_status'] != QUEST_STATUS_COMPLETE && $quest_list[$quest_id]['quest_unit_amount'] <= $unit_level_new) {
                   $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;
                 }
@@ -713,7 +713,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);
     }
   }

Braces +1 added lines, -2 removed lines

@@ -458,8 +458,7 @@
 
     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())');
     }
 

includes/functions/int_fleet_events.php

Doc Comments +4 added lines

@@ -135,6 +135,10 @@
   return $fleet_events;
 }
 
+/**
+ * @param integer $ov_label
+ * @param integer $planet_end_type
+ */
 function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
 {
   global $user, $planetrow, $fleet_number;

Spacing +14 added lines, -14 removed lines

@@ -10,11 +10,11 @@ 
 function flt_get_fleets($condition, $phalanx = false) {
   $fleet_db_list = array();
 
-  if(!$condition)
+  if (!$condition)
   {
     $missile_query = $condition = 1;
   }
-  elseif(is_array($condition))
+  elseif (is_array($condition))
   {
     $missile_query = "
       (fleet_start_galaxy = {$condition['galaxy']} AND fleet_start_system = {$condition['system']} AND fleet_start_planet = {$condition['planet']} AND fleet_start_type = {$condition['planet_type']})
@@ -41,7 +41,7 @@ 
   $sql_fleets = doquery("SELECT * FROM `{{iraks}}` WHERE {$missile_query};");
   while ($irak = db_fetch($sql_fleets))
   {
-    if($irak['fleet_end_time'] >= SN_TIME_NOW)
+    if ($irak['fleet_end_time'] >= SN_TIME_NOW)
     {
       $irak['fleet_start_type'] = PT_PLANET;
       $planet_start = db_planet_by_vector($irak, 'fleet_start_', false, 'name');
@@ -63,23 +63,23 @@ 
   $fleet_events = array();
   $fleet_number = 0;
 
-  if(empty($fleet_list))
+  if (empty($fleet_list))
   {
     return;
   }
 
-  foreach($fleet_list as $fleet)
+  foreach ($fleet_list as $fleet)
   {
     $planet_start_type = $fleet['fleet_start_type'] == PT_MOON ? PT_MOON : PT_PLANET;
     $planet_start = db_planet_by_gspt($fleet['fleet_start_galaxy'], $fleet['fleet_start_system'], $fleet['fleet_start_planet'], $planet_start_type, false, 'name');
     $fleet['fleet_start_name'] = $planet_start['name'];
 
     $planet_end_type = $fleet['fleet_end_type'] == PT_MOON ? PT_MOON : PT_PLANET;
-    if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
+    if ($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
     }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    elseif ($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
     }
@@ -89,7 +89,7 @@ 
       $fleet['fleet_end_name'] = $planet_end['name'];
     }
 
-    if($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
+    if ($fleet['fleet_start_time'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] != MT_MISSILE &&
       ($planet_scanned === false
         ||
         (
@@ -104,12 +104,12 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 0, $planet_end_type);
     }
 
-    if($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
+    if ($fleet['fleet_end_stay'] > SN_TIME_NOW && $fleet['fleet_mess'] == 0 && $planet_scanned === false && $fleet['fleet_mission'] != MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 1, $planet_end_type);
     }
 
-    if(
+    if (
       $fleet['fleet_end_time'] > SN_TIME_NOW && $fleet['fleet_mission'] != MT_MISSILE && ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mission'] != MT_RELOCATE && $fleet['fleet_mission'] != MT_COLONIZE)) &&
       (
         ($planet_scanned === false && $fleet['fleet_owner'] == $user['id'])
@@ -126,7 +126,7 @@ 
       $fleet_events[] = flt_register_fleet_event($fleet, 2, $planet_end_type);
     }
     
-    if($fleet['fleet_mission'] == MT_MISSILE)
+    if ($fleet['fleet_mission'] == MT_MISSILE)
     {
       $fleet_events[] = flt_register_fleet_event($fleet, 3, $planet_end_type);
     }
@@ -139,7 +139,7 @@ 
 {
   global $user, $planetrow, $fleet_number;
 
-  switch($fleet['ov_label'] = $ov_label)
+  switch ($fleet['ov_label'] = $ov_label)
   {
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
@@ -171,9 +171,9 @@ 
 
   }
 
-  $fleet['ov_this_planet'] = $is_this_planet;// || $planet_scanned != false;
+  $fleet['ov_this_planet'] = $is_this_planet; // || $planet_scanned != false;
 
-  if($fleet['fleet_owner'] == $user['id'])
+  if ($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
   }

Braces +5 added lines, -10 removed lines

@@ -13,8 +13,7 @@ 
   if(!$condition)
   {
     $missile_query = $condition = 1;
-  }
-  elseif(is_array($condition))
+  } elseif(is_array($condition))
   {
     $missile_query = "
       (fleet_start_galaxy = {$condition['galaxy']} AND fleet_start_system = {$condition['system']} AND fleet_start_planet = {$condition['planet']} AND fleet_start_type = {$condition['planet_type']})
@@ -24,8 +23,7 @@ 
       (fleet_start_galaxy = {$condition['galaxy']} AND fleet_start_system = {$condition['system']} AND fleet_start_planet = {$condition['planet']} AND fleet_start_type = {$condition['planet_type']}" . ($phalanx ? '' : ' AND fleet_mess = 1') . ")
       OR
       (fleet_end_galaxy = {$condition['galaxy']} AND fleet_end_system = {$condition['system']} AND fleet_end_planet = {$condition['planet']} AND fleet_end_type = {$condition['planet_type']}" . ($phalanx ? '' : ' AND fleet_mess = 0') . ")";
-  }
-  else
+  } else
   {
     $missile_query = "`fleet_owner` = '{$condition}' OR `fleet_target_owner` = '{$condition}'";
     $condition = $missile_query;
@@ -78,12 +76,10 @@ 
     if($fleet['fleet_end_planet'] > $config->game_maxPlanet)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_exploration'];
-    }
-    elseif($fleet['fleet_mission'] == MT_COLONIZE)
+    } elseif($fleet['fleet_mission'] == MT_COLONIZE)
     {
       $fleet['fleet_end_name'] = $lang['ov_fleet_colonization'];
-    }
-    else
+    } else
     {
       $planet_end = db_planet_by_gspt($fleet['fleet_end_galaxy'], $fleet['fleet_end_system'], $fleet['fleet_end_planet'], $planet_end_type, false, 'name');
       $fleet['fleet_end_name'] = $planet_end['name'];
@@ -176,8 +172,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }

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

@@ -26,7 +26,7 @@ 
     "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']} ";
@@ -41,19 +41,19 @@ 
 {
   global $config, $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);
@@ -69,9 +69,9 @@ 
 
   $message_class_name_total = $sn_message_class_list[MSG_TYPE_NEW]['name'];
 
-  if($owners[0] == '*')
+  if ($owners[0] == '*')
   {
-    if($user['authlevel'] < 3)
+    if ($user['authlevel'] < 3)
     {
       return false;
     }
@@ -87,7 +87,7 @@ 
 
     foreach ($owners as $owner)
     {
-      if($user['id'] != $owner)
+      if ($user['id'] != $owner)
       {
         $owner_row = db_user_by_id($owner);
       }
@@ -97,18 +97,18 @@ 
       }
       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 && $config->game_email_pm && $owner_row["opt_email_{$message_class_name}"])
+      if ($message_class_email && $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;
     }
@@ -118,7 +118,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]++;

Braces +2 added lines, -4 removed lines

@@ -79,8 +79,7 @@ 
     // TODO Добавить $sender - рассылка может быть и от кого-то
     db_message_insert_all($message_type, $from, $subject, $text);
     $owners = array();
-  }
-  else
+  } else
   {
     $insert_values = array();
     $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
@@ -90,8 +89,7 @@ 
       if($user['id'] != $owner)
       {
         $owner_row = db_user_by_id($owner);
-      }
-      else
+      } else
       {
         $owner_row = $user;
       }

includes/functions/rpg_points.php

Doc Comments +10 added lines

@@ -161,6 +161,9 @@ 
   return $rows_affected;
 }
 
+/**
+ * @param integer $type
+ */
 function rpg_level_up(&$user, $type, $xp_to_add = 0)
 {
   $q = 1.03;
@@ -223,6 +226,10 @@ 
   }
 }
 
+/**
+ * @param integer $b1
+ * @param double $q
+ */
 function rpg_xp_for_level($level, $b1, $q)
 {
   return floor($b1 * (pow($q, $level) - 1)/($q - 1));
@@ -233,6 +240,9 @@ 
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
+/**
+ * @param integer $level
+ */
 function RPG_get_raider_xp($level)
 {
   return rpg_xp_for_level($level, 10, 1.03);

Spacing +17 added lines, -17 removed lines

@@ -85,28 +85,28 @@ 
 function rpg_points_change($user_id, $change_type, $dark_matter, $comment = false, $already_changed = false) {
   global $debug, $config, $dm_change_legit, $user;
 
-  if(!$user_id) {
+  if (!$user_id) {
     return false;
   }
 
   $dm_change_legit = true;
   $sn_data_dark_matter_db_name = pname_resource_name(RES_DARK_MATTER);
 
-  if($already_changed) {
+  if ($already_changed) {
     $rows_affected = 1;
   } else {
     $changeset = array();
     $a_user = db_user_by_id($user_id, true);
-    if($dark_matter < 0) {
+    if ($dark_matter < 0) {
       $dark_matter_exists = mrc_get_level($a_user, null, RES_DARK_MATTER, false, true);
       $dark_matter_exists < 0 ? $dark_matter_exists = 0 : false;
       $metamatter_to_reduce = -$dark_matter - $dark_matter_exists;
-      if($metamatter_to_reduce > 0) {
+      if ($metamatter_to_reduce > 0) {
         $metamatter_exists = mrc_get_level($a_user, null, RES_METAMATTER);
-        if($metamatter_exists < $metamatter_to_reduce) {
+        if ($metamatter_exists < $metamatter_to_reduce) {
           $debug->error('Ошибка снятия ТМ - ММ+ТМ меньше, чем сумма для снятия!', 'Ошибка снятия ТМ', LOG_ERR_INT_NOT_ENOUGH_DARK_MATTER);
         }
-        if(is_array($comment)) {
+        if (is_array($comment)) {
           $comment = call_user_func_array('sprintf', $comment);
         }
 //        mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
@@ -121,9 +121,9 @@ 
     $rows_affected = classSupernova::$db->db_affected_rows();
   }
 
-  if($rows_affected || !$dark_matter) {
+  if ($rows_affected || !$dark_matter) {
     $page_url = db_escape($_SERVER['SCRIPT_NAME']);
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
     $comment = db_escape($comment);
@@ -137,18 +137,18 @@ 
         {$dark_matter}, '{$comment}', '{$page_url}', {$user_id}
       );");
 
-    if($user['id'] == $user_id) {
+    if ($user['id'] == $user_id) {
       $user['dark_matter'] += $dark_matter;
     }
 
-    if($dark_matter > 0) {
+    if ($dark_matter > 0) {
       $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter}' WHERE `id` = {$user_id} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL, $partner_bonus, "Incoming From Referral ID {$user_id}");
         }
       }
@@ -165,7 +165,7 @@ 
 {
   $q = 1.03;
 
-  switch($type)
+  switch ($type)
   {
     case RPG_STRUCTURE:
       $field_level = 'lvl_minier';
@@ -203,19 +203,19 @@ 
 
   $xp = &$user[$field_xp];
 
-  if($xp_to_add)
+  if ($xp_to_add)
   {
     $xp += $xp_to_add;
     db_user_set_by_id($user['id'], "`{$field_xp}` = `{$field_xp}` + '{$xp_to_add}'");
   }
 
   $level = $user[$field_level];
-  while($xp > rpg_xp_for_level($level + 1, $b1, $q))
+  while ($xp > rpg_xp_for_level($level + 1, $b1, $q))
   {
     $level++;
   }
   $level -= $user[$field_level];
-  if($level > 0)
+  if ($level > 0)
   {
     db_user_set_by_id($user['id'], "`{$field_level}` = `{$field_level}` + '{$level}'");
     rpg_points_change($user['id'], $type, $level * 1000, $comment);
@@ -225,7 +225,7 @@ 
 
 function rpg_xp_for_level($level, $b1, $q)
 {
-  return floor($b1 * (pow($q, $level) - 1)/($q - 1));
+  return floor($b1 * (pow($q, $level) - 1) / ($q - 1));
 }
 
 function rpg_get_miner_xp($level)

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);
 

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Gorlum
- * Date: 17.04.2015
- * Time: 6:37
- */
+   * Created by PhpStorm.
+   * User: Gorlum
+   * Date: 17.04.2015
+   * Time: 6:37
+   */
 
 function sys_user_vacation($user) {
   global $config;

Spacing +23 added lines, -23 removed lines

@@ -9,7 +9,7 @@ 
 function sys_user_vacation($user) {
   global $config;
 
-  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 + $config->player_vacation_timeout;
@@ -17,7 +17,7 @@ 
     }
   }
 
-  if($user['vacation']) {
+  if ($user['vacation']) {
     // sn_sys_logout(false, true);
     // core_auth::logout(false, true);
 
@@ -49,33 +49,33 @@ 
   // TODO: Full rewrite
   sn_db_transaction_start();
   $TheUser = 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 `{{fleets}}` WHERE `fleet_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 `{{fleets}}` WHERE `fleet_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}');");
   global $config;
   $config->db_saveItem('users_amount', $config->db_loadItem('users_amount') - 1);
   sn_db_transaction_commit();
@@ -175,7 +175,7 @@ 
   !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'] = $config->LastSettedGalaxyPos;
     $options['system'] = $config->LastSettedSystemPos;
     $segment_size = floor($config->game_maxPlanet / 3);
@@ -184,19 +184,19 @@ 
     $options['planet'] = mt_rand(1 + $segment * $segment_size, ($segment + 1) * $segment_size);
 
     // $new_planet_id = 0;
-    while(true) {
-      if($options['planet'] > $config->game_maxPlanet) {
+    while (true) {
+      if ($options['planet'] > $config->game_maxPlanet) {
         $options['planet'] = mt_rand(0, $segment_size - 1) + 1;
         $options['system']++;
       }
-      if($options['system'] > $config->game_maxSystem) {
+      if ($options['system'] > $config->game_maxSystem) {
         $options['system'] = 1;
         $options['galaxy']++;
       }
       $options['galaxy'] > $config->game_maxGalaxy ? $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']) {
         $config->db_saveItem(array(
           'LastSettedGalaxyPos' => $options['galaxy'],
           'LastSettedSystemPos' => $options['system'],
@@ -225,7 +225,7 @@ 
   $username_safe = db_escape($username_unsafe);
   doquery("REPLACE INTO {{player_name_history}} SET `player_id` = {$user_new['id']}, `player_name` = '{$username_safe}'");
 
-  if(!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
+  if (!empty($options['partner_id']) && ($referral_row = db_user_by_id($options['partner_id'], true))) {
     doquery("INSERT INTO {{referrals}} SET `id` = {$user_new['id']}, `id_partner` = {$options['partner_id']}");
   }
 

includes/functions/tpl_helpers.php

Doc Comments +6 added lines

@@ -17,6 +17,9 @@ 
   }
 }
 
+/**
+ * @param template $template
+ */
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets')
 {
   if(!$fleets)
@@ -165,6 +168,9 @@ 
   return $result;
 }
 
+/**
+ * @param integer $que_id
+ */
 function tpl_parse_planet_que($que, $planet, $que_id)
 {
   $hangar_que = array();

Spacing +31 added lines, -31 removed lines

@@ -3,9 +3,9 @@ 
 // Compare function to sort fleet in time order
 function tpl_assign_fleet_compare($a, $b)
 {
-  if($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET'])
+  if ($a['fleet']['OV_THIS_PLANET'] == $b['fleet']['OV_THIS_PLANET'])
   {
-    if($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT'])
+    if ($a['fleet']['OV_LEFT'] == $b['fleet']['OV_LEFT'])
     {
       return 0;
     }
@@ -19,20 +19,20 @@ 
 
 function tpl_assign_fleet(&$template, $fleets, $js_name = 'fleets')
 {
-  if(!$fleets)
+  if (!$fleets)
   {
     return;
   }
 
   usort($fleets, 'tpl_assign_fleet_compare');
 
-  foreach($fleets as $fleet_data)
+  foreach ($fleets as $fleet_data)
   {
     $template->assign_block_vars($js_name, $fleet_data['fleet']);
 
-    if($fleet_data['ships'])
+    if ($fleet_data['ships'])
     {
-      foreach($fleet_data['ships'] as $ship_data)
+      foreach ($fleet_data['ships'] as $ship_data)
       {
         $template->assign_block_vars("{$js_name}.ships", $ship_data);
       }
@@ -57,7 +57,7 @@ 
 
   foreach ($fleet as $ship_id => $ship_amount)
   {
-    if(in_array($ship_id, sn_get_groups('fleet')))
+    if (in_array($ship_id, sn_get_groups('fleet')))
     {
       $single_ship_data = get_ship_data($ship_id, $user_data);
       $return['ships'][$ship_id] = array(
@@ -74,15 +74,15 @@ 
   return $return;
 }
 
-function tpl_parse_fleet_db($fleet, $index, $user_data = false){return sn_function_call('tpl_parse_fleet_db', array($fleet, $index, $user_data, &$result));}
+function tpl_parse_fleet_db($fleet, $index, $user_data = false) {return sn_function_call('tpl_parse_fleet_db', array($fleet, $index, $user_data, &$result)); }
 function sn_tpl_parse_fleet_db($fleet, $index, $user_data = false, &$result) {
   global $lang, $user;
 
-  if(!$user_data) {
+  if (!$user_data) {
     $user_data = $user;
   }
 
-  if($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_AKS) {
+  if ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_AKS) {
     $aks = doquery("SELECT * FROM {{aks}} WHERE id={$fleet['fleet_group']} LIMIT 1;", true);
   }
 
@@ -132,11 +132,11 @@ 
 
   $ship_list = explode(';', $fleet['fleet_array']);
 
-  if($spy_level >= 6) {
-    foreach($ship_list as $ship_record) {
-      if($ship_record) {
+  if ($spy_level >= 6) {
+    foreach ($ship_list as $ship_record) {
+      if ($ship_record) {
         $ship_data = explode(',', $ship_record);
-        if($spy_level >= 10) {
+        if ($spy_level >= 10) {
           $single_ship_data = get_ship_data($ship_data[0], $user_data);
           $result['ships'][$ship_data[0]] = array(
             'ID'          => $ship_data[0],
@@ -169,9 +169,9 @@ 
 {
   $hangar_que = array();
   $que_hangar = $que['ques'][$que_id][$planet['id_owner']][$planet['id']];
-  if(!empty($que_hangar))
+  if (!empty($que_hangar))
   {
-    foreach($que_hangar as $que_item)
+    foreach ($que_hangar as $que_item)
     {
       $hangar_que['que'][] = array('id' => $que_item['que_unit_id'], 'count' => $que_item['que_unit_amount']);
       $hangar_que[$que_item['que_unit_id']] += $que_item['que_unit_amount'];
@@ -237,11 +237,11 @@ 
     'PLANET_GOVERNOR_LEVEL_MAX' => get_unit_param($planet['PLANET_GOVERNOR_ID'], P_MAX_STACK),
   );
 
-  if(!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']]))
+  if (!empty($que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']]))
   {
     $result['building_que'] = array();
     $building_que = &$que['ques'][QUE_STRUCTURES][$planet['id_owner']][$planet['id']];
-    foreach($building_que as $que_element)
+    foreach ($building_que as $que_element)
     {
       $result['building_que'][] = que_tpl_parse_element($que_element);
     }
@@ -252,23 +252,23 @@ 
 
 function flt_get_fleets_to_planet($planet, $fleet_db_list = 0)
 {
-  if(!($planet && $planet['id']) && !$fleet_db_list)
+  if (!($planet && $planet['id']) && !$fleet_db_list)
   {
     return $planet;
   }
 
   global $user;
 
-  if($fleet_db_list === 0)
+  if ($fleet_db_list === 0)
   {
     $fleet_db_list = flt_get_fleets($planet);
   }
 
-  foreach($fleet_db_list as $fleet)
+  foreach ($fleet_db_list as $fleet)
   {
-    if($fleet['fleet_owner'] == $user['id'])
+    if ($fleet['fleet_owner'] == $user['id'])
     {
-      if($fleet['fleet_mission'] == MT_MISSILE)
+      if ($fleet['fleet_mission'] == MT_MISSILE)
       {
         continue;
       }
@@ -276,7 +276,7 @@ 
     }
     else
     {
-      switch($fleet['fleet_mission'])
+      switch ($fleet['fleet_mission'])
       {
         case MT_ATTACK:
         case MT_AKS:
@@ -294,13 +294,13 @@ 
 
     $fleet_list[$fleet_ownage]['fleets'][$fleet['fleet_id']] = $fleet;
 
-    if($fleet['fleet_mess'] == 1 || ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_RELOCATE) || ($fleet['fleet_target_owner'] != $user['id']))
+    if ($fleet['fleet_mess'] == 1 || ($fleet['fleet_mess'] == 0 && $fleet['fleet_mission'] == MT_RELOCATE) || ($fleet['fleet_target_owner'] != $user['id']))
     {
 //      $fleet_sn = flt_expand($fleet);
       $fleet_sn = sys_unit_str2arr($fleet['fleet_array']);
-      foreach($fleet_sn as $ship_id => $ship_amount)
+      foreach ($fleet_sn as $ship_id => $ship_amount)
       {
-        if(in_array($ship_id, sn_get_groups('fleet')))
+        if (in_array($ship_id, sn_get_groups('fleet')))
         {
           $fleet_list[$fleet_ownage]['total'][$ship_id] += $ship_amount;
         }
@@ -324,13 +324,13 @@ 
 
     'ENERGY_BALANCE' => pretty_number($planetrow['energy_max'] - $planetrow['energy_used'], true, true),
     'ENERGY_MAX' => pretty_number($planetrow['energy_max'], true, -$planetrow['energy_used']),
-    'ENERGY_FILL' => round(($planetrow["energy_used"]/($planetrow["energy_max"]+1))*100,0),
+    'ENERGY_FILL' => round(($planetrow["energy_used"] / ($planetrow["energy_max"] + 1)) * 100, 0),
 
     'PLANET_METAL' => round($planetrow["metal"], $round),
     'PLANET_METAL_TEXT' => pretty_number($planetrow["metal"], $round, $planetrow["metal_max"]),
     'PLANET_METAL_MAX' => round($planetrow["metal_max"], $round),
     'PLANET_METAL_MAX_TEXT' => pretty_number($planetrow["metal_max"], $round, -$planetrow["metal"]),
-    'PLANET_METAL_FILL' => round(($planetrow["metal"]/($planetrow["metal_max"]+1))*100,0),
+    'PLANET_METAL_FILL' => round(($planetrow["metal"] / ($planetrow["metal_max"] + 1)) * 100, 0),
     'PLANET_METAL_PERHOUR' => round($planetrow["metal_perhour"], 5),
     'PLANET_METAL_FLEET_TEXT' => pretty_number($fleets_to_planet[$planetrow['id']]['fleet']['METAL'], $round, true),
 
@@ -338,7 +338,7 @@ 
     'PLANET_CRYSTAL_TEXT' => pretty_number($planetrow["crystal"], $round, $planetrow["crystal_max"]),
     'PLANET_CRYSTAL_MAX' => round($planetrow["crystal_max"], $round),
     'PLANET_CRYSTAL_MAX_TEXT' => pretty_number($planetrow["crystal_max"], $round, -$planetrow["crystal"]),
-    'PLANET_CRYSTAL_FILL' => round(($planetrow["crystal"]/($planetrow["crystal_max"]+1))*100,0),
+    'PLANET_CRYSTAL_FILL' => round(($planetrow["crystal"] / ($planetrow["crystal_max"] + 1)) * 100, 0),
     'PLANET_CRYSTAL_PERHOUR' => round($planetrow["crystal_perhour"], 5),
     'PLANET_CRYSTAL_FLEET_TEXT' => pretty_number($fleets_to_planet[$planetrow['id']]['fleet']['CRYSTAL'], $round, true),
 
@@ -346,7 +346,7 @@ 
     'PLANET_DEUTERIUM_TEXT' => pretty_number($planetrow["deuterium"], $round, $planetrow["deuterium_max"]),
     'PLANET_DEUTERIUM_MAX' => round($planetrow["deuterium_max"], $round),
     'PLANET_DEUTERIUM_MAX_TEXT' => pretty_number($planetrow["deuterium_max"], $round, -$planetrow["deuterium"]),
-    'PLANET_DEUTERIUM_FILL' => round(($planetrow["deuterium"]/($planetrow["deuterium_max"]+1))*100,0),
+    'PLANET_DEUTERIUM_FILL' => round(($planetrow["deuterium"] / ($planetrow["deuterium_max"] + 1)) * 100, 0),
     'PLANET_DEUTERIUM_PERHOUR' => round($planetrow["deuterium_perhour"], 5),
     'PLANET_DEUTERIUM_FLEET_TEXT' => pretty_number($fleets_to_planet[$planetrow['id']]['fleet']['DEUTERIUM'], $round, true),
   ));

Braces +2 added lines, -4 removed lines

@@ -10,8 +10,7 @@ 
       return 0;
     }
     return ($a['fleet']['OV_LEFT'] < $b['fleet']['OV_LEFT']) ? -1 : 1;
-  }
-  else
+  } else
   {
     return $a['fleet']['OV_THIS_PLANET'] ? -1 : 1;
   }
@@ -273,8 +272,7 @@ 
         continue;
       }
       $fleet_ownage = 'own';
-    }
-    else
+    } else
     {
       switch($fleet['fleet_mission'])
       {

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);

Spacing +27 added lines, -27 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;
     }
@@ -59,7 +59,7 @@ 
 
   $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;
   }
 
@@ -68,11 +68,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);
     }
@@ -172,15 +172,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;
@@ -196,7 +196,7 @@ 
 
       $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';
@@ -211,7 +211,7 @@ 
           `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);
@@ -247,7 +247,7 @@ 
   $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');
   }
@@ -257,15 +257,15 @@ 
   }
 
   // Если новая планета не найдена или было переключения - проверяем текущую выбранную планету
-  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']))
       {
         global $debug;
         $debug->error("User ID {$user['id']} has Capital planet {$user['id_planet']} but this planet does not exists", 'User record error', 502);
@@ -274,7 +274,7 @@ 
   }
 
   // Если производилось переключение планеты - делаем запись в юзере
-  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'];
@@ -298,7 +298,7 @@ 
 {
   global $lang;
 
-  if(!$from['id'])
+  if (!$from['id'])
   {
     $result = $lang['sys_planet_expedition'];
   }
@@ -337,7 +337,7 @@ 
 function uni_calculate_moon_chance($FleetDebris)
 {
   $MoonChance = $FleetDebris / 1000000;
-  return ($MoonChance < 1) ? 0 : ($MoonChance>30 ? 30 : $MoonChance);
+  return ($MoonChance < 1) ? 0 : ($MoonChance > 30 ? 30 : $MoonChance);
 }
 
 function uni_coordinates_valid($coordinates, $prefix = '')
@@ -359,11 +359,11 @@ 
   global $lang, $config;
 
   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($lang['ov_teleport_err_cooldown'], ERR_ERROR);
     }
 
-    if(mrc_get_level($user, false, RES_DARK_MATTER) < $config->planet_teleport_cost) {
+    if (mrc_get_level($user, false, RES_DARK_MATTER) < $config->planet_teleport_cost) {
       throw new exception($lang['ov_teleport_err_no_dark_matter'], ERR_ERROR);
     }
 
@@ -372,7 +372,7 @@ 
       (fleet_start_galaxy = {$planetrow['galaxy']} and fleet_start_system = {$planetrow['system']} and fleet_start_planet = {$planetrow['planet']})
       or
       (fleet_end_galaxy = {$planetrow['galaxy']} and fleet_end_system = {$planetrow['system']} and fleet_end_planet = {$planetrow['planet']})", true);
-    if(!empty($incoming['incoming'])) {
+    if (!empty($incoming['incoming'])) {
       throw new exception($lang['ov_teleport_err_fleet'], ERR_ERROR);
     }
 
@@ -381,10 +381,10 @@ 
     //  throw new exception($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($lang['ov_teleport_err_destination_busy'], ERR_ERROR);
       }
     }
@@ -393,7 +393,7 @@ 
       'result'  => ERR_NONE,
       'message' => '',
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     $response = array(
       'result'  => $e->getCode(),
       'message' => $e->getMessage(),

Braces +5 added lines, -5 removed lines

@@ -250,16 +250,17 @@ 
   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
+  } 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']))
     {
@@ -301,8 +302,7 @@ 
   if(!$from['id'])
   {
     $result = $lang['sys_planet_expedition'];
-  }
-  else
+  } else
   {
     $from_planet_id = $include_id ? (
       'ID {' . ($from['id'] ? $from['id'] : ($from[$prefix . 'planet_id'] ? $from[$prefix . 'planet_id'] : 0)) . '} '

includes/general.php

Doc Comments +29 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -815,7 +815,7 @@
       '%H' => '(?P<H>[0-9]{2})',
       '%M' => '(?P<M>[0-9]{2})',
       '%S' => '(?P<S>[0-9]{2})',
-     // usw..
+      // usw..
     );
 
     $rexep = "#".strtr(preg_quote($format), $masks)."#";

Spacing +169 added lines, -169 removed lines

@@ -15,7 +15,7 @@ 
 {
   global $functions; // All data in $functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
 
-  if(is_array($functions[$func_name]) && !is_callable($functions[$func_name]))
+  if (is_array($functions[$func_name]) && !is_callable($functions[$func_name]))
   {
     // Chain-callable functions should be made as following:
     // 1. Never use incomplete calls with parameters "by default"
@@ -23,11 +23,11 @@ 
     // 3. Use same format for original value and cumulative result (if there is original value)
     // 4. Honor cumulative result
     // 5. Return cumulative result
-    foreach($functions[$func_name] as $func_chain_name)
+    foreach ($functions[$func_name] as $func_chain_name)
     {
       // По идее - это уже тут не нужно, потому что оно все должно быть callable к этому моменту
       // Но для старых модулей...
-      if(is_callable($func_chain_name))
+      if (is_callable($func_chain_name))
       {
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
@@ -37,7 +37,7 @@ 
   {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
     $func_name = isset($functions[$func_name]) && is_callable($functions[$func_name]) ? $functions[$func_name] : ('sn_' . $func_name);
-    if(is_callable($func_name))
+    if (is_callable($func_name))
     {
       $result = call_user_func_array($func_name, $func_arg);
     }
@@ -47,9 +47,9 @@ 
 }
 
 function execute_hooks(&$hook_list, &$template) {
-  if(!empty($hook_list)) {
-    foreach($hook_list as $hook) {
-      if(is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
+  if (!empty($hook_list)) {
+    foreach ($hook_list as $hook) {
+      if (is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
         $template = call_user_func($hook_call, $template);
       }
     }
@@ -68,21 +68,21 @@ 
   return @file_put_contents($filename, $content, FILE_APPEND);
 }
 
-function get_game_speed($plain = false){return sn_function_call('get_game_speed', array($plain, &$result));}
+function get_game_speed($plain = false) {return sn_function_call('get_game_speed', array($plain, &$result)); }
 function sn_get_game_speed($plain = false, &$result) {
   global $config;
 
   return $result = $config->game_speed ? $config->game_speed : 1;
 }
 
-function flt_server_flight_speed_multiplier($plain = false){return sn_function_call('flt_server_flight_speed_multiplier', array($plain, &$result));}
+function flt_server_flight_speed_multiplier($plain = false) {return sn_function_call('flt_server_flight_speed_multiplier', array($plain, &$result)); }
 function sn_flt_server_flight_speed_multiplier($plain = false, &$result) {
   global $config;
 
   return $result = $config->fleet_speed;
 }
 
-function game_resource_multiplier($plain = false){return sn_function_call('game_resource_multiplier', array($plain,&$result));}
+function game_resource_multiplier($plain = false) {return sn_function_call('game_resource_multiplier', array($plain, &$result)); }
 function sn_game_resource_multiplier($plain = false, &$result) {
   global $config;
 
@@ -96,7 +96,7 @@ 
  *
  * @return mixed
  */
-function get_mm_cost($plain = false){return sn_function_call('get_mm_cost', array($plain, &$result));}
+function get_mm_cost($plain = false) {return sn_function_call('get_mm_cost', array($plain, &$result)); }
 function sn_get_mm_cost($plain = false, &$result) {
   global $config;
 
@@ -148,11 +148,11 @@ 
 function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null)
 {
   $n = floatval($n);
-  if(is_int($floor))
+  if (is_int($floor))
   {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
   }
-  elseif($floor === true)
+  elseif ($floor === true)
   {
     $n = floor($n);
     $floor = 0;
@@ -165,11 +165,11 @@ 
   $ret = $n;
 
   $suffix = '';
-  if($limit)
+  if ($limit)
   {
-    if($ret > 0)
+    if ($ret > 0)
     {
-      while($ret > $limit)
+      while ($ret > $limit)
       {
         $suffix .= 'k';
         $ret = round($ret / 1000);
@@ -177,7 +177,7 @@ 
     }
     else
     {
-      while($ret < -$limit)
+      while ($ret < -$limit)
       {
         $suffix .= 'k';
         $ret = round($ret / 1000);
@@ -188,13 +188,13 @@ 
   $ret = number_format($ret, $floor, ',', '.');
   $ret .= $suffix;
 
-  if($color !== false)
+  if ($color !== false)
   {
-    if($color === true)
+    if ($color === true)
     {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
     }
-    elseif($color >= 0)
+    elseif ($color >= 0)
     {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
     }
@@ -203,7 +203,7 @@ 
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
 
-    if(!isset($style))
+    if (!isset($style))
     {
       $ret = "<span class='{$class}'>{$ret}</span>";
     }
@@ -338,13 +338,13 @@ 
 function sys_get_param_phone($param_name, $default = '')
 {
   $phone_raw = sys_get_param_str_unsafe($param_name, $default = '');
-  if($phone_raw)
+  if ($phone_raw)
   {
     $phone = $phone_raw[0] == '+' ? '+' : '';
-    for($i = 0; $i < strlen($phone_raw); $i++)
+    for ($i = 0; $i < strlen($phone_raw); $i++)
     {
       $ord = ord($phone_raw[$i]);
-      if($ord >= 48 && $ord <= 57)
+      if ($ord >= 48 && $ord <= 57)
       {
         $phone .= $phone_raw[$i];
       }
@@ -366,7 +366,7 @@ 
 
 function CheckAbandonPlanetState(&$planet)
 {
-  if($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW)
+  if ($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW)
   {
     db_planet_delete_by_id($planet['id']);
   }
@@ -377,7 +377,7 @@ 
   global $config;
 
   static $rate, $sn_group_resources_all, $sn_group_resources_loot;
-  if(!$rate)
+  if (!$rate)
   {
     $sn_group_resources_all = sn_get_groups('resources_all');
     $sn_group_resources_loot = sn_get_groups('resources_loot');
@@ -388,22 +388,22 @@ 
   }
 
   $unit_cost_data = get_unit_param($unit_id, 'cost');
-  if(!is_array($unit_cost_data))
+  if (!is_array($unit_cost_data))
   {
     return array('total' => 0);
   }
   $factor = isset($unit_cost_data['factor']) ? $unit_cost_data['factor'] : 1;
   $cost_array = array(BUILD_CREATE => array(), 'total' => 0);
   $unit_level = $unit_level > 0 ? $unit_level : 0;
-  foreach($unit_cost_data as $resource_id => $resource_amount)
+  foreach ($unit_cost_data as $resource_id => $resource_amount)
   {
-    if(!in_array($resource_id, $sn_group_resources_all))
+    if (!in_array($resource_id, $sn_group_resources_all))
     {
       continue;
     }
 //    $cost_array[BUILD_CREATE][$resource_id] = $resource_amount * ($factor == 1 ? $unit_level : ((pow($factor, $unit_level) - $factor) / ($factor - 1)));
     $cost_array[BUILD_CREATE][$resource_id] = round($resource_amount * ($factor == 1 ? $unit_level : ((1 - pow($factor, $unit_level)) / (1 - $factor))));
-    if(in_array($resource_id, $sn_group_resources_loot))
+    if (in_array($resource_id, $sn_group_resources_loot))
     {
       $cost_array['total'] += $cost_array[BUILD_CREATE][$resource_id] * $rate[$resource_id];
     }
@@ -412,9 +412,9 @@ 
   return $cost_array;
 }
 
-function sn_unit_purchase($unit_id){}
+function sn_unit_purchase($unit_id) {}
 
-function sn_unit_relocate($unit_id, $from, $to){}
+function sn_unit_relocate($unit_id, $from, $to) {}
 
 /*
   ЭТО ПРОСТОЙ ВРАППЕР ДЛЯ БД! Здесь НЕТ никаких проверок! ВСЕ проверки должны быть сделаны заранее!
@@ -473,48 +473,48 @@ 
 }
 */
 
-function mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false){return sn_function_call(__FUNCTION__, array(&$user, $planet, $unit_id, $for_update, $plain, &$result));}
+function mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false) {return sn_function_call(__FUNCTION__, array(&$user, $planet, $unit_id, $for_update, $plain, &$result)); }
 function sn_mrc_get_level(&$user, $planet = array(), $unit_id, $for_update = false, $plain = false, &$result) {
   $mercenary_level = 0;
   $unit_db_name = pname_resource_name($unit_id);
 
-  if(in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
+  if (in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
     $unit = classSupernova::db_get_unit_by_location($user['id'], LOC_USER, $user['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
+  } elseif (in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
     $unit = classSupernova::db_get_unit_by_location(is_array($user) ? $user['id'] : $planet['id_owner'], LOC_PLANET, $planet['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups('governors'))) {
+  } elseif (in_array($unit_id, sn_get_groups('governors'))) {
     $mercenary_level = $unit_id == $planet['PLANET_GOVERNOR_ID'] ? $planet['PLANET_GOVERNOR_LEVEL'] : 0;
-  } elseif($unit_id == RES_DARK_MATTER) {
+  } elseif ($unit_id == RES_DARK_MATTER) {
     $mercenary_level = $user[$unit_db_name] + ($plain || $user['user_as_ally'] ? 0 : classSupernova::$auth->account->account_metamatter);
-  } elseif($unit_id == RES_METAMATTER) {
+  } elseif ($unit_id == RES_METAMATTER) {
     $mercenary_level = classSupernova::$auth->account->account_metamatter; //$user[$unit_db_name];
-  } elseif(in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
+  } elseif (in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
     $mercenary_level = !empty($planet) ? $planet[$unit_db_name] : $user[$unit_db_name];
   }
 
   return $result = $mercenary_level;
 }
 
-function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) {return sn_function_call('mrc_modify_value', array(&$user, $planet, $mercenaries, $value));}
+function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) {return sn_function_call('mrc_modify_value', array(&$user, $planet, $mercenaries, $value)); }
 function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null)
 {
-  if(!is_array($mercenaries))
+  if (!is_array($mercenaries))
   {
     $mercenaries = array($mercenaries);
   }
 
   $base_value = isset($base_value) ? $base_value : $value;
 
-  foreach($mercenaries as $mercenary_id)
+  foreach ($mercenaries as $mercenary_id)
   {
     $mercenary_level = mrc_get_level($user, $planet, $mercenary_id);
 
     $mercenary = get_unit_param($mercenary_id);
     $mercenary_bonus = $mercenary['bonus'];
 
-    switch($mercenary['bonus_type'])
+    switch ($mercenary['bonus_type'])
     {
       case BONUS_PERCENT_CUMULATIVE:
         $value *= 1 + $mercenary_level * $mercenary_bonus / 100;
@@ -546,7 +546,7 @@ 
   $allowed_length = strlen($allowed_chars);
 
   $random_string = '';
-  for($i = 0; $i < $length; $i++) {
+  for ($i = 0; $i < $length; $i++) {
     $random_string .= $allowed_chars[mt_rand(0, $allowed_length - 1)];
   }
 
@@ -569,10 +569,10 @@ 
 
   $options = '';
   $option_list = array();
-  foreach($user_option_list as $option_group_id => $option_group)
+  foreach ($user_option_list as $option_group_id => $option_group)
   {
     $option_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value)
+    foreach ($option_group as $option_name => $option_value)
     {
       if (!isset($user[$option_name]))
       {
@@ -598,19 +598,19 @@ 
   $option_list = array();
   $option_string_list = explode('|', $user['options']);
 
-  foreach($option_string_list as $option_string)
+  foreach ($option_string_list as $option_string)
   {
     list($option_name, $option_value) = explode('^', $option_string);
     $option_list[$option_name] = $option_value;
   }
 
   $final_list = array();
-  foreach($user_option_list as $option_group_id => $option_group)
+  foreach ($user_option_list as $option_group_id => $option_group)
   {
     $final_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value)
+    foreach ($option_group as $option_name => $option_value)
     {
-      if(!isset($option_list[$option_name]))
+      if (!isset($option_list[$option_name]))
       {
         $option_list[$option_name] = $option_value;
       }
@@ -626,15 +626,15 @@ 
 function sys_unit_str2arr($fleet_string)
 {
   $fleet_array = array();
-  if(!empty($fleet_string))
+  if (!empty($fleet_string))
   {
     $arrTemp = explode(';', $fleet_string);
-    foreach($arrTemp as $temp)
+    foreach ($arrTemp as $temp)
     {
-      if($temp)
+      if ($temp)
       {
         $temp = explode(',', $temp);
-        if(!empty($temp[0]) && !empty($temp[1]))
+        if (!empty($temp[0]) && !empty($temp[1]))
         {
           $fleet_array[$temp[0]] += $temp[1];
         }
@@ -648,16 +648,16 @@ 
 function sys_unit_arr2str($unit_list)
 {
   $fleet_string = array();
-  if(isset($unit_list))
+  if (isset($unit_list))
   {
-    if(!is_array($unit_list))
+    if (!is_array($unit_list))
     {
       $unit_list = array($unit_list => 1);
     }
 
-    foreach($unit_list as $unit_id => $unit_count)
+    foreach ($unit_list as $unit_id => $unit_count)
     {
-      if($unit_id && $unit_count)
+      if ($unit_id && $unit_count)
       {
         $fleet_string[] = "{$unit_id},{$unit_count}";
       }
@@ -673,7 +673,7 @@ 
   $from = trim($from ? $from : $config->game_adminEmail);
 
   $head  = '';
-  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain'). "; charset=utf-8 \r\n";
+  $head .= "Content-Type: text/" . ($html ? 'html' : 'plain') . "; charset=utf-8 \r\n";
   $head .= "Date: " . date('r') . " \r\n";
   $head .= "Return-Path: {$config->game_adminEmail} \r\n";
   $head .= "From: {$from} \r\n";
@@ -685,7 +685,7 @@ 
   $body = str_replace("\r\n", "\n", $body);
   $body = str_replace("\n", "\r\n", $body);
 
-  if($html) {
+  if ($html) {
     $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
   }
 
@@ -699,15 +699,15 @@ 
   global $lang;
 
   $seconds = $time % 60;
-  $time = floor($time/60);
+  $time = floor($time / 60);
   $minutes = $time % 60;
-  $time = floor($time/60);
+  $time = floor($time / 60);
   $hours = $time % 24;
-  $time = floor($time/24);
+  $time = floor($time / 24);
 
   return
-    ($full || $time    ? "{$time} {$lang['sys_day']}&nbsp;" : '') .
-    ($full || $hours   ? "{$hours} {$lang['sys_hrs']}&nbsp;" : '') .
+    ($full || $time ? "{$time} {$lang['sys_day']}&nbsp;" : '') .
+    ($full || $hours ? "{$hours} {$lang['sys_hrs']}&nbsp;" : '') .
     ($full || $minutes ? "{$minutes} {$lang['sys_min']}&nbsp;" : '') .
     ($full || !$time || $seconds ? "{$seconds} {$lang['sys_sec']}" : '');
 }
@@ -724,35 +724,35 @@ 
 }
 
 // TODO Для полноценного функионирования апдейтера пакет функций, включая эту должен быть вынесен раньше - или грузить general.php до апдейтера
-function sys_get_unit_location($user, $planet, $unit_id){return sn_function_call('sys_get_unit_location', array($user, $planet, $unit_id));}
+function sys_get_unit_location($user, $planet, $unit_id) {return sn_function_call('sys_get_unit_location', array($user, $planet, $unit_id)); }
 function sn_sys_get_unit_location($user, $planet, $unit_id)
 {
   return get_unit_param($unit_id, 'location');
 }
 
 function sn_ali_fill_user_ally(&$user) {
-  if(!$user['ally_id']) {
+  if (!$user['ally_id']) {
     return;
   }
 
-  if(!isset($user['ally'])) {
+  if (!isset($user['ally'])) {
     $user['ally'] = doquery("SELECT * FROM {{alliance}} WHERE `id` = {$user['ally_id']} LIMIT 1;", true);
   }
 
-  if(!isset($user['ally']['player'])) {
+  if (!isset($user['ally']['player'])) {
     $user['ally']['player'] = db_user_by_id($user['ally']['ally_user_id'], true, '*', false);
   }
 }
 
 function sn_get_url_contents($url)
 {
-  if(function_exists('curl_init'))
+  if (function_exists('curl_init'))
   {
     $crl = curl_init();
     $timeout = 5;
-    curl_setopt ($crl, CURLOPT_URL,$url);
-    curl_setopt ($crl, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt ($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
+    curl_setopt($crl, CURLOPT_URL, $url);
+    curl_setopt($crl, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
     $return = curl_exec($crl);
     curl_close($crl);
   }
@@ -786,12 +786,12 @@ 
 function get_ship_data($ship_id, $user)
 {
   $ship_data = array();
-  if(in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
+  if (in_array($ship_id, sn_get_groups(array('fleet', 'missile'))))
   {
-    foreach(get_unit_param($ship_id, 'engine') as $engine_info)
+    foreach (get_unit_param($ship_id, 'engine') as $engine_info)
     {
       $tech_level = intval(mrc_get_level($user, false, $engine_info['tech']));
-      if(empty($ship_data) || $tech_level >= $engine_info['min_level'])
+      if (empty($ship_data) || $tech_level >= $engine_info['min_level'])
       {
         $ship_data = $engine_info;
         $ship_data['tech_level'] = $tech_level;
@@ -804,7 +804,7 @@ 
   return $ship_data;
 }
 
-if(!function_exists('strptime'))
+if (!function_exists('strptime'))
 {
   function strptime($date, $format)
   {
@@ -818,8 +818,8 @@ 
      // usw..
     );
 
-    $rexep = "#".strtr(preg_quote($format), $masks)."#";
-    if(preg_match($rexep, $date, $out))
+    $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
+    if (preg_match($rexep, $date, $out))
     {
       $ret = array(
         "tm_sec"  => (int) $out['S'],
@@ -841,7 +841,7 @@ 
 function sn_sys_sector_buy($redirect = 'overview.php') {
   global $lang, $user, $planetrow;
 
-  if(!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
+  if (!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
     return;
   }
 
@@ -854,9 +854,9 @@ 
 //  $planetrow = $planetrow['planet'];
   $sector_cost = eco_get_build_data($user, $planetrow, UNIT_SECTOR, mrc_get_level($user, $planetrow, UNIT_SECTOR), true);
   $sector_cost = $sector_cost[BUILD_CREATE][RES_DARK_MATTER];
-  if($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
+  if ($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
     $planet_name_text = uni_render_planet($planetrow);
-    if(rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf($lang['sys_sector_purchase_log'],
+    if (rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf($lang['sys_sector_purchase_log'],
         $user['username'], $user['id'], $planet_name_text, $lang['sys_planet_type'][$planetrow['planet_type']], $planetrow['id'], $sector_cost)
     )) {
       $sector_db_name = pname_resource_name(UNIT_SECTOR);
@@ -872,43 +872,43 @@ 
 
 function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '')
 {
-  if(isset($handler_list) && is_array($handler_list) && !empty($handler_list))
+  if (isset($handler_list) && is_array($handler_list) && !empty($handler_list))
   {
-    foreach($handler_list as $function_name => $function_data)
+    foreach ($handler_list as $function_name => $function_data)
     {
-      if(is_string($function_data))
+      if (is_string($function_data))
       {
         $override_with = &$function_data;
       }
-      elseif(isset($function_data['callable']))
+      elseif (isset($function_data['callable']))
       {
         $override_with = &$function_data['callable'];
       }
 
       $overwrite = $override_with[0] == '*';
-      if($overwrite)
+      if ($overwrite)
       {
         $override_with = substr($override_with, 1);
       }
 
-      if(($point_position = strpos($override_with, '.')) === false && $class_module_name)
+      if (($point_position = strpos($override_with, '.')) === false && $class_module_name)
       {
         $override_with = array($class_module_name, $override_with);
       }
-      elseif($point_position == 0)
+      elseif ($point_position == 0)
       {
         $override_with = substr($override_with, 1);
       }
-      elseif($point_position > 0)
+      elseif ($point_position > 0)
       {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
 
-      if($overwrite)
+      if ($overwrite)
       {
         $functions[$function_name] = array();
       }
-      elseif(!isset($functions[$function_name]))
+      elseif (!isset($functions[$function_name]))
       {
         $functions[$function_name] = array();
         $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
@@ -925,18 +925,18 @@ 
 
 // TODO - поменять название
 // Может принимать: (array)$user, $nick_render_array, $nick_render_array_html, $nick_render_string_compact
-function player_nick_render_to_html($result, $options = false){
+function player_nick_render_to_html($result, $options = false) {
   // TODO - обрабатывать разные случаи: $user, $render_nick_array, $string
 
-  if(is_string($result) && strpos($result, ':{i:')) {
+  if (is_string($result) && strpos($result, ':{i:')) {
     $result = player_nick_uncompact($result);
   }
 
-  if(is_array($result)) {
-    if(isset($result['id'])) {
+  if (is_array($result)) {
+    if (isset($result['id'])) {
       $result = player_nick_render_current_to_array($result, $options);
     }
-    if(!isset($result[NICK_HTML])) {
+    if (!isset($result[NICK_HTML])) {
       $result = player_nick_render_array_to_html($result);
     }
     unset($result[NICK_HTML]);
@@ -958,31 +958,31 @@ 
   try {
     $result = unserialize($nick_string);
     // ksort($result); // Всегда ksort-ый в player_nick_compact()
-  } catch(exception $e) {
+  } catch (exception $e) {
     $result = strpos($nick_string, ':{i:') ? null : $nick_string; // fallback if it is already string - for old chat strings, for example
   }
   return $result;
 }
 
-function player_nick_render_array_to_html($nick_array){return sn_function_call('player_nick_render_array_to_html', array($nick_array, &$result));}
+function player_nick_render_array_to_html($nick_array) {return sn_function_call('player_nick_render_array_to_html', array($nick_array, &$result)); }
 function sn_player_nick_render_array_to_html($nick_array, &$result) {
   global $config, $user;
 
   // ALL STRING ARE UNSAFE!!!
-  if(isset($nick_array[NICK_BIRTHSDAY])) {
+  if (isset($nick_array[NICK_BIRTHSDAY])) {
     $result[NICK_BIRTHSDAY] = '<img src="design/images/birthday.png" />';
   }
 
-  if(isset($nick_array[NICK_VACATION])) {
+  if (isset($nick_array[NICK_VACATION])) {
     $result[NICK_VACATION] = '<img src="design/images/icon_vacation.png" />';
   }
 
-  if(isset($nick_array[NICK_GENDER])) {
+  if (isset($nick_array[NICK_GENDER])) {
     $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
   }
 
-  if(isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
-    switch($nick_array[NICK_AUTH_LEVEL]) {
+  if (isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
+    switch ($nick_array[NICK_AUTH_LEVEL]) {
       case 4:
         $highlight = $config->chat_highlight_developer;
         break;
@@ -1003,20 +1003,20 @@ 
         $highlight = isset($nick_array[NICK_PREMIUM]) ? $config->chat_highlight_premium : '';
     }
 
-    if($highlight) {
+    if ($highlight) {
       list($result[NICK_HIGHLIGHT], $result[NICK_HIGHLIGHT_END]) = explode('$1', $highlight);
     }
     // $result = preg_replace("#(.+)#", $highlight, $result);
   }
 
-  if(isset($nick_array[NICK_CLASS])) {
-    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] .'>';
+  if (isset($nick_array[NICK_CLASS])) {
+    $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] . '>';
     $result[NICK_CLASS_END] = '</span>';
   }
 
   $result[NICK_NICK] = sys_safe_output($nick_array[NICK_NICK]);
 
-  if(isset($nick_array[NICK_ALLY])) {
+  if (isset($nick_array[NICK_ALLY])) {
     $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
   }
 
@@ -1025,7 +1025,7 @@ 
   return $result;
 }
 
-function player_nick_render_current_to_array($render_user, $options = false){return sn_function_call('player_nick_render_current_to_array', array($render_user, $options, &$result));}
+function player_nick_render_current_to_array($render_user, $options = false) {return sn_function_call('player_nick_render_current_to_array', array($render_user, $options, &$result)); }
 function sn_player_nick_render_current_to_array($render_user, $options = false, &$result) {
   /*
   $options = $options !== true ? $options :
@@ -1039,32 +1039,32 @@ 
   */
 
 
-  if($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
+  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
     $result[NICK_BIRTHSDAY] = '';
   }
 
-  if($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
+  if ($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
     $result[NICK_GENDER] = $render_user['gender'] == GENDER_UNKNOWN ? 'unknown' : ($render_user['gender'] == GENDER_FEMALE ? 'female' : 'male');
   }
 
-  if(($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
+  if (($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
     $result[NICK_VACATION] = $render_user['vacation'];
   }
 
-  if($options === true || (isset($options['color']) && $options['color'])) {
-    if($user_auth_level = $render_user['authlevel']) {
+  if ($options === true || (isset($options['color']) && $options['color'])) {
+    if ($user_auth_level = $render_user['authlevel']) {
       $result[NICK_AUTH_LEVEL] = $user_auth_level;
     }
-    if($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
+    if ($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
       $result[NICK_PREMIUM] = $user_premium;
     }
   }
 
-  if((isset($options['class']) && $options['class'])) {
+  if ((isset($options['class']) && $options['class'])) {
     $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_CLASS] : '') . $options['class'];
   }
 
-  if($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
+  if ($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
     $result[NICK_ALLY] = $render_user['ally_tag'];
   }
 
@@ -1115,25 +1115,25 @@ 
 
   $user_skip_list = array();
 
-  if($config->stats_hide_admins) {
+  if ($config->stats_hide_admins) {
     $user_skip_list[] = '`authlevel` > 0';
   }
 
-  if($config->stats_hide_player_list) {
+  if ($config->stats_hide_player_list) {
     $temp = explode(',', $config->stats_hide_player_list);
-    foreach($temp as $user_id) {
+    foreach ($temp as $user_id) {
       $user_id = floatval($user_id);
-      if($user_id) {
+      if ($user_id) {
         $user_skip_list[] = '`id` = ' . $user_id;
       }
     }
   }
 
-  if(!empty($user_skip_list)) {
+  if (!empty($user_skip_list)) {
     $user_skip_list = implode(' OR ', $user_skip_list);
     $user_skip_query = db_user_list($user_skip_list);
-    if(!empty($user_skip_query)) {
-      foreach($user_skip_query as $user_skip_row) {
+    if (!empty($user_skip_query)) {
+      foreach ($user_skip_query as $user_skip_row) {
         $result[$user_skip_row['id']] = $user_skip_row['id'];
       }
     }
@@ -1145,7 +1145,7 @@ 
 // function player_nick_render_to_html($render_user, $options = false){return sn_function_call('player_nick_render_to_html', array($render_user, $options, &$result));}
 // function sn_render_player_nick($render_user, $options = false, &$result)
 
-function get_unit_param($unit_id, $param_name = null, $user = null, $planet = null){return sn_function_call('get_unit_param', array($unit_id, $param_name, $user, $planet, &$result));}
+function get_unit_param($unit_id, $param_name = null, $user = null, $planet = null) {return sn_function_call('get_unit_param', array($unit_id, $param_name, $user, $planet, &$result)); }
 function sn_get_unit_param($unit_id, $param_name = null, $user = null, $planet = null, &$result)
 {
   global $sn_data;
@@ -1160,11 +1160,11 @@ 
   return $result;
 }
 
-function sn_get_groups($groups){return sn_function_call('sn_get_groups', array($groups, &$result));}
+function sn_get_groups($groups) {return sn_function_call('sn_get_groups', array($groups, &$result)); }
 function sn_sn_get_groups($groups, &$result)
 {
   $result = is_array($result) ? $result : array();
-  foreach($groups = is_array($groups) ? $groups : array($groups) as $group_name)
+  foreach ($groups = is_array($groups) ? $groups : array($groups) as $group_name)
   {
     $result += is_array($a_group = get_unit_param(UNIT_GROUP, $group_name)) ? $a_group : array();
   }
@@ -1179,7 +1179,7 @@ 
   return preg_match('#^(\d*)#', $value, $matches) && $matches[1] ? floatval($matches[1]) : $default;
 }
 
-function unit_requirements_render($user, $planetrow, $unit_id, $field = 'require'){return sn_function_call('unit_requirements_render', array($user, $planetrow, $unit_id, $field, &$result));}
+function unit_requirements_render($user, $planetrow, $unit_id, $field = 'require') {return sn_function_call('unit_requirements_render', array($user, $planetrow, $unit_id, $field, &$result)); }
 function sn_unit_requirements_render($user, $planetrow, $unit_id, $field = 'require', &$result)
 {
   global $lang, $config;
@@ -1187,9 +1187,9 @@ 
   $sn_data_unit = get_unit_param($unit_id);
 
   $result = is_array($result) ? $result : array();
-  if($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && $config->empire_mercenary_temporary))
+  if ($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && $config->empire_mercenary_temporary))
   {
-    foreach($sn_data_unit[$field] as $require_id => $require_level)
+    foreach ($sn_data_unit[$field] as $require_id => $require_level)
     {
       $level_got = mrc_get_level($user, $planetrow, $require_id);
       $level_basic = mrc_get_level($user, $planetrow, $require_id, false, true);
@@ -1215,19 +1215,19 @@ 
 
   $ranks = array();
 
-  if($ally['ranklist'])
+  if ($ally['ranklist'])
   {
     $str_ranks = explode(';', $ally['ranklist']);
-    foreach($str_ranks as $str_rank)
+    foreach ($str_ranks as $str_rank)
     {
-      if(!$str_rank)
+      if (!$str_rank)
       {
         continue;
       }
 
       $tmp = explode(',', $str_rank);
       $rank_id = count($ranks);
-      foreach($ally_rights as $key => $value)
+      foreach ($ally_rights as $key => $value)
       {
         $ranks[$rank_id][$value] = $tmp[$key];
       }
@@ -1237,13 +1237,13 @@ 
   return $ranks;
 }
 
-function sys_player_new_adjust($user_id, $planet_id){return sn_function_call('sys_player_new_adjust', array($user_id, $planet_id, &$result));}
+function sys_player_new_adjust($user_id, $planet_id) {return sn_function_call('sys_player_new_adjust', array($user_id, $planet_id, &$result)); }
 function sn_sys_player_new_adjust($user_id, $planet_id, &$result) {
   return $result;
 }
 
 function array_merge_recursive_numeric($array1, $array2) {
-  foreach($array2 as $key => $value) {
+  foreach ($array2 as $key => $value) {
 //    if(!isset($array1[$key]) || !is_array($array1[$key])) {
 //      $array1[$key] = $value;
 //    } else {
@@ -1258,7 +1258,7 @@ 
 function sn_sys_array_cumulative_sum(&$array)
 {
   $accum = 0;
-  foreach($array as &$value)
+  foreach ($array as &$value)
   {
     $accum += $value;
     $value = $accum;
@@ -1269,7 +1269,7 @@ 
   $sn_data_density = sn_get_groups('planet_density');
   $density_price_chart = array();
 
-  foreach($sn_data_density as $density_id => $density_data) {
+  foreach ($sn_data_density as $density_id => $density_data) {
     // Отсекаем записи с RARITY = 0 - служебные записи и супер-ядра
     $density_data[UNIT_PLANET_DENSITY_RARITY] ? $density_price_chart[$density_id] = $density_data[UNIT_PLANET_DENSITY_RARITY] : false;
   }
@@ -1277,7 +1277,7 @@ 
 
   $total_rarity = array_sum($density_price_chart);
 
-  foreach($density_price_chart as &$density_data) {
+  foreach ($density_price_chart as &$density_data) {
     $density_data = ceil($total_rarity / $density_data * $planet_row['field_max'] * PLANET_DENSITY_TO_DARK_MATTER_RATE);
   }
 
@@ -1285,18 +1285,18 @@ 
 }
 
 function sn_sys_planet_core_transmute(&$user, &$planetrow) {
-  if(!sys_get_param_str('transmute')) {
+  if (!sys_get_param_str('transmute')) {
     return array();
   }
 
   global $lang;
 
   try {
-    if($planetrow['planet_type'] != PT_PLANET) {
+    if ($planetrow['planet_type'] != PT_PLANET) {
       throw new exception($lang['ov_core_err_not_a_planet'], ERR_ERROR);
     }
 
-    if($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
+    if ($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
       throw new exception($lang['ov_core_err_same_density'], ERR_WARNING);
     }
 
@@ -1310,7 +1310,7 @@ 
     $planet_density_index = $planetrow['density_index'];
 
     $density_price_chart = planet_density_price_chart($planetrow);
-    if(!isset($density_price_chart[$new_density_index])) {
+    if (!isset($density_price_chart[$new_density_index])) {
       // Hack attempt
       throw new exception($lang['ov_core_err_denisty_type_wrong'], ERR_ERROR);
     }
@@ -1319,13 +1319,13 @@ 
     // $transmute_cost = get_unit_param(UNIT_PLANET_DENSITY, 'cost');
     // $transmute_cost = $transmute_cost[RES_DARK_MATTER] * $density_price_chart[$new_density_index];
     $transmute_cost = $density_price_chart[$new_density_index];
-    if($user_dark_matter < $transmute_cost) {
+    if ($user_dark_matter < $transmute_cost) {
       throw new exception($lang['ov_core_err_no_dark_matter'], ERR_ERROR);
     }
 
     $sn_data_planet_density = sn_get_groups('planet_density');
-    foreach($sn_data_planet_density as $key => $value) {
-      if($key == $new_density_index) {
+    foreach ($sn_data_planet_density as $key => $value) {
+      if ($key == $new_density_index) {
         break;
       }
       $prev_density_index = $key;
@@ -1356,7 +1356,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => sprintf($lang['ov_core_err_none'], $lang['uni_planet_density_types'][$planet_density_index], $lang['uni_planet_density_types'][$new_density_index], $new_density),
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $result = array(
       'STATUS'  => $e->getCode(),
@@ -1372,9 +1372,9 @@ 
   global $sn_module_list;
 
   $active_modules = 0;
-  if(isset($sn_module_list[$group]) && is_array($sn_module_list[$group]))
+  if (isset($sn_module_list[$group]) && is_array($sn_module_list[$group]))
   {
-    foreach($sn_module_list[$group] as $payment_module)
+    foreach ($sn_module_list[$group] as $payment_module)
     {
       $active_modules += $payment_module->manifest['active'];
     }
@@ -1387,7 +1387,7 @@ 
 {
   static $rates;
 
-  if(!$rates)
+  if (!$rates)
   {
     global $config;
 
@@ -1398,7 +1398,7 @@ 
       RES_DARK_MATTER => 'rpg_exchange_darkMatter',
     );
 
-    foreach($rates as &$rate)
+    foreach ($rates as &$rate)
     {
       $rate = $config->$rate;
     }
@@ -1411,13 +1411,13 @@ 
 {
   static $rates;
 
-  if(!$rates)
+  if (!$rates)
   {
     $rates = get_resource_exchange();
   }
 
   $metal_cost = 0;
-  foreach($cost as $resource_id => $resource_value)
+  foreach ($cost as $resource_id => $resource_value)
   {
     $metal_cost += $rates[$resource_id] * $resource_value;
   }
@@ -1426,15 +1426,15 @@ 
 }
 
 function get_player_current_expeditions(&$user) {
-  $FlyingExpeditions  = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", true);
+  $FlyingExpeditions = doquery("SELECT COUNT(fleet_owner) AS `expedi` FROM {{fleets}} WHERE `fleet_owner` = {$user['id']} AND `fleet_mission` = '" . MT_EXPLORE . "';", true);
   return $FlyingExpeditions['expedi'];
 }
 
-function get_player_max_expeditons(&$user, $astrotech = -1){return sn_function_call('get_player_max_expeditons', array(&$user, $astrotech, &$result));}
+function get_player_max_expeditons(&$user, $astrotech = -1) {return sn_function_call('get_player_max_expeditons', array(&$user, $astrotech, &$result)); }
 function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0)
 {
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX]))
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX]))
     {
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
       $user[UNIT_PLAYER_EXPEDITIONS_MAX] = $astrotech >= 1 ? floor(sqrt($astrotech - 1)) : 0;
@@ -1454,8 +1454,8 @@ 
 function get_player_max_colonies(&$user, $astrotech = -1) {
   global $config;
 
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
 
       $expeditions = get_player_max_expeditons($user);
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
@@ -1482,7 +1482,7 @@ 
 function flt_send_back(&$fleet_row)
 {
   $fleet_id = round(isset($fleet_row['fleet_id']) && $fleet_row['fleet_id'] ? $fleet_row['fleet_id'] : $fleet_row);
-  if(!$fleet_id)
+  if (!$fleet_id)
   {
     return false;
   }
@@ -1492,7 +1492,7 @@ 
 
 function flt_destroy(&$fleet_row) {
   $fleet_id = round(isset($fleet_row['fleet_id']) && $fleet_row['fleet_id'] ? $fleet_row['fleet_id'] : $fleet_row);
-  if(!$fleet_id) {
+  if (!$fleet_id) {
     return false;
   }
 
@@ -1508,7 +1508,7 @@ 
 }
 
 
-function sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false){return sn_function_call('sn_powerup_get_price_matrix', array($powerup_id, $powerup_unit, $level_max, $plain, &$result));}
+function sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false) {return sn_function_call('sn_powerup_get_price_matrix', array($powerup_id, $powerup_unit, $level_max, $plain, &$result)); }
 function sn_sn_powerup_get_price_matrix($powerup_id, $powerup_unit = false, $level_max = null, $plain = false, &$result) {
   global $sn_powerup_buy_discounts;
 
@@ -1520,10 +1520,10 @@ 
 
   // pdump($powerup_unit, '$powerup_unit');
   $level_current = $term_original = $time_left = 0;
-  if($is_upgrade) {
+  if ($is_upgrade) {
     $time_finish = strtotime($powerup_unit['unit_time_finish']);
     $time_left = max(0, $time_finish - SN_TIME_NOW);
-    if($time_left > 0) {
+    if ($time_left > 0) {
       $term_original = $time_finish - strtotime($powerup_unit['unit_time_start']);
       $level_current = $powerup_unit['unit_level'];
     }
@@ -1531,17 +1531,17 @@ 
 
   $level_max = $level_max > $powerup_data[P_MAX_STACK] ? $level_max : $powerup_data[P_MAX_STACK];
   $original_cost = 0;
-  for($i = 1; $i <= $level_max; $i++) {
+  for ($i = 1; $i <= $level_max; $i++) {
     $base_cost = eco_get_total_cost($powerup_id, $i);
     $base_cost = $base_cost[BUILD_CREATE][RES_DARK_MATTER];
-    foreach($sn_powerup_buy_discounts as $period => $discount) {
+    foreach ($sn_powerup_buy_discounts as $period => $discount) {
       $upgrade_price = floor($base_cost * $discount * $period / PERIOD_MONTH);
       $result[$i][$period] = $upgrade_price;
       $original_cost = $is_upgrade && $i == $level_current && $period <= $term_original ? $upgrade_price : $original_cost;
     }
   }
 
-  if($is_upgrade && $time_left) {
+  if ($is_upgrade && $time_left) {
     $term_original = round($term_original / PERIOD_DAY);
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
@@ -1602,14 +1602,14 @@ 
 
 function print_rr($var, $capture = false) {
   $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
-  if($capture) {
+  if ($capture) {
     return $print;
   } else {
     print($print);
   }
 }
 
-function can_capture_planet(){return sn_function_call('can_capture_planet', array(&$result));}
+function can_capture_planet() {return sn_function_call('can_capture_planet', array(&$result)); }
 function sn_can_capture_planet(&$result) {
   return $result = false;
 }

Braces +14 added lines, -28 removed lines

@@ -32,8 +32,7 @@ 
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
     }
-  }
-  else
+  } else
   {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
     $func_name = isset($functions[$func_name]) && is_callable($functions[$func_name]) ? $functions[$func_name] : ('sn_' . $func_name);
@@ -151,13 +150,11 @@ 
   if(is_int($floor))
   {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
-  }
-  elseif($floor === true)
+  } elseif($floor === true)
   {
     $n = floor($n);
     $floor = 0;
-  }
-  else
+  } else
   {
     $floor = 2;
   }
@@ -174,8 +171,7 @@ 
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
-    }
-    else
+    } else
     {
       while($ret < -$limit)
       {
@@ -193,12 +189,10 @@ 
     if($color === true)
     {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
-    }
-    elseif($color >= 0)
+    } elseif($color >= 0)
     {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
-    }
-    else
+    } else
     {
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
@@ -206,8 +200,7 @@ 
     if(!isset($style))
     {
       $ret = "<span class='{$class}'>{$ret}</span>";
-    }
-    else
+    } else
     {
       $ret = $style ? $ret = $class : $ret = array('text' => $ret, 'class' => $class);
     }
@@ -350,8 +343,7 @@ 
       }
     }
     $phone = strlen($phone) < 11 ? '' : $phone;
-  }
-  else
+  } else
   {
     $phone = '';
   }
@@ -755,8 +747,7 @@ 
     curl_setopt ($crl, CURLOPT_CONNECTTIMEOUT, $timeout);
     $return = curl_exec($crl);
     curl_close($crl);
-  }
-  else
+  } else
   {
     $return = @file_get_contents($url);
   }
@@ -829,8 +820,7 @@ 
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
-    }
-    else
+    } else
     {
       $ret = false;
     }
@@ -879,8 +869,7 @@ 
       if(is_string($function_data))
       {
         $override_with = &$function_data;
-      }
-      elseif(isset($function_data['callable']))
+      } elseif(isset($function_data['callable']))
       {
         $override_with = &$function_data['callable'];
       }
@@ -894,12 +883,10 @@ 
       if(($point_position = strpos($override_with, '.')) === false && $class_module_name)
       {
         $override_with = array($class_module_name, $override_with);
-      }
-      elseif($point_position == 0)
+      } elseif($point_position == 0)
       {
         $override_with = substr($override_with, 1);
-      }
-      elseif($point_position > 0)
+      } elseif($point_position > 0)
       {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
@@ -907,8 +894,7 @@ 
       if($overwrite)
       {
         $functions[$function_name] = array();
-      }
-      elseif(!isset($functions[$function_name]))
+      } elseif(!isset($functions[$function_name]))
       {
         $functions[$function_name] = array();
         $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');

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 +20 added lines, -20 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,47 +103,47 @@ 
 }
 function linear_calc(&$linear, $from = 0, $debug = 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($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if ($debug) 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($debug) pdump($linear, 'Подставили х' . $from);
+  if ($debug) pdump($linear, 'Подставили х' . $from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $debug);
   }
 
-  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($debug) pdump($linear, 'Подставили обратно х' . $from);
+    if ($debug) pdump($linear, 'Подставили обратно х' . $from);
   }
   else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($debug) pdump($linear, 'Результат' . $from);
+    foreach ($linear as $index => &$eq)
     {
       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($debug) pdump($linear, 'Нормализовано по х' . $from);
+  if($debug) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +122,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($debug) pdump($linear, 'Подставили х' . $from);
+  if($debug) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +141,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($debug) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($debug) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($debug) pdump($linear, 'Результат' . $from);
+    if($debug) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);