supernova-ws / SuperNova

includes/db.php

Doc Comments +8 added lines, -5 removed lines

@@ -11,6 +11,9 @@ 
 
 require_once('db/db_queries.php');
 
+/**
+ * @param string $tablename
+ */
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
   if($query && $object_id) {
@@ -63,6 +66,9 @@ 
   db_change_units_perform($query[LOC_USER], 'users', $user['id']);
   db_change_units_perform($query[LOC_PLANET], 'planets', $planet['id']);
 }
+/**
+ * @param string $table
+ */
 function sn_db_perform($table, $values, $type = 'insert', $options = false) {
   $mass_perform = false;
 
@@ -171,11 +177,8 @@ 
 /**
  * Функция проверяет статус транзакции
  *
- * @param null|true|false $status Должна ли быть запущена транзакция в момент проверки
- *   <p>null - транзакция НЕ должна быть запущена</p>
- *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
- *   <p>false - всё равно - для совместимости с $for_update</p>
- * @return bool Текущий статус транзакции
+ * @param boolean $transaction_should_be_started
+ * @return null|boolean Текущий статус транзакции
  */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::db_transaction_check($transaction_should_be_started);

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
  * @copyright 2008-2015 Gorlum for Project "SuperNova.WS"
  */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die();
 }
 
@@ -13,7 +13,7 @@ 
 
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
-  if($query && $object_id) {
+  if ($query && $object_id) {
     return classSupernova::db_upd_record_by_id($tablename == 'users' ? LOC_USER : LOC_PLANET, $object_id, $query);
     // return doquery("UPDATE {{{$tablename}}} SET {$query} WHERE `id` = '{$object_id}' LIMIT 1;");
   }
@@ -30,15 +30,15 @@ 
 
   $group = sn_get_groups('resources_loot');
 
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_units() вызван для не-ресурсов!');
     }
 
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       continue;
     }
 
@@ -47,7 +47,7 @@ 
     $unit_location = sys_get_unit_location($user, $planet, $unit_id);
 
     // Changing value in object
