supernova-ws / SuperNova

includes/classes/supernova.php

Spacing +103 added lines, -105 removed lines

@@ -202,7 +202,7 @@ 
 
 
   public static function log_file($message, $spaces = 0) {
-    if(self::$debug) {
+    if (self::$debug) {
       self::$debug->log_file($message, $spaces);
     }
   }
@@ -214,16 +214,16 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) {
+    if (!is_array($array)) {
       return;
     }
 
-    foreach($array as $key => &$value) {
-      if($value === null) {
+    foreach ($array as $key => &$value) {
+      if ($value === null) {
         unset($array[$key]);
-      } elseif($level > 0 && is_array($value)) {
+      } elseif ($level > 0 && is_array($value)) {
         static::array_repack($value, $level - 1);
-        if(empty($value)) {
+        if (empty($value)) {
           unset($array[$key]);
         }
       }
@@ -234,7 +234,7 @@ 
   // TODO Вынести в отдельный объект
   public static function cache_repack($location_type, $record_id = 0) {
     // Если есть $user_id - проверяем, а надо ли перепаковывать?
-    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) {
+    if ($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) {
       return;
     }
 
@@ -245,9 +245,9 @@ 
 
   public static function cache_clear($location_type, $hard = true) {
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
-    if($hard && !empty(static::$data[$location_type])) {
+    if ($hard && !empty(static::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(static::$data[$location_type], function (&$item) { $item = null; });
+      array_walk(static::$data[$location_type], function(&$item) { $item = null; });
     }
     static::$locator[$location_type] = array();
     static::$queries[$location_type] = array();
@@ -256,7 +256,7 @@ 
 
   public static function cache_clear_all($hard = true) {
     //print('<br />CACHE CLEAR ALL<br />');
-    if($hard) {
+    if ($hard) {
       static::$data = array();
       static::cache_lock_unset_all();
     }
@@ -285,12 +285,12 @@ 
   */
   public static function cache_set($location_type, $record_id, $record, $force_overwrite = false, $skip_lock = false) {
     // нет идентификатора - выход
-    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) {
+    if (!($record_id = $record[static::$location_info[$location_type][P_ID]])) {
       return;
     }
 
     $in_transaction = static::db_transaction_check(false);
-    if(
+    if (
       $force_overwrite
       ||
       // Не заменяются заблокированные записи во время транзакции
@@ -300,7 +300,7 @@ 
       !static::cache_isset($location_type, $record_id)
     ) {
       static::$data[$location_type][$record_id] = $record;
-      if($in_transaction && !$skip_lock) {
+      if ($in_transaction && !$skip_lock) {
         static::cache_lock_set($location_type, $record_id);
       }
     }
@@ -308,7 +308,7 @@ 
 
   public static function cache_unset($cache_id, $safe_record_id) {
     // $record_id должен быть проверен заранее !
-    if(isset(static::$data[$cache_id][$safe_record_id]) && static::$data[$cache_id][$safe_record_id] !== null) {
+    if (isset(static::$data[$cache_id][$safe_record_id]) && static::$data[$cache_id][$safe_record_id] !== null) {
       // Выставляем запись в null
       static::$data[$cache_id][$safe_record_id] = null;
       // Очищаем кэш мягко - что бы удалить очистить связанные данные - кэш локаций и кэш запоросов и всё, что потребуется впредь
@@ -325,7 +325,7 @@ 
   }
 
   public static function cache_lock_unset($location_type, $record_id) {
-    if(isset(static::$locks[$location_type][$record_id])) {
+    if (isset(static::$locks[$location_type][$record_id])) {
       unset(static::$locks[$location_type][$record_id]);
     }
 
@@ -359,13 +359,13 @@ 
    */
   public static function db_transaction_check($status = null) {
     $error_msg = false;
-    if($status && !static::$db_in_transaction) {
+    if ($status && !static::$db_in_transaction) {
       $error_msg = 'No transaction started for current operation';
-    } elseif($status === null && static::$db_in_transaction) {
+    } elseif ($status === null && static::$db_in_transaction) {
       $error_msg = 'Transaction is already started';
     }
 
-    if($error_msg) {
+    if ($error_msg) {
       // TODO - Убрать позже
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
       $backtrace = debug_backtrace();
@@ -385,7 +385,7 @@ 
     static::$transaction_id++;
     doquery('START TRANSACTION');
 
-    if(classSupernova::$config->db_manual_lock_enabled) {
+    if (classSupernova::$config->db_manual_lock_enabled) {
       classSupernova::$config->db_loadItem('var_db_manually_locked');
       classSupernova::$config->db_saveItem('var_db_manually_locked', SN_TIME_SQL);
     }
@@ -402,7 +402,7 @@ 
   public static function db_transaction_commit() {
     static::db_transaction_check(true);
 
-    if(!empty(static::$delayed_changset)) {
+    if (!empty(static::$delayed_changset)) {
       static::db_changeset_apply(static::$delayed_changset, true);
       // pdump(static::$delayed_changset);
     }
@@ -418,7 +418,7 @@ 
 
   public static function db_transaction_rollback() {
     // static::db_transaction_check(true); // TODO - вообще-то тут тоже надо проверять есть ли транзакция
-    if(!empty(static::$delayed_changset)) {
+    if (!empty(static::$delayed_changset)) {
       static::db_changeset_revert();
     }
     static::$delayed_changset = array();
@@ -441,7 +441,7 @@ 
    */
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
-    foreach($tables as $table_name => $condition) {
+    foreach ($tables as $table_name => $condition) {
       self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
     }
   }
@@ -484,17 +484,17 @@ 
     //pdump($filter, 'Выбираем ' . $location_type);
     $query_cache = &static::$queries[$location_type][$filter];
 
-    if(!isset($query_cache) || $query_cache === null) {
+    if (!isset($query_cache) || $query_cache === null) {
       // pdump($filter, 'Кэш пустой, начинаем возню');
       $location_info = &static::$location_info[$location_type];
       $id_field = $location_info[P_ID];
       $query_cache = array();
 
-      if(static::db_transaction_check(false)) {
+      if (static::db_transaction_check(false)) {
         //pdump($filter, 'Транзакция - блокируем ' . $location_type);
         // Проходим по всем родителям данной записи
         // foreach($location_info[P_OWNER_INFO] as $owner_location_type => $owner_data)
-        foreach($location_info[P_OWNER_INFO] as $owner_data) {
+        foreach ($location_info[P_OWNER_INFO] as $owner_data) {
           $owner_location_type = $owner_data[P_LOCATION];
           //pdump($filter, 'Транзакция - блокируем родителя ' . $owner_location_type);
           $parent_id_list = array();
@@ -507,15 +507,15 @@ 
             ($fetch ? ' LIMIT 1' : ''), false, true);
 
           //pdump($q, 'Запрос блокировки');
-          while($row = db_fetch($query)) {
+          while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
-            if(!static::cache_lock_get($owner_location_type, $row['parent_id'])) {
+            if (!static::cache_lock_get($owner_location_type, $row['parent_id'])) {
               $parent_id_list[$row['parent_id']] = $row['parent_id'];
             }
           }
           //pdump($parent_id_list, 'Выбраны родители');
           // Если все-таки какие-то записи еще не заблокированы - вынимаем текущие версии из базы
-          if($indexes_str = implode(',', $parent_id_list)) {
+          if ($indexes_str = implode(',', $parent_id_list)) {
             //pdump($indexes_str, '$indexes_str');
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
@@ -530,7 +530,7 @@ 
         "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
         (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         // static::db_get_record_by_id($location_type, $row[$id_field]);
         static::cache_set($location_type, $row[$id_field], $row);
         $query_cache[$row[$id_field]] = &static::$data[$location_type][$row[$id_field]];
@@ -538,14 +538,14 @@ 
       }
     }
 
-    if($no_return) {
+    if ($no_return) {
       return true;
     } else {
       $result = false;
-      if(is_array($query_cache)) {
-        foreach($query_cache as $key => $value) {
+      if (is_array($query_cache)) {
+        foreach ($query_cache as $key => $value) {
           $result[$key] = $value;
-          if($fetch) {
+          if ($fetch) {
             break;
           }
         }
@@ -564,16 +564,16 @@ 
    */
   public static function db_upd_record_by_id($location_type, $record_id, $set) {
     //if(!($record_id = intval($record_id)) || !($set = trim($set))) return false;
-    if(!($record_id = idval($record_id)) || !($set = trim($set))) {
+    if (!($record_id = idval($record_id)) || !($set = trim($set))) {
       return false;
     }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
     {
-      if(static::$db->db_affected_rows()) {
+      if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         // TODO - переделать под работу со структурированными $set
 
@@ -589,7 +589,7 @@ 
   }
 
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -598,9 +598,9 @@ 
 
 //static::db_get_record_list($location_type, $condition, false, true);
 
-    if($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
 
-      if(static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
         // TODO - когда будет структурированный $condition и $set - перепаковывать данные
         static::cache_clear($location_type, true);
@@ -619,8 +619,8 @@ 
   public static function db_ins_record($location_type, $set) {
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
-    if($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+    if ($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
@@ -642,8 +642,8 @@ 
     $fields = implode(',', array_keys($field_set));
 
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
-    if($result = static::db_query("INSERT INTO `{{{$table_name}}}` ($fields) VALUES ($values);")) {
-      if(static::$db->db_affected_rows()) {
+    if ($result = static::db_query("INSERT INTO `{{{$table_name}}}` ($fields) VALUES ($values);")) {
+      if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         $record_id = db_insert_id();
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
@@ -659,15 +659,15 @@ 
 
   public static function db_del_record_by_id($location_type, $safe_record_id) {
     // if(!($safe_record_id = intval($safe_record_id))) return false;
-    if(!($safe_record_id = idval($safe_record_id))) {
+    if (!($safe_record_id = idval($safe_record_id))) {
       return false;
     }
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+    if ($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
@@ -677,7 +677,7 @@ 
   }
 
   public static function db_del_record_list($location_type, $condition) {
-    if(!($condition = trim($condition))) {
+    if (!($condition = trim($condition))) {
       return false;
     }
 
@@ -686,8 +686,8 @@ 
 
 //static::db_get_record_list($location_type, $condition, false, true);
 
-    if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+    if ($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         // TODO - когда будет структурированный $condition можно будет делать только cache_unset по нужным записям
@@ -734,20 +734,20 @@ 
 
   public static function db_get_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
-    if(!($username_unsafe = trim($username_unsafe))) {
+    if (!($username_unsafe = trim($username_unsafe))) {
       return false;
     }
 
     $user = null;
-    if(is_array(static::$data[LOC_USER])) {
-      foreach(static::$data[LOC_USER] as $user_id => $user_data) {
-        if(is_array($user_data) && isset($user_data['username'])) {
+    if (is_array(static::$data[LOC_USER])) {
+      foreach (static::$data[LOC_USER] as $user_id => $user_data) {
+        if (is_array($user_data) && isset($user_data['username'])) {
           // проверяем поле
           // TODO Возможно есть смысл всегда искать по strtolower - но может игрок захочет переименоваться с другим регистром? Проверить!
-          if((!$like && $user_data['username'] == $username_unsafe) || ($like && strtolower($user_data['username']) == strtolower($username_unsafe))) {
+          if ((!$like && $user_data['username'] == $username_unsafe) || ($like && strtolower($user_data['username']) == strtolower($username_unsafe))) {
             // $user_as_ally = intval($user_data['user_as_ally']);
             $user_as_ally = idval($user_data['user_as_ally']);
-            if($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally)) {
+            if ($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally)) {
               $user = $user_data;
               break;
             }
@@ -756,7 +756,7 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
@@ -774,17 +774,17 @@ 
 
   // UNUSED
   public static function db_get_user_by_email($email_unsafe, $use_both = false, $for_update = false, $fields = '*') {
-    if(!($email_unsafe = strtolower(trim($email_unsafe)))) {
+    if (!($email_unsafe = strtolower(trim($email_unsafe)))) {
       return false;
     }
 
     $user = null;
     // TODO переделать на индексы
-    if(is_array(static::$data[LOC_USER])) {
-      foreach(static::$data[LOC_USER] as $user_id => $user_data) {
-        if(is_array($user_data) && isset($user_data['email_2'])) {
+    if (is_array(static::$data[LOC_USER])) {
+      foreach (static::$data[LOC_USER] as $user_id => $user_data) {
+        if (is_array($user_data) && isset($user_data['email_2'])) {
           // проверяем поле
-          if(strtolower($user_data['email_2']) == $email_unsafe || ($use_both && strtolower($user_data['email']) == $email_unsafe)) {
+          if (strtolower($user_data['email_2']) == $email_unsafe || ($use_both && strtolower($user_data['email']) == $email_unsafe)) {
             $user = $user_data;
             break;
           }
@@ -792,7 +792,7 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $email_safe = db_escape($email_unsafe);
       $user = static::db_query(
@@ -811,7 +811,7 @@ 
     $user = null;
     // TODO переделать на индексы
 
-    if($user === null && !empty($where_safe)) {
+    if ($user === null && !empty($where_safe)) {
       // Вытаскиваем запись
       $user = static::db_query("SELECT * FROM {{users}} WHERE {$where_safe}", true);
 
@@ -833,7 +833,7 @@ 
   public static function db_get_unit_by_id($unit_id, $for_update = false, $fields = '*') {
     // TODO запихивать в $data[LOC_LOCATION][$location_type][$location_id]
     $unit = static::db_get_record_by_id(LOC_UNIT, $unit_id, $for_update, $fields);
-    if(is_array($unit)) {
+    if (is_array($unit)) {
       static::$locator[LOC_UNIT][$unit['unit_location_type']][$unit['unit_location_id']][$unit['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
     }
 
@@ -849,15 +849,15 @@ 
    */
   public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id) {
     //if(!($location_type = intval($location_type)) || !($location_id = intval($location_id))) return false;
-    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) {
+    if (!($location_type = idval($location_type)) || !($location_id = idval($location_id))) {
       return false;
     }
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
-    if(!isset($query_cache)) {
+    if (!isset($query_cache)) {
       $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
-      if(is_array($got_data)) {
-        foreach($got_data as $unit_id => $unit_data) {
+      if (is_array($got_data)) {
+        foreach ($got_data as $unit_id => $unit_data) {
           // static::$data[LOC_LOCATION][$location_type][$location_id][$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
           $query_cache[$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
         }
@@ -865,8 +865,8 @@ 
     }
 
     $result = false;
-    if(is_array($query_cache)) {
-      foreach($query_cache as $key => $value) {
+    if (is_array($query_cache)) {
+      foreach ($query_cache as $key => $value) {
         $result[$key] = $value;
       }
     }
@@ -901,7 +901,7 @@ 
    *
    */
   public static function db_que_list_by_type_location($user_id, $planet_id = null, $que_type = false, $for_update = false) {
-    if(!$user_id) {
+    if (!$user_id) {
       pdump(debug_backtrace());
       die('No user_id for que_get_que()');
     }
@@ -911,16 +911,16 @@ 
     $query = array();
 
     // if($user_id = intval($user_id))
-    if($user_id = idval($user_id)) {
+    if ($user_id = idval($user_id)) {
       $query[] = "`que_player_id` = {$user_id}";
     }
 
-    if($que_type == QUE_RESEARCH || $planet_id === null) {
+    if ($que_type == QUE_RESEARCH || $planet_id === null) {
       $query[] = "`que_planet_id` IS NULL";
-    } elseif($planet_id) {
+    } elseif ($planet_id) {
       $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
     }
-    if($que_type) {
+    if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
     }
 
@@ -953,13 +953,13 @@ 
 
 
   public static function db_changeset_prepare_unit($unit_id, $unit_value, $user, $planet_id = null) {
-    if(!is_array($user)) {
+    if (!is_array($user)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER is not ARRAY</h1>');
       pdump(debug_backtrace());
       die('USER is not ARRAY');
     }
-    if(!isset($user['id']) || !$user['id']) {
+    if (!isset($user['id']) || !$user['id']) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_unit_changeset_prepare() - USER[id] пустой</h1>');
       pdump($user);
@@ -974,7 +974,7 @@ 
 
     $db_changeset = array();
     $temp = db_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
-    if($temp['unit_id']) {
+    if ($temp['unit_id']) {
       $db_changeset = array(
         'action'  => SQL_OP_UPDATE,
         P_VERSION => 1,
@@ -1043,9 +1043,9 @@ 
   }
 
   public function db_changeset_condition_compile(&$conditions, &$table_name = '') {
-    if(!$conditions[P_LOCATION] || $conditions[P_LOCATION] == LOC_NONE) {
+    if (!$conditions[P_LOCATION] || $conditions[P_LOCATION] == LOC_NONE) {
       $conditions[P_LOCATION] = LOC_NONE;
-      switch($table_name) {
+      switch ($table_name) {
         case 'users':
         case LOC_USER:
           $conditions[P_TABLE_NAME] = $table_name = 'users';
@@ -1067,18 +1067,18 @@ 
     }
 
     $conditions[P_FIELDS_STR] = '';
-    if($conditions['fields']) {
+    if ($conditions['fields']) {
       $fields = array();
-      foreach($conditions['fields'] as $field_name => $field_data) {
+      foreach ($conditions['fields'] as $field_name => $field_data) {
         $condition = "`{$field_name}` = ";
         $value = '';
-        if($field_data['delta']) {
+        if ($field_data['delta']) {
           $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-        } elseif($field_data['set']) {
+        } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
-        if($value) {
+        if ($value) {
           $fields[] = $condition . $value;
         }
       }
@@ -1086,16 +1086,14 @@ 
     }
 
     $conditions[P_WHERE_STR] = '';
-    if(!empty($conditions['where'])) {
-      if($conditions[P_VERSION] == 1) {
+    if (!empty($conditions['where'])) {
+      if ($conditions[P_VERSION] == 1) {
         $the_conditions = array();
-        foreach($conditions['where'] as $field_id => $field_value) {
+        foreach ($conditions['where'] as $field_id => $field_value) {
           // Простое условие - $field_id = $field_value
-          if(is_string($field_id)) {
+          if (is_string($field_id)) {
             $field_value =
-              $field_value === null ? 'NULL' :
-                (is_string($field_value) ? "'" . db_escape($field_value) . "'" :
-                  (is_bool($field_value) ? intval($field_value) : $field_value));
+              $field_value === null ? 'NULL' : (is_string($field_value) ? "'" . db_escape($field_value) . "'" : (is_bool($field_value) ? intval($field_value) : $field_value));
             $the_conditions[] = "`{$field_id}` = {$field_value}";
           } else {
             die('Неподдерживаемый тип условия');
@@ -1112,7 +1110,7 @@ 
       $conditions[P_WHERE_STR] = implode(' AND ', $the_conditions);
     }
 
-    switch($conditions['action']) {
+    switch ($conditions['action']) {
       case SQL_OP_DELETE:
         $conditions[P_ACTION_STR] = ("DELETE FROM {{{$table_name}}}");
       break;
@@ -1132,11 +1130,11 @@ 
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) {
+    if (!is_array($db_changeset) || empty($db_changeset)) {
       return $result;
     }
 
-    foreach($db_changeset as $table_name => &$table_data) {
+    foreach ($db_changeset as $table_name => &$table_data) {
       // TODO - delayed changeset
       /*
       if(static::db_transaction_check(false) && !$flush_delayed && ($table_name == 'users' || $table_name == 'planets' || $table_name == 'unit'))
@@ -1145,19 +1143,19 @@ 
         continue;
       }
       */
-      foreach($table_data as $record_id => &$conditions) {
+      foreach ($table_data as $record_id => &$conditions) {
         static::db_changeset_condition_compile($conditions, $table_name);
 
-        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
+        if ($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
           continue;
         }
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
+        if ($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
           continue;
         } // Защита от случайного удаления всех данных в таблице
 
-        if($conditions[P_LOCATION] != LOC_NONE) {
+        if ($conditions[P_LOCATION] != LOC_NONE) {
           //die('spec ops supernova.php line 928 Добавить работу с кэшем юнитов итд');
-          switch($conditions['action']) {
+          switch ($conditions['action']) {
             case SQL_OP_DELETE:
               $result = self::db_del_record_list($conditions[P_LOCATION], $conditions[P_WHERE_STR]) && $result;
             break;
@@ -1239,13 +1237,13 @@ 
   public static function init_0_prepare() {
     // Отключаем magic_quotes
     ini_get('magic_quotes_sybase') ? die('SN is incompatible with \'magic_quotes_sybase\' turned on. Disable it in php.ini or .htaccess...') : false;
-    if(@get_magic_quotes_gpc()) {
+    if (@get_magic_quotes_gpc()) {
       $gpcr = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-      array_walk_recursive($gpcr, function (&$value, $key) {
+      array_walk_recursive($gpcr, function(&$value, $key) {
         $value = stripslashes($value);
       });
     }
-    if(function_exists('set_magic_quotes_runtime')) {
+    if (function_exists('set_magic_quotes_runtime')) {
       @set_magic_quotes_runtime(0);
       @ini_set('magic_quotes_runtime', 0);
       @ini_set('magic_quotes_sybase', 0);
@@ -1317,7 +1315,7 @@ 
   }
 
   public static function init_debug_state() {
-    if($_SERVER['SERVER_NAME'] == 'localhost' && !defined('BE_DEBUG')) {
+    if ($_SERVER['SERVER_NAME'] == 'localhost' && !defined('BE_DEBUG')) {
       define('BE_DEBUG', true);
     }
 // define('DEBUG_SQL_ONLINE', true); // Полный дамп запросов в рил-тайме. Подойдет любое значение
@@ -1329,7 +1327,7 @@ 
     defined('DEBUG_SQL_ERROR') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
     defined('DEBUG_SQL_COMMENT_LONG') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
 
-    if(defined('BE_DEBUG') || static::$config->debug) {
+    if (defined('BE_DEBUG') || static::$config->debug) {
       @define('BE_DEBUG', true);
       @ini_set('display_errors', 1);
       @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);

includes/update.php

Spacing +76 added lines, -76 removed lines

@@ -21,7 +21,7 @@ 
    [!] DB code updates
 */
 
-if(!defined('INIT')) {
+if (!defined('INIT')) {
 //  include_once('init.php');
   die('Unauthorized access');
 }
@@ -39,8 +39,8 @@ 
 classSupernova::$config->debug = 0;
 
 
-if(classSupernova::$config->db_version == DB_VERSION) {
-} elseif(classSupernova::$config->db_version > DB_VERSION) {
+if (classSupernova::$config->db_version == DB_VERSION) {
+} elseif (classSupernova::$config->db_version > DB_VERSION) {
   classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW);
   die(
   'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -49,7 +49,7 @@ 
   );
 }
 
-if(classSupernova::$config->db_version < 26) {
+if (classSupernova::$config->db_version < 26) {
   $sys_log_disabled = true;
 }
 
@@ -68,20 +68,20 @@ 
 $update_tables = array();
 $update_indexes = array();
 $query = upd_do_query('SHOW TABLES;', true);
-while($row = db_fetch_row($query)) {
+while ($row = db_fetch_row($query)) {
   upd_load_table_info($row[0]);
 }
 upd_log_message('Table info loaded. Now looking DB for upgrades...');
 
 upd_do_query('SET FOREIGN_KEY_CHECKS=0;', true);
 
-if($new_version < 37) {
+if ($new_version < 37) {
   require_once('update_old.php');
 }
 
 ini_set('memory_limit', '1024M');
 
-switch($new_version) {
+switch ($new_version) {
   case 37:
     upd_log_version_update();
 
@@ -96,7 +96,7 @@ 
 
     upd_check_key('payment_currency_exchange_mm_', 2500, !classSupernova::$config->payment_currency_exchange_mm_);
 
-    if(!$update_tables['log_metamatter']) {
+    if (!$update_tables['log_metamatter']) {
       upd_create_table('log_metamatter',
         "(
           `id` SERIAL,
@@ -121,7 +121,7 @@ 
       "ADD `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
     ), !$update_tables['payment']['payment_test']);
 
-    if($update_tables['payment']['payment_test']['Default'] == 1) {
+    if ($update_tables['payment']['payment_test']['Default'] == 1) {
       upd_alter_table('payment', array(
         "MODIFY COLUMN `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
       ));
@@ -138,7 +138,7 @@ 
     ), $update_tables['users']['metamatter']['Type'] == 'int(20)');
 
     $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = " . QUE_RESEARCH . " AND que_unit_id IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ") FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $planet_id = ($row['que_planet_id_origin'] ? $row['que_planet_id_origin'] : $row['que_planet_id']);
       upd_do_query("SELECT id FROM {{planets}} WHERE id = {$planet_id} FOR UPDATE");
       $price = sys_unit_str2arr($row['que_unit_price']);
@@ -156,8 +156,8 @@ 
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
     WHERE unit_snid IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
     FOR UPDATE");
-    while($row = db_fetch($query)) {
-      if(!$row['id_planet']) {
+    while ($row = db_fetch($query)) {
+      if (!$row['id_planet']) {
         continue;
       }
 
@@ -165,7 +165,7 @@ 
       $unit_level = $row['unit_level'];
       $price = get_unit_param($unit_id, P_COST);
       $factor = $price['factor'];
-      foreach($price as $resource_id => &$resource_amount) {
+      foreach ($price as $resource_id => &$resource_amount) {
         $resource_amount = $resource_amount * (pow($factor, $unit_level) - 1) / ($factor - 1);
       }
       // upd_do_query
@@ -184,14 +184,14 @@ 
     // Вернуть ресы за уже исследованную Экспедиционную технологию
     upd_check_key('player_max_colonies', -1, classSupernova::$config->player_max_colonies >= 0);
 
-    if(!isset($update_tables['users']['player_rpg_explore_xp'])) {
+    if (!isset($update_tables['users']['player_rpg_explore_xp'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `player_rpg_explore_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
         "ADD COLUMN `player_rpg_explore_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
       ), !isset($update_tables['users']['player_rpg_explore_xp']));
     }
 
-    if(!$update_tables['log_users_online']) {
+    if (!$update_tables['log_users_online']) {
       upd_create_table('log_users_online', "(
         `online_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Measure time',
         `online_count` SMALLINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Users online',
@@ -206,11 +206,11 @@ 
       "ADD `user_time_measured` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'When was time diff measured last time' AFTER `onlinetime`",
     ), !$update_tables['users']['user_time_measured']);
 
-    if($update_tables['rw']) {
+    if ($update_tables['rw']) {
       upd_do_query("DROP TABLE IF EXISTS {{rw}};");
     }
 
-    if(!$update_tables['player_award']) {
+    if (!$update_tables['player_award']) {
       upd_create_table('player_award', "(
         `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
         `award_type_id` int(11) DEFAULT NULL COMMENT 'Award type i.e. order, medal, pennant, rank etc',
@@ -252,14 +252,14 @@ 
     upd_log_version_update();
 
 
-    if(!isset($update_tables['planets']['que_processed'])) {
+    if (!isset($update_tables['planets']['que_processed'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `last_update`",
       ), true);
       upd_do_query("UPDATE {{planets}} SET que_processed = last_update;");
     }
 
-    if(!isset($update_tables['users']['que_processed'])) {
+    if (!isset($update_tables['users']['que_processed'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `onlinetime`",
       ), true);
@@ -267,7 +267,7 @@ 
     }
 
 
-    if(isset($update_tables['planets']['que'])) {
+    if (isset($update_tables['planets']['que'])) {
       $sn_data_aux = array(
         SHIP_SMALL_FIGHTER_WRATH    => array(
           'name' => 'ship_fighter_wrath',
@@ -352,20 +352,20 @@ 
       $unit_data = array();
       $planets = array();
 
-      foreach($planet_unit_list as $unit_id) {
-        if(!($unit_name = get_unit_param($unit_id, P_NAME))) {
+      foreach ($planet_unit_list as $unit_id) {
+        if (!($unit_name = get_unit_param($unit_id, P_NAME))) {
           $unit_name = $sn_data_aux[$unit_id][P_NAME];
         }
-        if(isset($update_tables['planets'][$unit_name])) {
+        if (isset($update_tables['planets'][$unit_name])) {
           $drop[] = "DROP COLUMN `{$unit_name}`";
 
-          if(isset($aux_group[$unit_id])) {
+          if (isset($aux_group[$unit_id])) {
             $units_info[$unit_id] = $sn_data_aux[$unit_id];
             $units_info[$unit_id]['que'] = QUE_HANGAR;
           } else {
             $units_info[$unit_id] = get_unit_param($unit_id);
-            foreach($ques_info as $que_id => $que_data1) {
-              if(in_array($unit_id, $que_data1['unit_list'])) {
+            foreach ($ques_info as $que_id => $que_data1) {
+              if (in_array($unit_id, $que_data1['unit_list'])) {
                 $units_info[$unit_id]['que'] = $que_id;
                 break;
               }
@@ -375,7 +375,7 @@ 
       }
 
       $query = upd_do_query("SELECT * FROM {{planets}} FOR UPDATE");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $user_id = $row['id_owner'];
         $planet_id = $row['id'];
 
@@ -383,14 +383,14 @@ 
 
         // Конвертируем юниты
         $units_levels = array();
-        foreach($planet_unit_list as $unit_id) {
+        foreach ($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
+          if (!isset($row[$unit_name]) || !$row[$unit_name]) {
             continue;
           }
           $units_levels[$unit_id] = $row[$unit_name];
           $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
-          if(count($unit_data) > 30) {
+          if (count($unit_data) > 30) {
             $unit_data_max = strlen(implode(',', $unit_data)) > $unit_data_max ? strlen(implode(',', $unit_data)) : $unit_data_max;
             upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
             $unit_data = array();
@@ -398,10 +398,10 @@ 
         }
 
         // Конвертируем очередь построек
-        if($row['que']) {
+        if ($row['que']) {
           $que = explode(';', $row['que']);
-          foreach($que as $que_item) {
-            if(!$que_item) {
+          foreach ($que as $que_item) {
+            if (!$que_item) {
               continue;
             }
 
@@ -416,8 +416,8 @@ 
             $unit_factor = $unit_cost[P_FACTOR] ? $unit_cost[P_FACTOR] : 1;
             $price_increase = pow($unit_factor, $unit_level);
             // $unit_time = 0;
-            foreach($unit_cost as $resource_id => &$resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($unit_cost as $resource_id => &$resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 unset($unit_cost[$resource_id]);
                 continue;
               }
@@ -431,38 +431,38 @@ 
         }
 
         // Конвертируем очередь верфи
-        if($row['b_hangar_id']) {
+        if ($row['b_hangar_id']) {
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0,);
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
-          foreach($hangar_units as $unit_id => $unit_count) {
-            if($unit_count <= 0) {
+          foreach ($hangar_units as $unit_id => $unit_count) {
+            if ($unit_count <= 0) {
               continue;
             }
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 continue;
               }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
-          if(array_sum($return_resources) > 0) {
+          if (array_sum($return_resources) > 0) {
             upd_do_query("UPDATE {{planets}} SET `metal` = `metal` + {$return_resources[RES_METAL]}, `crystal` = `crystal` + {$return_resources[RES_CRYSTAL]}, `deuterium` = `deuterium` + {$return_resources[RES_DEUTERIUM]} WHERE `id` = {$planet_id} LIMIT 1");
           }
         }
 
 
-        if(count($que_data) > 10) {
+        if (count($que_data) > 10) {
           $que_data_max = strlen(implode(',', $que_data)) > $que_data_max ? strlen(implode(',', $que_data)) : $que_data_max;
           upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
           $que_data = array();
         }
       }
 
-      if(!empty($unit_data)) {
+      if (!empty($unit_data)) {
         upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
       }
 
-      if(!empty($que_data)) {
+      if (!empty($que_data)) {
         upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_id`, `que_planet_id_origin`, `que_type`, `que_time_left`, `que_unit_id`, `que_unit_amount`, `que_unit_mode`, `que_unit_level`, `que_unit_time`, `que_unit_price`) VALUES ' . implode(',', $que_data) . ';');
       }
 
@@ -473,7 +473,7 @@ 
       JOIN `{{users}}` AS u ON a.`id` = u.`user_as_ally` AND `user_as_ally` IS NOT NULL AND `username` = ''
       SET u.`username` = CONCAT('[', a.`ally_tag`, ']');");
 
-    if($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
+    if ($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
       upd_do_query("SET FOREIGN_KEY_CHECKS=0;");
       upd_alter_table('statpoints', "DROP FOREIGN KEY `FK_stats_id_ally`", $update_foreigns['statpoints']['FK_stats_id_ally']);
       upd_alter_table('statpoints', "DROP KEY `I_stats_id_ally`", $update_indexes['statpoints']['I_stats_id_ally']);
@@ -569,7 +569,7 @@ 
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{{security_browser}}` (`browser_id`) ON DELETE SET NULL ON UPDATE CASCADE",
     ), !isset($update_tables['users']['user_last_proxy']));
 
-    if(!isset($update_tables['notes']['planet_type'])) {
+    if (!isset($update_tables['notes']['planet_type'])) {
       upd_alter_table('notes', array(
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
         "ADD COLUMN `system` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `galaxy`",
@@ -587,7 +587,7 @@ 
     upd_alter_table('users', "ADD COLUMN `user_bot` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['users']['user_bot']));
     upd_alter_table('unit', "ADD KEY `I_unit_type_snid` (unit_type, unit_snid) USING BTREE", !$update_indexes['unit']['I_unit_type_snid']);
 
-    if($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
+    if ($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
       upd_alter_table('users', array(
         "MODIFY COLUMN `settings_tooltiptime` smallint(5) unsigned NOT NULL DEFAULT '500'",
       ), $update_tables['users']['settings_tooltiptime']['Type'] != 'smallint');
@@ -595,7 +595,7 @@ 
       upd_do_query("UPDATE `{{users}}` SET settings_tooltiptime = 500;");
     }
 
-    if(!isset($update_tables['log_users_online']['online_aggregated'])) {
+    if (!isset($update_tables['log_users_online']['online_aggregated'])) {
       upd_alter_table('log_users_online', "ADD COLUMN `online_aggregated` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['log_users_online']['online_aggregated']));
       upd_alter_table('log_users_online', array(
         "DROP PRIMARY KEY",
@@ -603,13 +603,13 @@ 
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
     }
 
-    if(!isset($update_tables['users']['gender'])) {
+    if (!isset($update_tables['users']['gender'])) {
       upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT " . GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
       upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', " . GENDER_FEMALE . ", IF(UPPER(`sex`) = 'M', " . GENDER_MALE . ", " . GENDER_UNKNOWN . "));");
     }
     upd_alter_table('users', "DROP COLUMN `sex`", isset($update_tables['users']['sex']));
 
-    if(!$update_tables['users']['dark_matter_total']) {
+    if (!$update_tables['users']['dark_matter_total']) {
       upd_alter_table('users', "ADD `dark_matter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Dark Matter amount ever gained' AFTER `dark_matter`", !$update_tables['users']['dark_matter_total']);
       upd_do_query(
         "UPDATE `{{users}}` AS u
@@ -622,7 +622,7 @@ 
     }
 
     upd_check_key('player_metamatter_immortal', 100000, !isset(classSupernova::$config->player_metamatter_immortal));
-    if(!$update_tables['users']['metamatter_total']) {
+    if (!$update_tables['users']['metamatter_total']) {
       upd_alter_table('users', "ADD `metamatter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Metamatter amount ever bought'", !$update_tables['users']['metamatter_total']);
 
       upd_do_query(
@@ -634,11 +634,11 @@ 
             (SELECT IF(sum(amount) IS NULL, 0, sum(amount)) FROM {{log_metamatter}} AS mm WHERE mm.user_id = u.id AND mm.amount > 0)
           );");
     }
-    if(!isset($update_tables['users']['immortal'])) {
+    if (!isset($update_tables['users']['immortal'])) {
       upd_alter_table('users', "ADD COLUMN `immortal` TIMESTAMP NULL", !isset($update_tables['users']['immortal']));
       upd_do_query("UPDATE {{users}} SET `immortal` = NOW() WHERE `metamatter_total` > 0;");
     }
-    if(isset($update_tables['player_award'])) {
+    if (isset($update_tables['player_award'])) {
       upd_do_query(
         "UPDATE {{users}} AS u JOIN {{player_award}} AS pa ON u.id = pa.player_id
           SET metamatter_total = 1, immortal = NOW()
@@ -665,7 +665,7 @@ 
       CONSTRAINT `FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `{{users}}` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
 
-    if(empty($update_tables['blitz_statpoints'])) {
+    if (empty($update_tables['blitz_statpoints'])) {
       upd_create_table('blitz_statpoints', " (
         `stat_date` int(11) NOT NULL DEFAULT '0',
         `id_owner` bigint(20) unsigned DEFAULT NULL,
@@ -733,7 +733,7 @@ 
       CONSTRAINT `FK_survey_votes_survey_parent_id` FOREIGN KEY (`survey_parent_id`) REFERENCES `{{survey}}` (`survey_id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
 
-    if(empty($update_tables['security_url'])) {
+    if (empty($update_tables['security_url'])) {
       upd_create_table('security_url', " (
         `url_id` int unsigned NOT NULL AUTO_INCREMENT,
         `url_string` VARCHAR(250) NOT NULL DEFAULT '',
@@ -746,9 +746,9 @@ 
 
         $strings = array();
         $query = doquery($query);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $strings[] = '("' . db_escape($row['url']) . '")';
-          if(count($strings) > 100) {
+          if (count($strings) > 100) {
             doquery($query_string . implode(',', $strings));
             $strings = array();
           }
@@ -756,7 +756,7 @@ 
         !empty($strings) ? doquery($query_string . implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if (isset($update_tables['counter']['page'])) // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
@@ -781,7 +781,7 @@ 
       "ADD CONSTRAINT `FK_counter_page_url_id` FOREIGN KEY (`page_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
       "ADD CONSTRAINT `FK_counter_plain_url_id` FOREIGN KEY (`plain_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
     ), !isset($update_tables['counter']['device_id']));
-    if(isset($update_tables['counter']['ip'])) {
+    if (isset($update_tables['counter']['ip'])) {
       // upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `user_proxy` = `proxy`, `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` AS c JOIN {{security_url}} AS u ON u.url_string = c.page SET c.page_url_id = u.url_id');
@@ -832,7 +832,7 @@ 
 
     upd_check_key('stats_history_days', 14, !classSupernova::$config->stats_history_days);
 
-    if(classSupernova::$config->payment_currency_default != 'USD') {
+    if (classSupernova::$config->payment_currency_default != 'USD') {
       upd_check_key('payment_currency_default', 'USD', true);
       upd_check_key('payment_currency_exchange_dm_', 20000, true);
       upd_check_key('payment_currency_exchange_mm_', 20000, true);
@@ -915,7 +915,7 @@ 
     function propagade_player_options($old_option_name, $new_option_id) {
       global $update_tables;
 
-      if(!empty($update_tables['users'][$old_option_name])) {
+      if (!empty($update_tables['users'][$old_option_name])) {
         upd_do_query(
           "REPLACE INTO {{player_options}} (`player_id`, `option_id`, `value`)
           SELECT `id`, {$new_option_id}, `{$old_option_name}`
@@ -949,7 +949,7 @@ 
 
 
     // 2015-08-03 15:05:26 40a6.0
-    if(empty($update_tables['planets']['position_original'])) {
+    if (empty($update_tables['planets']['position_original'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `position_original` smallint NOT NULL DEFAULT 0",
         "ADD COLUMN `field_max_original` smallint NOT NULL DEFAULT 0",
@@ -977,12 +977,12 @@ 
 
     // 2015-08-27 19:14:05 40a10.0
     // Старая версия таблицы
-    if(!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
+    if (!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
       upd_drop_table('account');
       upd_drop_table('account_translate');
     }
 
-    if(empty($update_tables['account'])) {
+    if (empty($update_tables['account'])) {
       upd_create_table('account', " (
           `account_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
@@ -1044,7 +1044,7 @@ 
 
 
     // 2015-09-24 11:39:37 40a10.25
-    if(empty($update_tables['log_metamatter']['provider_id'])) {
+    if (empty($update_tables['log_metamatter']['provider_id'])) {
       upd_alter_table('log_metamatter', array(
         "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider'",
         "ADD COLUMN `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
@@ -1096,7 +1096,7 @@ 
     upd_check_key('event_halloween_2015_code', '', !isset(classSupernova::$config->event_halloween_2015_code));
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset(classSupernova::$config->event_halloween_2015_timestamp));
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset(classSupernova::$config->event_halloween_2015_units_used));
-    if(empty($update_tables['log_halloween_2015'])) {
+    if (empty($update_tables['log_halloween_2015'])) {
       upd_create_table('log_halloween_2015', " (
       `log_hw2015_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
       `player_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
@@ -1111,7 +1111,7 @@ 
 
 
     // 2015-11-28 06:30:27 40a19.21
-    if(!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
+    if (!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
       upd_alter_table('ube_report', array(
         "ADD COLUMN `ube_report_debris_total_in_metal` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Total debris in metal'",
         "ADD KEY `I_ube_report_time_debris_id` (`ube_report_time_process` DESC, `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC)", // For Best Battles module
@@ -1126,7 +1126,7 @@ 
 
 
     // 2015-12-06 15:10:58 40b1.0
-    if(!empty($update_indexes['planets']['I_metal_mine'])) {
+    if (!empty($update_indexes['planets']['I_metal_mine'])) {
       upd_alter_table('planets', "DROP KEY `I_metal`", $update_indexes['planets']['I_metal']);
       upd_alter_table('planets', "DROP KEY `I_ship_sattelite_sloth`", $update_indexes['planets']['I_ship_sattelite_sloth']);
       upd_alter_table('planets', "DROP KEY `I_ship_bomber_envy`", $update_indexes['planets']['I_ship_bomber_envy']);
@@ -1189,7 +1189,7 @@ 
   case 40:
     upd_log_version_update();
 
-    if(empty($update_tables['festival'])) {
+    if (empty($update_tables['festival'])) {
       upd_create_table('festival', " (
           `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
           `start` datetime NOT NULL COMMENT 'Festival start datetime',
@@ -1230,7 +1230,7 @@ 
       );
     }
 
-    if(empty($update_tables['festival_unit'])) {
+    if (empty($update_tables['festival_unit'])) {
       upd_create_table('festival_unit', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1247,7 +1247,7 @@ 
     }
 
     // 2015-12-21 06:06:09 41a0.12
-    if(empty($update_tables['festival_unit_log'])) {
+    if (empty($update_tables['festival_unit_log'])) {
       upd_create_table('festival_unit_log', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1277,16 +1277,16 @@ 
       $update_tables['security_browser']['browser_user_agent']['Collation'] == 'latin1_bin'
     );
 
-    if($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
+    if ($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
       upd_alter_table('security_browser', "DROP KEY `I_browser_user_agent`", true);
       upd_alter_table('security_browser', "ADD KEY `I_browser_user_agent` (`browser_user_agent`) USING HASH", true);
     }
 
-    if(!empty($update_tables['fleets']['fleet_array'])) {
+    if (!empty($update_tables['fleets']['fleet_array'])) {
       $query = upd_do_query("SELECT * FROM {{fleets}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $unit_list = sys_unit_str2arr($row['fleet_array']);
-        foreach($unit_list as $unit_id => $unit_count) {
+        foreach ($unit_list as $unit_id => $unit_count) {
           upd_do_query(
             "REPLACE INTO {{unit}} (`unit_player_id`,`unit_location_type`,`unit_location_id`,`unit_type`,`unit_snid`,`unit_level`) VALUES
               ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
@@ -1322,7 +1322,7 @@ 
 
 classSupernova::$cache->unset_by_prefix('lng_');
 
-if($new_version) {
+if ($new_version) {
   classSupernova::$config->db_saveItem('db_version', $new_version);
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
 } else {

includes/update_old.php

Spacing +109 added lines, -109 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('IN_UPDATE') || IN_UPDATE !== true) {
+if (!defined('IN_UPDATE') || IN_UPDATE !== true) {
   die('Hack attempt');
 }
 
-switch($new_version) {
+switch ($new_version) {
   case 0:
   case 1:
   case 2:
@@ -32,7 +32,7 @@ 
     );
     upd_drop_table('lunas');
 
-    if($update_tables['galaxy']) {
+    if ($update_tables['galaxy']) {
       upd_do_query(
         'UPDATE `{{planets}}`
           LEFT JOIN `{{galaxy}}` ON {{galaxy}}.id_planet = {{planets}}.id
@@ -82,7 +82,7 @@ 
     );
     upd_add_more_time();
 
-    if($update_tables['users']['rpg_points']) {
+    if ($update_tables['users']['rpg_points']) {
       upd_do_query(
         "UPDATE {{users}} AS u
           RIGHT JOIN {{referrals}} AS r
@@ -175,18 +175,18 @@ 
     upd_alter_table('planets', "ADD `governor_level` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Governor level'", !$update_tables['planets']['governor_level']);
     upd_alter_table('planets', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'Planet que'", !$update_tables['planets']['que']);
 
-    if($update_tables['planets']['b_building']) {
+    if ($update_tables['planets']['b_building']) {
       $planet_query = upd_do_query('SELECT * FROM {{planets}} WHERE `b_building` <> 0;');
       $const_que_structures = QUE_STRUCTURES;
-      while($planet_data = db_fetch($planet_query)) {
+      while ($planet_data = db_fetch($planet_query)) {
         $old_que = explode(';', $planet_data['b_building_id']);
-        foreach($old_que as $old_que_item_string) {
-          if(!$old_que_item_string) {
+        foreach ($old_que as $old_que_item_string) {
+          if (!$old_que_item_string) {
             continue;
           }
 
           $old_que_item = explode(',', $old_que_item_string);
-          if($old_que_item[4] == 'build') {
+          if ($old_que_item[4] == 'build') {
             $old_que_item[4] = BUILD_CREATE;
           } else {
             $old_que_item[4] = BUILD_DESTROY;
@@ -219,7 +219,7 @@ 
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
     );
 
-    if($update_tables['users']['urlaubs_until']) {
+    if ($update_tables['users']['urlaubs_until']) {
       upd_alter_table('users', "ADD `vacation` int(11) NOT NULL DEFAULT '0' COMMENT 'Time when user can leave vacation mode'", !$update_tables['users']['vacation']);
       upd_do_query('UPDATE {{users}} SET `vacation` = `urlaubs_until` WHERE `urlaubs_modus` <> 0;');
       upd_alter_table('users', 'DROP COLUMN `urlaubs_until`, DROP COLUMN `urlaubs_modus`, DROP COLUMN `urlaubs_modus_time`', $update_tables['users']['urlaubs_until']);
@@ -269,9 +269,9 @@ 
     ), !$update_tables['logs']['log_timestamp']);
     upd_do_query('DELETE FROM `{{logs}}` WHERE `log_code` = 303;');
 
-    if($update_tables['errors']) {
+    if ($update_tables['errors']) {
       upd_do_query('INSERT INTO `{{logs}}` (`log_code`, `log_sender`, `log_title`, `log_text`, `log_page`, `log_time`) SELECT 500, `error_sender`, `error_type`, `error_text`, `error_page`, `error_time` FROM `{{errors}}`;');
-      if($update_tables['errors_backup']) {
+      if ($update_tables['errors_backup']) {
         upd_drop_table('errors_backup');
       }
       upd_alter_table('errors', ' RENAME TO ' . classSupernova::$config->db_prefix . 'errors_backup');
@@ -332,7 +332,7 @@ 
 
     upd_alter_table('users', 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci');
 
-    if(!$update_tables['shortcut']) {
+    if (!$update_tables['shortcut']) {
       upd_create_table('shortcut',
         "(
           `shortcut_id` SERIAL,
@@ -356,10 +356,10 @@ 
       $temp_planet_types = array(PT_PLANET, PT_DEBRIS, PT_MOON);
 
       $query = upd_do_query("SELECT id, fleet_shortcut FROM {{users}} WHERE fleet_shortcut > '';");
-      while($user_data = db_fetch($query)) {
+      while ($user_data = db_fetch($query)) {
         $shortcuts = explode("\r\n", $user_data['fleet_shortcut']);
-        foreach($shortcuts as $shortcut) {
-          if(!$shortcut) {
+        foreach ($shortcuts as $shortcut) {
+          if (!$shortcut) {
             continue;
           }
 
@@ -370,7 +370,7 @@ 
           $shortcut[3] = intval($shortcut[3]);
           $shortcut[4] = intval($shortcut[4]);
 
-          if($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types)) {
+          if ($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types)) {
             upd_do_query("INSERT INTO {classSupernova::$config->db_prefix}shortcut (shortcut_user_id, shortcut_galaxy, shortcut_system, shortcut_planet, shortcut_planet_type, shortcut_text) VALUES ({$user_data['id']}, {$shortcut[1]}, {$shortcut[2]}, {$shortcut[3]}, {$shortcut[4]}, '{$shortcut[0]}');", true);
           }
         }
@@ -522,7 +522,7 @@ 
 
     upd_check_key('quest_total', 0, !isset(classSupernova::$config->quest_total));
 
-    for($i = 0; $i < 25; $i++) {
+    for ($i = 0; $i < 25; $i++) {
       upd_alter_table('alliance', array("DROP INDEX `id_{$i}`",), $update_indexes['alliance']["id_{$i}"]);
       upd_alter_table('users', array("DROP INDEX `id_{$i}`",), $update_indexes['users']["id_{$i}"]);
       upd_alter_table('planets', array("DROP INDEX `id_{$i}`",), $update_indexes['planets']["id_{$i}"]);
@@ -550,7 +550,7 @@ 
       "ADD `msg_admin` bigint(11) unsigned DEFAULT '0' AFTER mnl_buildlist"
     ), !$update_tables['users']['msg_admin']);
 
-    if(!$update_foreigns['users']['FK_users_ally_id']) {
+    if (!$update_foreigns['users']['FK_users_ally_id']) {
       upd_alter_table('users', array(
         'MODIFY COLUMN `ally_name` VARCHAR(32) DEFAULT NULL',
         'MODIFY COLUMN `ally_id` BIGINT(20) UNSIGNED DEFAULT NULL',
@@ -572,7 +572,7 @@ 
     ), strtoupper($update_tables['planets']['debris_metal']['Type']) != 'BIGINT(20) UNSIGNED');
 
     $illegal_moon_query = upd_do_query("SELECT id FROM `{{planets}}` WHERE `id_owner` <> 0 AND `planet_type` = 3 AND `parent_planet` <> 0 AND `parent_planet` NOT IN (SELECT `id` FROM {{planets}} WHERE `planet_type` = 1);");
-    while($illegal_moon_row = db_fetch($illegal_moon_query)) {
+    while ($illegal_moon_row = db_fetch($illegal_moon_query)) {
       upd_do_query("DELETE FROM {{planets}} WHERE id = {$illegal_moon_row['id']} LIMIT 1;", true);
     }
 
@@ -609,16 +609,16 @@ 
     upd_do_query('COMMIT;', true);
 
     $records = 1;
-    while($records) {
+    while ($records) {
       upd_do_query('START TRANSACTION;', true);
       $query = upd_do_query("SELECT * FROM {{LOGS}} WHERE log_code = 102 ORDER BY log_id LIMIT 1000;");
       $records = db_num_rows($query);
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $result = preg_match('/^Player ID (\d+) Dark Matter was adjusted with (\-?\d+). Reason: (.+)$/', $row['log_text'], $matches);
 
         $reason = RPG_NONE;
         $comment = $matches[3];
-        switch($matches[3]) {
+        switch ($matches[3]) {
           case 'Level Up For Structure Building':
             $reason = RPG_STRUCTURE;
           break;
@@ -634,22 +634,22 @@ 
           break;
 
           default:
-            if(preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2)) {
+            if (preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2)) {
               $reason = RPG_MARKET;
-            } elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2)) {
               $reason = RPG_MERCENARY;
               $comment = "Spent for mercenary {$matches2[1]} GUID {$matches2[2]}";
-            } elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2)) {
               $reason = RPG_REFERRAL;
               $comment = "Incoming from referral ID {$matches[1]}";
-            } elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2)) {
               $reason = RPG_ADMIN;
               $comment = $matches2[1];
             }
           break;
         }
 
-        if($matches[2]) {
+        if ($matches[2]) {
           $row['log_username'] = db_escape($row['log_username']);
           $row['log_page'] = db_escape($row['log_page']);
           $comment = db_escape($comment);
@@ -668,12 +668,12 @@ 
       upd_do_query('COMMIT;', true);
     }
 
-    foreach($update_tables as $table_name => $cork) {
+    foreach ($update_tables as $table_name => $cork) {
       $row = db_fetch(upd_do_query("SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '" . classSupernova::$config->db_prefix . "{$table_name}';", true));
-      if($row['ENGINE'] != 'InnoDB') {
+      if ($row['ENGINE'] != 'InnoDB') {
         upd_alter_table($table_name, 'ENGINE=InnoDB', true);
       }
-      if($row['TABLE_COLLATION'] != 'utf8_general_ci') {
+      if ($row['TABLE_COLLATION'] != 'utf8_general_ci') {
         upd_alter_table($table_name, 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci', true);
       }
     }
@@ -693,7 +693,7 @@ 
       "CHANGE COLUMN `governor_level` `PLANET_GOVERNOR_LEVEL` SMALLINT(5) NOT NULL DEFAULT 0",
     ), !$update_tables['planets']['PLANET_GOVERNOR_ID']);
 
-    if($update_tables['users']['rpg_geologue']) {
+    if ($update_tables['users']['rpg_geologue']) {
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_geologue` + `rpg_ingenieur` + `rpg_constructeur` + `rpg_technocrate` + `rpg_scientifique` + `rpg_defenseur`) * 3;");
 
       upd_alter_table('users', array(
@@ -706,7 +706,7 @@ 
       ), $update_tables['users']['rpg_geologue']);
     }
 
-    if($update_tables['users']['rpg_bunker']) {
+    if ($update_tables['users']['rpg_bunker']) {
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_bunker`) * 3;");
 
       upd_alter_table('users', array(
@@ -756,7 +756,7 @@ 
     ), !isset($update_tables['alliance']['total_rank']));
     doquery("UPDATE {{alliance}} AS a JOIN {{statpoints}} AS sp ON sp.id_owner = 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;");
 
-    if(!isset($update_tables['users']['ally_tag'])) {
+    if (!isset($update_tables['users']['ally_tag'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
       ), !isset($update_tables['users']['ally_tag']));
@@ -771,7 +771,7 @@ 
       "ADD COLUMN `player_artifact_list` TEXT",
     ), !isset($update_tables['users']['player_artifact_list']));
 
-    if(!isset($update_tables['users']['player_rpg_tech_xp'])) {
+    if (!isset($update_tables['users']['player_rpg_tech_xp'])) {
       upd_check_key('eco_scale_storage', 1, !isset(classSupernova::$config->eco_scale_storage));
 
       upd_alter_table('users', array(
@@ -801,7 +801,7 @@ 
       "MODIFY COLUMN `ally_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
     ), strtoupper($update_tables['alliance']['ally_owner']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    if(strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('alliance_diplomacy', array(
         "DROP FOREIGN KEY `FK_diplomacy_ally_id`",
         "DROP FOREIGN KEY `FK_diplomacy_contr_ally_id`"
@@ -816,7 +816,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('alliance_negotiation', array(
         "DROP FOREIGN KEY `FK_negotiation_ally_id`",
         "DROP FOREIGN KEY `FK_negotiation_contr_ally_id`"
@@ -832,7 +832,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{alliance_requests}} WHERE id_user NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
 
       upd_alter_table('alliance_requests', array(
@@ -846,7 +846,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{annonce}} WHERE USER NOT IN (SELECT username FROM {{users}});', true);
 
       upd_alter_table('annonce', array(
@@ -859,7 +859,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('bashing', array(
         "DROP FOREIGN KEY `FK_bashing_user_id`",
         "DROP FOREIGN KEY `FK_bashing_planet_id`",
@@ -874,7 +874,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{buddy}} WHERE sender NOT IN (SELECT id FROM {{users}}) OR OWNER NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('buddy', array(
@@ -912,7 +912,7 @@ 
       "MODIFY COLUMN `fleet_resource_deuterium` DECIMAL(65,0) DEFAULT '0'",
     ), strtoupper($update_tables['fleets']['fleet_resource_metal']['Type']) != 'DECIMAL(65,0)');
 
-    if(strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{iraks}} WHERE OWNER NOT IN (SELECT id FROM {{users}}) OR zielid NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('iraks', array(
@@ -936,7 +936,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{notes}} WHERE OWNER NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('notes', array(
@@ -1061,7 +1061,7 @@ 
       "DROP COLUMN `b_hangar_plus`",
     ), isset($update_tables['planets']['b_hangar_plus']));
 
-    if(strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{referrals}} WHERE id NOT IN (SELECT id FROM {{users}}) OR id_partner NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('referrals', array(
@@ -1080,7 +1080,7 @@ 
       "MODIFY COLUMN `id_owner2` BIGINT(20) UNSIGNED",
     ), strtoupper($update_tables['rw']['id_owner1']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    if(strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{shortcut}} WHERE shortcut_user_id NOT IN (SELECT id FROM {{users}}) OR shortcut_planet_id NOT IN (SELECT id FROM {{planets}});', true);
 
       upd_alter_table('shortcut', array(
@@ -1095,7 +1095,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{statpoints}} WHERE id_owner NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
 
       upd_alter_table('statpoints', array(
@@ -1249,7 +1249,7 @@ 
       "DROP COLUMN `settings_allylogo`",
     ), isset($update_tables['users']['settings_allylogo']));
 
-    if(!isset($update_tables['powerup'])) {
+    if (!isset($update_tables['powerup'])) {
       upd_do_query("DROP TABLE IF EXISTS {{mercenaries}};");
 
       upd_create_table('powerup',
@@ -1279,24 +1279,24 @@ 
 
       $update_query_template = "UPDATE {{users}} SET id = id %s WHERE id = %d LIMIT 1;";
       $user_list = upd_do_query("SELECT * FROM {{users}};");
-      while($user_row = db_fetch($user_list)) {
+      while ($user_row = db_fetch($user_list)) {
         $update_query_str = '';
-        foreach(sn_get_groups('mercenaries') as $mercenary_id) {
+        foreach (sn_get_groups('mercenaries') as $mercenary_id) {
           $mercenary_data_name = get_unit_param($mercenary_id, P_NAME);
-          if($mercenary_level = $user_row[$mercenary_data_name]) {
+          if ($mercenary_level = $user_row[$mercenary_data_name]) {
             $update_query_str = ", `{$mercenary_data_name}` = 0";
             upd_do_query("DELETE FROM {{powerup}} WHERE powerup_user_id = {$user_row['id']} AND powerup_unit_id = {$mercenary_id} LIMIT 1;");
             upd_do_query("INSERT {{powerup}} SET powerup_user_id = {$user_row['id']}, powerup_unit_id = {$mercenary_id}, powerup_unit_level = {$mercenary_level};");
           }
         }
 
-        if($update_query_str) {
+        if ($update_query_str) {
           upd_do_query(sprintf($update_query_template, $update_query_str, $user_row['id']));
         }
       }
     }
 
-    if(!isset($update_tables['universe'])) {
+    if (!isset($update_tables['universe'])) {
       upd_create_table('universe',
         "(
           `universe_galaxy` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
@@ -1319,7 +1319,7 @@ 
 
     // ------------------------------------------------------------------------
     // Modifying tables
-    if(strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('users', array(
         "ADD COLUMN user_as_ally BIGINT(20) UNSIGNED DEFAULT NULL",
 
@@ -1340,7 +1340,7 @@ 
     // ------------------------------------------------------------------------
     // Creating players for allies
     $ally_row_list = doquery("SELECT `id`, `ally_tag` FROM {{alliance}} WHERE ally_user_id IS NULL;");
-    while($ally_row = db_fetch($ally_row_list)) {
+    while ($ally_row = db_fetch($ally_row_list)) {
       $ally_user_name = db_escape("[{$ally_row['ally_tag']}]");
       doquery("INSERT INTO {{users}} SET `username` = '{$ally_user_name}', `register_time` = " . SN_TIME_NOW . ", `user_as_ally` = {$ally_row['id']};");
       $ally_user_id = db_insert_id();
@@ -1354,7 +1354,7 @@ 
     // ------------------------------------------------------------------------
     // Creating planets for allies
     $ally_user_list = doquery("SELECT `id`, `username` FROM {{users}} WHERE `user_as_ally` IS NOT NULL AND `id_planet` = 0;");
-    while($ally_user_row = db_fetch($ally_user_list)) {
+    while ($ally_user_row = db_fetch($ally_user_list)) {
       $ally_planet_name = db_escape($ally_user_row['username']);
       doquery("INSERT INTO {{planets}} SET `name` = '{$ally_planet_name}', `last_update` = " . SN_TIME_NOW . ", `id_owner` = {$ally_user_row['id']};");
       $ally_planet_id = db_insert_id();
@@ -1385,9 +1385,9 @@ 
     // Adding db field
     upd_alter_table('users', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'User que'", !$update_tables['users']['que']);
     // Converting old data to new one and dropping old fields
-    if($update_tables['users']['b_tech_planet']) {
+    if ($update_tables['users']['b_tech_planet']) {
       $query = doquery("SELECT * FROM {{planets}} WHERE `b_tech_id` <> 0;");
-      while($planet_row = db_fetch($query)) {
+      while ($planet_row = db_fetch($query)) {
         $que_item_string = "{$planet_row['b_tech_id']},1," . max(0, $planet_row['b_tech'] - SN_TIME_NOW) . "," . BUILD_CREATE . "," . QUE_RESEARCH;
         doquery("UPDATE {{users}} SET `que` = '{$que_item_string}' WHERE `id` = {$planet_row['id_owner']} LIMIT 1;");
       }
@@ -1400,7 +1400,7 @@ 
       upd_alter_table('users', "DROP COLUMN `b_tech_planet`", $update_tables['users']['b_tech_planet']);
     }
 
-    if(!$update_tables['powerup']['powerup_category']) {
+    if (!$update_tables['powerup']['powerup_category']) {
       upd_alter_table('powerup', "ADD COLUMN `powerup_category` SMALLINT NOT NULL DEFAULT 0 AFTER `powerup_planet_id`", !$update_tables['powerup']['powerup_category']);
 
       doquery("UPDATE {{powerup}} SET powerup_category = " . BONUS_MERCENARY);
@@ -1421,7 +1421,7 @@ 
     upd_check_key('ali_bonus_brackets', 10, !isset(classSupernova::$config->ali_bonus_brackets));
     upd_check_key('ali_bonus_brackets_divisor', 50, !isset(classSupernova::$config->ali_bonus_brackets_divisor));
 
-    if(!classSupernova::$config->db_loadItem('rpg_flt_explore')) {
+    if (!classSupernova::$config->db_loadItem('rpg_flt_explore')) {
       $inflation_rate = 1000;
 
       classSupernova::$config->db_saveItem('rpg_cost_banker', classSupernova::$config->rpg_cost_banker * $inflation_rate);
@@ -1438,17 +1438,17 @@ 
       doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` * {$inflation_rate};");
 
       $query = doquery("SELECT * FROM {{quest}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $query_add = '';
         $quest_reward_list = explode(';', $row['quest_rewards']);
-        foreach($quest_reward_list as &$quest_reward) {
+        foreach ($quest_reward_list as &$quest_reward) {
           list($reward_resource, $reward_amount) = explode(',', $quest_reward);
-          if($reward_resource == RES_DARK_MATTER) {
+          if ($reward_resource == RES_DARK_MATTER) {
             $quest_reward = "{$reward_resource}," . $reward_amount * 1000;
           }
         }
         $new_rewards = implode(';', $quest_reward_list);
-        if($new_rewards != $row['quest_rewards']) {
+        if ($new_rewards != $row['quest_rewards']) {
           doquery("UPDATE {{quest}} SET `quest_rewards` = '{$new_rewards}' WHERE quest_id = {$row['quest_id']} LIMIT 1;");
         }
       }
@@ -1478,7 +1478,7 @@ 
     upd_check_key('user_birthday_range', 30, !isset(classSupernova::$config->user_birthday_range));
     upd_check_key('user_birthday_celebrate', 0, !isset(classSupernova::$config->user_birthday_celebrate));
 
-    if(!isset($update_tables['payment'])) {
+    if (!isset($update_tables['payment'])) {
       upd_alter_table('users', array(
         "ADD KEY `I_user_id_name` (`id`, `username`)",
       ), !$update_indexes['users']['I_user_id_name']);
@@ -1529,7 +1529,7 @@ 
     ), !$update_tables['iraks']['fleet_start_type']);
 
 
-    if(!$update_tables['payment']['payment_status']) {
+    if (!$update_tables['payment']['payment_status']) {
       upd_alter_table('payment', array(
         "ADD COLUMN `payment_status` INT DEFAULT 0 COMMENT 'Payment status' AFTER `payment_id`",
 
@@ -1613,7 +1613,7 @@ 
       "ADD INDEX `I_owner_priority_time` (`owner`, `priority`, `time`)",
     ), !$update_indexes['notes']['I_owner_priority_time']);
 
-    if(!$update_tables['buddy']['BUDDY_ID']) {
+    if (!$update_tables['buddy']['BUDDY_ID']) {
       upd_alter_table('buddy', array(
         "CHANGE COLUMN `id` `BUDDY_ID` SERIAL COMMENT 'Buddy table row ID'",
         "CHANGE COLUMN `active` `BUDDY_STATUS` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Buddy request status'",
@@ -1634,16 +1634,16 @@ 
 
       $query = upd_do_query("SELECT `BUDDY_ID`, `BUDDY_SENDER_ID`, `BUDDY_OWNER_ID` FROM {{buddy}} ORDER BY `BUDDY_ID`;");
       $found = $lost = array();
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']) . ';' . max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
-        if(!isset($found[$index])) {
+        if (!isset($found[$index])) {
           $found[$index] = $row['BUDDY_ID'];
         } else {
           $lost[] = $row['BUDDY_ID'];
         }
       }
       $lost = implode(',', $lost);
-      if($lost) {
+      if ($lost) {
         upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
       }
 
@@ -1664,7 +1664,7 @@ 
 
     upd_do_query("UPDATE {{users}} SET `ally_name` = NULL, `ally_tag` = NULL, ally_register_time = 0, ally_rank_id = 0 WHERE `ally_id` IS NULL");
 
-    if(!$update_tables['ube_report']) {
+    if (!$update_tables['ube_report']) {
       upd_create_table('ube_report',
         "(
           `ube_report_id` SERIAL COMMENT 'Report ID',
@@ -1705,7 +1705,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_player']) {
+    if (!$update_tables['ube_report_player']) {
       upd_create_table('ube_report_player',
         "(
           `ube_report_player_id` SERIAL COMMENT 'Record ID',
@@ -1726,7 +1726,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_fleet']) {
+    if (!$update_tables['ube_report_fleet']) {
       upd_create_table('ube_report_fleet',
         "(
           `ube_report_fleet_id` SERIAL COMMENT 'Record DB ID',
@@ -1756,7 +1756,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_unit']) {
+    if (!$update_tables['ube_report_unit']) {
       // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
       // Может сохранять имена удаленных кораблей долго?
 
@@ -1793,7 +1793,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_fleet']) {
+    if (!$update_tables['ube_report_outcome_fleet']) {
       upd_create_table('ube_report_outcome_fleet',
         "(
           `ube_report_outcome_fleet_id` SERIAL COMMENT 'Record DB ID',
@@ -1822,7 +1822,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_unit']) {
+    if (!$update_tables['ube_report_outcome_unit']) {
       upd_create_table('ube_report_outcome_unit',
         "(
           `ube_report_outcome_unit_id` SERIAL COMMENT 'Record DB ID',
@@ -1843,7 +1843,7 @@ 
       );
     }
 
-    if(!$update_tables['unit']) {
+    if (!$update_tables['unit']) {
       upd_create_table('unit',
         "(
           `unit_id` SERIAL COMMENT 'Record ID',
@@ -1862,7 +1862,7 @@ 
       );
     }
 
-    if(!$update_tables['captain']) {
+    if (!$update_tables['captain']) {
       upd_create_table('captain',
         "(
           `captain_id` SERIAL COMMENT 'Record ID',
@@ -1882,7 +1882,7 @@ 
       );
     }
 
-    if(!$update_tables['fleets']['fleet_start_planet_id']) {
+    if (!$update_tables['fleets']['fleet_start_planet_id']) {
       upd_alter_table('fleets', array(
         "ADD `fleet_start_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Fleet start planet ID' AFTER `fleet_start_time`",
         "ADD `fleet_end_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Fleet end planet ID' AFTER `fleet_end_stay`",
@@ -1904,7 +1904,7 @@ 
 
     upd_alter_table('fleets', array("DROP COLUMN `processing_start`"), $update_tables['fleets']['processing_start']);
 
-    if(!$update_tables['chat_player']) {
+    if (!$update_tables['chat_player']) {
       upd_create_table('chat_player',
         "(
           `chat_player_id` SERIAL COMMENT 'Record ID',
@@ -1966,7 +1966,7 @@ 
       "DROP FOREIGN KEY `FK_payment_user`",
     ), $update_foreigns['payment']['FK_payment_user']);
 
-    if($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;') {
+    if ($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;') {
       upd_alter_table('chat', array(
         "DROP FOREIGN KEY `FK_chat_message_sender_user_id`",
         "DROP FOREIGN KEY `FK_chat_message_sender_recipient_id`",
@@ -1999,7 +1999,7 @@ 
       "ADD KEY `I_ube_report_time_combat` (`ube_report_time_combat`)",
     ), !$update_indexes['ube_report']['I_ube_report_time_combat']);
 
-    if(!$update_tables['unit']['unit_time_start']) {
+    if (!$update_tables['unit']['unit_time_start']) {
       upd_alter_table('unit', array(
         "ADD COLUMN `unit_time_start` DATETIME NULL DEFAULT NULL COMMENT 'Unit activation start time'",
         "ADD COLUMN `unit_time_finish` DATETIME NULL DEFAULT NULL COMMENT 'Unit activation end time'",
@@ -2015,7 +2015,7 @@ 
       );
     }
 
-    if(!$update_tables['que']) {
+    if (!$update_tables['que']) {
       upd_create_table('que',
         "(
           `que_id` SERIAL COMMENT 'Internal que id',
@@ -2047,25 +2047,25 @@ 
     }
 
     // Конвертирум очередь исследований
-    if($update_tables['users']['que']) {
+    if ($update_tables['users']['que']) {
       $que_lines = array();
       $que_query = upd_do_query("SELECT * FROM {{users}} WHERE `que`");
-      while($que_row = db_fetch($que_query)) {
+      while ($que_row = db_fetch($que_query)) {
         $que_data = explode(',', $que_row['que']);
 
-        if(!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech'))) {
+        if (!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech'))) {
           continue;
         }
 
         $que_data[QI_TIME] = $que_data[QI_TIME] >= 0 ? $que_data[QI_TIME] : 0;
         // Если планета пустая - ставим главку
         $que_data[QI_PLANET_ID] = $que_data[QI_PLANET_ID] ? $que_data[QI_PLANET_ID] : $que_row['id_planet'];
-        if($que_data[QI_PLANET_ID]) {
+        if ($que_data[QI_PLANET_ID]) {
           $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
-          if(!$que_planet_check['id']) {
+          if (!$que_planet_check['id']) {
             $que_data[QI_PLANET_ID] = $que_row['id_planet'];
             $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
-            if(!$que_planet_check['id']) {
+            if (!$que_planet_check['id']) {
               $que_data[QI_PLANET_ID] = 'NULL';
             }
           }
@@ -2079,8 +2079,8 @@ 
         $price_increase = pow($unit_factor, $unit_level);
         $unit_level++;
         $unit_cost = array();
-        foreach($unit_info[P_COST] as $resource_id => $resource_amount) {
-          if($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase)) {
+        foreach ($unit_info[P_COST] as $resource_id => $resource_amount) {
+          if ($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase)) {
             continue;
           }
           $unit_cost[] = $resource_id . ',' . floor($resource_cost);
@@ -2091,7 +2091,7 @@ 
           BUILD_CREATE . ",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
       }
 
-      if(!empty($que_lines)) {
+      if (!empty($que_lines)) {
         upd_do_query('INSERT INTO `{{que}}` (`que_player_id`,`que_planet_id_origin`,`que_type`,`que_time_left`,`que_unit_id`,`que_unit_amount`,`que_unit_mode`,`que_unit_level`,`que_unit_time`,`que_unit_price`) VALUES ' . implode(',', $que_lines));
       }
 
@@ -2105,22 +2105,22 @@ 
 
 
     // Ковертируем технологии в таблицы
-    if($update_tables['users']['graviton_tech']) {
+    if ($update_tables['users']['graviton_tech']) {
       upd_do_query("DELETE FROM {{unit}} WHERE unit_type = " . UNIT_TECHNOLOGIES);
 
       $que_lines = array();
       $user_query = upd_do_query("SELECT * FROM {{users}}");
       upd_add_more_time(300);
       $sn_group_tech = sn_get_groups('tech');
-      while($user_row = db_fetch($user_query)) {
-        foreach($sn_group_tech as $tech_id) {
-          if($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)])) {
+      while ($user_row = db_fetch($user_query)) {
+        foreach ($sn_group_tech as $tech_id) {
+          if ($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)])) {
             $que_lines[] = "({$user_row['id']}," . LOC_USER . ",{$user_row['id']}," . UNIT_TECHNOLOGIES . ",{$tech_id},{$tech_level})";
           }
         }
       }
 
-      if(!empty($que_lines)) {
+      if (!empty($que_lines)) {
         upd_do_query("INSERT INTO {{unit}} (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level) VALUES " . implode(',', $que_lines));
       }
 
@@ -2129,25 +2129,25 @@ 
       ), $update_tables['users']['graviton_tech']);
     }
 
-    if(!$update_indexes['unit']['I_unit_record_search']) {
+    if (!$update_indexes['unit']['I_unit_record_search']) {
       upd_alter_table('unit', array(
         "ADD KEY `I_unit_record_search` (`unit_snid`,`unit_player_id`,`unit_level` DESC,`unit_id`)",
       ), !$update_indexes['unit']['I_unit_record_search']);
 
-      foreach(sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id) {
+      foreach (sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id) {
         $planet_units[get_unit_param($unit_id, P_NAME)] = 1;
       }
       $drop_index = array();
       $create_index = &$drop_index; // array();
-      foreach($planet_units as $unit_name => $unit_create) {
-        if($update_indexes['planets']['I_' . $unit_name]) {
+      foreach ($planet_units as $unit_name => $unit_create) {
+        if ($update_indexes['planets']['I_' . $unit_name]) {
           $drop_index[] = "DROP KEY I_{$unit_name}";
         }
-        if($update_indexes['planets']['i_' . $unit_name]) {
+        if ($update_indexes['planets']['i_' . $unit_name]) {
           $drop_index[] = "DROP KEY i_{$unit_name}";
         }
 
-        if($unit_create) {
+        if ($unit_create) {
           $create_index[] = "ADD KEY `I_{$unit_name}` (`id_owner`, {$unit_name} DESC)";
         }
       }
@@ -2158,7 +2158,7 @@ 
       "ADD `user_time_utc_offset` INT(11) DEFAULT NULL COMMENT 'User time difference with server time' AFTER `user_time_diff`",
     ), !$update_tables['users']['user_time_utc_offset']);
 
-    if(!$update_foreigns['alliance']['FK_alliance_owner']) {
+    if (!$update_foreigns['alliance']['FK_alliance_owner']) {
       upd_do_query("UPDATE {{alliance}} SET ally_owner = NULL WHERE ally_owner NOT IN (SELECT id FROM {{users}})");
 
       upd_alter_table('alliance', array(
@@ -2178,7 +2178,7 @@ 
 
     upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !classSupernova::$config->chat_highlight_developer);
 
-    if(!$update_tables['player_name_history']) {
+    if (!$update_tables['player_name_history']) {
       upd_check_key('game_user_changename_cost', 100000, !classSupernova::$config->game_user_changename_cost);
       upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
 
@@ -2207,7 +2207,7 @@ 
       "ADD `density_index` TINYINT NOT NULL DEFAULT " . PLANET_DENSITY_STANDARD . " COMMENT 'Planet cached density index'",
     ), !$update_tables['planets']['density_index']);
 
-    if($update_tables['users']['player_artifact_list']) {
+    if ($update_tables['users']['player_artifact_list']) {
       upd_alter_table('unit', "DROP KEY `unit_id`", $update_indexes['unit']['unit_id']);
 
       upd_alter_table('unit', "ADD KEY `I_unit_player_location_snid` (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_snid`)", !$update_indexes['unit']['I_unit_player_location_snid']);
@@ -2217,14 +2217,14 @@ 
       $db_changeset = array();
 
       $query = upd_do_query("SELECT `id`, `player_artifact_list` FROM {{users}} WHERE `player_artifact_list` IS NOT NULL AND `player_artifact_list` != '' FOR UPDATE");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $artifact_list = explode(';', $row['player_artifact_list']);
-        if(!$row['player_artifact_list'] || empty($artifact_list)) {
+        if (!$row['player_artifact_list'] || empty($artifact_list)) {
           continue;
         }
-        foreach($artifact_list as $key => &$value) {
+        foreach ($artifact_list as $key => &$value) {
           $value = explode(',', $value);
-          if(!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]])) {
+          if (!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]])) {
             unset($artifact_list[$key]);
             continue;
           }

includes/init/init_functions.php

Spacing +12 added lines, -12 removed lines

@@ -2,25 +2,25 @@ 
 
 // ------------------------------------------------------------------------------------------------------------------------------
 function sn_sys_load_php_files($dir_name, $load_extension = 'php', $modules = false) {
-  if(file_exists($dir_name)) {
+  if (file_exists($dir_name)) {
     $dir = opendir($dir_name);
-    while(($file = readdir($dir)) !== false) {
-      if($file == '..' || $file == '.') {
+    while (($file = readdir($dir)) !== false) {
+      if ($file == '..' || $file == '.') {
         continue;
       }
 
       $full_filename = $dir_name . $file;
-      if($modules && is_dir($full_filename)) {
-        if(file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
+      if ($modules && is_dir($full_filename)) {
+        if (file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
           require_once($full_filename);
           // Registering module
-          if(class_exists($file)) {
+          if (class_exists($file)) {
             new $file($full_filename);
           }
         }
       } else {
         $extension = substr($full_filename, -strlen($load_extension));
-        if($extension == $load_extension) {
+        if ($extension == $load_extension) {
           require_once($full_filename);
         }
       }
@@ -39,11 +39,11 @@ 
  */
 function init_update() {
   $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
-  if(file_exists($update_file)) {
-    if(filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
-      if(defined('IN_ADMIN')) {
+  if (file_exists($update_file)) {
+    if (filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
+      if (defined('IN_ADMIN')) {
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
-        if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
+        if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
           classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW + (classSupernova::$config->upd_lock_time ? classSupernova::$config->upd_lock_time : 300));
           sn_db_transaction_commit();
 
@@ -53,7 +53,7 @@ 
           $current_time = time();
           classSupernova::$config->db_saveItem('var_db_update', $current_time);
           classSupernova::$config->db_saveItem('var_db_update_end', $current_time);
-        } elseif(filemtime($update_file) > classSupernova::$config->var_db_update) {
+        } elseif (filemtime($update_file) > classSupernova::$config->var_db_update) {
           $timeout = classSupernova::$config->var_db_update_end - SN_TIME_NOW;
           die(
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />

includes/template.php

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
 function gettemplatename($u_dpath) {
   static $template_names = array();
 
-  if(!isset($template_names[$u_dpath])) {
+  if (!isset($template_names[$u_dpath])) {
     $template_names[$u_dpath] = file_exists(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') ? sys_file_read(SN_ROOT_PHYSICAL . $u_dpath . 'tmpl.ini') : TEMPLATE_NAME;
   }
 
@@ -52,12 +52,12 @@ 
  * @param $sn_menu_extra
  */
 function tpl_menu_merge_extra(&$sn_menu, &$sn_menu_extra) {
-  if(empty($sn_menu) || empty($sn_menu_extra)) {
+  if (empty($sn_menu) || empty($sn_menu_extra)) {
     return;
   }
 
-  foreach($sn_menu_extra as $menu_item_id => $menu_item) {
-    if(empty($menu_item['LOCATION'])) {
+  foreach ($sn_menu_extra as $menu_item_id => $menu_item) {
+    if (empty($menu_item['LOCATION'])) {
       $sn_menu[$menu_item_id] = $menu_item;
       continue;
     }
@@ -66,16 +66,16 @@ 
     unset($menu_item['LOCATION']);
 
     $is_positioned = $item_location[0];
-    if($is_positioned == '+' || $is_positioned == '-') {
+    if ($is_positioned == '+' || $is_positioned == '-') {
       $item_location = substr($item_location, 1);
     } else {
       $is_positioned = '';
     }
 
-    if($item_location) {
+    if ($item_location) {
       $menu_keys = array_keys($sn_menu);
       $insert_position = array_search($item_location, $menu_keys);
-      if($insert_position === false) {
+      if ($insert_position === false) {
         $insert_position = count($sn_menu) - 1;
         $is_positioned = '+';
         $item_location = '';
@@ -88,7 +88,7 @@ 
     $spliced = array_splice($sn_menu, $insert_position, count($sn_menu) - $insert_position);
     $sn_menu[$menu_item_id] = $menu_item;
 
-    if(!$is_positioned && $item_location) {
+    if (!$is_positioned && $item_location) {
       unset($spliced[$item_location]);
     }
     $sn_menu = array_merge($sn_menu, $spliced);
@@ -102,24 +102,24 @@ 
  * @param template $template
  */
 function tpl_menu_assign_to_template(&$sn_menu, &$template) {
-  if(empty($sn_menu) || !is_array($sn_menu)) {
+  if (empty($sn_menu) || !is_array($sn_menu)) {
     return;
   }
 
-  foreach($sn_menu as $menu_item_id => $menu_item) {
-    if(!$menu_item) {
+  foreach ($sn_menu as $menu_item_id => $menu_item) {
+    if (!$menu_item) {
       continue;
     }
 
-    if(is_string($menu_item_id)) {
+    if (is_string($menu_item_id)) {
       $menu_item['ID'] = $menu_item_id;
     }
 
-    if($menu_item['TYPE'] == 'lang') {
+    if ($menu_item['TYPE'] == 'lang') {
       $lang_string = &classLocale::$lang;
-      if(preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
-        for($i = 1; $i < count($matches); $i++) {
-          if(defined($matches[$i])) {
+      if (preg_match('#(\w+)(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?(?:\[(\w+)\])?#', $menu_item['ITEM'], $matches) && count($matches) > 1) {
+        for ($i = 1; $i < count($matches); $i++) {
+          if (defined($matches[$i])) {
             $matches[$i] = constant($matches[$i]);
           }
           $lang_string = &$lang_string[$matches[$i]];
@@ -131,8 +131,8 @@ 
     $menu_item['ALT'] = htmlentities($menu_item['ALT']);
     $menu_item['TITLE'] = htmlentities($menu_item['TITLE']);
 
-    if(!empty($menu_item['ICON'])) {
-      if(is_string($menu_item['ICON'])) {
+    if (!empty($menu_item['ICON'])) {
+      if (is_string($menu_item['ICON'])) {
         $menu_item['ICON_PATH'] = $menu_item['ICON'];
       } else {
         $menu_item['ICON'] = $menu_item_id;
@@ -162,7 +162,7 @@ 
     'MENU_START_HIDE'     => !empty($_COOKIE[SN_COOKIE . '_menu_hidden']) || defined('SN_GOOGLE'),
   ));
 
-  if(isset($template_result['MENU_CUSTOMIZE'])) {
+  if (isset($template_result['MENU_CUSTOMIZE'])) {
     $template->assign_vars(array(
       'PLAYER_OPTION_MENU_SHOW_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_SHOW_ON_BUTTON],
       'PLAYER_OPTION_MENU_HIDE_ON_BUTTON'   => classSupernova::$user_options[PLAYER_OPTION_MENU_HIDE_ON_BUTTON],
@@ -176,7 +176,7 @@ 
     ));
   }
 
-  if(defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
+  if (defined('IN_ADMIN') && IN_ADMIN === true && !empty($user['authlevel']) && $user['authlevel'] > 0) {
     tpl_menu_merge_extra($sn_menu_admin, $sn_menu_admin_extra);
     tpl_menu_assign_to_template($sn_menu_admin, $template);
   } else {
@@ -216,7 +216,7 @@ 
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
   $is_login = defined('LOGIN_LOGOUT') && LOGIN_LOGOUT === true;
 
-  if(is_object($page)) {
+  if (is_object($page)) {
     isset($page->_rootref['MENU']) ? $isDisplayMenu = $page->_rootref['MENU'] : false;
     isset($page->_rootref['NAVBAR']) ? $isDisplayTopNav = $page->_rootref['NAVBAR'] : false;
 
@@ -224,7 +224,7 @@ 
     !isset($page->_rootref['PAGE_HEADER']) && $title ? $page->assign_var('PAGE_HEADER', $title) : false;
   }
 
-  if(empty($user['id']) || !is_numeric($user['id'])) {
+  if (empty($user['id']) || !is_numeric($user['id'])) {
     $isDisplayMenu = false;
     $isDisplayTopNav = false;
   }
@@ -236,10 +236,10 @@ 
   $user_time_measured_unix = intval(isset($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) ? strtotime($user_time_diff[PLAYER_OPTION_TIME_DIFF_MEASURE_TIME]) : 0);
 
   $font_size = !empty($_COOKIE[SN_COOKIE_F]) ? $_COOKIE[SN_COOKIE_F] : classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE];
-  if(strpos($font_size, '%') !== false) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -251,10 +251,10 @@ 
 
   $template = gettemplate('_global_header', true);
 
-  if(!empty(classSupernova::$sn_mvc['javascript'])) {
-    foreach(classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
-      if(empty($page_name) || $page_name == $sn_page_name) {
-        foreach($script_list as $filename => $content) {
+  if (!empty(classSupernova::$sn_mvc['javascript'])) {
+    foreach (classSupernova::$sn_mvc['javascript'] as $page_name => $script_list) {
+      if (empty($page_name) || $page_name == $sn_page_name) {
+        foreach ($script_list as $filename => $content) {
           $template_result['.']['javascript'][] = array(
             'FILE'    => $filename,
             'CONTENT' => $content,
@@ -280,9 +280,9 @@ 
   classSupernova::$sn_mvc['css'][''] = array_merge($standard_css, classSupernova::$sn_mvc['css']['']);
 
 
-  foreach(classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
-    if(empty($page_name) || $page_name == $sn_page_name) {
-      foreach($script_list as $filename => $content) {
+  foreach (classSupernova::$sn_mvc['css'] as $page_name => $script_list) {
+    if (empty($page_name) || $page_name == $sn_page_name) {
+      foreach ($script_list as $filename => $content) {
         $template_result['.']['css'][] = array(
           'FILE'    => $filename,
           'CONTENT' => $content,
@@ -329,12 +329,12 @@ 
   $template->assign_recursive($template_result);
   displayP(parsetemplate($template));
 
-  if(($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
+  if (($isDisplayMenu || $in_admin) && !isset($_COOKIE['menu_disable'])) {
     // $AdminPage = $AdminPage ? $user['authlevel'] : 0;
     displayP(parsetemplate(tpl_render_menu()));
   }
 
-  if($isDisplayTopNav && !$in_admin) {
+  if ($isDisplayTopNav && !$in_admin) {
     displayP(parsetemplate(tpl_render_topnav($user, $planetrow)));
   }
 
@@ -342,8 +342,8 @@ 
 
   !is_array($page) ? $page = array($page) : false;
   $result_added = false;
-  foreach($page as $page_item) {
-    if(!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
+  foreach ($page as $page_item) {
+    if (!$result_added && is_object($page_item) && isset($page_item->_tpldata['result'])) {
       $page_item = gettemplate('_result_message', $page_item);
       $temp = $page_item->files['_result_message'];
       unset($page_item->files['_result_message']);
@@ -366,7 +366,7 @@ 
   ));
   displayP(parsetemplate($template));
 
-  $user['authlevel'] >= 3 && classSupernova::$config->debug ? $debug->echo_log() : false;;
+  $user['authlevel'] >= 3 && classSupernova::$config->debug ? $debug->echo_log() : false; ;
 
   sn_db_disconnect();
 
@@ -404,7 +404,7 @@ 
  * @param string         $type
  */
 function tpl_topnav_event_build(&$template, $FleetList, $type = 'fleet') {
-  if(empty($FleetList)) {
+  if (empty($FleetList)) {
     return;
   }
 
@@ -413,19 +413,19 @@ 
   $fleet_event_count = 0;
   $fleet_flying_sorter = array();
   $fleet_flying_events = array();
-  foreach($FleetList->_container as $objFleet) {
+  foreach ($FleetList->_container as $objFleet) {
     $will_return = true;
-    if(!$objFleet->isReturning()) {
+    if (!$objFleet->isReturning()) {
       // cut fleets on Hold and Expedition
-      if($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
+      if ($objFleet->time_arrive_to_target >= SN_TIME_NOW) {
         $objFleet->mission_type == MT_RELOCATE ? $will_return = false : false;
         tpl_topnav_event_build_helper($objFleet->time_arrive_to_target, EVENT_FLEET_ARRIVE, classLocale::$lang['sys_event_arrive'], $objFleet->target_coordinates_typed(), !$will_return, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
-      if($objFleet->time_mission_job_complete) {
+      if ($objFleet->time_mission_job_complete) {
         tpl_topnav_event_build_helper($objFleet->time_mission_job_complete, EVENT_FLEET_STAY, classLocale::$lang['sys_event_stay'], $objFleet->target_coordinates_typed(), false, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
       }
     }
-    if($will_return) {
+    if ($will_return) {
       tpl_topnav_event_build_helper($objFleet->time_return_to_source, EVENT_FLEET_RETURN, classLocale::$lang['sys_event_return'], $objFleet->launch_coordinates_typed(), true, $objFleet, $fleet_flying_sorter, $fleet_flying_events, $fleet_event_count);
     }
   }
@@ -433,7 +433,7 @@ 
   asort($fleet_flying_sorter);
 
   $fleet_flying_count = $FleetList->count();
-  foreach($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
+  foreach ($fleet_flying_sorter as $fleet_event_id => $fleet_time) {
     $fleet_event = &$fleet_flying_events[$fleet_event_id];
     $template->assign_block_vars("flying_{$type}s", array(
       'TIME' => max(0, $fleet_time - SN_TIME_NOW),
@@ -462,7 +462,7 @@ 
   global $template_result;
   $classLocale = classLocale::$lang;
 
-  if(!is_array($user)) {
+  if (!is_array($user)) {
     return '';
   }
 
@@ -483,8 +483,8 @@ 
 
   $ThisUsersPlanets = db_planet_list_sorted($user);
   // while ($CurPlanet = db_fetch($ThisUsersPlanets))
-  foreach($ThisUsersPlanets as $CurPlanet) {
-    if($CurPlanet['destruyed']) {
+  foreach ($ThisUsersPlanets as $CurPlanet) {
+    if ($CurPlanet['destruyed']) {
       continue;
     }
 
@@ -508,8 +508,8 @@ 
    */
   $fleet_flying_list = array();
   $fleet_flying_list[0] = FleetList::dbGetFleetListByOwnerId($user['id']);
-  foreach($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
-    if(empty($fleet_flying_list[$objFleet->mission_type])) {
+  foreach ($fleet_flying_list[0]->_container as $fleet_id => $objFleet) {
+    if (empty($fleet_flying_list[$objFleet->mission_type])) {
       $fleet_flying_list[$objFleet->mission_type] = new FleetList();
     }
     $fleet_flying_list[$objFleet->mission_type][$fleet_id] = $objFleet;
@@ -521,8 +521,8 @@ 
   que_tpl_parse($template, QUE_RESEARCH, $user, array(), null, !classSupernova::$user_options[PLAYER_OPTION_NAVBAR_RESEARCH_WIDE]);
   que_tpl_parse($template, SUBQUE_FLEET, $user, $planetrow, null, true);
 
-  if(!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
-    foreach(classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
+  if (!empty(classSupernova::$sn_mvc['navbar_prefix_button']) && is_array(classSupernova::$sn_mvc['navbar_prefix_button'])) {
+    foreach (classSupernova::$sn_mvc['navbar_prefix_button'] as $navbar_button_image => $navbar_button_url) {
       $template->assign_block_vars('navbar_prefix_button', array(
         'IMAGE'        => $navbar_button_image,
         'URL_RELATIVE' => $navbar_button_url,
@@ -536,13 +536,13 @@ 
   $time_now_parsed = getdate(SN_TIME_NOW);
   $time_local_parsed = getdate(defined('SN_CLIENT_TIME_LOCAL') ? SN_CLIENT_TIME_LOCAL : SN_TIME_NOW);
 
-  if(classSupernova::$config->game_news_overview) {
+  if (classSupernova::$config->game_news_overview) {
     $user_last_read_safe = intval($user['news_lastread']);
     nws_render($template, "WHERE UNIX_TIMESTAMP(`tsTimeStamp`) >= {$user_last_read_safe}", classSupernova::$config->game_news_overview);
   }
 
   $notes_query = db_note_list_by_owner($user['id'], true);
-  while($note_row = db_fetch($notes_query)) {
+  while ($note_row = db_fetch($notes_query)) {
     note_assign($template, $note_row);
   }
 
@@ -556,7 +556,7 @@ 
     'QUE_ID'   => QUE_RESEARCH,
     'QUE_HTML' => 'topnav',
 
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
 
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], classLocale::$lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -633,7 +633,7 @@ 
     'QUE_STRUCTURES' => QUE_STRUCTURES,
   ));
 
-  if((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
+  if ((defined('SN_RENDER_NAVBAR_PLANET') && SN_RENDER_NAVBAR_PLANET === true) || ($user['option_list'][OPT_INTERFACE]['opt_int_navbar_resource_force'] && SN_RENDER_NAVBAR_PLANET !== false)) {
     tpl_set_resource_info($template, $planetrow);
     $template->assign_vars(array(
       'SN_RENDER_NAVBAR_PLANET' => true,
@@ -648,12 +648,12 @@ 
  * @param template|string $template
  */
 function displayP($template) {
-  if(is_object($template)) {
-    if(empty($template->parsed)) {
+  if (is_object($template)) {
+    if (empty($template->parsed)) {
       parsetemplate($template);
     }
 
-    foreach($template->files as $section => $filename) {
+    foreach ($template->files as $section => $filename) {
       $template->display($section);
     }
   } else {
@@ -668,11 +668,11 @@ 
  * @return mixed
  */
 function parsetemplate($template, $array = false) {
-  if(is_object($template)) {
+  if (is_object($template)) {
     global $user;
 
-    if(!empty($array) && is_array($array)) {
-      foreach($array as $key => $data) {
+    if (!empty($array) && is_array($array)) {
+      foreach ($array as $key => $data) {
         $template->assign_var($key, $data);
       }
     }
@@ -713,7 +713,7 @@ 
 
   $template_ex = '.tpl.html';
 
-  if($template === false) {
+  if ($template === false) {
     return sys_file_read(TEMPLATE_DIR . '/' . $files . $template_ex);
   }
 
@@ -733,7 +733,7 @@ 
   !empty(classSupernova::$sn_mvc['i18n']['']) ? lng_load_i18n(classSupernova::$sn_mvc['i18n']['']) : false;
   $sn_page_name ? lng_load_i18n(classSupernova::$sn_mvc['i18n'][$sn_page_name]) : false;
 
-  foreach($files as &$filename) {
+  foreach ($files as &$filename) {
     $filename = $filename . $template_ex;
   }
 
@@ -758,13 +758,13 @@ 
     'LANG'     => $language ? $language : '',
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
   ));
 
-  foreach(lng_get_list() as $lng_id => $lng_data) {
-    if(isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
-      foreach($lng_data['LANG_VARIANTS'] as $lang_variant) {
+  foreach (lng_get_list() as $lng_id => $lng_data) {
+    if (isset($lng_data['LANG_VARIANTS']) && is_array($lng_data['LANG_VARIANTS'])) {
+      foreach ($lng_data['LANG_VARIANTS'] as $lang_variant) {
         $lng_data1 = $lng_data;
         $lng_data1 = array_merge($lng_data1, $lang_variant);
         $template->assign_block_vars('language', $lng_data1);
@@ -787,8 +787,8 @@ 
   $que = $que['ques'][$que_type][$planet['id_owner']][$planet['id']];
 
   $que_length = 0;
-  if(!empty($que)) {
-    foreach($que as $que_item) {
+  if (!empty($que)) {
+    foreach ($que as $que_item) {
       $template->assign_block_vars('que', que_tpl_parse_element($que_item));
     }
     $que_length = count($que);
@@ -803,7 +803,7 @@ 
  * @param int      $user_dark_matter
  */
 function tpl_planet_density_info(&$template, &$density_price_chart, $user_dark_matter) {
-  foreach($density_price_chart as $density_price_index => &$density_price_data) {
+  foreach ($density_price_chart as $density_price_index => &$density_price_data) {
     $density_cost = $density_price_data;
     $density_number_style = pretty_number($density_cost, true, $user_dark_matter, false, false);
 
@@ -827,7 +827,7 @@ 
 function tpl_assign_select(&$template, $name, $values) {
   !is_array($values) ? $values = array($values => $values) : false;
 
-  foreach($values as $key => $value) {
+  foreach ($values as $key => $value) {
     $template->assign_block_vars($name, array(
       'KEY'   => htmlentities($key, ENT_COMPAT, 'UTF-8'),
       'VALUE' => htmlentities($value, ENT_COMPAT, 'UTF-8'),

alliance.php

Spacing +14 added lines, -14 removed lines

@@ -2,7 +2,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(classSupernova::$config->game_mode == GAME_BLITZ) {
+if (classSupernova::$config->game_mode == GAME_BLITZ) {
   message(classLocale::$lang['sys_blitz_page_disabled'], classLocale::$lang['sys_error'], 'overview.php', 10);
   die();
 }
@@ -14,16 +14,16 @@ 
 
 $mode = sys_get_param_str('mode');
 
-if($mode == 'ainfo') {
+if ($mode == 'ainfo') {
   include('includes/alliance/ali_info.inc');
 }
 
-if(!$user['ally_id']) {
+if (!$user['ally_id']) {
   $user_request = db_ally_request_get_by_user_id($user['id']);
-  if($user_request['id_user']) {
+  if ($user_request['id_user']) {
     require('includes/alliance/ali_external_request.inc');
   } else {
-    switch($mode) {
+    switch ($mode) {
       case 'search':
         require('includes/alliance/ali_external_search.inc');
       break;
@@ -44,7 +44,7 @@ 
 }
 
 sn_ali_fill_user_ally($user);
-if(!isset($user['ally'])) {
+if (!isset($user['ally'])) {
   db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
   message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['your_alliance'], 'alliance.php');
 }
@@ -72,18 +72,18 @@ 
 
 // This piece converting old ally data to new one
 //  unset($ally['ranklist']);
-if(!$ally['ranklist'] && $ally['ally_ranks']) {
+if (!$ally['ranklist'] && $ally['ally_ranks']) {
   $ally_ranks = unserialize($ally['ally_ranks']);
   $i = 0;
-  foreach($ally_ranks as $rank_id => $rank) {
-    foreach($ally_rights as $key => $value) {
+  foreach ($ally_ranks as $rank_id => $rank) {
+    foreach ($ally_rights as $key => $value) {
       $ranks[$i][$value] = $rank[$rights_old[$key]];
     }
     db_user_list_set_ally_deprecated_convert_ranks($user['ally_id'], $i, $rank_id);
     $i++;
   }
 
-  if(!empty($ranks)) {
+  if (!empty($ranks)) {
     ali_rank_list_save($ranks);
   }
 }
@@ -101,15 +101,15 @@ 
 
 $edit = sys_get_param_str('edit');
 ally_pre_call();
-switch($mode) {
+switch ($mode) {
   case 'admin':
-    if(!array_key_exists($edit, $sn_ali_admin_internal)) {
+    if (!array_key_exists($edit, $sn_ali_admin_internal)) {
       $edit = 'default';
     }
-    if($sn_ali_admin_internal[$edit]['include']) {
+    if ($sn_ali_admin_internal[$edit]['include']) {
       require("includes/{$sn_ali_admin_internal[$edit]['include']}");
     }
-    if(isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
+    if (isset($sn_ali_admin_internal[$edit]['function']) && is_callable($sn_ali_admin_internal[$edit]['function'])) {
       call_user_func($sn_ali_admin_internal[$edit]['function']);
     }
   break;

overview.php

Spacing +37 added lines, -37 removed lines

@@ -78,7 +78,7 @@ 
 
 $result = array();
 
-switch($mode = sys_get_param_str('mode')) {
+switch ($mode = sys_get_param_str('mode')) {
   case 'manage':
     sn_sys_sector_buy('overview.php?mode=manage');
 
@@ -88,11 +88,11 @@ 
     $template  = gettemplate('planet_manage', true);
     $planet_id = sys_get_param_id('planet_id');
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
 //      $new_name = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name}'");
-    } elseif(sys_get_param_str('action') == 'make_capital') {
+    } elseif (sys_get_param_str('action') == 'make_capital') {
       try {
         sn_db_transaction_start();
         $user = db_user_by_id($user['id'], true, '*');
@@ -101,15 +101,15 @@ 
 //        $user = $global_data['user'];
 //        $planetrow = $global_data['planet'];
 
-        if($planetrow['planet_type'] != PT_PLANET) {
+        if ($planetrow['planet_type'] != PT_PLANET) {
           throw new exception(classLocale::$lang['ov_capital_err_not_a_planet'], ERR_ERROR);
         }
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           throw new exception(classLocale::$lang['ov_capital_err_capital_already'], ERR_ERROR);
         }
 
-        if($user_dark_matter < classSupernova::$config->planet_capital_cost) {
+        if ($user_dark_matter < classSupernova::$config->planet_capital_cost) {
           throw new exception(classLocale::$lang['ov_capital_err_no_dark_matter'], ERR_ERROR);
         }
 
@@ -126,16 +126,16 @@ 
         );
         sn_db_transaction_commit();
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_teleport') {
+    } elseif (sys_get_param_str('action') == 'planet_teleport') {
       try {
-        if(!uni_coordinates_valid($new_coordinates = array(
+        if (!uni_coordinates_valid($new_coordinates = array(
           'galaxy' => sys_get_param_int('new_galaxy'),
           'system' => sys_get_param_int('new_system'),
           'planet' => sys_get_param_int('new_planet')))
@@ -152,7 +152,7 @@ 
 //        $planetrow = $global_data['planet'];
 
         $can_teleport = uni_planet_teleport_check($user, $planetrow, $new_coordinates);
-        if($can_teleport['result'] != ERR_NONE) {
+        if ($can_teleport['result'] != ERR_NONE) {
           throw new exception($can_teleport['message'], $can_teleport['result']);
         }
 
@@ -163,7 +163,7 @@ 
         db_planet_set_by_gspt($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], PT_ALL,
           "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}, planet_teleport_next = {$planet_teleport_next}");
 
-        if($planetrow['id'] == $user['id_planet']) {
+        if ($planetrow['id'] == $user['id_planet']) {
           db_user_set_by_id($user['id'], "galaxy = {$new_coordinates['galaxy']}, system = {$new_coordinates['system']}, planet = {$new_coordinates['planet']}");
         }
 
@@ -176,17 +176,17 @@ 
           'MESSAGE' => classLocale::$lang['ov_teleport_err_none'],
         );
         sys_redirect('overview.php?mode=manage');
-      } catch(exception $e) {
+      } catch (exception $e) {
         sn_db_transaction_rollback();
         $result[] = array(
           'STATUS'  => $e->getCode(),
           'MESSAGE' => $e->getMessage(),
         );
       }
-    } elseif(sys_get_param_str('action') == 'planet_abandon') {
+    } elseif (sys_get_param_str('action') == 'planet_abandon') {
       // if(sec_password_check($user['id'], sys_get_param('abandon_confirm'))) {
-      if(classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
-        if($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
+      if (classSupernova::$auth->password_check(sys_get_param('abandon_confirm'))) {
+        if ($user['id_planet'] != $user['current_planet'] && $user['current_planet'] == $planet_id) {
           $destroyed = SN_TIME_NOW + 60 * 60 * 24;
           db_planet_set_by_id($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
           db_planet_set_by_parent($user['current_planet'], "`destruyed`='{$destroyed}', `id_owner`=0");
@@ -196,9 +196,9 @@ 
           message(classLocale::$lang['ov_delete_wrong_planet'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
         }
       } else {
-        message(classLocale::$lang['ov_delete_wrong_pass'] , classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
+        message(classLocale::$lang['ov_delete_wrong_pass'], classLocale::$lang['colony_abandon'], 'overview.php?mode=manage');
       }
-    } elseif(
+    } elseif (
       ($hire = sys_get_param_int('hire')) && in_array($hire, sn_get_groups('governors'))
       && (
         !get_unit_param($hire, P_MAX_STACK) ||
@@ -213,8 +213,8 @@ 
       $user = db_user_by_id($user['id'], true);
       $planetrow = db_planet_by_id($planetrow['id'], true);
       $build_data = eco_get_build_data($user, $planetrow, $hire, $planetrow['PLANET_GOVERNOR_ID'] == $hire ? $planetrow['PLANET_GOVERNOR_LEVEL'] : 0);
-      if($build_data['CAN'][BUILD_CREATE]) {
-        if($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
+      if ($build_data['CAN'][BUILD_CREATE]) {
+        if ($planetrow['PLANET_GOVERNOR_ID'] == $hire) {
           $planetrow['PLANET_GOVERNOR_LEVEL']++;
           $query = '`PLANET_GOVERNOR_LEVEL` + 1';
         } else {
@@ -240,8 +240,8 @@ 
 
     lng_include('mrc_mercenary');
     int_planet_pretemplate($planetrow, $template);
-    foreach(sn_get_groups('governors') as $governor_id) {
-      if($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
+    foreach (sn_get_groups('governors') as $governor_id) {
+      if ($planetrow['planet_type'] == PT_MOON && $governor_id == MRC_TECHNOLOGIST) {
         continue;
       }
 
@@ -293,7 +293,7 @@ 
       'PAGE_HINT'   => classLocale::$lang['ov_manage_page_hint'],
     ));
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 
@@ -303,7 +303,7 @@ 
   default:
     sn_sys_sector_buy();
 
-    if(sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
+    if (sys_get_param_str('rename') && $new_name = sys_get_param_str('new_name')) {
       $planetrow['name'] = $new_name;
       $new_name_safe = db_escape($new_name);
       db_planet_set_by_id($planetrow['id'], "`name` = '{$new_name_safe}'");
@@ -333,7 +333,7 @@ 
 
     $planet_count = 0;
     $planets_query = db_planet_list_sorted($user, false, '*');
-    foreach($planets_query as $an_id => $UserPlanet) {
+    foreach ($planets_query as $an_id => $UserPlanet) {
       sn_db_transaction_start();
       $UserPlanet = sys_o_get_updated($user, $UserPlanet['id'], SN_TIME_NOW, false, true);
       sn_db_transaction_commit();
@@ -344,16 +344,16 @@ 
 
       $planet_fleet_id = 0;
       $fleet_list = $template_planet['fleet_list'];
-      if($fleet_list['own']['count']) {
+      if ($fleet_list['own']['count']) {
         $planet_fleet_id = "p{$UserPlanet['id']}";
         $fleets_to_planet[$UserPlanet['id']] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
 //        $fleet_id++;tpl_parse_fleet_sn
       }
-      if($UserPlanet['planet_type'] == PT_MOON) {
+      if ($UserPlanet['planet_type'] == PT_MOON) {
         continue;
       }
       $moon = db_planet_by_parent($UserPlanet['id']);
-      if($moon) {
+      if ($moon) {
         $moon_fill = min(100, floor($moon['field_current'] / eco_planet_fields_max($moon) * 100));
       } else {
         $moon_fill = 0;
@@ -393,7 +393,7 @@ 
     tpl_assign_fleet($template, $fleets);
 
     $lune = $planetrow['planet_type'] == PT_PLANET ? db_planet_by_parent($planetrow['id']) : db_planet_by_id($planetrow['parent_planet']);
-    if($lune) {
+    if ($lune) {
       $template->assign_vars(array(
         'MOON_ID' => $lune['id'],
         'MOON_IMG' => $lune['image'],
@@ -405,15 +405,15 @@ 
     $planet_fill = $planet_fill > 100 ? 100 : $planet_fill;
 
     $planet_recyclers_orbiting = 0;
-    foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+    foreach (sn_get_groups('flt_recyclers') as $recycler_id) {
       $planet_recyclers_orbiting += mrc_get_level($user, $planetrow, $recycler_id);
     }
 
     int_planet_pretemplate($planetrow, $template);
 
     $sn_group_ques = sn_get_groups('ques');
-    if(!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
-      foreach(array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
+    if (!defined('GAME_STRUCTURES_DISABLED') || !GAME_STRUCTURES_DISABLED) {
+      foreach (array(QUE_STRUCTURES => $sn_group_ques[QUE_STRUCTURES]) as $que_id => $que_type_data) {
         $this_que = $que['ques'][$que_id][$user['id']][$planetrow['id']];
         $template->assign_block_vars('ques', array(
           'ID'     => $que_id,
@@ -421,8 +421,8 @@ 
           'LENGTH' => empty($this_que) ? 0 : count($this_que),
         ));
 
-        if(!empty($this_que)) {
-          foreach($this_que as $que_item) {
+        if (!empty($this_que)) {
+          foreach ($this_que as $que_item) {
             $template->assign_block_vars('que', que_tpl_parse_element($que_item));
           }
         }
@@ -436,7 +436,7 @@ 
       'LENGTH' => $que_hangar_length,
     ));
 
-    if(!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
+    if (!defined('GAME_DEFENSE_DISABLED') || !GAME_DEFENSE_DISABLED) {
       $que_hangar_length = tpl_assign_hangar($template, $planetrow, SUBQUE_DEFENSE);
       $template->assign_block_vars('ques', array(
         'ID'     => SUBQUE_DEFENSE,
@@ -448,12 +448,12 @@ 
     $overview_planet_rows = $user['opt_int_overview_planet_rows'];
     $overview_planet_columns = $user['opt_int_overview_planet_columns'];
 
-    if($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows <= 0 && $overview_planet_columns <= 0) {
       $overview_planet_rows = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_rows'];
       $overview_planet_columns = $user_option_list[OPT_INTERFACE]['opt_int_overview_planet_columns'];
     }
 
-    if($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
+    if ($overview_planet_rows > 0 && $overview_planet_columns <= 0) {
       $overview_planet_columns = ceil($planet_count / $overview_planet_rows);
     }
 
@@ -510,7 +510,7 @@ 
     ));
     tpl_set_resource_info($template, $planetrow, $fleets_to_planet, 2);
 
-    foreach($result as &$a_result) {
+    foreach ($result as &$a_result) {
       $template->assign_block_vars('result', $a_result);
     }
 

blitz_register.php

Spacing +26 added lines, -26 removed lines

@@ -2,12 +2,12 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
   !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
   );
 
-  if($error_message) {
+  if ($error_message) {
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
     die();
   }
@@ -16,16 +16,16 @@ 
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
 
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
   sn_db_transaction_start();
   $user = db_user_by_id($user['id'], true);
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
-  if(sys_get_param_str('register_me')) {
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
+  if (sys_get_param_str('register_me')) {
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
       db_blitz_reg_insert($user, $current_round);
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
     }
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
     db_blitz_reg_delete($user, $current_round);
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
   }
@@ -40,17 +40,17 @@ 
 $blitz_players = 0;
 $blitz_prize_dark_matter = 0;
 $blitz_prize_places = 0;
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
-  if(sys_get_param_str('generate')) {
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
+  if (sys_get_param_str('generate')) {
     $next_id = 0;
     $query = db_blitz_reg_get_random_id($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $next_id++;
       $blitz_name = 'Игрок' . $next_id;
       $blitz_password = sys_random_string(8);
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
     }
-  } elseif(sys_get_param_str('import_generated')) {
+  } elseif (sys_get_param_str('import_generated')) {
     // ЭТО НА БЛИЦЕ!!!
     db_player_list_blitz_delete_players();
     db_planets_purge();
@@ -72,7 +72,7 @@ 
     $system = $system_step;
     $planet = round(classSupernova::$config->game_maxPlanet / 2);
 
-    foreach($imported_string as &$string_data) {
+    foreach ($imported_string as &$string_data) {
       $string_data = explode(',', $string_data);
       $username_safe = $string_data[0];
 
@@ -92,7 +92,7 @@ 
 
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
 
-      if(($system += $system_step) >= classSupernova::$config->game_maxSystem) {
+      if (($system += $system_step) >= classSupernova::$config->game_maxSystem) {
         $galaxy++;
         $system = $system_step;
       }
@@ -102,13 +102,13 @@ 
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
     // pdump($imported_string);
     // generated_string
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
     $blitz_result = explode(';', $blitz_result_string);
     $blitz_last_update = $blitz_result[0]; // Пока не используется
     unset($blitz_result[0]);
-    foreach($blitz_result as $blitz_result_data) {
+    foreach ($blitz_result as $blitz_result_data) {
       $blitz_result_data = explode(',', $blitz_result_data);
-      if(count($blitz_result_data) == 5) {
+      if (count($blitz_result_data) == 5) {
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
         db_blitz_reg_update_results($blitz_result_data, $current_round);
       }
@@ -116,15 +116,15 @@ 
     $blitz_result = array();
   }
 
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
     $query = db_player_list_export_blitz_info();
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
     }
   } else {
     $query = db_blitz_reg_get_player_list($current_round);
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
       $blitz_players++;
@@ -132,13 +132,13 @@ 
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
 
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
       sn_db_transaction_start();
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
-      while($row = db_fetch($query)) {
-        if(!$row['blitz_place']) {
+      while ($row = db_fetch($query)) {
+        if (!$row['blitz_place']) {
           continue;
         }
 
@@ -147,14 +147,14 @@ 
 
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
-        if($reward) {
+        if ($reward) {
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
           ));
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
         }
 
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
           break;
         }
       }
@@ -169,12 +169,12 @@ 
 
 $player_registered = false;
 $query = db_blitz_reg_get_player_list_and_users($current_round);
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $tpl_player_data = array(
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
   );
 
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
     $tpl_player_data = array_merge($tpl_player_data, array(
       'ID'                       => $row['id'],
@@ -187,7 +187,7 @@ 
   }
 
   $template->assign_block_vars('registrations', $tpl_player_data);
-  if($row['id'] == $user['id']) {
+  if ($row['id'] == $user['id']) {
     $player_registered = $row;
   }
 }

admin/tools.php

Spacing +6 added lines, -6 removed lines

@@ -12,19 +12,19 @@ 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
 // if($user['authlevel'] < 1)
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 $mode = sys_get_param_int('mode');
 
-switch($mode) {
+switch ($mode) {
   case ADM_TOOL_CONFIG_RELOAD:
     classSupernova::$config->db_loadAll();
     sys_refresh_tablelist();
 
     classSupernova::$config->db_loadItem('game_watchlist');
-    if(classSupernova::$config->game_watchlist) {
+    if (classSupernova::$config->game_watchlist) {
       classSupernova::$config->game_watchlist_array = explode(';', classSupernova::$config->game_watchlist);
     } else {
       unset(classSupernova::$config->game_watchlist_array);
@@ -69,7 +69,7 @@ 
       classLocale::$lang['adm_tool_sql_client_version'] => db_get_client_info(),
       classLocale::$lang['adm_tool_sql_host_info']      => db_get_host_info(),
     );
-    foreach($status as $key => $value) {
+    foreach ($status as $key => $value) {
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $key,
         'VALUE_2' => $value,
@@ -78,7 +78,7 @@ 
 
     $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table']['status']);
     $status = explode('  ', db_server_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $row[0],
@@ -89,7 +89,7 @@ 
 
     $template->assign_block_vars('table', classLocale::$lang['adm_tool_sql_table']['params']);
     $result = db_core_show_status();
-    while($row = db_fetch($result)) {
+    while ($row = db_fetch($result)) {
       $template->assign_block_vars('table.row', array(
         'VALUE_1' => $row['Variable_name'],
         'VALUE_2' => $row['Value'],