-    switch($unit_location) {
+    switch ($unit_location) {
       case LOC_USER:
         $user[$unit_db_name] += $unit_amount;
         break;
@@ -69,23 +69,23 @@ 
   $field_set = '';
   $value_set = '';
 
-  switch($type) {
+  switch ($type) {
     case 'delete':
       $query = 'DELETE FROM';
       break;
 
     case 'insert':
       $query = 'INSERT INTO';
-      if(isset($options['__multi'])) {
+      if (isset($options['__multi'])) {
         // Here we generate mass-insert set
         break;
       }
     case 'update':
-      if(!$query) {
+      if (!$query) {
         $query = 'UPDATE';
       }
 
-      foreach($values as $field => &$value) {
+      foreach ($values as $field => &$value) {
         $value_type = gettype($value);
         if ($value_type == 'string') {
           $value = "'" . db_escape($value) . "'";
@@ -113,12 +113,12 @@ 
   $field_set['__IS_SAFE'] = true;
 }
 function sn_db_field_set_make_safe($field_set, $serialize = false) {
-  if(!is_array($field_set)) {
+  if (!is_array($field_set)) {
     die('$field_set is not an array!');
   }
 
   $result = array();
-  foreach($field_set as $field => $value) {
+  foreach ($field_set as $field => $value) {
     $field = db_escape(trim($field));
     switch (true) {
       case is_int($value):

includes/db/db_queries.php

Doc Comments +5 added lines

@@ -337,6 +337,11 @@
  */
 // OK v4
 // TODO - вынести в отдельный класс
+/**
+ * @param string $db_id_field_name
+ * @param string $db_table_name
+ * @param string $db_value_field_name
+ */
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);

Spacing +9 added lines, -9 removed lines

@@ -103,7 +103,7 @@ 
 
 function db_unit_records_sum($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -115,7 +115,7 @@ 
 
 function db_unit_records_plain($unit_id, $user_skip_list_unit)
 {
-  return doquery (
+  return doquery(
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
           WHERE unit_player_id != 0 AND unit_snid = {$unit_id} {$user_skip_list_unit}
@@ -125,7 +125,7 @@ 
 }
 
 function db_stat_list_statistic($who, $is_common_stat, $Rank, $start, $source = false) {
-  if(!$source) {
+  if (!$source) {
     $source = array(
       'statpoints' => 'statpoints',
       'users' => 'users',
@@ -146,8 +146,8 @@ 
     );
   }
 
-  if($who == 1) {
-    if($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
+  if ($who == 1) {
+    if ($is_common_stat) { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
       @rownum:=@rownum+1 rownum, subject.{$source['id']} as `id`, sp.{$Rank}_rank as rank, sp.{$Rank}_old_rank as rank_old, sp.{$Rank}_points as points, subject.{$source['username']} as `name`, subject.*
@@ -161,7 +161,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      ". $start .",100;";
+      " . $start . ",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -174,7 +174,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      ". $start .",100;";
+      " . $start . ",100;";
     }
   } else {
     // TODO
@@ -191,7 +191,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    ". $start .",100;";
+    " . $start . ",100;";
   }
 
   return doquery($query_str);
@@ -277,7 +277,7 @@ 
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = doquery("SELECT `{$db_id_field_name}` AS id_field FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE", true);
-  if(!isset($value_id['id_field']) || !$value_id['id_field']) {
+  if (!isset($value_id['id_field']) || !$value_id['id_field']) {
     doquery("INSERT INTO {{{$db_table_name}}} (`{$db_value_field_name}`) VALUES ('{$current_value_safe}');");
     $variable_id = db_insert_id();
   } else {

Braces +14 added lines, -28 removed lines

@@ -7,8 +7,7 @@ 
 require_once('db_queries_fleet.php');
 
 
-function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type)
-{
+function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return doquery(
     "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
     " FROM {{planets}} AS p
@@ -17,8 +16,7 @@ 
     " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
-function db_planet_list_search($searchtext)
-{
+function db_planet_list_search($searchtext) {
   return doquery(
     "SELECT
       p.galaxy, p.system, p.planet, p.planet_type, p.name as planet_name,
@@ -38,8 +36,7 @@ 
 
 
 
-function db_user_list_search($searchtext)
-{
+function db_user_list_search($searchtext) {
   return doquery(
     "SELECT
       pn.player_name, u.id as uid, u.username, u.ally_id, u.id_planet, u.total_points, u.total_rank,
@@ -57,8 +54,7 @@ 
   );
 }
 
-function db_buddy_list_by_user($user_id)
-{
+function db_buddy_list_by_user($user_id) {
 //  return ($user_id = intval($user_id)) ? doquery(
   return ($user_id = idval($user_id)) ? doquery(
     "SELECT
@@ -84,8 +80,7 @@ 
 
 
 
-function db_message_list_outbox_by_user_id($user_id)
-{
+function db_message_list_outbox_by_user_id($user_id) {
   // return ($user_id = intval($user_id))
   return ($user_id = idval($user_id))
     ? doquery("SELECT {{messages}}.message_id, {{messages}}.message_owner, {{users}}.id AS message_sender, {{messages}}.message_time,
@@ -101,8 +96,7 @@ 
 
 
 
-function db_unit_records_sum($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_sum($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, sum(unit_level) as unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -113,8 +107,7 @@ 
     , true);
 }
 
-function db_unit_records_plain($unit_id, $user_skip_list_unit)
-{
+function db_unit_records_plain($unit_id, $user_skip_list_unit) {
   return doquery (
     "SELECT unit_player_id, username, unit_level
           FROM {{unit}} JOIN {{users}} AS u ON u.id = unit_player_id
@@ -198,25 +191,21 @@ 
 }
 
 
-function db_stat_list_update_user_stats()
-{
+function db_stat_list_update_user_stats() {
   return doquery("UPDATE {{users}} AS u JOIN {{statpoints}} AS sp ON sp.id_owner = u.id AND sp.stat_code = 1 AND sp.stat_type = 1 SET u.total_rank = sp.total_rank, u.total_points = sp.total_points WHERE user_as_ally IS NULL;");
 }
 
-function db_stat_list_update_ally_stats()
-{
+function db_stat_list_update_ally_stats() {
   return doquery("UPDATE {{alliance}} AS a JOIN {{statpoints}} AS sp ON sp.id_ally = a.id AND sp.stat_code = 1 AND sp.stat_type = 2 SET a.total_rank = sp.total_rank, a.total_points = sp.total_points;");
 }
 
-function db_stat_list_delete_ally_player()
-{
+function db_stat_list_delete_ally_player() {
   return doquery('DELETE s FROM {{statpoints}} AS s JOIN {{users}} AS u ON u.id = s.id_owner WHERE s.id_ally IS NULL AND u.user_as_ally IS NOT NULL');
 }
 
 
 
-function db_chat_player_list_online($chat_refresh_rate, $ally_add)
-{
+function db_chat_player_list_online($chat_refresh_rate, $ally_add) {
   $sql_date = SN_TIME_NOW - $chat_refresh_rate * 2;
 
   return doquery(
@@ -230,13 +219,11 @@ 
     ORDER BY authlevel DESC, `username`");
 }
 
-function db_referrals_list_by_id($user_id)
-{
+function db_referrals_list_by_id($user_id) {
   return doquery("SELECT r.*, u.username, u.register_time FROM {{referrals}} AS r LEFT JOIN {{users}} AS u ON u.id = r.id WHERE id_partner = {$user_id}");
 }
 
-function db_message_list_admin_by_type($int_type_selected, $StartRec)
-{
+function db_message_list_admin_by_type($int_type_selected, $StartRec) {
   return doquery("SELECT
   message_id as `ID`,
   message_from as `FROM`,
@@ -255,8 +242,7 @@ 
 }
 
 
-function db_message_insert_all($message_type, $from, $subject, $text)
-{
+function db_message_insert_all($message_type, $from, $subject, $text) {
   return doquery($QryInsertMessage = 'INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
     "SELECT `id`, 0, unix_timestamp(now()), {$message_type}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
 }

includes/db/db_queries_users.php

Doc Comments +3 added lines

@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @param boolean $player
+ */
 function db_user_by_id($user_id_unsafe, $for_update = false, $fields = '*', $player = null) {
   return classSupernova::db_get_user_by_id($user_id_unsafe, $for_update, $fields, $player);
 }

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
     "SELECT `id` AS `ID`, `username` AS `NAME`, `ally_name` AS `ALLY`, `total_points` AS `STAT_POINTS`,
       `onlinetime` AS `ACTIVITY`
     FROM {{users}}
-    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) ." ORDER BY user_as_ally, `". $TypeSort ."` ASC;");
+    WHERE `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) . " ORDER BY user_as_ally, `" . $TypeSort . "` ASC;");
 }
 
 
@@ -98,7 +98,7 @@ 
   return doquery("SELECT u.*, COUNT(r.id) AS referral_count, SUM(r.dark_matter) AS referral_dm FROM {{users}} as u
     LEFT JOIN {{referrals}} as r on r.id_partner = u.id
     WHERE" .
-    ($online ? " `onlinetime` >= ". (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
+    ($online ? " `onlinetime` >= " . (SN_TIME_NOW - $config->game_users_online_timeout) : ' user_as_ally IS NULL') .
     " GROUP BY u.id
     ORDER BY user_as_ally, {$sort} ASC");
 }
@@ -114,7 +114,7 @@ 
   !is_array($user_id_list) ? $user_id_list = array($user_id_list) : false;
 
   $user_list = array();
-  foreach($user_id_list as $user_id_unsafe) {
+  foreach ($user_id_list as $user_id_unsafe) {
     $user = db_user_by_id($user_id_unsafe);
     !empty($user) ? $user_list[$user_id_unsafe] = $user : false;
   }

includes/functions/eco_get_build_data.php

Doc Comments +4 added lines

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

Spacing +36 added lines, -36 removed lines

@@ -13,13 +13,13 @@ 
  */
 function eco_get_lab_max_effective_level(&$user, $lab_require)
 {
-  if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
+  if (!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
     $query = DBStaticUnit::db_unit_list_laboratories($user['id']);
-    while($row = db_fetch($query))
+    while ($row = db_fetch($query))
     {
-      if(!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
+      if (!eco_unit_busy($user, $row, UNIT_TECHNOLOGIES))
       {
         $row += array(
           STRUC_LABORATORY => $level_lab = mrc_get_level($user, $row, STRUC_LABORATORY),
@@ -33,9 +33,9 @@ 
     uasort($user['laboratories_active'], 'eco_lab_sort_effectivness');
   }
 
-  if(!isset($user['research_effective_level'][$lab_require]))
+  if (!isset($user['research_effective_level'][$lab_require]))
   {
-    if($user['user_as_ally'])
+    if ($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
     }
@@ -44,13 +44,13 @@ 
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
 
-      foreach($user['laboratories_active'] as $data)
+      foreach ($user['laboratories_active'] as $data)
       {
-        if($tech_intergalactic <= 0)
+        if ($tech_intergalactic <= 0)
         {
           break;
         }
-        if($data[STRUC_LABORATORY] >= $lab_require)
+        if ($data[STRUC_LABORATORY] >= $lab_require)
         {
           $lab_level['effective_level'] += $data['laboratory_effective_level'];
           $tech_intergalactic--;
@@ -79,8 +79,8 @@ 
   $time = 0;
   $only_dark_matter = 0;
   $cost_in_metal = 0;
-  foreach($unit_data[P_COST] as $resource_id => $resource_amount) {
-    if($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
+  foreach ($unit_data[P_COST] as $resource_id => $resource_amount) {
+    if ($resource_id === P_FACTOR || !($resource_cost = $resource_amount * $price_increase)) {
       continue;
     }
 
@@ -89,12 +89,12 @@ 
 
     $resource_db_name = pname_resource_name($resource_id);
     $cost_in_metal += $cost[BUILD_CREATE][$resource_id] * $config->__get("rpg_exchange_{$resource_db_name}");
-    if(in_array($resource_id, sn_get_groups('resources_loot'))) {
+    if (in_array($resource_id, sn_get_groups('resources_loot'))) {
       $time += $resource_cost * $config->__get("rpg_exchange_{$resource_db_name}") / $rpg_exchange_deuterium;
       $resource_got = mrc_get_level($user, $planet, $resource_id);
-    } elseif($resource_id == RES_DARK_MATTER) {
+    } elseif ($resource_id == RES_DARK_MATTER) {
       $resource_got = mrc_get_level($user, null, $resource_id);
-    } elseif($resource_id == RES_ENERGY) {
+    } elseif ($resource_id == RES_ENERGY) {
       $resource_got = max(0, $planet['energy_max'] - $planet['energy_used']);
     } else {
       $resource_got = 0;
@@ -107,7 +107,7 @@ 
 
   $resources_normalized = 0;
   $resources_loot = sn_get_groups('resources_loot');
-  foreach($resources_loot as $resource_id) {
+  foreach ($resources_loot as $resource_id) {
     $resource_db_name = pname_resource_name($resource_id);
     $resource_got = mrc_get_level($user, $planet, $resource_id);
     $resources_normalized += floor($resource_got) * $config->__get("rpg_exchange_{$resource_db_name}");
@@ -125,7 +125,7 @@ 
   $cost[P_OPTIONS][P_TIME_RAW] = $time = $time * 60 * 60 / get_game_speed() / 2500;
 
   // TODO - Вынести в отдельную процедуру расчёт стоимости
-  if($only_cost) {
+  if ($only_cost) {
     return $cost;
   }
 
@@ -134,7 +134,7 @@ 
 
   $mercenary = 0;
   $cost['RESULT'][BUILD_DESTROY] = BUILD_INDESTRUCTABLE;
-  if(in_array($unit_id, sn_get_groups('structures'))) {
+  if (in_array($unit_id, sn_get_groups('structures'))) {
     $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_ROBOT) + 1);
     $mercenary = MRC_ENGINEER;
     $cost['RESULT'][BUILD_DESTROY] =
@@ -144,23 +144,23 @@ 
             : BUILD_NO_RESOURCES
           )
         : BUILD_NO_UNITS;
-  } elseif(in_array($unit_id, sn_get_groups('tech'))) {
+  } elseif (in_array($unit_id, sn_get_groups('tech'))) {
     $lab_level = eco_get_lab_max_effective_level($user, intval($unit_data['require'][STRUC_LABORATORY]));
     $time = $time / $lab_level;
     $mercenary = MRC_ACADEMIC;
-  } elseif(in_array($unit_id, sn_get_groups('defense'))) {
-    $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1) ;
+  } elseif (in_array($unit_id, sn_get_groups('defense'))) {
+    $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_FORTIFIER;
-  } elseif(in_array($unit_id, sn_get_groups('fleet'))) {
+  } elseif (in_array($unit_id, sn_get_groups('fleet'))) {
     $time = $time * pow(0.5, mrc_get_level($user, $planet, STRUC_FACTORY_NANO)) / (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) + 1);
     $mercenary = MRC_ENGINEER;
   }
 
-  if($mercenary) {
+  if ($mercenary) {
     $time = $time / mrc_modify_value($user, $planet, $mercenary, 1);
   }
 
-  if(in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
+  if (in_array($unit_id, sn_get_groups('governors')) || $only_dark_matter) {
     $cost[RES_TIME][BUILD_CREATE] = $cost[RES_TIME][BUILD_DESTROY] = 0;
   } else {
     $cost[RES_TIME][BUILD_CREATE]  = round($time >= 1 ? $time : 1);
@@ -170,7 +170,7 @@ 
   return $cost;
 }
 
-function eco_can_build_unit($user, $planet, $unit_id){return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result));}
+function eco_can_build_unit($user, $planet, $unit_id) {return sn_function_call('eco_can_build_unit', array($user, $planet, $unit_id, &$result)); }
 function sn_eco_can_build_unit($user, $planet, $unit_id, &$result) {
   global $config;
 
@@ -178,11 +178,11 @@ 
   $result = $result == BUILD_ALLOWED && eco_unit_busy($user, $planet, $unit_id) ? BUILD_UNIT_BUSY : $result;
 
   $unit_param = get_unit_param($unit_id);
-  if($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
+  if ($unit_param[P_UNIT_TYPE] != UNIT_MERCENARIES || !$config->empire_mercenary_temporary) {
     $requirement = &$unit_param[P_REQUIRE];
-    if($result == BUILD_ALLOWED && $requirement) {
-      foreach($requirement as $require_id => $require_level) {
-        if(mrc_get_level($user, $planet, $require_id) < $require_level) {
+    if ($result == BUILD_ALLOWED && $requirement) {
+      foreach ($requirement as $require_id => $require_level) {
+        if (mrc_get_level($user, $planet, $require_id) < $require_level) {
           $result = BUILD_REQUIRE_NOT_MEET;
           break;
         }
@@ -199,12 +199,12 @@ 
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
   $planet_que = explode(';', $planet_que);
-  foreach($planet_que as $planet_que_item)
+  foreach ($planet_que as $planet_que_item)
   {
-    if($planet_que_item)
+    if ($planet_que_item)
     {
       list($planet_que_item) = explode(',', $planet_que_item);
-      if(in_array($planet_que_item, $unit_list))
+      if (in_array($planet_que_item, $unit_list))
       {
         $eco_is_builds_in_que = true;
         break;
@@ -215,21 +215,21 @@ 
   return $eco_is_builds_in_que;
 }
 
-function eco_unit_busy(&$user, &$planet, $unit_id){return sn_function_call('eco_unit_busy', array(&$user, &$planet, $unit_id, &$result));}
+function eco_unit_busy(&$user, &$planet, $unit_id) {return sn_function_call('eco_unit_busy', array(&$user, &$planet, $unit_id, &$result)); }
 function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
 {
   global $config;
 
   $result = isset($result) ? $result : false;
-  if(!$result)
+  if (!$result)
   {
-    if(($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
+    if (($unit_id == STRUC_LABORATORY || $unit_id == STRUC_LABORATORY_NANO) && !$config->BuildLabWhileRun)
     {
       $global_que = que_get($user['id'], $planet['id'], QUE_RESEARCH, false);
-      if(is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
+      if (is_array($global_que['ques'][QUE_RESEARCH][$user['id']]))
       {
         $first_element = reset($global_que['ques'][QUE_RESEARCH][$user['id']]);
-        if(is_array($first_element))
+        if (is_array($first_element))
         {
           $result = true;
         }
@@ -239,7 +239,7 @@ 
       //  $result = true;
       //}
     }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    elseif (($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

Braces +6 added lines, -12 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 
-function eco_lab_sort_effectivness($a, $b)
-{
+function eco_lab_sort_effectivness($a, $b) {
   return $a['laboratory_effective_level'] > $b['laboratory_effective_level'] ? -1 : ($a['laboratory_effective_level'] < $b['laboratory_effective_level'] ? 1 : 0);
 }
 
@@ -11,8 +10,7 @@ 
  * 1.0 - copyright (c) 2010 by Gorlum for http://supernova.ws
  * @version 1.0
  */
-function eco_get_lab_max_effective_level(&$user, $lab_require)
-{
+function eco_get_lab_max_effective_level(&$user, $lab_require) {
   if(!$user['user_as_ally'] && !isset($user['laboratories_active']))
   {
     $user['laboratories_active'] = array();
@@ -38,8 +36,7 @@ 
     if($user['user_as_ally'])
     {
       $lab_level = doquery("SELECT ally_members AS effective_level FROM {{alliance}} WHERE id = {$user['user_as_ally']} LIMIT 1", true);
-    }
-    else
+    } else
     {
       $tech_intergalactic = mrc_get_level($user, false, TECH_RESEARCH) + 1;
       $lab_level['effective_level'] = 0;
@@ -193,8 +190,7 @@ 
   return $result;
 }
 
-function eco_is_builds_in_que($planet_que, $unit_list)
-{
+function eco_is_builds_in_que($planet_que, $unit_list) {
   $eco_is_builds_in_que = false;
 
   $unit_list = is_array($unit_list) ? $unit_list : array($unit_list => $unit_list);
@@ -216,8 +212,7 @@ 
 }
 
 function eco_unit_busy(&$user, &$planet, $unit_id){return sn_function_call('eco_unit_busy', array(&$user, &$planet, $unit_id, &$result));}
-function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result)
-{
+function sn_eco_unit_busy(&$user, &$planet, $unit_id, &$result) {
   global $config;
 
   $result = isset($result) ? $result : false;
@@ -238,8 +233,7 @@ 
       //{
       //  $result = true;
       //}
-    }
-    elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
+    } elseif(($unit_id == UNIT_TECHNOLOGIES || in_array($unit_id, sn_get_groups('tech'))) && !$config->BuildLabWhileRun && $planet['que'])
     {
       $result = eco_is_builds_in_que($planet['que'], array(STRUC_LABORATORY, STRUC_LABORATORY_NANO));
     }

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 = DBStaticPlanet::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)) {
     DBStaticPlanet::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) {
       DBStaticQue::db_que_delete_by_id($que_item['que_id']);
 
-      if($que_item['que_planet_id_origin']) {
+      if ($que_item['que_planet_id_origin']) {
         $planet['id'] = $que_item['que_planet_id_origin'];
       }
 
-      if(!isset($planets_locked[$planet['id']])) {
+      if (!isset($planets_locked[$planet['id']])) {
         $planets_locked[$planet['id']] = $planet['id'] ? DBStaticPlanet::db_planet_by_id($planet['id'], true) : $planet;
       }
 
@@ -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'])) {
       DBStaticPlanet::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 = DBStaticPlanet::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'])) {
       DBStaticPlanet::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 +11 added lines, -11 removed lines

@@ -8,23 +8,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 = DBStaticPlanet::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'];
     }
@@ -34,7 +34,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
         ||
         (
@@ -49,12 +49,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'])
@@ -71,7 +71,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);
     }
@@ -84,7 +84,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'];
@@ -116,9 +116,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 +6 added lines, -12 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 
 
-function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false)
-{
+function flt_parse_fleets_to_events($fleet_list, $planet_scanned = false) {
   global $config, $user, $fleet_number, $lang;
 
   $fleet_events = array();
@@ -23,12 +22,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 = DBStaticPlanet::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'];
@@ -80,8 +77,7 @@ 
   return $fleet_events;
 }
 
-function flt_register_fleet_event($fleet, $ov_label, $planet_end_type)
-{
+function flt_register_fleet_event($fleet, $ov_label, $planet_end_type) {
   global $user, $planetrow, $fleet_number;
 
   switch($fleet['ov_label'] = $ov_label)
@@ -121,8 +117,7 @@ 
   if($fleet['fleet_owner'] == $user['id'])
   {
     $user_data = $user;
-  }
-  else
+  } else
   {
     $user_data = db_user_by_id($fleet['fleet_owner']);
   }
@@ -130,8 +125,7 @@ 
   return tpl_parse_fleet_db($fleet, ++$fleet_number, $user_data);
 }
 
-function int_planet_pretemplate($planetrow, &$template)
-{
+function int_planet_pretemplate($planetrow, &$template) {
   global $lang, $user;
 
   $governor_id = $planetrow['PLANET_GOVERNOR_ID'];

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -89,18 +89,18 @@ 
     case 0:
       $fleet['event_time'] = $fleet['fleet_start_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
     case 1:
       $fleet['event_time'] = $fleet['fleet_end_stay'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_end_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_end_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_end_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_end_system']) and
+        ($planetrow['planet'] == $fleet['fleet_end_planet']) and
         ($planetrow['planet_type'] == $planet_end_type));
     break;
 
@@ -108,9 +108,9 @@ 
     case 3:
       $fleet['event_time'] = $fleet['fleet_end_time'];
       $is_this_planet = (
-        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) AND
-        ($planetrow['system'] == $fleet['fleet_start_system']) AND
-        ($planetrow['planet'] == $fleet['fleet_start_planet']) AND
+        ($planetrow['galaxy'] == $fleet['fleet_start_galaxy']) and
+        ($planetrow['system'] == $fleet['fleet_start_system']) and
+        ($planetrow['planet'] == $fleet['fleet_start_planet']) and
         ($planetrow['planet_type'] == $fleet['fleet_start_type']));
     break;
 

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

@@ -15,8 +15,7 @@ 
    1.5 - copyright (c) 2010-2011 by Gorlum for http://supernova.ws
          [+] SuperMassMailing - authlevel=3 player can send messages to whole server ('*' as $owners)
  */
-function msg_ali_send($message, $subject, $ally_rank_id = 0, $ally_id = 0)
-{
+function msg_ali_send($message, $subject, $ally_rank_id = 0, $ally_id = 0) {
   global $user;
 
   $ally_id = $ally_id ? $ally_id : $user['ally_id'];
@@ -37,8 +36,7 @@ 
   return $list;
 }
 
-function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false)
-{
+function msg_send_simple_message($owners, $sender, $timestamp, $message_type, $from, $subject, $text, $escaped = false, $force = false) {
   global $config, $user, $sn_message_class_list;
 
   if(!$owners)
@@ -79,8 +77,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 +87,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)

Braces +6 added lines, -12 removed lines

@@ -161,8 +161,7 @@ 
   return $rows_affected;
 }
 
-function rpg_level_up(&$user, $type, $xp_to_add = 0)
-{
+function rpg_level_up(&$user, $type, $xp_to_add = 0) {
   $q = 1.03;
 
   switch($type)
@@ -223,27 +222,22 @@ 
   }
 }
 
-function rpg_xp_for_level($level, $b1, $q)
-{
+function rpg_xp_for_level($level, $b1, $q) {
   return floor($b1 * (pow($q, $level) - 1)/($q - 1));
 }
 
-function rpg_get_miner_xp($level)
-{
+function rpg_get_miner_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function RPG_get_raider_xp($level)
-{
+function RPG_get_raider_xp($level) {
   return rpg_xp_for_level($level, 10, 1.03);
 }
 
-function rpg_get_tech_xp($level)
-{
+function rpg_get_tech_xp($level) {
   return rpg_xp_for_level($level, 50, 1.03);
 }
 
-function rpg_get_explore_xp($level)
-{
+function rpg_get_explore_xp($level) {
   return rpg_xp_for_level($level, 10, 1.05);
 }

includes/functions/sys_user.php

Doc Comments +3 added lines

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

Spacing +22 added lines, -22 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 . "';");
 
   DBStaticPlanet::db_planet_list_delete_by_owner($UserID);
 
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_sender` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{messages}}` WHERE `message_owner` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{notes}}` WHERE `owner` = '" . $UserID . "';");
   db_fleet_list_delete_by_owner($UserID);
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner1` = '" . $UserID . "';");
 //  doquery ( "DELETE FROM `{{rw}}` WHERE `id_owner2` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
-  doquery ( "DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_SENDER_ID` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{buddy}}` WHERE `BUDDY_OWNER_ID` = '" . $UserID . "';");
+  doquery("DELETE FROM `{{annonce}}` WHERE `user` = '" . $UserID . "';");
 
 
   classSupernova::db_del_record_by_id(LOC_USER, $UserID);
-  doquery ( "DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
+  doquery("DELETE FROM `{{referrals}}` WHERE (`id` = '{$UserID}') OR (`id_partner` = '{$UserID}');");
   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 = DBStaticPlanet::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']}");
   }