supernova-ws / SuperNova

includes/classes/PlayerToAccountTranslate.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
   protected static $is_init = false;
 
   protected static function init() {
-    if(!empty(static::$db)) {
+    if (!empty(static::$db)) {
       return;
     }
     static::$db = classSupernova::$db;
@@ -66,12 +66,12 @@ 
     $provider_id_safe = intval($provider_id_unsafe);
     !is_array($account_list) ? $account_list = array($account_list) : false;
 
-    foreach($account_list as $provider_account_id_unsafe) {
+    foreach ($account_list as $provider_account_id_unsafe) {
       $provider_account_id_safe = intval($provider_account_id_unsafe);
 
       // TODO - Здесь могут отсутствовать аккаунты - проверять провайдером
       $query = static::$db->doquery("SELECT `user_id` FROM {{account_translate}} WHERE `provider_id` = {$provider_id_safe} AND `provider_account_id` = {$provider_account_id_safe} FOR UPDATE");
-      while($row = static::$db->db_fetch($query)) {
+      while ($row = static::$db->db_fetch($query)) {
         $account_translation[$row['user_id']][$provider_id_unsafe][$provider_account_id_unsafe] = true;
       }
     }
@@ -91,7 +91,7 @@ 
       "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
       ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
       "ORDER BY `timestamp` FOR UPDATE");
-    while($row = static::$db->db_fetch($query)) {
+    while ($row = static::$db->db_fetch($query)) {
       $account_translation[$row['user_id']][$row['provider_id']][$row['provider_account_id']] = $row;
     }
 

includes/classes/supernova.php

Braces +79 added lines, -35 removed lines

@@ -202,14 +202,18 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) return;
+    if(!is_array($array)) {
+      return;
+    }
 
     foreach($array as $key => &$value) {
       if($value === null) {
         unset($array[$key]);
       } elseif($level > 0 && is_array($value)) {
         static::array_repack($value, $level - 1);
-        if(empty($value)) unset($array[$key]);
+        if(empty($value)) {
+          unset($array[$key]);
+        }
       }
     }
   }
@@ -218,7 +222,9 @@ 
   // 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) return;
+    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) {
+      return;
+    }
 
     static::array_repack(static::$data[$location_type]);
     static::array_repack(static::$locator[$location_type], 3); // TODO У каждого типа локации - своя глубина!!!! Но можно и глубже ???
@@ -263,7 +269,9 @@ 
   */
   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]])) return;
+    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) {
+      return;
+    }
 
     $in_transaction = static::db_transaction_check(false);
     if(
@@ -297,8 +305,9 @@ 
     return static::$locks[$location_type][$record_id] = true; // Не всегда - от результата
   }
   public static function cache_lock_unset($location_type, $record_id) {
-    if(isset(static::$locks[$location_type][$record_id]))
-      unset(static::$locks[$location_type][$record_id]);
+    if(isset(static::$locks[$location_type][$record_id])) {
+          unset(static::$locks[$location_type][$record_id]);
+    }
     return true; // Не всегда - от результата
   }
   public static function cache_lock_unset_all() {
@@ -471,8 +480,9 @@ 
           //pdump($q, 'Запрос блокировки');
           while($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
-            if(!static::cache_lock_get($owner_location_type, $row['parent_id']))
-              $parent_id_list[$row['parent_id']] = $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, 'Выбраны родители');
           // Если все-таки какие-то записи еще не заблокированы - вынимаем текущие версии из базы
@@ -506,7 +516,9 @@ 
       if(is_array($query_cache)) {
         foreach($query_cache as $key => $value) {
           $result[$key] = $value;
-          if($fetch) break;
+          if($fetch) {
+            break;
+          }
         }
       }
       return $fetch ? (is_array($result) ? reset($result) : false) : $result;
@@ -515,12 +527,15 @@ 
 
   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))) return false;
+    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()) {
         // Обновляем данные только если ряд был затронут
@@ -528,6 +543,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -537,7 +553,9 @@ 
     return $result;
   }
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) return false;
+    if(!($set = trim($set))) {
+      return false;
+    }
 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
@@ -560,9 +578,11 @@ 
     $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(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -600,24 +620,30 @@ 
   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))) return false;
+    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(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
   }
   public static function db_del_record_list($location_type, $condition)
   {
-    if(!($condition = trim($condition))) return false;
+    if(!($condition = trim($condition))) {
+      return false;
+    }
 
     $location_info = &static::$location_info[$location_type];
     $table_name = $location_info[P_TABLE_NAME];
@@ -626,12 +652,14 @@ 
 
     if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         // TODO - когда будет структурированный $condition можно будет делать только cache_unset по нужным записям
         static::cache_clear($location_type);
       }
+      }
     }
 
     return $result;
@@ -673,11 +701,13 @@ 
   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))) return false;
+    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(static::$data[LOC_USER])) {
+        foreach(static::$data[LOC_USER] as $user_id => $user_data)
     {
       if(is_array($user_data) && isset($user_data['username']))
       {
@@ -687,6 +717,7 @@ 
         {
           // $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))
           {
             $user = $user_data;
@@ -714,7 +745,9 @@ 
   }
   // 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)))) return false;
+    if(!($email_unsafe = strtolower(trim($email_unsafe)))) {
+      return false;
+    }
 
     $user = null;
     // TODO переделать на индексы
@@ -794,7 +827,9 @@ 
   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))) return false;
+    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))
@@ -861,15 +896,18 @@ 
     $query = array();
 
     // if($user_id = intval($user_id))
-    if($user_id = idval($user_id))
-      $query[] = "`que_player_id` = {$user_id}";
+    if($user_id = idval($user_id)) {
+          $query[] = "`que_player_id` = {$user_id}";
+    }
 
-    if($que_type == QUE_RESEARCH || $planet_id === null)
-      $query[] = "`que_planet_id` IS NULL";
-    elseif($planet_id)
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
-    if($que_type)
-      $query[] = "`que_type` = {$que_type}";
+    if($que_type == QUE_RESEARCH || $planet_id === null) {
+          $query[] = "`que_planet_id` IS NULL";
+    } elseif($planet_id) {
+          $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+    }
+    if($que_type) {
+          $query[] = "`que_type` = {$que_type}";
+    }
 
     /*
     $sql = '';
@@ -990,8 +1028,7 @@ 
           ),
         ),
       );
-    }
-    else
+    } else
     {
       $db_changeset = array(
         'action' => SQL_OP_INSERT,
@@ -1133,7 +1170,9 @@ 
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    if(!is_array($db_changeset) || empty($db_changeset)) {
+      return $result;
+    }
 
     foreach($db_changeset as $table_name => &$table_data) {
       // TODO - delayed changeset
@@ -1147,8 +1186,13 @@ 
       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]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) {
+          continue;
+        }
+        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) {
+          continue;
+        }
+        // Защита от случайного удаления всех данных в таблице
 
         if($conditions[P_LOCATION] != LOC_NONE) {
           //die('spec ops supernova.php line 928 Добавить работу с кэшем юнитов итд');

Doc Comments +6 added lines, -3 removed lines

@@ -323,7 +323,7 @@ 
    *   <p>null - транзакция НЕ должна быть запущена</p>
    *   <p>true - транзакция должна быть запущена - для совместимости с $for_update</p>
    *   <p>false - всё равно - для совместимости с $for_update</p>
-   * @return bool Текущий статус транзакции
+   * @return null|boolean Текущий статус транзакции
    */
   public static function db_transaction_check($status = null) {
     $error_msg = false;
@@ -399,7 +399,7 @@ 
   /**
    * Блокирует указанные таблицу/список таблиц
    *
-   * @param string|array $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
+   * @param string $tables Таблица/список таблиц для блокировки. Названия таблиц - без префиксов
    * <p>string - название таблицы для блокировки</p>
    * <p>array - массив, где ключ - имя таблицы, а значение - условия блокировки элементов</p>
    */
@@ -587,6 +587,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $location_type
+   */
   public static function db_ins_field_set($location_type, $field_set, $serialize = false) {
     // TODO multiinsert
     !sn_db_field_set_is_safe($field_set) ? $field_set = sn_db_field_set_make_safe($field_set, $serialize) : false;
@@ -809,7 +812,7 @@ 
    * @param     $location_type
    * @param     $location_id
    *
-   * @return array|bool
+   * @return boolean
    */
   public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id)
   {

Spacing +106 added lines, -108 removed lines

@@ -191,7 +191,7 @@ 
 
 
   public static function log_file($message, $spaces = 0) {
-    if(self::$debug) {
+    if (self::$debug) {
       self::$debug->log_file($message, $spaces);
     }
   }
@@ -202,14 +202,14 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) return;
+    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)) unset($array[$key]);
+        if (empty($value)) unset($array[$key]);
       }
     }
   }
@@ -218,7 +218,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) return;
+    if ($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) return;
 
     static::array_repack(static::$data[$location_type]);
     static::array_repack(static::$locator[$location_type], 3); // TODO У каждого типа локации - своя глубина!!!! Но можно и глубже ???
@@ -226,9 +226,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();
@@ -236,7 +236,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();
     }
@@ -263,10 +263,10 @@ 
   */
   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]])) return;
+    if (!($record_id = $record[static::$location_info[$location_type][P_ID]])) return;
 
     $in_transaction = static::db_transaction_check(false);
-    if(
+    if (
       $force_overwrite
       ||
       // Не заменяются заблокированные записи во время транзакции
@@ -276,14 +276,14 @@ 
       !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);
       }
     }
   }
   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;
       // Очищаем кэш мягко - что бы удалить очистить связанные данные - кэш локаций и кэш запоросов и всё, что потребуется впредь
@@ -297,7 +297,7 @@ 
     return static::$locks[$location_type][$record_id] = true; // Не всегда - от результата
   }
   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]);
     return true; // Не всегда - от результата
   }
@@ -327,13 +327,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();
@@ -354,7 +354,7 @@ 
     static::$transaction_id++;
     doquery('START TRANSACTION');
 
-    if($config->db_manual_lock_enabled) {
+    if ($config->db_manual_lock_enabled) {
       $config->db_loadItem('var_db_manually_locked');
       $config->db_saveItem('var_db_manually_locked', SN_TIME_SQL);
     }
@@ -369,7 +369,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);
     }
@@ -384,7 +384,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();
@@ -405,7 +405,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 : ''));
     }
   }
@@ -446,17 +446,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();
@@ -469,14 +469,14 @@ 
             ($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,
@@ -491,7 +491,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]];
@@ -499,14 +499,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) break;
+          if ($fetch) break;
         }
       }
       return $fetch ? (is_array($result) ? reset($result) : false) : $result;
@@ -522,14 +522,14 @@ 
    */
   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))) return false;
+    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
 
@@ -544,16 +544,16 @@ 
     return $result;
   }
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) return false;
+    if (!($set = trim($set))) return false;
 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
 //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);
@@ -572,8 +572,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 могли быть "данные по умолчанию"
@@ -595,8 +595,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 могли быть "данные по умолчанию"
@@ -613,14 +613,14 @@ 
   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))) return false;
+    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 ($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
@@ -630,16 +630,16 @@ 
   }
   public static function db_del_record_list($location_type, $condition)
   {
-    if(!($condition = trim($condition))) return false;
+    if (!($condition = trim($condition))) return false;
 
     $location_info = &static::$location_info[$location_type];
     $table_name = $location_info[P_TABLE_NAME];
 
 //static::db_get_record_list($location_type, $condition, false, true);
 
-    if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
+    if ($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         // TODO - когда будет структурированный $condition можно будет делать только cache_unset по нужным записям
@@ -686,21 +686,21 @@ 
   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))) return false;
+    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(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($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;
@@ -709,7 +709,7 @@ 
       }
     }
 
-    if($user === null)
+    if ($user === null)
     {
       // Вытаскиваем запись
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
@@ -718,7 +718,7 @@ 
       // self::db_get_record_list(LOC_USER, "`username` " . ($like ? 'LIKE' : '='). " '{$username_safe}'");
 
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '='). " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
       , true);
       static::cache_set(LOC_USER, $user['id'], $user); // В кэш-юзер так же заполнять индексы
     }
@@ -727,15 +727,15 @@ 
   }
   // 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)))) return false;
+    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;
           }
@@ -743,7 +743,7 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $email_safe = db_escape($email_unsafe);
       $user = static::db_query(
@@ -761,7 +761,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);
 
@@ -796,7 +796,7 @@ 
   {
     // 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];
     }
@@ -814,15 +814,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))) return false;
+    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))
+      if (is_array($got_data))
       {
-        foreach($got_data as $unit_id => $unit_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];
@@ -831,8 +831,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;
       }
     }
@@ -870,7 +870,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()');
@@ -881,14 +881,14 @@ 
     $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}";
 
     /*
@@ -957,14 +957,14 @@ 
 
   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>');
@@ -980,7 +980,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,
@@ -1055,9 +1055,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';
@@ -1079,18 +1079,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']) {
-          $value = (is_string($field_data['set']) ? "'{$field_data['set']}'": $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;
         }
       }
@@ -1098,16 +1098,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('Неподдерживаемый тип условия');
@@ -1124,7 +1122,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;
       case SQL_OP_UPDATE: $conditions[P_ACTION_STR] = ("UPDATE {{{$table_name}}} SET"); break;
       case SQL_OP_INSERT: $conditions[P_ACTION_STR] = ("INSERT INTO {{{$table_name}}} SET"); break;
@@ -1137,9 +1135,9 @@ 
 
   public static function db_changeset_apply($db_changeset, $flush_delayed = false) {
     $result = true;
-    if(!is_array($db_changeset) || empty($db_changeset)) return $result;
+    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'))
@@ -1148,15 +1146,15 @@ 
         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]) continue;
-        if($conditions['action'] == SQL_OP_DELETE && !$conditions[P_WHERE_STR]) continue; // Защита от случайного удаления всех данных в таблице
+        if ($conditions['action'] != SQL_OP_DELETE && !$conditions[P_FIELDS_STR]) continue;
+        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;
             case SQL_OP_UPDATE: $result = self::db_upd_record_list($conditions[P_LOCATION], $conditions[P_WHERE_STR], $conditions[P_FIELDS_STR]) && $result; break;
@@ -1237,16 +1235,16 @@ 
   }
 
 
-  public static function init_0_prepare () {
+  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);
@@ -1324,7 +1322,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); // Полный дамп запросов в рил-тайме. Подойдет любое значение
@@ -1336,7 +1334,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/classes/auth_abstract.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
    */
   // OK 4.9
   public function __construct($filename = __FILE__) {
-    if($this->provider_id == ACCOUNT_PROVIDER_NONE) {
+    if ($this->provider_id == ACCOUNT_PROVIDER_NONE) {
       die('У всех провайдеров должен быть $provider_id!');
     }
 
@@ -133,7 +133,7 @@ 
   // OK 4.6
   public function player_name_suggest() {
     $name = '';
-    if(is_object($this->account) && !empty($this->account->account_email)) {
+    if (is_object($this->account) && !empty($this->account->account_email)) {
       list($name) = explode('@', $this->account->account_email);
     }
 

includes/classes/skin.php

Spacing +18 added lines, -18 removed lines

@@ -152,7 +152,7 @@ 
    * Инициализация харнилища скинов
    */
   protected static function init() {
-    if(static::$is_init) {
+    if (static::$is_init) {
       return;
     }
 
@@ -165,7 +165,7 @@ 
 
     // Загружены ли уже данные по текущему скину?
 //pdump(static::$skin_list[$ini_path], 'static');
-    if(empty(static::$skin_list[$skin_path])) {
+    if (empty(static::$skin_list[$skin_path])) {
       // Прогружаем текущий скин
       static::$skin_list[$skin_path] = new skin($skin_path);
       static::$active = static::$skin_list[$skin_path];
@@ -201,22 +201,22 @@ 
 
     $this->is_ini_present = false;
     // Проверка на корректность и существование пути
-    if(is_file($this->root_physical_absolute . 'skin.ini')) {
+    if (is_file($this->root_physical_absolute . 'skin.ini')) {
       // Пытаемся распарсить файл
 
       // По секциям? images и config? Что бы не копировать конфигурацию? Или просто unset(__inherit) а затем заново записать
       $this->config = parse_ini_file($this->root_physical_absolute . 'skin.ini');
-      if(!empty($this->config)) {
+      if (!empty($this->config)) {
 
         $this->is_ini_present = true;
 
-        if(!empty($this->config['_inherit'])) {
+        if (!empty($this->config['_inherit'])) {
           // Если скин наследует себя...
-          if($this->config['_inherit'] == $skin_path) {
+          if ($this->config['_inherit'] == $skin_path) {
             // TODO - определять более сложные случаи циклических ссылок в _inherit
             die('">circular skin inheritance!');
           }
-          if(empty(static::$skin_list[$this->config['_inherit']])) {
+          if (empty(static::$skin_list[$this->config['_inherit']])) {
             static::$skin_list[$this->config['_inherit']] = new skin($this->config['_inherit']);
           }
           $this->parent = static::$skin_list[$this->config['_inherit']];
@@ -232,12 +232,12 @@ 
     }
 
     // Пытаемся скомпилировать _no_image заранее
-    if(!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
+    if (!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = $this->compile_try_path(SKIN_IMAGE_MISSED_FIELD, $this->config[SKIN_IMAGE_MISSED_FIELD]);
     }
 
     // Если нет заглушки
-    if(empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
+    if (empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = empty($this->parent)
         // Если нет парента - берем хардкод
         ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL . SKIN_IMAGE_MISSED_FILE_PATH
@@ -267,7 +267,7 @@ 
     $image_tag = $this->image_tag_parse($image_tag, $template);
 
     // Проверяем наличие ключа RIT в хранилища. В нём не может быть несуществующих файлов по построению
-    if(!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
+    if (!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
       return $this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]];
     }
 
@@ -285,7 +285,7 @@ 
     // Нет - image ID не является путём к файлу. Пора обратиться к предкам за помощью...
     // Пытаемся вытащить путь из родителя и применить к нему свои параметры
     // Тащим по ID изображения, а не по ТЭГУ - мало ли что там делает с путём родитель и как преобразовывает его в строку?
-    if(empty($this->container[$image_id]) && !empty($this->parent)) {
+    if (empty($this->container[$image_id]) && !empty($this->parent)) {
       $this->container[$image_id] = $this->parent->compile_image($image_id, $template);
 
       // Если у родителя нет картинки - он вернет пустую строку. Тогда нам надо использовать заглушку - свою или родительскую
@@ -306,18 +306,18 @@ 
   protected function image_tag_parse($image_tag, $template) {
     $image_tag_ptl_resolved = $image_tag;
     // Есть переменные из темплейта ?
-    if(strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
+    if (strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
       // Что бы лишний раз не запускать регексп
       // TODO - многоуровневые вложения ?! Надо ли и где их можно применить
       preg_match_all('#(\[.+?\])#', $image_tag_ptl_resolved, $matches);
-      foreach($matches[0] as &$match) {
+      foreach ($matches[0] as &$match) {
         $var_name = str_replace(array('[', ']'), '', $match);
-        if(strpos($var_name, '.') !== false) {
+        if (strpos($var_name, '.') !== false) {
           // Вложенная переменная темплейта - на текущем уровне
           // TODO Вложенная переменная из корня через "!"
           list($block_name, $block_var) = explode('.', $var_name);
           isset($template->_block_value[$block_name][$block_var]) ? $image_tag_ptl_resolved = str_replace($match, $template->_block_value[$block_name][$block_var], $image_tag_ptl_resolved) : false;
-        } elseif(strpos($var_name, '$') !== false) {
+        } elseif (strpos($var_name, '$') !== false) {
           // Корневой DEFINE
           $define_name = substr($var_name, 1);
           isset($template->_tpldata['DEFINE']['.'][$define_name]) ? $image_tag_ptl_resolved = str_replace($match, $template->_tpldata['DEFINE']['.'][$define_name], $image_tag_ptl_resolved) : false;
@@ -328,7 +328,7 @@ 
       }
     }
 
-    if(strpos($image_tag_ptl_resolved, '|') !== false) {
+    if (strpos($image_tag_ptl_resolved, '|') !== false) {
       $params = explode('|', $image_tag_ptl_resolved);
       $image_id = $params[0];
       unset($params[0]);
@@ -392,11 +392,11 @@ 
     $image_string = $this->container[$image_tag];
 
     // Нет параметров - просто возвращаем значение по $image_name из контейнера
-    if(!empty($params) && is_array($params)) {
+    if (!empty($params) && is_array($params)) {
       // Здесь автоматически произойдёт упорядочивание параметров
 
       // Параметр 'html' - выводить изображение в виде HTML-тэга
-      if(in_array('html', $params)) {
+      if (in_array('html', $params)) {
         $image_tag = $image_tag . '|html';
         $image_string = '<img src="' . $image_string . '" />';
         $this->container[$image_tag] = $image_string;

includes/update_old.php

Indentation +44 added lines, -44 removed lines

@@ -332,8 +332,8 @@ 
     upd_do_query("UPDATE `{{planets}}` SET `crystal` = 0 WHERE `crystal` < 0;");
     upd_do_query("UPDATE `{{planets}}` SET `deuterium` = 0 WHERE `deuterium` < 0;");
     upd_alter_table('planets', array(
-       "DROP COLUMN `b_building`",
-       "DROP COLUMN `b_building_id`"
+        "DROP COLUMN `b_building`",
+        "DROP COLUMN `b_building_id`"
     ), $update_tables['planets']['b_building']);
 
     upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('noobprotection', 'noobprotectionmulti', 'noobprotectiontime', 'chat_admin_msgFormat');");
@@ -587,8 +587,8 @@ 
       upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
 
       upd_alter_table('users', array(
-         "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-         "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
       ), !$update_foreigns['users']['FK_users_ally_id']);
     }
 
@@ -1155,46 +1155,46 @@ 
       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(
-       "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
-       "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-       "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
-       "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
-       "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
-       "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
-       "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
-       "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
-
-       "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "ADD KEY `I_stats_id_ally` (`id_ally`)",
-
-       "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-       "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
+        "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+        "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
+        "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
+        "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
+        "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
+        "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
+        "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
+
+        "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "ADD KEY `I_stats_id_ally` (`id_ally`)",
+
+        "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
       ), true);
     }
 

Spacing +120 added lines, -120 removed lines

@@ -1,11 +1,11 @@ 
 <?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:
@@ -34,7 +34,7 @@ 
     );
     upd_drop_table('lunas');
 
-    if($update_tables['galaxy'])
+    if ($update_tables['galaxy'])
     {
       upd_do_query(
         'UPDATE `{{planets}}`
@@ -85,7 +85,7 @@ 
     );
     upd_add_more_time();
 
-    if($update_tables['users']['rpg_points'])
+    if ($update_tables['users']['rpg_points'])
     {
       upd_do_query(
         "UPDATE {{users}} AS u
@@ -146,7 +146,7 @@ 
 
     upd_drop_table('update');
 
-    upd_check_key('fleet_speed', $config->fleet_speed/2500, $config->fleet_speed >= 2500);
+    upd_check_key('fleet_speed', $config->fleet_speed / 2500, $config->fleet_speed >= 2500);
     upd_check_key('game_counter', 0);
     upd_check_key('game_default_language', 'ru');
     upd_check_key('game_default_skin', 'skins/EpicBlue/');
@@ -155,7 +155,7 @@ 
     upd_check_key('game_news_actual', 259200);
     upd_check_key('game_noob_factor', 5, !isset($config->game_noob_factor));
     upd_check_key('game_noob_points', 5000, !isset($config->game_noob_points));
-    upd_check_key('game_speed', $config->game_speed/2500, $config->game_speed >= 2500);
+    upd_check_key('game_speed', $config->game_speed / 2500, $config->game_speed >= 2500);
     upd_check_key('int_format_date', 'd.m.Y');
     upd_check_key('int_format_time', 'H:i:s', true);
     upd_check_key('int_banner_background', 'design/images/banner.png', true);
@@ -179,22 +179,22 @@ 
     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)
+        foreach ($old_que as $old_que_item_string)
         {
-          if(!$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;
           }
@@ -230,7 +230,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;');
@@ -281,10 +281,10 @@ 
     ), !$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');
       }
@@ -350,7 +350,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',
         "(
@@ -375,12 +375,12 @@ 
       $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)
+        foreach ($shortcuts as $shortcut)
         {
-          if(!$shortcut)
+          if (!$shortcut)
           {
             continue;
           }
@@ -392,7 +392,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 {$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);
           }
@@ -546,7 +546,7 @@ 
 
     upd_check_key('quest_total', 0, !isset($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}"]);
@@ -575,7 +575,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',
@@ -598,7 +598,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);
     }
@@ -613,8 +613,8 @@ 
     upd_log_version_update();
 
     upd_check_key('game_email_pm', 0, !isset($config->game_email_pm));
-    upd_check_key('player_vacation_time', 2*24*60*60, !isset($config->player_vacation_time));
-    upd_check_key('player_delete_time', 45*24*60*60, !isset($config->player_delete_time));
+    upd_check_key('player_vacation_time', 2 * 24 * 60 * 60, !isset($config->player_vacation_time));
+    upd_check_key('player_delete_time', 45 * 24 * 60 * 60, !isset($config->player_delete_time));
 
     upd_create_table('log_dark_matter',
       "(
@@ -636,18 +636,18 @@ 
     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;
@@ -664,21 +664,21 @@ 
           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];
@@ -686,7 +686,7 @@ 
           break;
         }
 
-        if($matches[2])
+        if ($matches[2])
         {
           $row['log_username'] = db_escape($row['log_username']);
           $row['log_page'] = db_escape($row['log_page']);
@@ -706,14 +706,14 @@ 
       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 = '{$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);
       }
@@ -734,7 +734,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;");
 
@@ -748,7 +748,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;");
 
@@ -799,7 +799,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`",
@@ -815,7 +815,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($config->eco_scale_storage));
 
@@ -846,7 +846,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`",
@@ -862,7 +862,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`",
@@ -879,7 +879,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);
 
@@ -894,7 +894,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);
 
@@ -908,7 +908,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`",
@@ -924,7 +924,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);
 
@@ -963,7 +963,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);
 
@@ -988,7 +988,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);
 
@@ -1114,7 +1114,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);
 
@@ -1134,7 +1134,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);
 
@@ -1150,7 +1150,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);
 
@@ -1305,7 +1305,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 {$config->db_prefix}mercenaries;");
 
@@ -1336,13 +1336,13 @@ 
 
       $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;");
@@ -1350,14 +1350,14 @@ 
           }
         }
 
-        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',
         "(
@@ -1381,7 +1381,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",
@@ -1403,7 +1403,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']};");
@@ -1418,7 +1418,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']};");
@@ -1450,10 +1450,10 @@ 
     // 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;");
@@ -1467,7 +1467,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']);
 
@@ -1489,7 +1489,7 @@ 
     upd_check_key('ali_bonus_brackets', 10, !isset($config->ali_bonus_brackets));
     upd_check_key('ali_bonus_brackets_divisor', 50, !isset($config->ali_bonus_brackets_divisor));
 
-    if(!$config->db_loadItem('rpg_flt_explore'))
+    if (!$config->db_loadItem('rpg_flt_explore'))
     {
       $inflation_rate = 1000;
 
@@ -1507,20 +1507,20 @@ 
       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;");
         }
@@ -1551,7 +1551,7 @@ 
     upd_check_key('user_birthday_range', 30, !isset($config->user_birthday_range));
     upd_check_key('user_birthday_celebrate', 0, !isset($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`)",
@@ -1603,7 +1603,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`",
@@ -1688,7 +1688,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'",
@@ -1710,10 +1710,10 @@ 
 
       $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'];
         }
@@ -1723,7 +1723,7 @@ 
         }
       }
       $lost = implode(',', $lost);
-      if($lost)
+      if ($lost)
       {
         upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
       }
@@ -1745,7 +1745,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',
         "(
@@ -1787,7 +1787,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_player'])
+    if (!$update_tables['ube_report_player'])
     {
       upd_create_table('ube_report_player',
         "(
@@ -1809,7 +1809,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_fleet'])
+    if (!$update_tables['ube_report_fleet'])
     {
       upd_create_table('ube_report_fleet',
         "(
@@ -1840,7 +1840,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_unit'])
+    if (!$update_tables['ube_report_unit'])
     {
       // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
       // Может сохранять имена удаленных кораблей долго?
@@ -1878,7 +1878,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_fleet'])
+    if (!$update_tables['ube_report_outcome_fleet'])
     {
       upd_create_table('ube_report_outcome_fleet',
         "(
@@ -1908,7 +1908,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_unit'])
+    if (!$update_tables['ube_report_outcome_unit'])
     {
       upd_create_table('ube_report_outcome_unit',
         "(
@@ -1930,7 +1930,7 @@ 
       );
     }
 
-    if(!$update_tables['unit'])
+    if (!$update_tables['unit'])
     {
       upd_create_table('unit',
         "(
@@ -1950,7 +1950,7 @@ 
       );
     }
 
-    if(!$update_tables['captain'])
+    if (!$update_tables['captain'])
     {
       upd_create_table('captain',
         "(
@@ -1971,7 +1971,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`",
@@ -1994,7 +1994,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',
         "(
@@ -2057,7 +2057,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`",
@@ -2091,7 +2091,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'",
@@ -2108,7 +2108,7 @@ 
       );
     }
 
-    if(!$update_tables['que'])
+    if (!$update_tables['que'])
     {
       upd_create_table('que',
         "(
@@ -2141,15 +2141,15 @@ 
     }
 
     // Конвертирум очередь исследований
-    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;
         }
@@ -2157,14 +2157,14 @@ 
         $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';
             }
@@ -2181,9 +2181,9 @@ 
         $price_increase = pow($unit_factor, $unit_level);
         $unit_level++;
         $unit_cost = array();
-        foreach($unit_info[P_COST] as $resource_id => $resource_amount)
+        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))
+          if ($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase))
           {
             continue;
           }
@@ -2195,7 +2195,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));
       }
@@ -2210,7 +2210,7 @@ 
 
 
     // Ковертируем технологии в таблицы
-    if($update_tables['users']['graviton_tech'])
+    if ($update_tables['users']['graviton_tech'])
     {
       upd_do_query("DELETE FROM {{unit}} WHERE unit_type = " . UNIT_TECHNOLOGIES);
 
@@ -2218,18 +2218,18 @@ 
       $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))
+      while ($user_row = db_fetch($user_query))
       {
-        foreach($sn_group_tech as $tech_id)
+        foreach ($sn_group_tech as $tech_id)
         {
-          if($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)]))
+          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));
       }
@@ -2239,30 +2239,30 @@ 
       ), $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)
+      foreach ($planet_units as $unit_name => $unit_create)
       {
-        if($update_indexes['planets']['I_' . $unit_name])
+        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)";
         }
@@ -2274,7 +2274,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}})");
 
@@ -2295,7 +2295,7 @@ 
 
     upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !$config->chat_highlight_developer);
 
-    if(!$update_tables['player_name_history'])
+    if (!$update_tables['player_name_history'])
     {
       upd_check_key('game_user_changename_cost', 100000, !$config->game_user_changename_cost);
       upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
@@ -2325,7 +2325,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']);
 
@@ -2336,17 +2336,17 @@ 
       $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;
@@ -2378,14 +2378,14 @@ 
       "DROP COLUMN `colonisation_tech`",
     ), $update_tables['users']['spy_tech']);
 
-    upd_check_key('payment_currency_exchange_dm_', 2500,             !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
+    upd_check_key('payment_currency_exchange_dm_', 2500, !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
     upd_check_key('payment_currency_exchange_eur', 0.09259259259259, !$config->payment_currency_exchange_eur);
-    upd_check_key('payment_currency_exchange_rub', 4.0,              !$config->payment_currency_exchange_rub);
-    upd_check_key('payment_currency_exchange_usd', 0.125,            !$config->payment_currency_exchange_usd);
-    upd_check_key('payment_currency_exchange_wme', 0.0952380952381,  !$config->payment_currency_exchange_usd);
-    upd_check_key('payment_currency_exchange_wmr', 4.1,              !$config->payment_currency_exchange_wmr);
-    upd_check_key('payment_currency_exchange_wmu', 1.05,             !$config->payment_currency_exchange_wmu);
-    upd_check_key('payment_currency_exchange_wmz', 0.126582278481,   !$config->payment_currency_exchange_wmz);
+    upd_check_key('payment_currency_exchange_rub', 4.0, !$config->payment_currency_exchange_rub);
+    upd_check_key('payment_currency_exchange_usd', 0.125, !$config->payment_currency_exchange_usd);
+    upd_check_key('payment_currency_exchange_wme', 0.0952380952381, !$config->payment_currency_exchange_usd);
+    upd_check_key('payment_currency_exchange_wmr', 4.1, !$config->payment_currency_exchange_wmr);
+    upd_check_key('payment_currency_exchange_wmu', 1.05, !$config->payment_currency_exchange_wmu);
+    upd_check_key('payment_currency_exchange_wmz', 0.126582278481, !$config->payment_currency_exchange_wmz);
 
     upd_do_query('COMMIT;', true);
     $new_version = 37;

Braces +6 added lines, -12 removed lines

@@ -197,8 +197,7 @@ 
           if($old_que_item[4] == 'build')
           {
             $old_que_item[4] = BUILD_CREATE;
-          }
-          else
+          } else
           {
             $old_que_item[4] = BUILD_DESTROY;
           }
@@ -667,18 +666,15 @@ 
             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];
@@ -1716,8 +1712,7 @@ 
         if(!isset($found[$index]))
         {
           $found[$index] = $row['BUDDY_ID'];
-        }
-        else
+        } else
         {
           $lost[] = $row['BUDDY_ID'];
         }
@@ -2169,8 +2164,7 @@ 
               $que_data[QI_PLANET_ID] = 'NULL';
             }
           }
-        }
-        else
+        } else
         {
           $que_data[QI_PLANET_ID] = 'NULL';
         }

Switch Indentation +1564 added lines, -1564 removed lines

@@ -7,48 +7,48 @@ 
 
 switch($new_version)
 {
-  case 0:
-  case 1:
-  case 2:
-  case 3:
-  case 4:
-  case 5:
-  case 6:
-  case 7:
-  case 8:
-  case 9:
-    upd_log_version_update();
-
-    upd_alter_table('planets', "ADD `debris_metal` bigint(11) unsigned DEFAULT '0'", !$update_tables['planets']['debris_metal']);
-    upd_alter_table('planets', "ADD `debris_crystal` bigint(11) unsigned DEFAULT '0'", !$update_tables['planets']['debris_crystal']);
-
-    upd_alter_table('planets', array(
-      "ADD `parent_planet` bigint(11) unsigned DEFAULT '0'",
-      "ADD KEY `i_parent_planet` (`parent_planet`)"
-    ), !$update_tables['planets']['parent_planet']);
-    upd_do_query(
-      "UPDATE `{{planets}}` AS lu
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+      upd_log_version_update();
+
+      upd_alter_table('planets', "ADD `debris_metal` bigint(11) unsigned DEFAULT '0'", !$update_tables['planets']['debris_metal']);
+      upd_alter_table('planets', "ADD `debris_crystal` bigint(11) unsigned DEFAULT '0'", !$update_tables['planets']['debris_crystal']);
+
+      upd_alter_table('planets', array(
+        "ADD `parent_planet` bigint(11) unsigned DEFAULT '0'",
+        "ADD KEY `i_parent_planet` (`parent_planet`)"
+      ), !$update_tables['planets']['parent_planet']);
+      upd_do_query(
+        "UPDATE `{{planets}}` AS lu
         LEFT JOIN `{{planets}}` AS pl
           ON pl.galaxy=lu.galaxy AND pl.system=lu.system AND pl.planet=lu.planet AND pl.planet_type=1
       SET lu.parent_planet=pl.id WHERE lu.planet_type=3;"
-    );
-    upd_drop_table('lunas');
+      );
+      upd_drop_table('lunas');
 
-    if($update_tables['galaxy'])
-    {
-      upd_do_query(
-        'UPDATE `{{planets}}`
+      if($update_tables['galaxy'])
+      {
+        upd_do_query(
+          'UPDATE `{{planets}}`
           LEFT JOIN `{{galaxy}}` ON {{galaxy}}.id_planet = {{planets}}.id
         SET
           {{planets}}.debris_metal = {{galaxy}}.metal,
           {{planets}}.debris_crystal = {{galaxy}}.crystal
         WHERE {{galaxy}}.metal>0 OR {{galaxy}}.crystal>0;'
-      );
-    }
-    upd_drop_table('galaxy');
+        );
+      }
+      upd_drop_table('galaxy');
 
-    upd_create_table('counter',
-      "(
+      upd_create_table('counter',
+        "(
         `id` bigint(11) NOT NULL AUTO_INCREMENT,
         `time` int(11) NOT NULL DEFAULT '0',
         `page` varchar(255) CHARACTER SET utf8 DEFAULT '0',
@@ -58,63 +58,63 @@ 
         KEY `i_user_id` (`user_id`),
         KEY `i_ip` (`ip`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-    );
-    upd_alter_table('counter', "ADD `url` varchar(255) CHARACTER SET utf8 DEFAULT ''", !$update_tables['counter']['url']);
+      );
+      upd_alter_table('counter', "ADD `url` varchar(255) CHARACTER SET utf8 DEFAULT ''", !$update_tables['counter']['url']);
 
-    upd_alter_table('fleets', array(
-      "ADD KEY `fleet_mess` (`fleet_mess`)",
-      "ADD KEY `fleet_group` (`fleet_group`)"
-    ), !$update_indexes['fleets']['fleet_mess']);
+      upd_alter_table('fleets', array(
+        "ADD KEY `fleet_mess` (`fleet_mess`)",
+        "ADD KEY `fleet_group` (`fleet_group`)"
+      ), !$update_indexes['fleets']['fleet_mess']);
 
-    upd_alter_table('referrals', "ADD `dark_matter` bigint(11) NOT NULL DEFAULT '0' COMMENT 'How much player have aquired Dark Matter'", !$update_tables['referrals']['dark_matter']);
-    upd_alter_table('referrals', "ADD KEY `id_partner` (`id_partner`)", !$update_indexes['referrals']['id_partner']);
+      upd_alter_table('referrals', "ADD `dark_matter` bigint(11) NOT NULL DEFAULT '0' COMMENT 'How much player have aquired Dark Matter'", !$update_tables['referrals']['dark_matter']);
+      upd_alter_table('referrals', "ADD KEY `id_partner` (`id_partner`)", !$update_indexes['referrals']['id_partner']);
 
-    upd_check_key('rpg_bonus_divisor', 10);
+      upd_check_key('rpg_bonus_divisor', 10);
 
-    upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('BannerURL', 'banner_source_post', 'BannerOverviewFrame',
+      upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('BannerURL', 'banner_source_post', 'BannerOverviewFrame',
       'close_reason', 'dbVersion', 'ForumUserBarFrame', 'OverviewBanner', 'OverviewClickBanner', 'OverviewExternChat',
       'OverviewExternChatCmd', 'OverviewNewsText', 'UserbarURL', 'userbar_source');");
 
-    $dm_change_legit = true;
+      $dm_change_legit = true;
 
-    upd_do_query(
-      "UPDATE {{referrals}} AS r
+      upd_do_query(
+        "UPDATE {{referrals}} AS r
         LEFT JOIN {{users}} AS u
           ON u.id = r.id
       SET r.dark_matter = u.lvl_minier + u.lvl_raid;"
-    );
-    upd_add_more_time();
+      );
+      upd_add_more_time();
 
-    if($update_tables['users']['rpg_points'])
-    {
-      upd_do_query(
-        "UPDATE {{users}} AS u
+      if($update_tables['users']['rpg_points'])
+      {
+        upd_do_query(
+          "UPDATE {{users}} AS u
           RIGHT JOIN {{referrals}} AS r
             ON r.id_partner = u.id AND r.dark_matter >= {$config->rpg_bonus_divisor}
         SET u.rpg_points = u.rpg_points + FLOOR(r.dark_matter/{$config->rpg_bonus_divisor});"
-      );
-    }
+        );
+      }
 
-    $dm_change_legit = false;
-  upd_do_query('COMMIT;', true);
-  $new_version = 10;
-
-  case 10:
-  case 11:
-  case 12:
-  case 13:
-  case 14:
-  case 15:
-  case 16:
-  case 17:
-  case 18:
-  case 19:
-  case 20:
-  case 21:
-    upd_log_version_update();
-
-    upd_create_table('alliance_requests',
-      "(
+      $dm_change_legit = false;
+    upd_do_query('COMMIT;', true);
+    $new_version = 10;
+
+    case 10:
+    case 11:
+    case 12:
+    case 13:
+    case 14:
+    case 15:
+    case 16:
+    case 17:
+    case 18:
+    case 19:
+    case 20:
+    case 21:
+      upd_log_version_update();
+
+      upd_create_table('alliance_requests',
+        "(
         `id_user` int(11) NOT NULL,
         `id_ally` int(11) NOT NULL DEFAULT '0',
         `request_text` text,
@@ -122,103 +122,103 @@ 
         `request_denied` tinyint(1) unsigned NOT NULL DEFAULT '0',
         PRIMARY KEY (`id_user`,`id_ally`)
       ) ENGINE=MyISAM DEFAULT CHARSET=utf8;"
-    );
-
-    upd_alter_table('announce', "ADD `detail_url` varchar(250) NOT NULL DEFAULT '' COMMENT 'Link to more details about update'", !$update_tables['announce']['detail_url']);
-
-    upd_alter_table('counter', array("MODIFY `ip` VARCHAR(250) COMMENT 'User last IP'", "ADD `proxy` VARCHAR(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)'"), !$update_tables['counter']['proxy']);
-
-    upd_alter_table('statpoints', array(
-      "ADD `res_rank` INT(11) DEFAULT 0 COMMENT 'Rank by resources'",
-      "ADD `res_old_rank` INT(11) DEFAULT 0 COMMENT 'Old rank by resources'",
-      "ADD `res_points` BIGINT(20) DEFAULT 0 COMMENT 'Resource stat points'",
-      "ADD `res_count` BIGINT(20) DEFAULT 0 COMMENT 'Old rank by resources'"
-    ), !$update_tables['statpoints']['res_rank']);
-
-    upd_alter_table('planets', "ADD `supercargo` bigint(11) NOT NULL DEFAULT '0' COMMENT 'Supercargo ship count'", !$update_tables['planets']['supercargo']);
-
-    upd_alter_table('users', "DROP COLUMN `current_luna`", $update_tables['users']['current_luna']);
-    upd_alter_table('users', array("DROP COLUMN `aktywnosc`", "DROP COLUMN `time_aktyw`", "DROP COLUMN `kiler`",
-      "DROP COLUMN `kod_aktywujacy`", "DROP COLUMN `ataker`", "DROP COLUMN `atakin`"), $update_tables['users']['ataker']);
-    upd_alter_table('users', "ADD `options` TEXT COMMENT 'Packed user options'", !$update_tables['users']['options']);
-    upd_alter_table('users', "ADD `news_lastread` int(11) NOT NULL DEFAULT '0' COMMENT 'News last read date'", !$update_tables['users']['news_lastread']);
-    upd_alter_table('users', array("MODIFY `user_lastip` VARCHAR(250) COMMENT 'User last IP'", "ADD `user_proxy` VARCHAR(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)'"), !$update_tables['users']['user_proxy']);
-
-    upd_drop_table('update');
-
-    upd_check_key('fleet_speed', $config->fleet_speed/2500, $config->fleet_speed >= 2500);
-    upd_check_key('game_counter', 0);
-    upd_check_key('game_default_language', 'ru');
-    upd_check_key('game_default_skin', 'skins/EpicBlue/');
-    upd_check_key('game_default_template', 'OpenGame');
-    upd_check_key('game_news_overview', 3);
-    upd_check_key('game_news_actual', 259200);
-    upd_check_key('game_noob_factor', 5, !isset($config->game_noob_factor));
-    upd_check_key('game_noob_points', 5000, !isset($config->game_noob_points));
-    upd_check_key('game_speed', $config->game_speed/2500, $config->game_speed >= 2500);
-    upd_check_key('int_format_date', 'd.m.Y');
-    upd_check_key('int_format_time', 'H:i:s', true);
-    upd_check_key('int_banner_background', 'design/images/banner.png', true);
-    upd_check_key('int_userbar_background', 'design/images/userbar.png', true);
-    upd_check_key('player_max_colonies', $config->player_max_planets ? ($config->player_max_planets - 1) : 9);
-    upd_check_key('url_forum', $config->forum_url, !isset($config->url_forum));
-    upd_check_key('url_rules', $config->rules_url, !isset($config->url_rules));
-    upd_check_key('url_dark_matter', '', !isset($config->url_dark_matter));
-
-    upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN (
+      );
+
+      upd_alter_table('announce', "ADD `detail_url` varchar(250) NOT NULL DEFAULT '' COMMENT 'Link to more details about update'", !$update_tables['announce']['detail_url']);
+
+      upd_alter_table('counter', array("MODIFY `ip` VARCHAR(250) COMMENT 'User last IP'", "ADD `proxy` VARCHAR(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)'"), !$update_tables['counter']['proxy']);
+
+      upd_alter_table('statpoints', array(
+        "ADD `res_rank` INT(11) DEFAULT 0 COMMENT 'Rank by resources'",
+        "ADD `res_old_rank` INT(11) DEFAULT 0 COMMENT 'Old rank by resources'",
+        "ADD `res_points` BIGINT(20) DEFAULT 0 COMMENT 'Resource stat points'",
+        "ADD `res_count` BIGINT(20) DEFAULT 0 COMMENT 'Old rank by resources'"
+      ), !$update_tables['statpoints']['res_rank']);
+
+      upd_alter_table('planets', "ADD `supercargo` bigint(11) NOT NULL DEFAULT '0' COMMENT 'Supercargo ship count'", !$update_tables['planets']['supercargo']);
+
+      upd_alter_table('users', "DROP COLUMN `current_luna`", $update_tables['users']['current_luna']);
+      upd_alter_table('users', array("DROP COLUMN `aktywnosc`", "DROP COLUMN `time_aktyw`", "DROP COLUMN `kiler`",
+        "DROP COLUMN `kod_aktywujacy`", "DROP COLUMN `ataker`", "DROP COLUMN `atakin`"), $update_tables['users']['ataker']);
+      upd_alter_table('users', "ADD `options` TEXT COMMENT 'Packed user options'", !$update_tables['users']['options']);
+      upd_alter_table('users', "ADD `news_lastread` int(11) NOT NULL DEFAULT '0' COMMENT 'News last read date'", !$update_tables['users']['news_lastread']);
+      upd_alter_table('users', array("MODIFY `user_lastip` VARCHAR(250) COMMENT 'User last IP'", "ADD `user_proxy` VARCHAR(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)'"), !$update_tables['users']['user_proxy']);
+
+      upd_drop_table('update');
+
+      upd_check_key('fleet_speed', $config->fleet_speed/2500, $config->fleet_speed >= 2500);
+      upd_check_key('game_counter', 0);
+      upd_check_key('game_default_language', 'ru');
+      upd_check_key('game_default_skin', 'skins/EpicBlue/');
+      upd_check_key('game_default_template', 'OpenGame');
+      upd_check_key('game_news_overview', 3);
+      upd_check_key('game_news_actual', 259200);
+      upd_check_key('game_noob_factor', 5, !isset($config->game_noob_factor));
+      upd_check_key('game_noob_points', 5000, !isset($config->game_noob_points));
+      upd_check_key('game_speed', $config->game_speed/2500, $config->game_speed >= 2500);
+      upd_check_key('int_format_date', 'd.m.Y');
+      upd_check_key('int_format_time', 'H:i:s', true);
+      upd_check_key('int_banner_background', 'design/images/banner.png', true);
+      upd_check_key('int_userbar_background', 'design/images/userbar.png', true);
+      upd_check_key('player_max_colonies', $config->player_max_planets ? ($config->player_max_planets - 1) : 9);
+      upd_check_key('url_forum', $config->forum_url, !isset($config->url_forum));
+      upd_check_key('url_rules', $config->rules_url, !isset($config->url_rules));
+      upd_check_key('url_dark_matter', '', !isset($config->url_dark_matter));
+
+      upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN (
       'game_date_withTime', 'player_max_planets', 'OverviewNewsFrame', 'forum_url', 'rules_url'
     );");
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 22;
+    upd_do_query('COMMIT;', true);
+    $new_version = 22;
 
-  case 22:
-    upd_log_version_update();
+    case 22:
+      upd_log_version_update();
 
-    upd_alter_table('planets', "ADD `governor` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Planet governor'", !$update_tables['planets']['governor']);
-    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']);
+      upd_alter_table('planets', "ADD `governor` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Planet governor'", !$update_tables['planets']['governor']);
+      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'])
-    {
-      $planet_query = upd_do_query('SELECT * FROM {{planets}} WHERE `b_building` <> 0;');
-      $const_que_structures = QUE_STRUCTURES;
-      while($planet_data = db_fetch($planet_query))
+      if($update_tables['planets']['b_building'])
       {
-        $old_que = explode(';', $planet_data['b_building_id']);
-        foreach($old_que as $old_que_item_string)
+        $planet_query = upd_do_query('SELECT * FROM {{planets}} WHERE `b_building` <> 0;');
+        $const_que_structures = QUE_STRUCTURES;
+        while($planet_data = db_fetch($planet_query))
         {
-          if(!$old_que_item_string)
+          $old_que = explode(';', $planet_data['b_building_id']);
+          foreach($old_que as $old_que_item_string)
           {
-            continue;
-          }
+            if(!$old_que_item_string)
+            {
+              continue;
+            }
 
-          $old_que_item = explode(',', $old_que_item_string);
-          if($old_que_item[4] == 'build')
-          {
-            $old_que_item[4] = BUILD_CREATE;
-          }
-          else
-          {
-            $old_que_item[4] = BUILD_DESTROY;
-          }
+            $old_que_item = explode(',', $old_que_item_string);
+            if($old_que_item[4] == 'build')
+            {
+              $old_que_item[4] = BUILD_CREATE;
+            }
+            else
+            {
+              $old_que_item[4] = BUILD_DESTROY;
+            }
 
-          $old_que_item[3] = $old_que_item[3] > $planet_data['last_update'] ? $old_que_item[3] - $planet_data['last_update'] : 1;
-          $planet_data['que'] = "{$old_que_item[0]},1,{$old_que_item[3]},{$old_que_item[4]},{$const_que_structures};{$planet_data['que']}";
+            $old_que_item[3] = $old_que_item[3] > $planet_data['last_update'] ? $old_que_item[3] - $planet_data['last_update'] : 1;
+            $planet_data['que'] = "{$old_que_item[0]},1,{$old_que_item[3]},{$old_que_item[4]},{$const_que_structures};{$planet_data['que']}";
+          }
+          upd_do_query("UPDATE {{planets}} SET `que` = '{$planet_data['que']}', `b_building` = '0', `b_building_id` = '0' WHERE `id` = '{$planet_data['id']}' LIMIT 1;", true);
         }
-        upd_do_query("UPDATE {{planets}} SET `que` = '{$planet_data['que']}', `b_building` = '0', `b_building_id` = '0' WHERE `id` = '{$planet_data['id']}' LIMIT 1;", true);
       }
-    }
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 23;
+    upd_do_query('COMMIT;', true);
+    $new_version = 23;
 
-  case 23:
-  case 24:
-    upd_log_version_update();
+    case 23:
+    case 24:
+      upd_log_version_update();
 
-    upd_create_table('confirmations',
-      "(
+      upd_create_table('confirmations',
+        "(
         `id` bigint(11) NOT NULL AUTO_INCREMENT,
         `id_user` bigint(11) NOT NULL DEFAULT 0,
         `type` SMALLINT NOT NULL DEFAULT 0,
@@ -228,130 +228,130 @@ 
         PRIMARY KEY (`id`),
         KEY `i_code_email` (`code`, `email`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-    );
+      );
 
-    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']);
-    }
+      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']);
+      }
 
-    upd_check_key('user_vacation_disable', $config->urlaubs_modus_erz, !isset($config->user_vacation_disable));
-    upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('urlaubs_modus_erz');");
+      upd_check_key('user_vacation_disable', $config->urlaubs_modus_erz, !isset($config->user_vacation_disable));
+      upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('urlaubs_modus_erz');");
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 25;
-
-  case 25:
-    upd_log_version_update();
-
-    upd_alter_table('rw', array(
-      "DROP COLUMN `a_zestrzelona`",
-      "DROP INDEX `rid`",
-      "ADD COLUMN `report_id` bigint(11) NOT NULL AUTO_INCREMENT FIRST",
-      "ADD PRIMARY KEY (`report_id`)",
-      "ADD INDEX `i_rid` (`rid`)"
-    ), !$update_tables['rw']['report_id']);
-
-    upd_add_more_time();
-    upd_create_table('logs_backup', "AS (SELECT * FROM {$config->db_prefix}logs);");
-
-    upd_alter_table('logs', array(
-      "MODIFY COLUMN `log_id` INT(1)",
-      "DROP PRIMARY KEY"
-    ), !$update_tables['logs']['log_timestamp']);
-
-    upd_alter_table('logs', array(
-      "DROP COLUMN `log_id`",
-      "ADD COLUMN `log_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Human-readable record timestamp' FIRST",
-      "ADD COLUMN `log_username` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'Username' AFTER `log_timestamp`",
-      "MODIFY COLUMN `log_title` VARCHAR(64) NOT NULL DEFAULT 'Log entry' COMMENT 'Short description' AFTER `log_username`",
-      "MODIFY COLUMN `log_page` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Page that makes entry to log' AFTER `log_text`",
-      "CHANGE COLUMN `log_type` `log_code` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `log_page`",
-      "MODIFY COLUMN `log_sender` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'User ID which make log record' AFTER `log_code`",
-      "MODIFY COLUMN `log_time` INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Machine-readable timestamp' AFTER `log_sender`",
-      "ADD COLUMN `log_dump` TEXT NOT NULL DEFAULT '' COMMENT 'Machine-readable dump of variables' AFTER `log_time`",
-      "ADD INDEX `i_log_username` (`log_username`)",
-      "ADD INDEX `i_log_time` (`log_time`)",
-      "ADD INDEX `i_log_sender` (`log_sender`)",
-      "ADD INDEX `i_log_code` (`log_code`)",
-      "ADD INDEX `i_log_page` (`log_page`)",
-      "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"
-    ), !$update_tables['logs']['log_timestamp']);
-    upd_do_query('DELETE FROM `{{logs}}` WHERE `log_code` = 303;');
-
-    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'])
+    upd_do_query('COMMIT;', true);
+    $new_version = 25;
+
+    case 25:
+      upd_log_version_update();
+
+      upd_alter_table('rw', array(
+        "DROP COLUMN `a_zestrzelona`",
+        "DROP INDEX `rid`",
+        "ADD COLUMN `report_id` bigint(11) NOT NULL AUTO_INCREMENT FIRST",
+        "ADD PRIMARY KEY (`report_id`)",
+        "ADD INDEX `i_rid` (`rid`)"
+      ), !$update_tables['rw']['report_id']);
+
+      upd_add_more_time();
+      upd_create_table('logs_backup', "AS (SELECT * FROM {$config->db_prefix}logs);");
+
+      upd_alter_table('logs', array(
+        "MODIFY COLUMN `log_id` INT(1)",
+        "DROP PRIMARY KEY"
+      ), !$update_tables['logs']['log_timestamp']);
+
+      upd_alter_table('logs', array(
+        "DROP COLUMN `log_id`",
+        "ADD COLUMN `log_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Human-readable record timestamp' FIRST",
+        "ADD COLUMN `log_username` VARCHAR(64) NOT NULL DEFAULT '' COMMENT 'Username' AFTER `log_timestamp`",
+        "MODIFY COLUMN `log_title` VARCHAR(64) NOT NULL DEFAULT 'Log entry' COMMENT 'Short description' AFTER `log_username`",
+        "MODIFY COLUMN `log_page` VARCHAR(512) NOT NULL DEFAULT '' COMMENT 'Page that makes entry to log' AFTER `log_text`",
+        "CHANGE COLUMN `log_type` `log_code` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `log_page`",
+        "MODIFY COLUMN `log_sender` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'User ID which make log record' AFTER `log_code`",
+        "MODIFY COLUMN `log_time` INT(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Machine-readable timestamp' AFTER `log_sender`",
+        "ADD COLUMN `log_dump` TEXT NOT NULL DEFAULT '' COMMENT 'Machine-readable dump of variables' AFTER `log_time`",
+        "ADD INDEX `i_log_username` (`log_username`)",
+        "ADD INDEX `i_log_time` (`log_time`)",
+        "ADD INDEX `i_log_sender` (`log_sender`)",
+        "ADD INDEX `i_log_code` (`log_code`)",
+        "ADD INDEX `i_log_page` (`log_page`)",
+        "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"
+      ), !$update_tables['logs']['log_timestamp']);
+      upd_do_query('DELETE FROM `{{logs}}` WHERE `log_code` = 303;');
+
+      if($update_tables['errors'])
       {
-        upd_drop_table('errors_backup');
-      }
-//      __db_query("ALTER TABLE {$config->db_prefix}errors RENAME TO {$config->db_prefix}errors_backup;");
-//      classSupernova::$db->__db_query("ALTER TABLE {$config->db_prefix}errors RENAME TO {$config->db_prefix}errors_backup;");
-      upd_alter_table('errors', ' RENAME TO {$config->db_prefix}errors_backup');
+        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'])
+        {
+          upd_drop_table('errors_backup');
+        }
+  //      __db_query("ALTER TABLE {$config->db_prefix}errors RENAME TO {$config->db_prefix}errors_backup;");
+  //      classSupernova::$db->__db_query("ALTER TABLE {$config->db_prefix}errors RENAME TO {$config->db_prefix}errors_backup;");
+        upd_alter_table('errors', ' RENAME TO {$config->db_prefix}errors_backup');
 
-      upd_drop_table('errors');
-    }
+        upd_drop_table('errors');
+      }
 
-    upd_alter_table('logs', 'ORDER BY log_time');
+      upd_alter_table('logs', 'ORDER BY log_time');
 
-    upd_alter_table('logs', array("ADD COLUMN `log_id` SERIAL", "ADD PRIMARY KEY (`log_id`)"), !$update_tables['logs']['log_id']);
+      upd_alter_table('logs', array("ADD COLUMN `log_id` SERIAL", "ADD PRIMARY KEY (`log_id`)"), !$update_tables['logs']['log_id']);
 
-    upd_do_query('UPDATE `{{logs}}` SET `log_timestamp` = FROM_UNIXTIME(`log_time`);');
-    upd_do_query('UPDATE `{{logs}}` AS l LEFT JOIN `{{users}}` AS u ON u.id = l.log_sender SET l.log_username = u.username WHERE l.log_username IS NOT NULL;');
+      upd_do_query('UPDATE `{{logs}}` SET `log_timestamp` = FROM_UNIXTIME(`log_time`);');
+      upd_do_query('UPDATE `{{logs}}` AS l LEFT JOIN `{{users}}` AS u ON u.id = l.log_sender SET l.log_username = u.username WHERE l.log_username IS NOT NULL;');
 
-    upd_do_query("UPDATE `{{logs}}` SET `log_code` = 190 WHERE `log_code` = 100 AND `log_title` = 'Stat update';");
-    upd_do_query("UPDATE `{{logs}}` SET `log_code` = 191 WHERE `log_code` = 101 AND `log_title` = 'Stat update';");
-    upd_do_query("UPDATE `{{logs}}` SET `log_code` = 192 WHERE `log_code` = 102 AND `log_title` = 'Stat update';");
-    $sys_log_disabled = false;
+      upd_do_query("UPDATE `{{logs}}` SET `log_code` = 190 WHERE `log_code` = 100 AND `log_title` = 'Stat update';");
+      upd_do_query("UPDATE `{{logs}}` SET `log_code` = 191 WHERE `log_code` = 101 AND `log_title` = 'Stat update';");
+      upd_do_query("UPDATE `{{logs}}` SET `log_code` = 192 WHERE `log_code` = 102 AND `log_title` = 'Stat update';");
+      $sys_log_disabled = false;
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 26;
+      upd_do_query('COMMIT;', true);
+      $new_version = 26;
 
-  case 26:
-    upd_log_version_update();
+    case 26:
+      upd_log_version_update();
 
-    $sys_log_disabled = false;
+      $sys_log_disabled = false;
 
-    upd_alter_table('planets', "ADD INDEX `i_parent_planet` (`parent_planet`)", !$update_indexes['planets']['i_parent_planet']);
-    upd_alter_table('messages', "DROP INDEX `owner`", $update_indexes['messages']['owner']);
-    upd_alter_table('messages', "DROP INDEX `owner_type`", $update_indexes['messages']['owner_type']);
-    upd_alter_table('messages', "DROP INDEX `sender_type`", $update_indexes['messages']['sender_type']);
+      upd_alter_table('planets', "ADD INDEX `i_parent_planet` (`parent_planet`)", !$update_indexes['planets']['i_parent_planet']);
+      upd_alter_table('messages', "DROP INDEX `owner`", $update_indexes['messages']['owner']);
+      upd_alter_table('messages', "DROP INDEX `owner_type`", $update_indexes['messages']['owner_type']);
+      upd_alter_table('messages', "DROP INDEX `sender_type`", $update_indexes['messages']['sender_type']);
 
-    upd_alter_table('messages', array(
-      "ADD INDEX `i_owner_time` (`message_owner`, `message_time`)",
-      "ADD INDEX `i_sender_time` (`message_sender`, `message_time`)",
-      "ADD INDEX `i_time` (`message_time`)"
-    ), !$update_indexes['messages']['i_owner_time']);
+      upd_alter_table('messages', array(
+        "ADD INDEX `i_owner_time` (`message_owner`, `message_time`)",
+        "ADD INDEX `i_sender_time` (`message_sender`, `message_time`)",
+        "ADD INDEX `i_time` (`message_time`)"
+      ), !$update_indexes['messages']['i_owner_time']);
 
-    upd_drop_table('fleet_log');
+      upd_drop_table('fleet_log');
 
-    upd_do_query("UPDATE `{{planets}}` SET `metal` = 0 WHERE `metal` < 0;");
-    upd_do_query("UPDATE `{{planets}}` SET `crystal` = 0 WHERE `crystal` < 0;");
-    upd_do_query("UPDATE `{{planets}}` SET `deuterium` = 0 WHERE `deuterium` < 0;");
-    upd_alter_table('planets', array(
-       "DROP COLUMN `b_building`",
-       "DROP COLUMN `b_building_id`"
-    ), $update_tables['planets']['b_building']);
+      upd_do_query("UPDATE `{{planets}}` SET `metal` = 0 WHERE `metal` < 0;");
+      upd_do_query("UPDATE `{{planets}}` SET `crystal` = 0 WHERE `crystal` < 0;");
+      upd_do_query("UPDATE `{{planets}}` SET `deuterium` = 0 WHERE `deuterium` < 0;");
+      upd_alter_table('planets', array(
+         "DROP COLUMN `b_building`",
+         "DROP COLUMN `b_building_id`"
+      ), $update_tables['planets']['b_building']);
 
-    upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('noobprotection', 'noobprotectionmulti', 'noobprotectiontime', 'chat_admin_msgFormat');");
+      upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('noobprotection', 'noobprotectionmulti', 'noobprotectiontime', 'chat_admin_msgFormat');");
 
-    upd_do_query("DELETE FROM `{{logs}}` WHERE `log_code` = 501;");
-    upd_do_query("DELETE FROM `{{logs}}` WHERE `log_title` IN ('Canceling Hangar Que', 'Building Planet Defense');");
+      upd_do_query("DELETE FROM `{{logs}}` WHERE `log_code` = 501;");
+      upd_do_query("DELETE FROM `{{logs}}` WHERE `log_title` IN ('Canceling Hangar Que', 'Building Planet Defense');");
 
-    upd_check_key('chat_admin_highlight', '<font color=purple>$1</font>', !isset($config->chat_admin_highlight));
+      upd_check_key('chat_admin_highlight', '<font color=purple>$1</font>', !isset($config->chat_admin_highlight));
 
-    upd_check_key('int_banner_URL', 'banner.php?type=banner', $config->int_banner_URL == '/banner.php?type=banner');
-    upd_check_key('int_userbar_URL', 'banner.php?type=userbar', $config->int_userbar_URL == '/banner.php?type=userbar');
+      upd_check_key('int_banner_URL', 'banner.php?type=banner', $config->int_banner_URL == '/banner.php?type=banner');
+      upd_check_key('int_userbar_URL', 'banner.php?type=userbar', $config->int_userbar_URL == '/banner.php?type=userbar');
 
-    upd_alter_table('users', 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci');
+      upd_alter_table('users', 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci');
 
-    if(!$update_tables['shortcut'])
-    {
-      upd_create_table('shortcut',
-        "(
+      if(!$update_tables['shortcut'])
+      {
+        upd_create_table('shortcut',
+          "(
           `shortcut_id` SERIAL,
           `shortcut_user_id` BIGINT(11) UNSIGNED NOT NULL DEFAULT 0,
           `shortcut_planet_id` bigint(11) NOT NULL DEFAULT 0,
@@ -368,75 +368,75 @@ 
           CONSTRAINT `FK_shortcut_user_id` FOREIGN KEY (`shortcut_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
+        );
 
-      $temp_planet_types = array(PT_PLANET, PT_DEBRIS, PT_MOON);
+        $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))
-      {
-        $shortcuts = explode("\r\n", $user_data['fleet_shortcut']);
-        foreach($shortcuts as $shortcut)
+        $query = upd_do_query("SELECT id, fleet_shortcut FROM {{users}} WHERE fleet_shortcut > '';");
+        while($user_data = db_fetch($query))
         {
-          if(!$shortcut)
+          $shortcuts = explode("\r\n", $user_data['fleet_shortcut']);
+          foreach($shortcuts as $shortcut)
           {
-            continue;
-          }
+            if(!$shortcut)
+            {
+              continue;
+            }
 
-          $shortcut = explode(',', $shortcut);
-          $shortcut[0] = db_escape($shortcut[0]);
-          $shortcut[1] = intval($shortcut[1]);
-          $shortcut[2] = intval($shortcut[2]);
-          $shortcut[3] = intval($shortcut[3]);
-          $shortcut[4] = intval($shortcut[4]);
+            $shortcut = explode(',', $shortcut);
+            $shortcut[0] = db_escape($shortcut[0]);
+            $shortcut[1] = intval($shortcut[1]);
+            $shortcut[2] = intval($shortcut[2]);
+            $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))
-          {
-            upd_do_query("INSERT INTO {$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);
+            if($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types))
+            {
+              upd_do_query("INSERT INTO {$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);
+            }
           }
         }
-      }
 
-      upd_alter_table('users', 'DROP COLUMN `fleet_shortcut`');
-    };
+        upd_alter_table('users', 'DROP COLUMN `fleet_shortcut`');
+      };
 
-    upd_check_key('url_faq', '', !isset($config->url_faq));
+      upd_check_key('url_faq', '', !isset($config->url_faq));
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 27;
-
-  case 27:
-    upd_log_version_update();
-
-    upd_check_key('chat_highlight_moderator', '<font color=green>$1</font>', !isset($config->chat_highlight_moderator));
-    upd_check_key('chat_highlight_operator', '<font color=red>$1</font>', !isset($config->chat_highlight_operator));
-    upd_check_key('chat_highlight_admin', $config->chat_admin_highlight ? $config->chat_admin_highlight : '<font color=puple>$1</font>', !isset($config->chat_highlight_admin));
-
-    upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('chat_admin_highlight');");
-
-    upd_alter_table('banned', array(
-      "CHANGE COLUMN id ban_id bigint(20) unsigned NOT NULL AUTO_INCREMENT",
-      "CHANGE COLUMN `who` `ban_user_name` VARCHAR(64) NOT NULL DEFAULT ''",
-      "CHANGE COLUMN `theme` `ban_reason` VARCHAR(128) NOT NULL DEFAULT ''",
-      "CHANGE COLUMN `time` `ban_time` int(11) NOT NULL DEFAULT 0",
-      "CHANGE COLUMN `longer` `ban_until` int(11) NOT NULL DEFAULT 0",
-      "CHANGE COLUMN `author` `ban_issuer_name` VARCHAR(64) NOT NULL DEFAULT ''",
-      "CHANGE COLUMN `email` `ban_issuer_email` VARCHAR(64) NOT NULL DEFAULT ''",
-      "DROP COLUMN who2",
-      "ADD PRIMARY KEY (`ban_id`)"/*,
+      upd_do_query('COMMIT;', true);
+      $new_version = 27;
+
+    case 27:
+      upd_log_version_update();
+
+      upd_check_key('chat_highlight_moderator', '<font color=green>$1</font>', !isset($config->chat_highlight_moderator));
+      upd_check_key('chat_highlight_operator', '<font color=red>$1</font>', !isset($config->chat_highlight_operator));
+      upd_check_key('chat_highlight_admin', $config->chat_admin_highlight ? $config->chat_admin_highlight : '<font color=puple>$1</font>', !isset($config->chat_highlight_admin));
+
+      upd_do_query("DELETE FROM {{config}} WHERE `config_name` IN ('chat_admin_highlight');");
+
+      upd_alter_table('banned', array(
+        "CHANGE COLUMN id ban_id bigint(20) unsigned NOT NULL AUTO_INCREMENT",
+        "CHANGE COLUMN `who` `ban_user_name` VARCHAR(64) NOT NULL DEFAULT ''",
+        "CHANGE COLUMN `theme` `ban_reason` VARCHAR(128) NOT NULL DEFAULT ''",
+        "CHANGE COLUMN `time` `ban_time` int(11) NOT NULL DEFAULT 0",
+        "CHANGE COLUMN `longer` `ban_until` int(11) NOT NULL DEFAULT 0",
+        "CHANGE COLUMN `author` `ban_issuer_name` VARCHAR(64) NOT NULL DEFAULT ''",
+        "CHANGE COLUMN `email` `ban_issuer_email` VARCHAR(64) NOT NULL DEFAULT ''",
+        "DROP COLUMN who2",
+        "ADD PRIMARY KEY (`ban_id`)"/*,
       "RENAME TO {$config->db_prefix}ban"*/
-    ), !$update_tables['banned']['ban_id']);
-
-    upd_alter_table('alliance', array(
-      "MODIFY COLUMN `id` SERIAL",
-      "ADD CONSTRAINT UNIQUE KEY `i_ally_name` (`ally_name`)",
-      "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci",
-      "ENGINE=InnoDB"
-    ), !$update_indexes['alliance']['i_ally_name']);
-
-    $upd_relation_types = "'neutral', 'war', 'peace', 'confederation', 'federation', 'union', 'master', 'slave'";
-    upd_create_table('alliance_diplomacy',
-      "(
+      ), !$update_tables['banned']['ban_id']);
+
+      upd_alter_table('alliance', array(
+        "MODIFY COLUMN `id` SERIAL",
+        "ADD CONSTRAINT UNIQUE KEY `i_ally_name` (`ally_name`)",
+        "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci",
+        "ENGINE=InnoDB"
+      ), !$update_indexes['alliance']['i_ally_name']);
+
+      $upd_relation_types = "'neutral', 'war', 'peace', 'confederation', 'federation', 'union', 'master', 'slave'";
+      upd_create_table('alliance_diplomacy',
+        "(
         `alliance_diplomacy_id` SERIAL,
         `alliance_diplomacy_ally_id` bigint(11) UNSIGNED DEFAULT NULL,
         `alliance_diplomacy_contr_ally_id` bigint(11) UNSIGNED DEFAULT NULL,
@@ -453,10 +453,10 @@ 
         ,CONSTRAINT `FK_diplomacy_contr_ally_id`   FOREIGN KEY (`alliance_diplomacy_contr_ally_id`)   REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
         ,CONSTRAINT `FK_diplomacy_contr_ally_name` FOREIGN KEY (`alliance_diplomacy_contr_ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE CASCADE ON UPDATE CASCADE
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
+      );
 
-    upd_create_table('alliance_negotiation',
-      "(
+      upd_create_table('alliance_negotiation',
+        "(
         `alliance_negotiation_id` SERIAL,
         `alliance_negotiation_ally_id` bigint(11) UNSIGNED DEFAULT NULL,
         `alliance_negotiation_ally_name` varchar(32) DEFAULT '',
@@ -477,13 +477,13 @@ 
         ,CONSTRAINT `FK_negotiation_contr_ally_id`   FOREIGN KEY (`alliance_negotiation_contr_ally_id`)   REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
         ,CONSTRAINT `FK_negotiation_contr_ally_name` FOREIGN KEY (`alliance_negotiation_contr_ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE CASCADE ON UPDATE CASCADE
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
+      );
 
-    upd_alter_table('users', array("MODIFY COLUMN `id` SERIAL", "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"), true);
-    upd_alter_table('planets', array("MODIFY COLUMN `id` SERIAL", "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"), true);
+      upd_alter_table('users', array("MODIFY COLUMN `id` SERIAL", "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"), true);
+      upd_alter_table('planets', array("MODIFY COLUMN `id` SERIAL", "CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci"), true);
 
-    upd_create_table('bashing',
-      "(
+      upd_create_table('bashing',
+        "(
         `bashing_id` SERIAL,
         `bashing_user_id` bigint(11) UNSIGNED DEFAULT NULL,
         `bashing_planet_id` bigint(11) UNSIGNED DEFAULT NULL,
@@ -497,23 +497,23 @@ 
         CONSTRAINT  `FK_bashing_user_id`   FOREIGN KEY (`bashing_user_id`)   REFERENCES `{$config->db_prefix}users`   (`id`) ON DELETE CASCADE ON UPDATE CASCADE
         ,CONSTRAINT `FK_bashing_planet_id` FOREIGN KEY (`bashing_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
+      );
 
-    upd_check_key('fleet_bashing_war_delay', 12 * 60 * 60, !isset($config->fleet_bashing_war_delay));
-    upd_check_key('fleet_bashing_scope', 24 * 60 * 60, !isset($config->fleet_bashing_scope));
-    upd_check_key('fleet_bashing_interval', 30 * 60, !isset($config->fleet_bashing_interval));
-    upd_check_key('fleet_bashing_waves', 3, !isset($config->fleet_bashing_waves));
-    upd_check_key('fleet_bashing_attacks', 3, !isset($config->fleet_bashing_attacks));
+      upd_check_key('fleet_bashing_war_delay', 12 * 60 * 60, !isset($config->fleet_bashing_war_delay));
+      upd_check_key('fleet_bashing_scope', 24 * 60 * 60, !isset($config->fleet_bashing_scope));
+      upd_check_key('fleet_bashing_interval', 30 * 60, !isset($config->fleet_bashing_interval));
+      upd_check_key('fleet_bashing_waves', 3, !isset($config->fleet_bashing_waves));
+      upd_check_key('fleet_bashing_attacks', 3, !isset($config->fleet_bashing_attacks));
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 28;
+    upd_do_query('COMMIT;', true);
+    $new_version = 28;
 
-  case 28:
-  case 28.1:
-    upd_log_version_update();
+    case 28:
+    case 28.1:
+      upd_log_version_update();
 
-    upd_create_table('quest',
-      "(
+      upd_create_table('quest',
+        "(
         `quest_id` SERIAL,
         `quest_name` VARCHAR(255) DEFAULT NULL,
         `quest_description` TEXT,
@@ -525,10 +525,10 @@ 
         PRIMARY KEY (`quest_id`)
         ,KEY (`quest_type`, `quest_order`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
+      );
 
-    upd_create_table('quest_status',
-      "(
+      upd_create_table('quest_status',
+        "(
         `quest_status_id` SERIAL,
         `quest_status_quest_id` bigint(20) UNSIGNED DEFAULT NULL,
         `quest_status_user_id` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
@@ -540,82 +540,82 @@ 
         ,CONSTRAINT `FK_quest_status_quest_id` FOREIGN KEY (`quest_status_quest_id`) REFERENCES `{$config->db_prefix}quest` (`quest_id`) ON DELETE CASCADE ON UPDATE CASCADE
         ,CONSTRAINT `FK_quest_status_user_id`  FOREIGN KEY (`quest_status_user_id`)  REFERENCES `{$config->db_prefix}users` (`id`)       ON DELETE CASCADE ON UPDATE CASCADE
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
-
-    upd_check_key('quest_total', 0, !isset($config->quest_total));
-
-    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}"]);
-    }
-
-    upd_alter_table('alliance', array('DROP INDEX `id`',), $update_indexes['alliance']['id']);
-    upd_alter_table('alliance', array('DROP INDEX `ally_name`',), $update_indexes['alliance']['ally_name']);
-    upd_alter_table('alliance', array('ADD UNIQUE INDEX `i_ally_tag` (`ally_tag`)',), !$update_indexes['alliance']['i_ally_tag']);
-    upd_alter_table('alliance', array('MODIFY COLUMN `ranklist` TEXT',), true);
+      );
 
-    upd_alter_table('users', array('DROP INDEX `id`',), $update_indexes['users']['id']);
-    upd_alter_table('users', "CHANGE COLUMN `rpg_points` `dark_matter` int(11) DEFAULT 0", $update_tables['users']['rpg_points']);
+      upd_check_key('quest_total', 0, !isset($config->quest_total));
 
-    upd_alter_table('users', array(
-      'DROP COLUMN `ally_request`',
-      'DROP COLUMN `ally_request_text`',
-    ), $update_tables['users']['ally_request_text']);
+      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}"]);
+      }
 
-    upd_alter_table('users', array(
-      'ADD INDEX `i_ally_id` (`ally_id`)',
-      'ADD INDEX `i_ally_name` (`ally_name`)',
-    ), !$update_indexes['users']['i_ally_id']);
+      upd_alter_table('alliance', array('DROP INDEX `id`',), $update_indexes['alliance']['id']);
+      upd_alter_table('alliance', array('DROP INDEX `ally_name`',), $update_indexes['alliance']['ally_name']);
+      upd_alter_table('alliance', array('ADD UNIQUE INDEX `i_ally_tag` (`ally_tag`)',), !$update_indexes['alliance']['i_ally_tag']);
+      upd_alter_table('alliance', array('MODIFY COLUMN `ranklist` TEXT',), true);
 
-    upd_alter_table('users', array(
-      "ADD `msg_admin` bigint(11) unsigned DEFAULT '0' AFTER mnl_buildlist"
-    ), !$update_tables['users']['msg_admin']);
+      upd_alter_table('users', array('DROP INDEX `id`',), $update_indexes['users']['id']);
+      upd_alter_table('users', "CHANGE COLUMN `rpg_points` `dark_matter` int(11) DEFAULT 0", $update_tables['users']['rpg_points']);
 
-    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',
-      ), strtoupper($update_tables['users']['ally_id']['Type']) != 'BIGINT(20) UNSIGNED');
+        'DROP COLUMN `ally_request`',
+        'DROP COLUMN `ally_request_text`',
+      ), $update_tables['users']['ally_request_text']);
 
-      upd_do_query('DELETE FROM {{alliance}} WHERE id not in (select ally_id from {{users}} group by ally_id);');
-      upd_do_query("UPDATE {{users}} SET `ally_id` = null, ally_name = null, ally_register_time = 0, ally_rank_id = 0 WHERE `ally_id` NOT IN (SELECT id FROM {{alliance}});");
-      upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
+      upd_alter_table('users', array(
+        'ADD INDEX `i_ally_id` (`ally_id`)',
+        'ADD INDEX `i_ally_name` (`ally_name`)',
+      ), !$update_indexes['users']['i_ally_id']);
 
       upd_alter_table('users', array(
-         "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-         "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
-      ), !$update_foreigns['users']['FK_users_ally_id']);
-    }
+        "ADD `msg_admin` bigint(11) unsigned DEFAULT '0' AFTER mnl_buildlist"
+      ), !$update_tables['users']['msg_admin']);
 
-    upd_alter_table('planets', array(
-      "MODIFY COLUMN `debris_metal` BIGINT(20) UNSIGNED DEFAULT 0",
-      "MODIFY COLUMN `debris_crystal` BIGINT(20) UNSIGNED DEFAULT 0",
-    ), strtoupper($update_tables['planets']['debris_metal']['Type']) != 'BIGINT(20) UNSIGNED');
+      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',
+        ), strtoupper($update_tables['users']['ally_id']['Type']) != 'BIGINT(20) UNSIGNED');
+
+        upd_do_query('DELETE FROM {{alliance}} WHERE id not in (select ally_id from {{users}} group by ally_id);');
+        upd_do_query("UPDATE {{users}} SET `ally_id` = null, ally_name = null, ally_register_time = 0, ally_rank_id = 0 WHERE `ally_id` NOT IN (SELECT id FROM {{alliance}});");
+        upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
+
+        upd_alter_table('users', array(
+           "ADD CONSTRAINT `FK_users_ally_id` FOREIGN KEY (`ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+           "ADD CONSTRAINT `FK_users_ally_name` FOREIGN KEY (`ally_name`) REFERENCES `{$config->db_prefix}alliance` (`ally_name`) ON DELETE SET NULL ON UPDATE CASCADE",
+        ), !$update_foreigns['users']['FK_users_ally_id']);
+      }
 
-    $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))
-    {
-      upd_do_query("DELETE FROM {{planets}} WHERE id = {$illegal_moon_row['id']} LIMIT 1;", true);
-    }
+      upd_alter_table('planets', array(
+        "MODIFY COLUMN `debris_metal` BIGINT(20) UNSIGNED DEFAULT 0",
+        "MODIFY COLUMN `debris_crystal` BIGINT(20) UNSIGNED DEFAULT 0",
+      ), strtoupper($update_tables['planets']['debris_metal']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    upd_check_key('allow_buffing', isset($config->fleet_buffing_check) ? !$config->fleet_buffing_check : 0, !isset($config->allow_buffing));
-    upd_check_key('ally_help_weak', 0, !isset($config->ally_help_weak));
+      $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))
+      {
+        upd_do_query("DELETE FROM {{planets}} WHERE id = {$illegal_moon_row['id']} LIMIT 1;", true);
+      }
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 29;
+      upd_check_key('allow_buffing', isset($config->fleet_buffing_check) ? !$config->fleet_buffing_check : 0, !isset($config->allow_buffing));
+      upd_check_key('ally_help_weak', 0, !isset($config->ally_help_weak));
+
+    upd_do_query('COMMIT;', true);
+    $new_version = 29;
 
-  case 29:
-    upd_log_version_update();
+    case 29:
+      upd_log_version_update();
 
-    upd_check_key('game_email_pm', 0, !isset($config->game_email_pm));
-    upd_check_key('player_vacation_time', 2*24*60*60, !isset($config->player_vacation_time));
-    upd_check_key('player_delete_time', 45*24*60*60, !isset($config->player_delete_time));
+      upd_check_key('game_email_pm', 0, !isset($config->game_email_pm));
+      upd_check_key('player_vacation_time', 2*24*60*60, !isset($config->player_vacation_time));
+      upd_check_key('player_delete_time', 45*24*60*60, !isset($config->player_delete_time));
 
-    upd_create_table('log_dark_matter',
-      "(
+      upd_create_table('log_dark_matter',
+        "(
         `log_dark_matter_id` SERIAL,
         `log_dark_matter_timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Human-readable record timestamp',
         `log_dark_matter_username` varchar(64) NOT NULL DEFAULT '' COMMENT 'Username',
@@ -630,23 +630,23 @@ 
         KEY `i_log_dark_matter_reason_sender_id` (`log_dark_matter_reason`, `log_dark_matter_sender`, `log_dark_matter_id`),
         KEY `i_log_dark_matter_amount` (`log_dark_matter_amount`)
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_general_ci;"
-    );
-    upd_do_query('COMMIT;', true);
+      );
+      upd_do_query('COMMIT;', true);
 
-    $records = 1;
-    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))
+      $records = 1;
+      while($records)
       {
-        $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])
+        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))
         {
+          $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])
+          {
           case 'Level Up For Structure Building':
             $reason = RPG_STRUCTURE;
           break;
@@ -682,7 +682,7 @@ 
               $comment = $matches2[1];
             }
           break;
-        }
+          }
 
         if($matches[2])
         {
@@ -720,595 +720,595 @@ 
   upd_do_query('COMMIT;', true);
   $new_version = 30;
 
-  case 30:
-    upd_log_version_update();
+    case 30:
+      upd_log_version_update();
 
-    upd_alter_table('users', array(
-      "ADD `player_que` TEXT"
-    ), !$update_tables['users']['player_que']);
+      upd_alter_table('users', array(
+        "ADD `player_que` TEXT"
+      ), !$update_tables['users']['player_que']);
 
-    upd_alter_table('planets', array(
-      "CHANGE COLUMN `governor` `PLANET_GOVERNOR_ID` SMALLINT(5) NOT NULL DEFAULT 0",
-      "CHANGE COLUMN `governor_level` `PLANET_GOVERNOR_LEVEL` SMALLINT(5) NOT NULL DEFAULT 0",
-    ), !$update_tables['planets']['PLANET_GOVERNOR_ID']);
+      upd_alter_table('planets', array(
+        "CHANGE COLUMN `governor` `PLANET_GOVERNOR_ID` SMALLINT(5) NOT NULL DEFAULT 0",
+        "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'])
-    {
-      doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_geologue` + `rpg_ingenieur` + `rpg_constructeur` + `rpg_technocrate` + `rpg_scientifique` + `rpg_defenseur`) * 3;");
+      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(
+          "DROP COLUMN `rpg_geologue`",
+          "DROP COLUMN `rpg_ingenieur`",
+          "DROP COLUMN `rpg_constructeur`",
+          "DROP COLUMN `rpg_technocrate`",
+          "DROP COLUMN `rpg_scientifique`",
+          "DROP COLUMN `rpg_defenseur`",
+        ), $update_tables['users']['rpg_geologue']);
+      }
 
-      upd_alter_table('users', array(
-        "DROP COLUMN `rpg_geologue`",
-        "DROP COLUMN `rpg_ingenieur`",
-        "DROP COLUMN `rpg_constructeur`",
-        "DROP COLUMN `rpg_technocrate`",
-        "DROP COLUMN `rpg_scientifique`",
-        "DROP COLUMN `rpg_defenseur`",
-      ), $update_tables['users']['rpg_geologue']);
-    }
+      if($update_tables['users']['rpg_bunker'])
+      {
+        doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_bunker`) * 3;");
 
-    if($update_tables['users']['rpg_bunker'])
-    {
-      doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_bunker`) * 3;");
+        upd_alter_table('users', array(
+          "DROP COLUMN `rpg_bunker`",
+        ), $update_tables['users']['rpg_bunker']);
+      }
 
       upd_alter_table('users', array(
-        "DROP COLUMN `rpg_bunker`",
-      ), $update_tables['users']['rpg_bunker']);
-    }
+        "DROP COLUMN `p_infligees`",
+        "MODIFY COLUMN `dark_matter` BIGINT(20) DEFAULT '0' AFTER `lvl_raid`",
+      ), $update_tables['users']['p_infligees']);
 
-    upd_alter_table('users', array(
-      "DROP COLUMN `p_infligees`",
-      "MODIFY COLUMN `dark_matter` BIGINT(20) DEFAULT '0' AFTER `lvl_raid`",
-    ), $update_tables['users']['p_infligees']);
-
-    upd_alter_table('users', array(
-      "ADD COLUMN `mrc_academic` SMALLINT(3) DEFAULT 0",
-    ), !$update_tables['users']['mrc_academic']);
-
-    upd_alter_table('users', array(
-      "DROP COLUMN `db_deaktjava`",
-      "DROP COLUMN `kolorminus`",
-      "DROP COLUMN `kolorplus`",
-      "DROP COLUMN `kolorpoziom`",
-      "DROP COLUMN `deleteme`",
-
-      "MODIFY COLUMN `xpraid` BIGINT(20) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `xpminier` BIGINT(20) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `raids` BIGINT(20) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `raidsloose` BIGINT(20) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `raidswin` BIGINT(20) UNSIGNED DEFAULT '0'",
-
-      "MODIFY COLUMN `register_time` INT(10) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `onlinetime` INT(10) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `news_lastread` INT(10) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `deltime` INT(10) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `banaday` INT(10) UNSIGNED DEFAULT '0'",
-      "MODIFY COLUMN `vacation` INT(10) UNSIGNED DEFAULT '0'",
-    ), strtoupper($update_tables['users']['xpraid']['Type']) != 'BIGINT(20) UNSIGNED');
-
-    upd_alter_table('users', array(
-      "ADD COLUMN `total_rank` INT(10) UNSIGNED NOT NULL DEFAULT 0",
-      "ADD COLUMN `total_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0",
-    ), !isset($update_tables['users']['total_rank']));
-    doquery("UPDATE {{users}} AS u JOIN {{statpoints}} AS sp ON sp.id_owner = u.id AND sp.stat_code = 1 AND sp.stat_type = 1 SET u.total_rank = sp.total_rank, u.total_points = sp.total_points;");
-
-    upd_alter_table('alliance', array(
-      "ADD COLUMN `total_rank` INT(10) UNSIGNED NOT NULL DEFAULT 0",
-      "ADD COLUMN `total_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0",
-    ), !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']))
-    {
       upd_alter_table('users', array(
-        "ADD COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
-      ), !isset($update_tables['users']['ally_tag']));
-      doquery("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON a.id = u.ally_id SET u.ally_tag = a.ally_tag, u.ally_name = a.ally_name;");
-      doquery("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON a.id = u.ally_id SET u.ally_id = NULL, u.ally_tag = NULL, u.ally_name = NULL, u.ally_register_time = 0, ally_rank_id = 0 WHERE a.id is NULL;");
+        "ADD COLUMN `mrc_academic` SMALLINT(3) DEFAULT 0",
+      ), !$update_tables['users']['mrc_academic']);
+
       upd_alter_table('users', array(
-        "ADD CONSTRAINT `FK_users_ally_tag` FOREIGN KEY (`ally_tag`) REFERENCES `{$config->db_prefix}alliance` (`ally_tag`) ON DELETE SET NULL ON UPDATE CASCADE",
-      ), !$update_foreigns['users']['FK_users_ally_tag']);
-    }
+        "DROP COLUMN `db_deaktjava`",
+        "DROP COLUMN `kolorminus`",
+        "DROP COLUMN `kolorplus`",
+        "DROP COLUMN `kolorpoziom`",
+        "DROP COLUMN `deleteme`",
+
+        "MODIFY COLUMN `xpraid` BIGINT(20) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `xpminier` BIGINT(20) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `raids` BIGINT(20) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `raidsloose` BIGINT(20) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `raidswin` BIGINT(20) UNSIGNED DEFAULT '0'",
+
+        "MODIFY COLUMN `register_time` INT(10) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `onlinetime` INT(10) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `news_lastread` INT(10) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `deltime` INT(10) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `banaday` INT(10) UNSIGNED DEFAULT '0'",
+        "MODIFY COLUMN `vacation` INT(10) UNSIGNED DEFAULT '0'",
+      ), strtoupper($update_tables['users']['xpraid']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    upd_alter_table('users', array(
-      "ADD COLUMN `player_artifact_list` TEXT",
-    ), !isset($update_tables['users']['player_artifact_list']));
+      upd_alter_table('users', array(
+        "ADD COLUMN `total_rank` INT(10) UNSIGNED NOT NULL DEFAULT 0",
+        "ADD COLUMN `total_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0",
+      ), !isset($update_tables['users']['total_rank']));
+      doquery("UPDATE {{users}} AS u JOIN {{statpoints}} AS sp ON sp.id_owner = u.id AND sp.stat_code = 1 AND sp.stat_type = 1 SET u.total_rank = sp.total_rank, u.total_points = sp.total_points;");
 
-    if(!isset($update_tables['users']['player_rpg_tech_xp']))
-    {
-      upd_check_key('eco_scale_storage', 1, !isset($config->eco_scale_storage));
+      upd_alter_table('alliance', array(
+        "ADD COLUMN `total_rank` INT(10) UNSIGNED NOT NULL DEFAULT 0",
+        "ADD COLUMN `total_points` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0",
+      ), !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']))
+      {
+        upd_alter_table('users', array(
+          "ADD COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
+        ), !isset($update_tables['users']['ally_tag']));
+        doquery("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON a.id = u.ally_id SET u.ally_tag = a.ally_tag, u.ally_name = a.ally_name;");
+        doquery("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON a.id = u.ally_id SET u.ally_id = NULL, u.ally_tag = NULL, u.ally_name = NULL, u.ally_register_time = 0, ally_rank_id = 0 WHERE a.id is NULL;");
+        upd_alter_table('users', array(
+          "ADD CONSTRAINT `FK_users_ally_tag` FOREIGN KEY (`ally_tag`) REFERENCES `{$config->db_prefix}alliance` (`ally_tag`) ON DELETE SET NULL ON UPDATE CASCADE",
+        ), !$update_foreigns['users']['FK_users_ally_tag']);
+      }
 
       upd_alter_table('users', array(
-        "ADD COLUMN `player_rpg_tech_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
-        "ADD COLUMN `player_rpg_tech_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
-      ), !isset($update_tables['users']['player_rpg_tech_xp']));
+        "ADD COLUMN `player_artifact_list` TEXT",
+      ), !isset($update_tables['users']['player_artifact_list']));
 
-      doquery("UPDATE {{users}} AS u LEFT JOIN {{statpoints}} AS s ON s.id_owner = u.id AND s.stat_type = 1 AND s.stat_code = 1 SET u.player_rpg_tech_xp = s.tech_points;");
-    }
+      if(!isset($update_tables['users']['player_rpg_tech_xp']))
+      {
+        upd_check_key('eco_scale_storage', 1, !isset($config->eco_scale_storage));
 
-    upd_alter_table('planets', array(
-      "ADD COLUMN `planet_cargo_hyper` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `big_ship_cargo`",
-    ), !isset($update_tables['planets']['planet_cargo_hyper']));
+        upd_alter_table('users', array(
+          "ADD COLUMN `player_rpg_tech_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
+          "ADD COLUMN `player_rpg_tech_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
+        ), !isset($update_tables['users']['player_rpg_tech_xp']));
 
-  upd_do_query('COMMIT;', true);
-  $new_version = 31;
+        doquery("UPDATE {{users}} AS u LEFT JOIN {{statpoints}} AS s ON s.id_owner = u.id AND s.stat_type = 1 AND s.stat_code = 1 SET u.player_rpg_tech_xp = s.tech_points;");
+      }
 
-  case 31:
-    upd_log_version_update();
+      upd_alter_table('planets', array(
+        "ADD COLUMN `planet_cargo_hyper` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `big_ship_cargo`",
+      ), !isset($update_tables['planets']['planet_cargo_hyper']));
 
-    upd_alter_table('aks', array(
-      "MODIFY COLUMN `planet_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
-    ), strtoupper($update_tables['aks']['planet_type']['Type']) != 'TINYINT(1) UNSIGNED');
+    upd_do_query('COMMIT;', true);
+    $new_version = 31;
 
-    upd_alter_table('alliance', array(
-      "MODIFY COLUMN `ally_request_notallow` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
-      "MODIFY COLUMN `ally_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-    ), strtoupper($update_tables['alliance']['ally_owner']['Type']) != 'BIGINT(20) UNSIGNED');
+    case 31:
+      upd_log_version_update();
 
-    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`"
-      ), true);
-
-      upd_alter_table('alliance_diplomacy', array(
-        "MODIFY COLUMN `alliance_diplomacy_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `alliance_diplomacy_contr_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-
-        "ADD CONSTRAINT `FK_diplomacy_ally_id`       FOREIGN KEY (`alliance_diplomacy_ally_id`)       REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_diplomacy_contr_ally_id` FOREIGN KEY (`alliance_diplomacy_contr_ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      upd_alter_table('aks', array(
+        "MODIFY COLUMN `planet_type` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
+      ), strtoupper($update_tables['aks']['planet_type']['Type']) != 'TINYINT(1) 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`"
-      ), true);
-
-      upd_alter_table('alliance_negotiation', array(
-        "MODIFY COLUMN `alliance_negotiation_status` TINYINT(1) NOT NULL DEFAULT 0",
-        "MODIFY COLUMN `alliance_negotiation_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `alliance_negotiation_contr_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-
-        "ADD CONSTRAINT `FK_negotiation_ally_id`       FOREIGN KEY (`alliance_negotiation_ally_id`)       REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_negotiation_contr_ally_id` FOREIGN KEY (`alliance_negotiation_contr_ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      upd_alter_table('alliance', array(
+        "MODIFY COLUMN `ally_request_notallow` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
+        "MODIFY COLUMN `ally_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+      ), strtoupper($update_tables['alliance']['ally_owner']['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);
+      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`"
+        ), true);
+
+        upd_alter_table('alliance_diplomacy', array(
+          "MODIFY COLUMN `alliance_diplomacy_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `alliance_diplomacy_contr_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+
+          "ADD CONSTRAINT `FK_diplomacy_ally_id`       FOREIGN KEY (`alliance_diplomacy_ally_id`)       REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_diplomacy_contr_ally_id` FOREIGN KEY (`alliance_diplomacy_contr_ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      upd_alter_table('alliance_requests', array(
-        "MODIFY COLUMN `id_user` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
+      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`"
+        ), true);
+
+        upd_alter_table('alliance_negotiation', array(
+          "MODIFY COLUMN `alliance_negotiation_status` TINYINT(1) NOT NULL DEFAULT 0",
+          "MODIFY COLUMN `alliance_negotiation_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `alliance_negotiation_contr_ally_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+
+          "ADD CONSTRAINT `FK_negotiation_ally_id`       FOREIGN KEY (`alliance_negotiation_ally_id`)       REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_negotiation_contr_ally_id` FOREIGN KEY (`alliance_negotiation_contr_ally_id`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-        "ADD KEY `I_alliance_requests_id_ally` (`id_ally`, `id_user`)",
+      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);
 
-        "ADD CONSTRAINT `FK_alliance_request_user_id` FOREIGN KEY (`id_user`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_alliance_request_ally_id` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+        upd_alter_table('alliance_requests', array(
+          "MODIFY COLUMN `id_user` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
 
-    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);
+          "ADD KEY `I_alliance_requests_id_ally` (`id_ally`, `id_user`)",
 
-      upd_alter_table('annonce', array(
-        "MODIFY COLUMN `id` SERIAL",
-        "MODIFY COLUMN `user` VARCHAR(64) DEFAULT NULL",
+          "ADD CONSTRAINT `FK_alliance_request_user_id` FOREIGN KEY (`id_user`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_alliance_request_ally_id` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-        "ADD KEY `I_annonce_user` (`user`, `id`)",
+      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);
 
-        "ADD CONSTRAINT `FK_annonce_user` FOREIGN KEY (`user`) REFERENCES `{$config->db_prefix}users` (`username`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+        upd_alter_table('annonce', array(
+          "MODIFY COLUMN `id` SERIAL",
+          "MODIFY COLUMN `user` VARCHAR(64) DEFAULT NULL",
 
-    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`",
-      ), true);
-
-      upd_alter_table('bashing', array(
-        "MODIFY COLUMN `bashing_user_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `bashing_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-
-        "ADD CONSTRAINT `FK_bashing_user_id`   FOREIGN KEY (`bashing_user_id`)   REFERENCES `{$config->db_prefix}users`   (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_bashing_planet_id` FOREIGN KEY (`bashing_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+          "ADD KEY `I_annonce_user` (`user`, `id`)",
 
-    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);
+          "ADD CONSTRAINT `FK_annonce_user` FOREIGN KEY (`user`) REFERENCES `{$config->db_prefix}users` (`username`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      upd_alter_table('buddy', array(
-        "MODIFY COLUMN `id` SERIAL",
-        "MODIFY COLUMN `sender` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `active` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
+      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`",
+        ), true);
+
+        upd_alter_table('bashing', array(
+          "MODIFY COLUMN `bashing_user_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `bashing_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+
+          "ADD CONSTRAINT `FK_bashing_user_id`   FOREIGN KEY (`bashing_user_id`)   REFERENCES `{$config->db_prefix}users`   (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_bashing_planet_id` FOREIGN KEY (`bashing_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-        "ADD KEY `I_buddy_sender` (`sender`)",
-        "ADD KEY `I_buddy_owner` (`owner`)",
+      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);
 
-        "ADD CONSTRAINT `FK_buddy_sender_id` FOREIGN KEY (`sender`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_buddy_owner_id`  FOREIGN KEY (`owner`)  REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+        upd_alter_table('buddy', array(
+          "MODIFY COLUMN `id` SERIAL",
+          "MODIFY COLUMN `sender` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `active` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0",
 
-    upd_alter_table('chat', array(
-      "MODIFY COLUMN `messageid` SERIAL",
-    ), strtoupper($update_tables['chat']['messageid']['Type']) != 'BIGINT(20) UNSIGNED');
+          "ADD KEY `I_buddy_sender` (`sender`)",
+          "ADD KEY `I_buddy_owner` (`owner`)",
 
-    upd_alter_table('counter', array(
-      "CHANGE COLUMN `id` `counter_id` SERIAL",
+          "ADD CONSTRAINT `FK_buddy_sender_id` FOREIGN KEY (`sender`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_buddy_owner_id`  FOREIGN KEY (`owner`)  REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      "MODIFY COLUMN `user_id` BIGINT(20) UNSIGNED DEFAULT 0",
+      upd_alter_table('chat', array(
+        "MODIFY COLUMN `messageid` SERIAL",
+      ), strtoupper($update_tables['chat']['messageid']['Type']) != 'BIGINT(20) UNSIGNED');
 
-      "ADD COLUMN `user_name` VARCHAR(64) DEFAULT '' AFTER `user_id`",
+      upd_alter_table('counter', array(
+        "CHANGE COLUMN `id` `counter_id` SERIAL",
 
-      "ADD KEY `I_counter_user_name` (`user_name`)",
-    ), strtoupper($update_tables['counter']['counter_id']['Type']) != 'BIGINT(20) UNSIGNED');
+        "MODIFY COLUMN `user_id` BIGINT(20) UNSIGNED DEFAULT 0",
 
-    upd_alter_table('fleets', array(
-      "MODIFY COLUMN `fleet_id` SERIAL",
-      "MODIFY COLUMN `fleet_resource_metal` DECIMAL(65,0) DEFAULT '0'",
-      "MODIFY COLUMN `fleet_resource_crystal` DECIMAL(65,0) DEFAULT '0'",
-      "MODIFY COLUMN `fleet_resource_deuterium` DECIMAL(65,0) DEFAULT '0'",
-    ), strtoupper($update_tables['fleets']['fleet_resource_metal']['Type']) != 'DECIMAL(65,0)');
+        "ADD COLUMN `user_name` VARCHAR(64) DEFAULT '' AFTER `user_id`",
 
-    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);
+        "ADD KEY `I_counter_user_name` (`user_name`)",
+      ), strtoupper($update_tables['counter']['counter_id']['Type']) != 'BIGINT(20) UNSIGNED');
 
-      upd_alter_table('iraks', array(
-        "CHANGE COLUMN `zeit` `fleet_end_time` INT(11) UNSIGNED NOT NULL DEFAULT 0",
-        "CHANGE COLUMN `zielid` `fleet_target_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "CHANGE COLUMN `owner` `fleet_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "CHANGE COLUMN `anzahl` `fleet_amount` BIGINT(20) UNSIGNED DEFAULT 0",
-        "CHANGE COLUMN `galaxy_angreifer` `fleet_start_galaxy` INT(2) UNSIGNED DEFAULT 0",
-        "CHANGE COLUMN `system_angreifer` `fleet_start_system` INT(4) UNSIGNED DEFAULT 0",
-        "CHANGE COLUMN `planet_angreifer` `fleet_start_planet` INT(2) UNSIGNED DEFAULT 0",
-
-        "CHANGE COLUMN `galaxy` `fleet_end_galaxy` INT(2) UNSIGNED DEFAULT 0",
-        "CHANGE COLUMN `system` `fleet_end_system` INT(4) UNSIGNED DEFAULT 0",
-        "CHANGE COLUMN `planet` `fleet_end_planet` INT(2) UNSIGNED DEFAULT 0",
-
-        "ADD KEY `I_iraks_fleet_owner` (`fleet_owner`)",
-        "ADD KEY `I_iraks_fleet_target_owner` (`fleet_target_owner`)",
-
-        "ADD CONSTRAINT `FK_iraks_fleet_owner` FOREIGN KEY (`fleet_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_iraks_fleet_target_owner` FOREIGN KEY (`fleet_target_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      upd_alter_table('fleets', array(
+        "MODIFY COLUMN `fleet_id` SERIAL",
+        "MODIFY COLUMN `fleet_resource_metal` DECIMAL(65,0) DEFAULT '0'",
+        "MODIFY COLUMN `fleet_resource_crystal` DECIMAL(65,0) DEFAULT '0'",
+        "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['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED')
-    {
-      upd_do_query('DELETE FROM {{notes}} WHERE owner NOT IN (SELECT id FROM {{users}});', true);
+      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(
+          "CHANGE COLUMN `zeit` `fleet_end_time` INT(11) UNSIGNED NOT NULL DEFAULT 0",
+          "CHANGE COLUMN `zielid` `fleet_target_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "CHANGE COLUMN `owner` `fleet_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "CHANGE COLUMN `anzahl` `fleet_amount` BIGINT(20) UNSIGNED DEFAULT 0",
+          "CHANGE COLUMN `galaxy_angreifer` `fleet_start_galaxy` INT(2) UNSIGNED DEFAULT 0",
+          "CHANGE COLUMN `system_angreifer` `fleet_start_system` INT(4) UNSIGNED DEFAULT 0",
+          "CHANGE COLUMN `planet_angreifer` `fleet_start_planet` INT(2) UNSIGNED DEFAULT 0",
+
+          "CHANGE COLUMN `galaxy` `fleet_end_galaxy` INT(2) UNSIGNED DEFAULT 0",
+          "CHANGE COLUMN `system` `fleet_end_system` INT(4) UNSIGNED DEFAULT 0",
+          "CHANGE COLUMN `planet` `fleet_end_planet` INT(2) UNSIGNED DEFAULT 0",
+
+          "ADD KEY `I_iraks_fleet_owner` (`fleet_owner`)",
+          "ADD KEY `I_iraks_fleet_target_owner` (`fleet_target_owner`)",
+
+          "ADD CONSTRAINT `FK_iraks_fleet_owner` FOREIGN KEY (`fleet_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_iraks_fleet_target_owner` FOREIGN KEY (`fleet_target_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      upd_alter_table('notes', array(
-        "MODIFY COLUMN id SERIAL",
-        "MODIFY COLUMN `owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+      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);
 
-        "ADD KEY `I_notes_owner` (`owner`)",
+        upd_alter_table('notes', array(
+          "MODIFY COLUMN id SERIAL",
+          "MODIFY COLUMN `owner` BIGINT(20) UNSIGNED DEFAULT NULL",
 
-        "ADD CONSTRAINT `FK_notes_owner` FOREIGN KEY (`owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+          "ADD KEY `I_notes_owner` (`owner`)",
 
-    upd_alter_table('planets', array(
-      "MODIFY COLUMN `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT",
-      "MODIFY COLUMN `name` VARCHAR(64) DEFAULT 'Planet' NOT NULL",
-      "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-      "MODIFY COLUMN `galaxy` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `system` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `planet` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `planet_type` TINYINT NOT NULL DEFAULT '1'",
-
-      "MODIFY COLUMN `metal` DECIMAL(65,5) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `crystal` DECIMAL(65,5) NOT NULL DEFAULT '0' AFTER `metal`",
-      "MODIFY COLUMN `deuterium` DECIMAL(65,5) NOT NULL DEFAULT '0' AFTER `crystal`",
-      "MODIFY COLUMN `energy_max` DECIMAL(65,0) NOT NULL DEFAULT '0' AFTER `deuterium`",
-      "MODIFY COLUMN `energy_used` DECIMAL(65,0) NOT NULL DEFAULT '0' AFTER `energy_max`",
-
-      "MODIFY COLUMN `metal_mine` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `crystal_mine` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `deuterium_sintetizer` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `solar_plant` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `fusion_plant` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `robot_factory` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `nano_factory` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `hangar` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `metal_store` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `crystal_store` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `deuterium_store` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `laboratory` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `nano` SMALLINT DEFAULT '0' AFTER `laboratory`",
-      "MODIFY COLUMN `terraformer` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `ally_deposit` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `silo` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mondbasis` SMALLINT NOT NULL DEFAULT '0' AFTER `silo`",
-      "MODIFY COLUMN `phalanx` SMALLINT NOT NULL DEFAULT '0' AFTER `mondbasis`",
-      "MODIFY COLUMN `sprungtor` SMALLINT NOT NULL DEFAULT '0' AFTER `phalanx`",
-      "MODIFY COLUMN `last_jump_time` int(11) NOT NULL DEFAULT '0' AFTER `sprungtor`",
-
-      "MODIFY COLUMN `small_ship_cargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `big_ship_cargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `supercargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Supercargo ship count' AFTER `big_ship_cargo`",
-      "MODIFY COLUMN `planet_cargo_hyper` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `supercargo`",
-      "MODIFY COLUMN `recycler` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `planet_cargo_hyper`",
-      "MODIFY COLUMN `colonizer` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `recycler`",
-      "MODIFY COLUMN `spy_sonde` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `colonizer`",
-      "MODIFY COLUMN `solar_satelit` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `spy_sonde`",
-
-      "MODIFY COLUMN `light_hunter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `heavy_hunter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `crusher` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `battle_ship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `bomber_ship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `battleship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `bomber_ship`",
-      "MODIFY COLUMN `destructor` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `dearth_star` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `supernova` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-
-      "MODIFY COLUMN `misil_launcher` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `small_laser` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `big_laser` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `gauss_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `ionic_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `buster_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-
-      "MODIFY COLUMN `small_protection_shield` tinyint(1) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `big_protection_shield` tinyint(1) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `planet_protector` tinyint(1) NOT NULL DEFAULT '0'",
-
-      "MODIFY COLUMN `interceptor_misil` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `interplanetary_misil` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
-
-      "MODIFY COLUMN `metal_perhour` INT NOT NULL DEFAULT '0' AFTER `interplanetary_misil`",
-      "MODIFY COLUMN `crystal_perhour` INT NOT NULL DEFAULT '0' AFTER `metal_perhour`",
-      "MODIFY COLUMN `deuterium_perhour` INT NOT NULL DEFAULT '0' AFTER `crystal_perhour`",
-
-      "MODIFY COLUMN `metal_mine_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-      "MODIFY COLUMN `crystal_mine_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-      "MODIFY COLUMN `deuterium_sintetizer_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-      "MODIFY COLUMN `solar_plant_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-      "MODIFY COLUMN `fusion_plant_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-      "MODIFY COLUMN `solar_satelit_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
-
-      "MODIFY COLUMN `que` TEXT COMMENT 'Planet que' AFTER `solar_satelit_porcent`",
-//      "MODIFY COLUMN `b_tech` INT(11) NOT NULL DEFAULT 0 AFTER `que`",
-//      "MODIFY COLUMN `b_tech_id` SMALLINT NOT NULL DEFAULT 0 AFTER `b_tech`",
-      "MODIFY COLUMN `b_hangar` INT(11) NOT NULL DEFAULT '0' AFTER `que`",
-      "MODIFY COLUMN `b_hangar_id` TEXT AFTER `b_hangar`",
-      "MODIFY COLUMN `last_update` INT(11) DEFAULT NULL AFTER `b_hangar_id`",
-
-      "MODIFY COLUMN `image` varchar(64) NOT NULL DEFAULT 'normaltempplanet01' AFTER `last_update`",
-      "MODIFY COLUMN `points` bigint(20) DEFAULT '0' AFTER `image`",
-      "MODIFY COLUMN `ranks` bigint(20) DEFAULT '0' AFTER `points`",
-      "MODIFY COLUMN `id_level` TINYINT NOT NULL DEFAULT '0' AFTER `ranks`",
-      "MODIFY COLUMN `destruyed` int(11) NOT NULL DEFAULT '0' AFTER `id_level`",
-      "MODIFY COLUMN `diameter` int(11) NOT NULL DEFAULT '12800' AFTER `destruyed`",
-      "MODIFY COLUMN `field_max` SMALLINT UNSIGNED NOT NULL DEFAULT '163' AFTER `diameter`",
-      "MODIFY COLUMN `field_current` SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER `field_max`",
-      "MODIFY COLUMN `temp_min` SMALLINT NOT NULL DEFAULT '0' AFTER `field_current`",
-      "MODIFY COLUMN `temp_max` SMALLINT NOT NULL DEFAULT '40' AFTER `temp_min`",
-
-      "MODIFY COLUMN `metal_max` DECIMAL(65,0) DEFAULT '100000' AFTER `temp_max`",
-      "MODIFY COLUMN `crystal_max` DECIMAL(65,0) DEFAULT '100000' AFTER `metal_max`",
-      "MODIFY COLUMN `deuterium_max` DECIMAL(65,0) DEFAULT '100000' AFTER `crystal_max`",
-
-      "MODIFY COLUMN `debris_metal` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `debris_crystal` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `PLANET_GOVERNOR_ID` SMALLINT NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `PLANET_GOVERNOR_LEVEL` SMALLINT NOT NULL DEFAULT '0'",
-
-      "MODIFY COLUMN `parent_planet` BIGINT(20) unsigned DEFAULT '0'",
-
-      "DROP COLUMN `b_hangar_plus`",
-    ), isset($update_tables['planets']['b_hangar_plus']));
-
-    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);
+          "ADD CONSTRAINT `FK_notes_owner` FOREIGN KEY (`owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      upd_alter_table('referrals', array(
-        "MODIFY COLUMN `id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `id_partner` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `dark_matter` DECIMAL(65,0) NOT NULL DEFAULT '0'",
+      upd_alter_table('planets', array(
+        "MODIFY COLUMN `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT",
+        "MODIFY COLUMN `name` VARCHAR(64) DEFAULT 'Planet' NOT NULL",
+        "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+        "MODIFY COLUMN `galaxy` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `system` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `planet` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `planet_type` TINYINT NOT NULL DEFAULT '1'",
+
+        "MODIFY COLUMN `metal` DECIMAL(65,5) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `crystal` DECIMAL(65,5) NOT NULL DEFAULT '0' AFTER `metal`",
+        "MODIFY COLUMN `deuterium` DECIMAL(65,5) NOT NULL DEFAULT '0' AFTER `crystal`",
+        "MODIFY COLUMN `energy_max` DECIMAL(65,0) NOT NULL DEFAULT '0' AFTER `deuterium`",
+        "MODIFY COLUMN `energy_used` DECIMAL(65,0) NOT NULL DEFAULT '0' AFTER `energy_max`",
+
+        "MODIFY COLUMN `metal_mine` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `crystal_mine` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `deuterium_sintetizer` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `solar_plant` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `fusion_plant` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `robot_factory` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `nano_factory` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `hangar` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `metal_store` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `crystal_store` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `deuterium_store` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `laboratory` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `nano` SMALLINT DEFAULT '0' AFTER `laboratory`",
+        "MODIFY COLUMN `terraformer` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `ally_deposit` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `silo` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mondbasis` SMALLINT NOT NULL DEFAULT '0' AFTER `silo`",
+        "MODIFY COLUMN `phalanx` SMALLINT NOT NULL DEFAULT '0' AFTER `mondbasis`",
+        "MODIFY COLUMN `sprungtor` SMALLINT NOT NULL DEFAULT '0' AFTER `phalanx`",
+        "MODIFY COLUMN `last_jump_time` int(11) NOT NULL DEFAULT '0' AFTER `sprungtor`",
+
+        "MODIFY COLUMN `small_ship_cargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `big_ship_cargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `supercargo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Supercargo ship count' AFTER `big_ship_cargo`",
+        "MODIFY COLUMN `planet_cargo_hyper` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `supercargo`",
+        "MODIFY COLUMN `recycler` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `planet_cargo_hyper`",
+        "MODIFY COLUMN `colonizer` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `recycler`",
+        "MODIFY COLUMN `spy_sonde` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `colonizer`",
+        "MODIFY COLUMN `solar_satelit` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `spy_sonde`",
+
+        "MODIFY COLUMN `light_hunter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `heavy_hunter` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `crusher` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `battle_ship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `bomber_ship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `battleship` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' AFTER `bomber_ship`",
+        "MODIFY COLUMN `destructor` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `dearth_star` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `supernova` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `misil_launcher` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `small_laser` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `big_laser` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `gauss_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `ionic_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `buster_canyon` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `small_protection_shield` tinyint(1) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `big_protection_shield` tinyint(1) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `planet_protector` tinyint(1) NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `interceptor_misil` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `interplanetary_misil` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `metal_perhour` INT NOT NULL DEFAULT '0' AFTER `interplanetary_misil`",
+        "MODIFY COLUMN `crystal_perhour` INT NOT NULL DEFAULT '0' AFTER `metal_perhour`",
+        "MODIFY COLUMN `deuterium_perhour` INT NOT NULL DEFAULT '0' AFTER `crystal_perhour`",
+
+        "MODIFY COLUMN `metal_mine_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+        "MODIFY COLUMN `crystal_mine_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+        "MODIFY COLUMN `deuterium_sintetizer_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+        "MODIFY COLUMN `solar_plant_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+        "MODIFY COLUMN `fusion_plant_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+        "MODIFY COLUMN `solar_satelit_porcent` TINYINT UNSIGNED NOT NULL DEFAULT '10'",
+
+        "MODIFY COLUMN `que` TEXT COMMENT 'Planet que' AFTER `solar_satelit_porcent`",
+  //      "MODIFY COLUMN `b_tech` INT(11) NOT NULL DEFAULT 0 AFTER `que`",
+  //      "MODIFY COLUMN `b_tech_id` SMALLINT NOT NULL DEFAULT 0 AFTER `b_tech`",
+        "MODIFY COLUMN `b_hangar` INT(11) NOT NULL DEFAULT '0' AFTER `que`",
+        "MODIFY COLUMN `b_hangar_id` TEXT AFTER `b_hangar`",
+        "MODIFY COLUMN `last_update` INT(11) DEFAULT NULL AFTER `b_hangar_id`",
+
+        "MODIFY COLUMN `image` varchar(64) NOT NULL DEFAULT 'normaltempplanet01' AFTER `last_update`",
+        "MODIFY COLUMN `points` bigint(20) DEFAULT '0' AFTER `image`",
+        "MODIFY COLUMN `ranks` bigint(20) DEFAULT '0' AFTER `points`",
+        "MODIFY COLUMN `id_level` TINYINT NOT NULL DEFAULT '0' AFTER `ranks`",
+        "MODIFY COLUMN `destruyed` int(11) NOT NULL DEFAULT '0' AFTER `id_level`",
+        "MODIFY COLUMN `diameter` int(11) NOT NULL DEFAULT '12800' AFTER `destruyed`",
+        "MODIFY COLUMN `field_max` SMALLINT UNSIGNED NOT NULL DEFAULT '163' AFTER `diameter`",
+        "MODIFY COLUMN `field_current` SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER `field_max`",
+        "MODIFY COLUMN `temp_min` SMALLINT NOT NULL DEFAULT '0' AFTER `field_current`",
+        "MODIFY COLUMN `temp_max` SMALLINT NOT NULL DEFAULT '40' AFTER `temp_min`",
+
+        "MODIFY COLUMN `metal_max` DECIMAL(65,0) DEFAULT '100000' AFTER `temp_max`",
+        "MODIFY COLUMN `crystal_max` DECIMAL(65,0) DEFAULT '100000' AFTER `metal_max`",
+        "MODIFY COLUMN `deuterium_max` DECIMAL(65,0) DEFAULT '100000' AFTER `crystal_max`",
+
+        "MODIFY COLUMN `debris_metal` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `debris_crystal` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `PLANET_GOVERNOR_ID` SMALLINT NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `PLANET_GOVERNOR_LEVEL` SMALLINT NOT NULL DEFAULT '0'",
+
+        "MODIFY COLUMN `parent_planet` BIGINT(20) unsigned DEFAULT '0'",
+
+        "DROP COLUMN `b_hangar_plus`",
+      ), isset($update_tables['planets']['b_hangar_plus']));
+
+      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);
 
-        "ADD CONSTRAINT `FK_referrals_id` FOREIGN KEY (`id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_referrals_id_partner` FOREIGN KEY (`id_partner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+        upd_alter_table('referrals', array(
+          "MODIFY COLUMN `id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `id_partner` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `dark_matter` DECIMAL(65,0) NOT NULL DEFAULT '0'",
 
-    upd_alter_table('rw', array(
-      "MODIFY COLUMN `report_id` SERIAL",
-      "MODIFY COLUMN `id_owner1` BIGINT(20) UNSIGNED",
-      "MODIFY COLUMN `id_owner2` BIGINT(20) UNSIGNED",
-    ), strtoupper($update_tables['rw']['id_owner1']['Type']) != 'BIGINT(20) UNSIGNED');
+          "ADD CONSTRAINT `FK_referrals_id` FOREIGN KEY (`id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_referrals_id_partner` FOREIGN KEY (`id_partner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-    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(
-        "MODIFY COLUMN `shortcut_id` SERIAL",
-        "MODIFY COLUMN `shortcut_user_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `shortcut_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL",
-        "MODIFY COLUMN `shortcut_galaxy` TINYINT UNSIGNED DEFAULT 0",
-        "MODIFY COLUMN `shortcut_system` SMALLINT UNSIGNED DEFAULT 0",
-        "MODIFY COLUMN `shortcut_planet` TINYINT UNSIGNED DEFAULT 0",
-
-        "ADD CONSTRAINT `FK_shortcut_planet_id` FOREIGN KEY (`shortcut_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      upd_alter_table('rw', array(
+        "MODIFY COLUMN `report_id` SERIAL",
+        "MODIFY COLUMN `id_owner1` BIGINT(20) UNSIGNED",
+        "MODIFY COLUMN `id_owner2` BIGINT(20) UNSIGNED",
+      ), strtoupper($update_tables['rw']['id_owner1']['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);
+      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(
+          "MODIFY COLUMN `shortcut_id` SERIAL",
+          "MODIFY COLUMN `shortcut_user_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `shortcut_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL",
+          "MODIFY COLUMN `shortcut_galaxy` TINYINT UNSIGNED DEFAULT 0",
+          "MODIFY COLUMN `shortcut_system` SMALLINT UNSIGNED DEFAULT 0",
+          "MODIFY COLUMN `shortcut_planet` TINYINT UNSIGNED DEFAULT 0",
+
+          "ADD CONSTRAINT `FK_shortcut_planet_id` FOREIGN KEY (`shortcut_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-      upd_alter_table('statpoints', array(
-       "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
-       "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
-       "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
-       "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
-       "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
-       "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
-       "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
-       "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
-
-       "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-       "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
-
-       "ADD KEY `I_stats_id_ally` (`id_ally`)",
-
-       "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-       "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      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(
+         "MODIFY COLUMN `stat_date` int(11) NOT NULL DEFAULT '0' FIRST",
+         "MODIFY COLUMN `id_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
+         "MODIFY COLUMN `id_ally` BIGINT(20) UNSIGNED DEFAULT NULL",
+         "MODIFY COLUMN `stat_type` TINYINT UNSIGNED DEFAULT 0",
+         "MODIFY COLUMN `stat_code` TINYINT UNSIGNED NOT NULL DEFAULT '0'",
+
+         "MODIFY COLUMN `tech_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `tech_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `tech_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `tech_count` DECIMAL(65,0) UNSIGNED UNSIGNED NOT NULL DEFAULT '0'",
+
+         "MODIFY COLUMN `build_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `build_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `build_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `build_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+         "MODIFY COLUMN `defs_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `defs_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `defs_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `defs_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+         "MODIFY COLUMN `fleet_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `fleet_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `fleet_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `fleet_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+         "MODIFY COLUMN `res_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Rank by resources' AFTER `fleet_count`",
+         "MODIFY COLUMN `res_old_rank` INT(11) UNSIGNED DEFAULT '0' COMMENT 'Old rank by resources'AFTER `res_rank`",
+         "MODIFY COLUMN `res_points` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource stat points' AFTER `res_old_rank`",
+         "MODIFY COLUMN `res_count` DECIMAL(65,0) UNSIGNED DEFAULT '0' COMMENT 'Resource count' AFTER `res_points`",
+
+         "MODIFY COLUMN `total_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `total_old_rank` INT(11) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `total_points` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+         "MODIFY COLUMN `total_count` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT '0'",
+
+         "ADD KEY `I_stats_id_ally` (`id_ally`)",
+
+         "ADD CONSTRAINT `FK_stats_id_owner` FOREIGN KEY (`id_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+         "ADD CONSTRAINT `FK_stats_id_ally` FOREIGN KEY (`id_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-    upd_alter_table('users', array(
-      "MODIFY COLUMN `authlevel` tinyint unsigned NOT NULL DEFAULT '0' AFTER `username`",
-      "MODIFY COLUMN `vacation` int(11) unsigned DEFAULT '0' AFTER `authlevel`",
-      "MODIFY COLUMN `banaday` int(11) unsigned DEFAULT '0' AFTER `vacation`",
-      "MODIFY COLUMN `dark_matter` bigint(20) DEFAULT '0' AFTER `banaday`",
-      "MODIFY COLUMN `spy_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `computer_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `military_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `defence_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `shield_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `energy_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `hyperspace_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `combustion_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `impulse_motor_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `hyperspace_motor_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `laser_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `ionic_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `buster_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `intergalactic_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `expedition_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `colonisation_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `graviton_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `player_artifact_list` text AFTER `graviton_tech`",
-      "MODIFY COLUMN `ally_id` bigint(20) unsigned DEFAULT NULL AFTER `player_artifact_list`",
-      "MODIFY COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
-      "MODIFY COLUMN `ally_name` varchar(32) DEFAULT NULL AFTER `ally_tag`",
-      "MODIFY COLUMN `ally_register_time` int(11) NOT NULL DEFAULT '0' AFTER `ally_name`",
-      "MODIFY COLUMN `ally_rank_id` int(11) NOT NULL DEFAULT '0' AFTER `ally_register_time`",
-      "MODIFY COLUMN `player_que` text AFTER `ally_rank_id`",
-      "MODIFY COLUMN `lvl_minier` bigint(20) unsigned NOT NULL DEFAULT '1'",
-      "MODIFY COLUMN `xpminier` bigint(20) unsigned DEFAULT '0' AFTER `lvl_minier`",
-      "MODIFY COLUMN `player_rpg_tech_xp` bigint(20) unsigned NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `player_rpg_tech_level` bigint(20) unsigned NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `lvl_raid` bigint(20) unsigned NOT NULL DEFAULT '1' AFTER `player_rpg_tech_level`",
-      "MODIFY COLUMN `xpraid` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `raids` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `raidsloose` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `raidswin` bigint(20) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `new_message` int(11) NOT NULL DEFAULT '0' AFTER `raidswin`",
-      "MODIFY COLUMN `mnl_alliance` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_joueur` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_attaque` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_spy` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_exploit` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_transport` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_expedition` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `mnl_buildlist` int(11) NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `msg_admin` bigint(11) unsigned DEFAULT '0'",
-//      "MODIFY COLUMN `b_tech_planet` int(11) NOT NULL DEFAULT '0' AFTER `msg_admin`",
-      "MODIFY COLUMN `deltime` int(10) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `news_lastread` int(10) unsigned DEFAULT '0'",
-      "MODIFY COLUMN `total_rank` int(10) unsigned NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `total_points` bigint(20) unsigned NOT NULL DEFAULT '0'",
-      "MODIFY COLUMN `password` varchar(64) NOT NULL DEFAULT '' AFTER `total_points`",
-      "MODIFY COLUMN `email` varchar(64) NOT NULL DEFAULT '' AFTER `password`",
-      "MODIFY COLUMN `email_2` varchar(64) NOT NULL DEFAULT '' AFTER `email`",
-      "MODIFY COLUMN `lang` varchar(8) NOT NULL DEFAULT 'ru' AFTER `email_2`",
-      "MODIFY COLUMN `sex` char(1) DEFAULT NULL AFTER `lang`",
-      "MODIFY COLUMN `avatar` varchar(255) NOT NULL DEFAULT '' AFTER `sex`",
-      "MODIFY COLUMN `sign` mediumtext AFTER `avatar`",
-      "MODIFY COLUMN `id_planet` int(11) NOT NULL DEFAULT '0' AFTER `sign`",
-      "MODIFY COLUMN `galaxy` int(11) NOT NULL DEFAULT '0' AFTER `id_planet`",
-      "MODIFY COLUMN `system` int(11) NOT NULL DEFAULT '0' AFTER `galaxy`",
-      "MODIFY COLUMN `planet` int(11) NOT NULL DEFAULT '0' AFTER `system`",
-      "MODIFY COLUMN `current_planet` int(11) NOT NULL DEFAULT '0' AFTER `planet`",
-      "MODIFY COLUMN `user_agent` mediumtext NOT NULL AFTER `current_planet`",
-      "MODIFY COLUMN `user_lastip` varchar(250) DEFAULT NULL COMMENT 'User last IP' AFTER `user_agent`",
-      "MODIFY COLUMN `user_proxy` varchar(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)' AFTER `user_lastip`",
-      "MODIFY COLUMN `register_time` int(10) unsigned DEFAULT '0' AFTER `user_proxy`",
-      "MODIFY COLUMN `onlinetime` int(10) unsigned DEFAULT '0' AFTER `register_time`",
-      "MODIFY COLUMN `dpath` varchar(255) NOT NULL DEFAULT '' AFTER `onlinetime`",
-      "MODIFY COLUMN `design` tinyint(4) unsigned NOT NULL DEFAULT '1' AFTER `dpath`",
-      "MODIFY COLUMN `noipcheck` tinyint(4) unsigned NOT NULL DEFAULT '1' AFTER `design`",
-      "MODIFY COLUMN `options` mediumtext COMMENT 'Packed user options' AFTER `noipcheck`",
-      "MODIFY COLUMN `planet_sort` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `options`",
-      "MODIFY COLUMN `planet_sort_order` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `planet_sort`",
-      "MODIFY COLUMN `spio_anz` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `planet_sort_order`",
-      "MODIFY COLUMN `settings_tooltiptime` tinyint(1) unsigned NOT NULL DEFAULT '5' AFTER `spio_anz`",
-      "MODIFY COLUMN `settings_fleetactions` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `settings_tooltiptime`",
-      "MODIFY COLUMN `settings_esp` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_allylogo`",
-      "MODIFY COLUMN `settings_wri` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_esp`",
-      "MODIFY COLUMN `settings_bud` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_wri`",
-      "MODIFY COLUMN `settings_mis` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_bud`",
-      "MODIFY COLUMN `settings_rep` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `settings_mis`",
-    ), strtoupper($update_tables['users']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED');
+      upd_alter_table('users', array(
+        "MODIFY COLUMN `authlevel` tinyint unsigned NOT NULL DEFAULT '0' AFTER `username`",
+        "MODIFY COLUMN `vacation` int(11) unsigned DEFAULT '0' AFTER `authlevel`",
+        "MODIFY COLUMN `banaday` int(11) unsigned DEFAULT '0' AFTER `vacation`",
+        "MODIFY COLUMN `dark_matter` bigint(20) DEFAULT '0' AFTER `banaday`",
+        "MODIFY COLUMN `spy_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `computer_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `military_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `defence_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `shield_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `energy_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `hyperspace_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `combustion_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `impulse_motor_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `hyperspace_motor_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `laser_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `ionic_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `buster_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `intergalactic_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `expedition_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `colonisation_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `graviton_tech` SMALLINT UNSIGNED NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `player_artifact_list` text AFTER `graviton_tech`",
+        "MODIFY COLUMN `ally_id` bigint(20) unsigned DEFAULT NULL AFTER `player_artifact_list`",
+        "MODIFY COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
+        "MODIFY COLUMN `ally_name` varchar(32) DEFAULT NULL AFTER `ally_tag`",
+        "MODIFY COLUMN `ally_register_time` int(11) NOT NULL DEFAULT '0' AFTER `ally_name`",
+        "MODIFY COLUMN `ally_rank_id` int(11) NOT NULL DEFAULT '0' AFTER `ally_register_time`",
+        "MODIFY COLUMN `player_que` text AFTER `ally_rank_id`",
+        "MODIFY COLUMN `lvl_minier` bigint(20) unsigned NOT NULL DEFAULT '1'",
+        "MODIFY COLUMN `xpminier` bigint(20) unsigned DEFAULT '0' AFTER `lvl_minier`",
+        "MODIFY COLUMN `player_rpg_tech_xp` bigint(20) unsigned NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `player_rpg_tech_level` bigint(20) unsigned NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `lvl_raid` bigint(20) unsigned NOT NULL DEFAULT '1' AFTER `player_rpg_tech_level`",
+        "MODIFY COLUMN `xpraid` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `raids` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `raidsloose` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `raidswin` bigint(20) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `new_message` int(11) NOT NULL DEFAULT '0' AFTER `raidswin`",
+        "MODIFY COLUMN `mnl_alliance` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_joueur` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_attaque` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_spy` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_exploit` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_transport` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_expedition` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `mnl_buildlist` int(11) NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `msg_admin` bigint(11) unsigned DEFAULT '0'",
+  //      "MODIFY COLUMN `b_tech_planet` int(11) NOT NULL DEFAULT '0' AFTER `msg_admin`",
+        "MODIFY COLUMN `deltime` int(10) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `news_lastread` int(10) unsigned DEFAULT '0'",
+        "MODIFY COLUMN `total_rank` int(10) unsigned NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `total_points` bigint(20) unsigned NOT NULL DEFAULT '0'",
+        "MODIFY COLUMN `password` varchar(64) NOT NULL DEFAULT '' AFTER `total_points`",
+        "MODIFY COLUMN `email` varchar(64) NOT NULL DEFAULT '' AFTER `password`",
+        "MODIFY COLUMN `email_2` varchar(64) NOT NULL DEFAULT '' AFTER `email`",
+        "MODIFY COLUMN `lang` varchar(8) NOT NULL DEFAULT 'ru' AFTER `email_2`",
+        "MODIFY COLUMN `sex` char(1) DEFAULT NULL AFTER `lang`",
+        "MODIFY COLUMN `avatar` varchar(255) NOT NULL DEFAULT '' AFTER `sex`",
+        "MODIFY COLUMN `sign` mediumtext AFTER `avatar`",
+        "MODIFY COLUMN `id_planet` int(11) NOT NULL DEFAULT '0' AFTER `sign`",
+        "MODIFY COLUMN `galaxy` int(11) NOT NULL DEFAULT '0' AFTER `id_planet`",
+        "MODIFY COLUMN `system` int(11) NOT NULL DEFAULT '0' AFTER `galaxy`",
+        "MODIFY COLUMN `planet` int(11) NOT NULL DEFAULT '0' AFTER `system`",
+        "MODIFY COLUMN `current_planet` int(11) NOT NULL DEFAULT '0' AFTER `planet`",
+        "MODIFY COLUMN `user_agent` mediumtext NOT NULL AFTER `current_planet`",
+        "MODIFY COLUMN `user_lastip` varchar(250) DEFAULT NULL COMMENT 'User last IP' AFTER `user_agent`",
+        "MODIFY COLUMN `user_proxy` varchar(250) NOT NULL DEFAULT '' COMMENT 'User proxy (if any)' AFTER `user_lastip`",
+        "MODIFY COLUMN `register_time` int(10) unsigned DEFAULT '0' AFTER `user_proxy`",
+        "MODIFY COLUMN `onlinetime` int(10) unsigned DEFAULT '0' AFTER `register_time`",
+        "MODIFY COLUMN `dpath` varchar(255) NOT NULL DEFAULT '' AFTER `onlinetime`",
+        "MODIFY COLUMN `design` tinyint(4) unsigned NOT NULL DEFAULT '1' AFTER `dpath`",
+        "MODIFY COLUMN `noipcheck` tinyint(4) unsigned NOT NULL DEFAULT '1' AFTER `design`",
+        "MODIFY COLUMN `options` mediumtext COMMENT 'Packed user options' AFTER `noipcheck`",
+        "MODIFY COLUMN `planet_sort` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `options`",
+        "MODIFY COLUMN `planet_sort_order` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `planet_sort`",
+        "MODIFY COLUMN `spio_anz` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `planet_sort_order`",
+        "MODIFY COLUMN `settings_tooltiptime` tinyint(1) unsigned NOT NULL DEFAULT '5' AFTER `spio_anz`",
+        "MODIFY COLUMN `settings_fleetactions` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `settings_tooltiptime`",
+        "MODIFY COLUMN `settings_esp` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_allylogo`",
+        "MODIFY COLUMN `settings_wri` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_esp`",
+        "MODIFY COLUMN `settings_bud` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_wri`",
+        "MODIFY COLUMN `settings_mis` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `settings_bud`",
+        "MODIFY COLUMN `settings_rep` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `settings_mis`",
+      ), strtoupper($update_tables['users']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 32;
+      upd_do_query('COMMIT;', true);
+      $new_version = 32;
 
-  case 32:
-    upd_log_version_update();
+    case 32:
+      upd_log_version_update();
 
-    upd_check_key('avatar_max_width', 128, !isset($config->avatar_max_width));
-    upd_check_key('avatar_max_height', 128, !isset($config->avatar_max_height));
+      upd_check_key('avatar_max_width', 128, !isset($config->avatar_max_width));
+      upd_check_key('avatar_max_height', 128, !isset($config->avatar_max_height));
 
-    upd_alter_table('users', array(
-      "MODIFY COLUMN `avatar` tinyint(1) unsigned NOT NULL DEFAULT '0'",
-    ), strtoupper($update_tables['users']['avatar']['Type']) != 'TINYINT(1) UNSIGNED');
+      upd_alter_table('users', array(
+        "MODIFY COLUMN `avatar` tinyint(1) unsigned NOT NULL DEFAULT '0'",
+      ), strtoupper($update_tables['users']['avatar']['Type']) != 'TINYINT(1) UNSIGNED');
 
-    upd_alter_table('alliance', array(
-      "MODIFY COLUMN `ally_image` tinyint(1) unsigned NOT NULL DEFAULT '0'",
-    ), strtoupper($update_tables['alliance']['ally_image']['Type']) != 'TINYINT(1) UNSIGNED');
+      upd_alter_table('alliance', array(
+        "MODIFY COLUMN `ally_image` tinyint(1) unsigned NOT NULL DEFAULT '0'",
+      ), strtoupper($update_tables['alliance']['ally_image']['Type']) != 'TINYINT(1) UNSIGNED');
 
-    upd_alter_table('users', array(
-      "DROP COLUMN `settings_allylogo`",
-    ), isset($update_tables['users']['settings_allylogo']));
+      upd_alter_table('users', array(
+        "DROP COLUMN `settings_allylogo`",
+      ), isset($update_tables['users']['settings_allylogo']));
 
-    if(!isset($update_tables['powerup']))
-    {
-      upd_do_query("DROP TABLE IF EXISTS {$config->db_prefix}mercenaries;");
+      if(!isset($update_tables['powerup']))
+      {
+        upd_do_query("DROP TABLE IF EXISTS {$config->db_prefix}mercenaries;");
 
-      upd_create_table('powerup',
-        "(
+        upd_create_table('powerup',
+          "(
           `powerup_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
           `powerup_user_id` bigint(20) UNSIGNED NULL DEFAULT NULL,
           `powerup_planet_id` bigint(20) UNSIGNED NULL DEFAULT NULL,
@@ -1327,38 +1327,38 @@ 
           CONSTRAINT `FK_powerup_user_id` FOREIGN KEY (`powerup_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
           CONSTRAINT `FK_powerup_planet_id` FOREIGN KEY (`powerup_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
+        );
 
-      upd_check_key('empire_mercenary_temporary', 0, !isset($config->empire_mercenary_temporary));
-      upd_check_key('empire_mercenary_base_period', PERIOD_MONTH, !isset($config->empire_mercenary_base_period));
+        upd_check_key('empire_mercenary_temporary', 0, !isset($config->empire_mercenary_temporary));
+        upd_check_key('empire_mercenary_base_period', PERIOD_MONTH, !isset($config->empire_mercenary_base_period));
 
-      $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))
-      {
-        $update_query_str = '';
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
+        $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))
         {
-          $mercenary_data_name = get_unit_param($mercenary_id, P_NAME);
-          if($mercenary_level = $user_row[$mercenary_data_name])
+          $update_query_str = '';
+          foreach(sn_get_groups('mercenaries') as $mercenary_id)
           {
-            $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};");
+            $mercenary_data_name = get_unit_param($mercenary_id, P_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)
-        {
-          upd_do_query(sprintf($update_query_template, $update_query_str, $user_row['id']));
+          if($update_query_str)
+          {
+            upd_do_query(sprintf($update_query_template, $update_query_str, $user_row['id']));
+          }
         }
       }
-    }
 
-    if(!isset($update_tables['universe']))
-    {
-      upd_create_table('universe',
-        "(
+      if(!isset($update_tables['universe']))
+      {
+        upd_create_table('universe',
+          "(
           `universe_galaxy` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
           `universe_system` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
           `universe_name` varchar(32) NOT NULL DEFAULT '',
@@ -1366,197 +1366,197 @@ 
 
           PRIMARY KEY (`universe_galaxy`, `universe_system`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-
-      upd_check_key('uni_price_galaxy', 10000, !isset($config->uni_price_galaxy));
-      upd_check_key('uni_price_system', 1000, !isset($config->uni_price_system));
-    }
+        );
 
-    // ========================================================================
-    // Ally player
-    // Adding config variable
-    upd_check_key('ali_bonus_members', 10, !isset($config->ali_bonus_members));
+        upd_check_key('uni_price_galaxy', 10000, !isset($config->uni_price_galaxy));
+        upd_check_key('uni_price_system', 1000, !isset($config->uni_price_system));
+      }
 
-    // ------------------------------------------------------------------------
-    // Modifying tables
-    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",
+      // ========================================================================
+      // Ally player
+      // Adding config variable
+      upd_check_key('ali_bonus_members', 10, !isset($config->ali_bonus_members));
 
-        "ADD KEY `I_user_user_as_ally` (`user_as_ally`)",
+      // ------------------------------------------------------------------------
+      // Modifying tables
+      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",
 
-        "ADD CONSTRAINT `FK_user_user_as_ally` FOREIGN KEY (`user_as_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
+          "ADD KEY `I_user_user_as_ally` (`user_as_ally`)",
 
-      upd_alter_table('alliance', array(
-        "ADD COLUMN ally_user_id BIGINT(20) UNSIGNED DEFAULT NULL",
+          "ADD CONSTRAINT `FK_user_user_as_ally` FOREIGN KEY (`user_as_ally`) REFERENCES `{$config->db_prefix}alliance` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
 
-        "ADD KEY `I_ally_user_id` (`ally_user_id`)",
+        upd_alter_table('alliance', array(
+          "ADD COLUMN ally_user_id BIGINT(20) UNSIGNED DEFAULT NULL",
 
-        "ADD CONSTRAINT `FK_ally_ally_user_id` FOREIGN KEY (`ally_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+          "ADD KEY `I_ally_user_id` (`ally_user_id`)",
 
-    // ------------------------------------------------------------------------
-    // 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))
-    {
-      $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();
-      doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_row['id']} LIMIT 1;");
-    }
-    // Renaming old ally players TODO: Remove on release
-    upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.user_as_ally = a.id SET u.username = CONCAT('[', a.ally_tag, ']') WHERE u.user_as_ally IS NOT NULL AND u.username = '';");
-    // Setting last online time to old ally players TODO: Remove on release
-    upd_do_query("UPDATE {{users}} SET `onlinetime` = " . SN_TIME_NOW . " WHERE onlinetime = 0;");
-
-    // ------------------------------------------------------------------------
-    // 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))
-    {
-      $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();
-      doquery("UPDATE {{users}} SET `id_planet` = {$ally_planet_id} WHERE `id` = {$ally_user_row['id']} LIMIT 1;");
-    }
+          "ADD CONSTRAINT `FK_ally_ally_user_id` FOREIGN KEY (`ally_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-    upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
-
-    upd_alter_table('users', array(
-      "DROP COLUMN `rpg_amiral`",
-      "DROP COLUMN `mrc_academic`",
-      "DROP COLUMN `rpg_espion`",
-      "DROP COLUMN `rpg_commandant`",
-      "DROP COLUMN `rpg_stockeur`",
-      "DROP COLUMN `rpg_destructeur`",
-      "DROP COLUMN `rpg_general`",
-      "DROP COLUMN `rpg_raideur`",
-      "DROP COLUMN `rpg_empereur`",
-
-      "ADD COLUMN `metal` decimal(65,5) NOT NULL DEFAULT '0.00000'",
-      "ADD COLUMN `crystal` decimal(65,5) NOT NULL DEFAULT '0.00000'",
-      "ADD COLUMN `deuterium` decimal(65,5) NOT NULL DEFAULT '0.00000'",
-    ), $update_tables['users']['rpg_amiral']);
-
-
-    // ========================================================================
-    // User que
-    // 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'])
-    {
-      $query = doquery("SELECT * FROM {{planets}} WHERE `b_tech_id` <> 0;");
-      while($planet_row = db_fetch($query))
+      // ------------------------------------------------------------------------
+      // 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))
+      {
+        $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();
+        doquery("UPDATE {{alliance}} SET ally_user_id = {$ally_user_id} WHERE id = {$ally_row['id']} LIMIT 1;");
+      }
+      // Renaming old ally players TODO: Remove on release
+      upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.user_as_ally = a.id SET u.username = CONCAT('[', a.ally_tag, ']') WHERE u.user_as_ally IS NOT NULL AND u.username = '';");
+      // Setting last online time to old ally players TODO: Remove on release
+      upd_do_query("UPDATE {{users}} SET `onlinetime` = " . SN_TIME_NOW . " WHERE onlinetime = 0;");
+
+      // ------------------------------------------------------------------------
+      // 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))
       {
-        $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;");
+        $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();
+        doquery("UPDATE {{users}} SET `id_planet` = {$ally_planet_id} WHERE `id` = {$ally_user_row['id']} LIMIT 1;");
       }
 
-      upd_alter_table('planets', array(
-        "DROP COLUMN `b_tech`",
-        "DROP COLUMN `b_tech_id`",
-      ), $update_tables['planets']['b_tech']);
+      upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.ally_id = a.id SET u.ally_name = a.ally_name, u.ally_tag = a.ally_tag WHERE u.ally_id IS NOT NULL;");
 
-      upd_alter_table('users', "DROP COLUMN `b_tech_planet`", $update_tables['users']['b_tech_planet']);
-    }
+      upd_alter_table('users', array(
+        "DROP COLUMN `rpg_amiral`",
+        "DROP COLUMN `mrc_academic`",
+        "DROP COLUMN `rpg_espion`",
+        "DROP COLUMN `rpg_commandant`",
+        "DROP COLUMN `rpg_stockeur`",
+        "DROP COLUMN `rpg_destructeur`",
+        "DROP COLUMN `rpg_general`",
+        "DROP COLUMN `rpg_raideur`",
+        "DROP COLUMN `rpg_empereur`",
+
+        "ADD COLUMN `metal` decimal(65,5) NOT NULL DEFAULT '0.00000'",
+        "ADD COLUMN `crystal` decimal(65,5) NOT NULL DEFAULT '0.00000'",
+        "ADD COLUMN `deuterium` decimal(65,5) NOT NULL DEFAULT '0.00000'",
+      ), $update_tables['users']['rpg_amiral']);
+
+
+      // ========================================================================
+      // User que
+      // 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'])
+      {
+        $query = doquery("SELECT * FROM {{planets}} WHERE `b_tech_id` <> 0;");
+        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;");
+        }
 
-    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']);
+        upd_alter_table('planets', array(
+          "DROP COLUMN `b_tech`",
+          "DROP COLUMN `b_tech_id`",
+        ), $update_tables['planets']['b_tech']);
 
-      doquery("UPDATE {{powerup}} SET powerup_category = " . BONUS_MERCENARY);
-    }
+        upd_alter_table('users', "DROP COLUMN `b_tech_planet`", $update_tables['users']['b_tech_planet']);
+      }
+
+      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);
+      }
 
-    upd_check_key('rpg_cost_info', 10000, !isset($config->rpg_cost_info));
-    upd_check_key('tpl_minifier', 0, !isset($config->tpl_minifier));
+      upd_check_key('rpg_cost_info', 10000, !isset($config->rpg_cost_info));
+      upd_check_key('tpl_minifier', 0, !isset($config->tpl_minifier));
 
-    upd_check_key('server_updater_check_auto', 0, !isset($config->server_updater_check_auto));
-    upd_check_key('server_updater_check_period', PERIOD_DAY, !isset($config->server_updater_check_period));
-    upd_check_key('server_updater_check_last', 0, !isset($config->server_updater_check_last));
-    upd_check_key('server_updater_check_result', SNC_VER_NEVER, !isset($config->server_updater_check_result));
-    upd_check_key('server_updater_key', '', !isset($config->server_updater_key));
-    upd_check_key('server_updater_id', 0, !isset($config->server_updater_id));
+      upd_check_key('server_updater_check_auto', 0, !isset($config->server_updater_check_auto));
+      upd_check_key('server_updater_check_period', PERIOD_DAY, !isset($config->server_updater_check_period));
+      upd_check_key('server_updater_check_last', 0, !isset($config->server_updater_check_last));
+      upd_check_key('server_updater_check_result', SNC_VER_NEVER, !isset($config->server_updater_check_result));
+      upd_check_key('server_updater_key', '', !isset($config->server_updater_key));
+      upd_check_key('server_updater_id', 0, !isset($config->server_updater_id));
 
-    upd_check_key('ali_bonus_algorithm', 0, !isset($config->ali_bonus_algorithm));
-    upd_check_key('ali_bonus_divisor', 10000000, !isset($config->ali_bonus_divisor));
-    upd_check_key('ali_bonus_brackets', 10, !isset($config->ali_bonus_brackets));
-    upd_check_key('ali_bonus_brackets_divisor', 50, !isset($config->ali_bonus_brackets_divisor));
+      upd_check_key('ali_bonus_algorithm', 0, !isset($config->ali_bonus_algorithm));
+      upd_check_key('ali_bonus_divisor', 10000000, !isset($config->ali_bonus_divisor));
+      upd_check_key('ali_bonus_brackets', 10, !isset($config->ali_bonus_brackets));
+      upd_check_key('ali_bonus_brackets_divisor', 50, !isset($config->ali_bonus_brackets_divisor));
 
-    if(!$config->db_loadItem('rpg_flt_explore'))
-    {
-      $inflation_rate = 1000;
+      if(!$config->db_loadItem('rpg_flt_explore'))
+      {
+        $inflation_rate = 1000;
 
-      $config->db_saveItem('rpg_cost_banker', $config->rpg_cost_banker * $inflation_rate);
-      $config->db_saveItem('rpg_cost_exchange', $config->rpg_cost_exchange * $inflation_rate);
-      $config->db_saveItem('rpg_cost_pawnshop', $config->rpg_cost_pawnshop * $inflation_rate);
-      $config->db_saveItem('rpg_cost_scraper', $config->rpg_cost_scraper * $inflation_rate);
-      $config->db_saveItem('rpg_cost_stockman', $config->rpg_cost_stockman * $inflation_rate);
-      $config->db_saveItem('rpg_cost_trader', $config->rpg_cost_trader * $inflation_rate);
+        $config->db_saveItem('rpg_cost_banker', $config->rpg_cost_banker * $inflation_rate);
+        $config->db_saveItem('rpg_cost_exchange', $config->rpg_cost_exchange * $inflation_rate);
+        $config->db_saveItem('rpg_cost_pawnshop', $config->rpg_cost_pawnshop * $inflation_rate);
+        $config->db_saveItem('rpg_cost_scraper', $config->rpg_cost_scraper * $inflation_rate);
+        $config->db_saveItem('rpg_cost_stockman', $config->rpg_cost_stockman * $inflation_rate);
+        $config->db_saveItem('rpg_cost_trader', $config->rpg_cost_trader * $inflation_rate);
 
-      $config->db_saveItem('rpg_exchange_darkMatter', $config->rpg_exchange_darkMatter / $inflation_rate * 4);
+        $config->db_saveItem('rpg_exchange_darkMatter', $config->rpg_exchange_darkMatter / $inflation_rate * 4);
 
-      $config->db_saveItem('rpg_flt_explore', $inflation_rate);
+        $config->db_saveItem('rpg_flt_explore', $inflation_rate);
 
-      doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` * {$inflation_rate};");
+        doquery("UPDATE {{users}} SET `dark_matter` = `dark_matter` * {$inflation_rate};");
 
-      $query = doquery("SELECT * FROM {{quest}}");
-      while($row = db_fetch($query))
-      {
-        $query_add = '';
-        $quest_reward_list = explode(';', $row['quest_rewards']);
-        foreach($quest_reward_list as &$quest_reward)
+        $query = doquery("SELECT * FROM {{quest}}");
+        while($row = db_fetch($query))
         {
-          list($reward_resource, $reward_amount) = explode(',', $quest_reward);
-          if($reward_resource == RES_DARK_MATTER)
+          $query_add = '';
+          $quest_reward_list = explode(';', $row['quest_rewards']);
+          foreach($quest_reward_list as &$quest_reward)
           {
-            $quest_reward = "{$reward_resource}," . $reward_amount * 1000;
+            list($reward_resource, $reward_amount) = explode(',', $quest_reward);
+            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'])
+          {
+            doquery("UPDATE {{quest}} SET `quest_rewards` = '{$new_rewards}' WHERE quest_id = {$row['quest_id']} LIMIT 1;");
           }
-        }
-        $new_rewards = implode(';', $quest_reward_list);
-        if($new_rewards != $row['quest_rewards'])
-        {
-          doquery("UPDATE {{quest}} SET `quest_rewards` = '{$new_rewards}' WHERE quest_id = {$row['quest_id']} LIMIT 1;");
         }
       }
-    }
 
-    upd_check_key('rpg_bonus_minimum', 10000, !isset($config->rpg_bonus_minimum));
-    upd_check_key('rpg_bonus_divisor',
-      !isset($config->rpg_bonus_divisor) ? 10 : ($config->rpg_bonus_divisor >= 1000 ? floor($config->rpg_bonus_divisor / 1000) : $config->rpg_bonus_divisor),
-      !isset($config->rpg_bonus_divisor) || $config->rpg_bonus_divisor >= 1000);
+      upd_check_key('rpg_bonus_minimum', 10000, !isset($config->rpg_bonus_minimum));
+      upd_check_key('rpg_bonus_divisor',
+        !isset($config->rpg_bonus_divisor) ? 10 : ($config->rpg_bonus_divisor >= 1000 ? floor($config->rpg_bonus_divisor / 1000) : $config->rpg_bonus_divisor),
+        !isset($config->rpg_bonus_divisor) || $config->rpg_bonus_divisor >= 1000);
 
-    upd_check_key('var_news_last', 0, !isset($config->var_news_last));
+      upd_check_key('var_news_last', 0, !isset($config->var_news_last));
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 33;
+      upd_do_query('COMMIT;', true);
+      $new_version = 33;
 
-  case 33:
-    upd_log_version_update();
+    case 33:
+      upd_log_version_update();
 
-    upd_alter_table('users', array(
-      "ADD `user_birthday` DATE DEFAULT NULL COMMENT 'User birthday'",
-      "ADD `user_birthday_celebrated` DATE DEFAULT NULL COMMENT 'Last time where user got birthday gift'",
+      upd_alter_table('users', array(
+        "ADD `user_birthday` DATE DEFAULT NULL COMMENT 'User birthday'",
+        "ADD `user_birthday_celebrated` DATE DEFAULT NULL COMMENT 'Last time where user got birthday gift'",
 
-      "ADD KEY `I_user_birthday` (`user_birthday`, `user_birthday_celebrated`)",
-    ), !$update_tables['users']['user_birthday']);
+        "ADD KEY `I_user_birthday` (`user_birthday`, `user_birthday_celebrated`)",
+      ), !$update_tables['users']['user_birthday']);
 
-    upd_check_key('user_birthday_gift', 0, !isset($config->user_birthday_gift));
-    upd_check_key('user_birthday_range', 30, !isset($config->user_birthday_range));
-    upd_check_key('user_birthday_celebrate', 0, !isset($config->user_birthday_celebrate));
+      upd_check_key('user_birthday_gift', 0, !isset($config->user_birthday_gift));
+      upd_check_key('user_birthday_range', 30, !isset($config->user_birthday_range));
+      upd_check_key('user_birthday_celebrate', 0, !isset($config->user_birthday_celebrate));
 
-    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']);
+      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']);
 
-      upd_create_table('payment',
-        "(
+        upd_create_table('payment',
+          "(
           `payment_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'Internal payment ID',
           `payment_user_id` BIGINT(20) UNSIGNED DEFAULT NULL,
           `payment_user_name` VARCHAR(64) DEFAULT NULL,
@@ -1576,177 +1576,177 @@ 
 
           CONSTRAINT `FK_payment_user` FOREIGN KEY (`payment_user_id`, `payment_user_name`) REFERENCES `{$config->db_prefix}users` (`id`, `username`) ON UPDATE CASCADE ON DELETE NO ACTION
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
+        );
 
-      upd_check_key('payment_currency_default', 'UAH', !isset($config->payment_currency_default));
-    }
-    upd_check_key('payment_lot_size', 1000, !isset($config->payment_lot_size));
-    upd_check_key('payment_lot_price', 1, !isset($config->payment_lot_price));
+        upd_check_key('payment_currency_default', 'UAH', !isset($config->payment_currency_default));
+      }
+      upd_check_key('payment_lot_size', 1000, !isset($config->payment_lot_size));
+      upd_check_key('payment_lot_price', 1, !isset($config->payment_lot_price));
 
-    // Updating category for Mercenaries
-    upd_do_query("UPDATE {{powerup}} SET powerup_category = " . UNIT_MERCENARIES . " WHERE powerup_unit_id > 600 AND powerup_unit_id < 700;");
+      // Updating category for Mercenaries
+      upd_do_query("UPDATE {{powerup}} SET powerup_category = " . UNIT_MERCENARIES . " WHERE powerup_unit_id > 600 AND powerup_unit_id < 700;");
 
-    // Convert Destructor to Death Star schematic
-    upd_do_query("UPDATE {{powerup}}
+      // Convert Destructor to Death Star schematic
+      upd_do_query("UPDATE {{powerup}}
       SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS . ", powerup_unit_id = " . UNIT_PLAN_SHIP_DEATH_STAR . "
       WHERE (powerup_time_start = 0 OR powerup_time_finish >= UNIX_TIMESTAMP()) AND powerup_unit_id = 612;");
-    // Convert Assasin to SuperNova schematic
-    upd_do_query("UPDATE {{powerup}}
+      // Convert Assasin to SuperNova schematic
+      upd_do_query("UPDATE {{powerup}}
       SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS . ", powerup_unit_id = " . UNIT_PLAN_SHIP_SUPERNOVA . "
       WHERE (powerup_time_start = 0 OR powerup_time_finish >= UNIX_TIMESTAMP()) AND powerup_unit_id = 614;");
 
-    upd_alter_table('iraks', array(
-      "ADD `fleet_start_type` SMALLINT NOT NULL DEFAULT 1",
-      "ADD `fleet_end_type` SMALLINT NOT NULL DEFAULT 1",
-    ), !$update_tables['iraks']['fleet_start_type']);
-
-
-    if(!$update_tables['payment']['payment_status'])
-    {
-      upd_alter_table('payment', array(
-        "ADD COLUMN `payment_status` INT DEFAULT 0 COMMENT 'Payment status' AFTER `payment_id`",
+      upd_alter_table('iraks', array(
+        "ADD `fleet_start_type` SMALLINT NOT NULL DEFAULT 1",
+        "ADD `fleet_end_type` SMALLINT NOT NULL DEFAULT 1",
+      ), !$update_tables['iraks']['fleet_start_type']);
 
-        "CHANGE COLUMN `payment_dm` `payment_dark_matter_paid` DECIMAL(65,0) DEFAULT 0 COMMENT 'Real DM paid for'",
-        "ADD COLUMN `payment_dark_matter_gained` DECIMAL(65,0) DEFAULT 0 COMMENT 'DM gained by player (with bonuses)' AFTER `payment_dark_matter_paid`",
 
-        "CHANGE COLUMN `payment_internal_id` `payment_external_id` VARCHAR(255) DEFAULT '' COMMENT 'External payment ID in payment system'",
-        "CHANGE COLUMN `payment_internal_date` `payment_external_date` DATETIME COMMENT 'External payment timestamp in payment system'",
-        "ADD COLUMN `payment_external_lots` decimal(65,5) NOT NULL DEFAULT '0.00000' COMMENT 'Payment system lot amount'",
-        "ADD COLUMN `payment_external_amount` decimal(65,5) NOT NULL DEFAULT '0.00000' COMMENT 'Money incoming from payment system'",
-        "ADD COLUMN `payment_external_currency` VARCHAR(3) NOT NULL DEFAULT '' COMMENT 'Payment system currency'",
-      ), !$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`",
+
+          "CHANGE COLUMN `payment_dm` `payment_dark_matter_paid` DECIMAL(65,0) DEFAULT 0 COMMENT 'Real DM paid for'",
+          "ADD COLUMN `payment_dark_matter_gained` DECIMAL(65,0) DEFAULT 0 COMMENT 'DM gained by player (with bonuses)' AFTER `payment_dark_matter_paid`",
+
+          "CHANGE COLUMN `payment_internal_id` `payment_external_id` VARCHAR(255) DEFAULT '' COMMENT 'External payment ID in payment system'",
+          "CHANGE COLUMN `payment_internal_date` `payment_external_date` DATETIME COMMENT 'External payment timestamp in payment system'",
+          "ADD COLUMN `payment_external_lots` decimal(65,5) NOT NULL DEFAULT '0.00000' COMMENT 'Payment system lot amount'",
+          "ADD COLUMN `payment_external_amount` decimal(65,5) NOT NULL DEFAULT '0.00000' COMMENT 'Money incoming from payment system'",
+          "ADD COLUMN `payment_external_currency` VARCHAR(3) NOT NULL DEFAULT '' COMMENT 'Payment system currency'",
+        ), !$update_tables['payment']['payment_status']);
+      }
 
-    upd_do_query("UPDATE {{powerup}} SET powerup_time_start = 0, powerup_time_finish = 0 WHERE powerup_category = " . UNIT_PLANS . ";");
+      upd_do_query("UPDATE {{powerup}} SET powerup_time_start = 0, powerup_time_finish = 0 WHERE powerup_category = " . UNIT_PLANS . ";");
 
-    upd_check_key('server_start_date', date('d.m.Y', SN_TIME_NOW), !isset($config->server_start_date));
-    upd_check_key('server_que_length_structures', 5, !isset($config->server_que_length_structures));
-    upd_check_key('server_que_length_hangar', 5, !isset($config->server_que_length_hangar));
+      upd_check_key('server_start_date', date('d.m.Y', SN_TIME_NOW), !isset($config->server_start_date));
+      upd_check_key('server_que_length_structures', 5, !isset($config->server_que_length_structures));
+      upd_check_key('server_que_length_hangar', 5, !isset($config->server_que_length_hangar));
 
-    upd_check_key('chat_highlight_moderator', '<span class="nick_moderator">$1</span>', $config->chat_highlight_admin == '<font color=green>$1</font>');
-    upd_check_key('chat_highlight_operator', '<span class="nick_operator">$1</span>', $config->chat_highlight_admin == '<font color=red>$1</font>');
-    upd_check_key('chat_highlight_admin', '<span class="nick_admin">$1</span>', $config->chat_highlight_admin == '<font color=purple>$1</font>');
+      upd_check_key('chat_highlight_moderator', '<span class="nick_moderator">$1</span>', $config->chat_highlight_admin == '<font color=green>$1</font>');
+      upd_check_key('chat_highlight_operator', '<span class="nick_operator">$1</span>', $config->chat_highlight_admin == '<font color=red>$1</font>');
+      upd_check_key('chat_highlight_admin', '<span class="nick_admin">$1</span>', $config->chat_highlight_admin == '<font color=purple>$1</font>');
 
-    upd_check_key('chat_highlight_premium', '<span class="nick_premium">$1</span>', !isset($config->chat_highlight_premium));
+      upd_check_key('chat_highlight_premium', '<span class="nick_premium">$1</span>', !isset($config->chat_highlight_premium));
 
-    upd_do_query("UPDATE {{planets}} SET `PLANET_GOVERNOR_LEVEL` = CEILING(`PLANET_GOVERNOR_LEVEL`/2) WHERE PLANET_GOVERNOR_ID = " . MRC_ENGINEER . " AND `PLANET_GOVERNOR_LEVEL` > 8;");
+      upd_do_query("UPDATE {{planets}} SET `PLANET_GOVERNOR_LEVEL` = CEILING(`PLANET_GOVERNOR_LEVEL`/2) WHERE PLANET_GOVERNOR_ID = " . MRC_ENGINEER . " AND `PLANET_GOVERNOR_LEVEL` > 8;");
 
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 34;
+      upd_do_query('COMMIT;', true);
+      $new_version = 34;
 
-  case 34:
-    upd_log_version_update();
+    case 34:
+      upd_log_version_update();
 
-    upd_alter_table('planets', array(
-      "ADD COLUMN `planet_teleport_next` INT(11) NOT NULL DEFAULT 0 COMMENT 'Next teleport time'",
-    ), !$update_tables['planets']['planet_teleport_next']);
+      upd_alter_table('planets', array(
+        "ADD COLUMN `planet_teleport_next` INT(11) NOT NULL DEFAULT 0 COMMENT 'Next teleport time'",
+      ), !$update_tables['planets']['planet_teleport_next']);
 
-    upd_check_key('planet_teleport_cost', 50000, !isset($config->planet_teleport_cost));
-    upd_check_key('planet_teleport_timeout', PERIOD_DAY * 1, !isset($config->planet_teleport_timeout));
+      upd_check_key('planet_teleport_cost', 50000, !isset($config->planet_teleport_cost));
+      upd_check_key('planet_teleport_timeout', PERIOD_DAY * 1, !isset($config->planet_teleport_timeout));
 
-    upd_check_key('planet_capital_cost', 25000, !isset($config->planet_capital_cost));
+      upd_check_key('planet_capital_cost', 25000, !isset($config->planet_capital_cost));
 
-    upd_alter_table('users', array(
-      "ADD COLUMN `player_race` INT(11) NOT NULL DEFAULT 0 COMMENT 'Player\'s race'",
-    ), !$update_tables['users']['player_race']);
+      upd_alter_table('users', array(
+        "ADD COLUMN `player_race` INT(11) NOT NULL DEFAULT 0 COMMENT 'Player\'s race'",
+      ), !$update_tables['users']['player_race']);
 
-    upd_alter_table('chat', array(
-      "MODIFY COLUMN `user` TEXT COMMENT 'Chat message user name'",
-    ), strtoupper($update_tables['chat']['user']['Type']) != 'TEXT');
+      upd_alter_table('chat', array(
+        "MODIFY COLUMN `user` TEXT COMMENT 'Chat message user name'",
+      ), strtoupper($update_tables['chat']['user']['Type']) != 'TEXT');
 
-    upd_alter_table('planets', array(
-      "ADD `ship_sattelite_sloth` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Terran Sloth'",
-      "ADD `ship_bomber_envy` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Lunar Envy'",
-      "ADD `ship_recycler_gluttony` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Mercurian Gluttony'",
-      "ADD `ship_fighter_wrath` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Venerian Wrath'",
-      "ADD `ship_battleship_pride` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Martian Pride'",
-      "ADD `ship_cargo_greed` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Republican Greed'",
-    ), !$update_tables['planets']['ship_sattelite_sloth']);
+      upd_alter_table('planets', array(
+        "ADD `ship_sattelite_sloth` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Terran Sloth'",
+        "ADD `ship_bomber_envy` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Lunar Envy'",
+        "ADD `ship_recycler_gluttony` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Mercurian Gluttony'",
+        "ADD `ship_fighter_wrath` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Venerian Wrath'",
+        "ADD `ship_battleship_pride` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Martian Pride'",
+        "ADD `ship_cargo_greed` bigint(20) NOT NULL DEFAULT '0' COMMENT 'Republican Greed'",
+      ), !$update_tables['planets']['ship_sattelite_sloth']);
 
-    upd_alter_table('planets', array(
-      "ADD `ship_sattelite_sloth_porcent` TINYINT(3) UNSIGNED NOT NULL DEFAULT '10' COMMENT 'Terran Sloth production'",
-      "ADD KEY `I_ship_sattelite_sloth` (`ship_sattelite_sloth`, `id_level`)",
-      "ADD KEY `I_ship_bomber_envy` (`ship_bomber_envy`, `id_level`)",
-      "ADD KEY `I_ship_recycler_gluttony` (`ship_recycler_gluttony`, `id_level`)",
-      "ADD KEY `I_ship_fighter_wrath` (`ship_fighter_wrath`, `id_level`)",
-      "ADD KEY `I_ship_battleship_pride` (`ship_battleship_pride`, `id_level`)",
-      "ADD KEY `I_ship_cargo_greed` (`ship_cargo_greed`, `id_level`)",
-    ), !$update_tables['planets']['ship_sattelite_sloth_porcent']);
+      upd_alter_table('planets', array(
+        "ADD `ship_sattelite_sloth_porcent` TINYINT(3) UNSIGNED NOT NULL DEFAULT '10' COMMENT 'Terran Sloth production'",
+        "ADD KEY `I_ship_sattelite_sloth` (`ship_sattelite_sloth`, `id_level`)",
+        "ADD KEY `I_ship_bomber_envy` (`ship_bomber_envy`, `id_level`)",
+        "ADD KEY `I_ship_recycler_gluttony` (`ship_recycler_gluttony`, `id_level`)",
+        "ADD KEY `I_ship_fighter_wrath` (`ship_fighter_wrath`, `id_level`)",
+        "ADD KEY `I_ship_battleship_pride` (`ship_battleship_pride`, `id_level`)",
+        "ADD KEY `I_ship_cargo_greed` (`ship_cargo_greed`, `id_level`)",
+      ), !$update_tables['planets']['ship_sattelite_sloth_porcent']);
 
-    upd_check_key('stats_hide_admins', 1, !isset($config->stats_hide_admins));
-    upd_check_key('stats_hide_player_list', '', !isset($config->stats_hide_player_list));
+      upd_check_key('stats_hide_admins', 1, !isset($config->stats_hide_admins));
+      upd_check_key('stats_hide_player_list', '', !isset($config->stats_hide_player_list));
 
-    upd_check_key('adv_seo_meta_description', '', !isset($config->adv_seo_meta_description));
-    upd_check_key('adv_seo_meta_keywords', '', !isset($config->adv_seo_meta_keywords));
+      upd_check_key('adv_seo_meta_description', '', !isset($config->adv_seo_meta_description));
+      upd_check_key('adv_seo_meta_keywords', '', !isset($config->adv_seo_meta_keywords));
 
-    upd_check_key('stats_hide_pm_link', '0', !isset($config->stats_hide_pm_link));
+      upd_check_key('stats_hide_pm_link', '0', !isset($config->stats_hide_pm_link));
 
-    upd_alter_table('notes', array(
-      "ADD INDEX `I_owner_priority_time` (`owner`, `priority`, `time`)",
-    ), !$update_indexes['notes']['I_owner_priority_time']);
+      upd_alter_table('notes', array(
+        "ADD INDEX `I_owner_priority_time` (`owner`, `priority`, `time`)",
+      ), !$update_indexes['notes']['I_owner_priority_time']);
 
-    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'",
-        "CHANGE COLUMN `text` `BUDDY_REQUEST` TINYTEXT DEFAULT '' COMMENT 'Buddy request text'", // 255 chars
-
-        "DROP INDEX `id`",
-
-        "DROP FOREIGN KEY `FK_buddy_sender_id`",
-        "DROP FOREIGN KEY `FK_buddy_owner_id`",
-        "DROP INDEX `I_buddy_sender`",
-        "DROP INDEX `I_buddy_owner`",
-      ), !$update_tables['buddy']['BUDDY_ID']);
-
-      upd_alter_table('buddy', array(
-        "CHANGE COLUMN `sender` `BUDDY_SENDER_ID` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Buddy request sender ID'",
-        "CHANGE COLUMN `owner` `BUDDY_OWNER_ID` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Buddy request recipient ID'",
-      ), !$update_tables['buddy']['BUDDY_SENDER']);
-
-      $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))
+      if(!$update_tables['buddy']['BUDDY_ID'])
       {
-        $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']) . ';' . max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
-        if(!isset($found[$index]))
+        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'",
+          "CHANGE COLUMN `text` `BUDDY_REQUEST` TINYTEXT DEFAULT '' COMMENT 'Buddy request text'", // 255 chars
+
+          "DROP INDEX `id`",
+
+          "DROP FOREIGN KEY `FK_buddy_sender_id`",
+          "DROP FOREIGN KEY `FK_buddy_owner_id`",
+          "DROP INDEX `I_buddy_sender`",
+          "DROP INDEX `I_buddy_owner`",
+        ), !$update_tables['buddy']['BUDDY_ID']);
+
+        upd_alter_table('buddy', array(
+          "CHANGE COLUMN `sender` `BUDDY_SENDER_ID` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Buddy request sender ID'",
+          "CHANGE COLUMN `owner` `BUDDY_OWNER_ID` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Buddy request recipient ID'",
+        ), !$update_tables['buddy']['BUDDY_SENDER']);
+
+        $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))
         {
-          $found[$index] = $row['BUDDY_ID'];
+          $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']) . ';' . max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
+          if(!isset($found[$index]))
+          {
+            $found[$index] = $row['BUDDY_ID'];
+          }
+          else
+          {
+            $lost[] = $row['BUDDY_ID'];
+          }
         }
-        else
+        $lost = implode(',', $lost);
+        if($lost)
         {
-          $lost[] = $row['BUDDY_ID'];
+          upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
         }
-      }
-      $lost = implode(',', $lost);
-      if($lost)
-      {
-        upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
-      }
 
-      upd_alter_table('buddy', array(
-          "ADD KEY `I_BUDDY_SENDER_ID` (`BUDDY_SENDER_ID`, `BUDDY_OWNER_ID`)",
-          "ADD KEY `I_BUDDY_OWNER_ID` (`BUDDY_OWNER_ID`, `BUDDY_SENDER_ID`)",
+        upd_alter_table('buddy', array(
+            "ADD KEY `I_BUDDY_SENDER_ID` (`BUDDY_SENDER_ID`, `BUDDY_OWNER_ID`)",
+            "ADD KEY `I_BUDDY_OWNER_ID` (`BUDDY_OWNER_ID`, `BUDDY_SENDER_ID`)",
 
-          "ADD CONSTRAINT `FK_BUDDY_SENDER_ID` FOREIGN KEY (`BUDDY_SENDER_ID`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-          "ADD CONSTRAINT `FK_BUDDY_OWNER_ID` FOREIGN KEY (`BUDDY_OWNER_ID`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), !$update_indexes['buddy']['I_BUDDY_SENDER_ID']);
-    }
+            "ADD CONSTRAINT `FK_BUDDY_SENDER_ID` FOREIGN KEY (`BUDDY_SENDER_ID`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+            "ADD CONSTRAINT `FK_BUDDY_OWNER_ID` FOREIGN KEY (`BUDDY_OWNER_ID`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), !$update_indexes['buddy']['I_BUDDY_SENDER_ID']);
+      }
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 35;
+      upd_do_query('COMMIT;', true);
+      $new_version = 35;
 
-  case 35:
-    upd_log_version_update();
+    case 35:
+      upd_log_version_update();
 
-    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");
+      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'])
-    {
-      upd_create_table('ube_report',
-        "(
+      if(!$update_tables['ube_report'])
+      {
+        upd_create_table('ube_report',
+          "(
           `ube_report_id` SERIAL COMMENT 'Report ID',
 
           `ube_report_cypher` CHAR(32) NOT NULL DEFAULT '' COMMENT '16 char secret report ID',
@@ -1782,13 +1782,13 @@ 
           PRIMARY KEY (`ube_report_id`),
           KEY `I_ube_report_cypher` (`ube_report_cypher`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['ube_report_player'])
-    {
-      upd_create_table('ube_report_player',
-        "(
+      if(!$update_tables['ube_report_player'])
+      {
+        upd_create_table('ube_report_player',
+          "(
           `ube_report_player_id` SERIAL COMMENT 'Record ID',
           `ube_report_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Report ID',
           `ube_report_player_player_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Player ID',
@@ -1804,13 +1804,13 @@ 
           KEY `I_ube_report_player_player_id` (`ube_report_player_player_id`),
           CONSTRAINT `FK_ube_report_player_ube_report` FOREIGN KEY (`ube_report_id`) REFERENCES `{$config->db_prefix}ube_report` (`ube_report_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['ube_report_fleet'])
-    {
-      upd_create_table('ube_report_fleet',
-        "(
+      if(!$update_tables['ube_report_fleet'])
+      {
+        upd_create_table('ube_report_fleet',
+          "(
           `ube_report_fleet_id` SERIAL COMMENT 'Record DB ID',
 
           `ube_report_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Report ID',
@@ -1835,17 +1835,17 @@ 
           PRIMARY KEY (`ube_report_fleet_id`),
           CONSTRAINT `FK_ube_report_fleet_ube_report` FOREIGN KEY (`ube_report_id`) REFERENCES `{$config->db_prefix}ube_report` (`ube_report_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['ube_report_unit'])
-    {
-      // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
-      // Может сохранять имена удаленных кораблей долго?
+      if(!$update_tables['ube_report_unit'])
+      {
+        // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
+        // Может сохранять имена удаленных кораблей долго?
 
-      // round SIGNED!!! -1 например - для ауткома
-      upd_create_table('ube_report_unit',
-        "(
+        // round SIGNED!!! -1 например - для ауткома
+        upd_create_table('ube_report_unit',
+          "(
           `ube_report_unit_id` SERIAL COMMENT 'Record DB ID',
 
           `ube_report_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Report ID',
@@ -1873,13 +1873,13 @@ 
           KEY `I_ube_report_unit_order` (`ube_report_unit_sort_order`),
           CONSTRAINT `FK_ube_report_unit_ube_report` FOREIGN KEY (`ube_report_id`) REFERENCES `{$config->db_prefix}ube_report` (`ube_report_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['ube_report_outcome_fleet'])
-    {
-      upd_create_table('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',
 
           `ube_report_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Report ID',
@@ -1903,13 +1903,13 @@ 
           KEY `I_ube_report_outcome_fleet_report_fleet` (`ube_report_id`, `ube_report_outcome_fleet_fleet_id`),
           CONSTRAINT `FK_ube_report_outcome_fleet_ube_report` FOREIGN KEY (`ube_report_id`) REFERENCES `{$config->db_prefix}ube_report` (`ube_report_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['ube_report_outcome_unit'])
-    {
-      upd_create_table('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',
 
           `ube_report_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Report ID',
@@ -1925,13 +1925,13 @@ 
           KEY `I_ube_report_outcome_unit_report_order` (`ube_report_id`, `ube_report_outcome_unit_sort_order`),
           CONSTRAINT `FK_ube_report_outcome_unit_ube_report` FOREIGN KEY (`ube_report_id`) REFERENCES `{$config->db_prefix}ube_report` (`ube_report_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['unit'])
-    {
-      upd_create_table('unit',
-        "(
+      if(!$update_tables['unit'])
+      {
+        upd_create_table('unit',
+          "(
           `unit_id` SERIAL COMMENT 'Record ID',
 
           `unit_player_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Unit owner',
@@ -1945,13 +1945,13 @@ 
           KEY `I_unit_player_location_snid` (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_snid`),
           CONSTRAINT `FK_unit_player_id` FOREIGN KEY (`unit_player_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['captain'])
-    {
-      upd_create_table('captain',
-        "(
+      if(!$update_tables['captain'])
+      {
+        upd_create_table('captain',
+          "(
           `captain_id` SERIAL COMMENT 'Record ID',
           `captain_unit_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Link to `unit` record',
 
@@ -1966,36 +1966,36 @@ 
           KEY `I_captain_unit_id` (`captain_unit_id`),
           CONSTRAINT `FK_captain_unit_id` FOREIGN KEY (`captain_unit_id`) REFERENCES `{$config->db_prefix}unit` (`unit_id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    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`",
+      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`",
 
-        "ADD KEY `I_fleet_start_planet_id` (`fleet_start_planet_id`)",
-        "ADD KEY `I_fleet_end_planet_id` (`fleet_end_planet_id`)",
+          "ADD KEY `I_fleet_start_planet_id` (`fleet_start_planet_id`)",
+          "ADD KEY `I_fleet_end_planet_id` (`fleet_end_planet_id`)",
 
-        "ADD CONSTRAINT `FK_fleet_planet_start` FOREIGN KEY (`fleet_start_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_fleet_planet_end` FOREIGN KEY (`fleet_end_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-      ), !$update_tables['fleets']['fleet_start_planet_id']);
+          "ADD CONSTRAINT `FK_fleet_planet_start` FOREIGN KEY (`fleet_start_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_fleet_planet_end` FOREIGN KEY (`fleet_end_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+        ), !$update_tables['fleets']['fleet_start_planet_id']);
 
-      upd_do_query("
+        upd_do_query("
         UPDATE {{fleets}} AS f
          LEFT JOIN {{planets}} AS p_s ON p_s.galaxy = f.fleet_start_galaxy AND p_s.system = f.fleet_start_system AND p_s.planet = f.fleet_start_planet AND p_s.planet_type = f.fleet_start_type
          LEFT JOIN {{planets}} AS p_e ON p_e.galaxy = f.fleet_end_galaxy AND p_e.system = f.fleet_end_system AND p_e.planet = f.fleet_end_planet AND p_e.planet_type = f.fleet_end_type
         SET f.fleet_start_planet_id = p_s.id, f.fleet_end_planet_id = p_e.id
       ");
-    }
+      }
 
-    upd_alter_table('fleets', array("DROP COLUMN `processing_start`"), $update_tables['fleets']['processing_start']);
+      upd_alter_table('fleets', array("DROP COLUMN `processing_start`"), $update_tables['fleets']['processing_start']);
 
-    if(!$update_tables['chat_player'])
-    {
-      upd_create_table('chat_player',
-        "(
+      if(!$update_tables['chat_player'])
+      {
+        upd_create_table('chat_player',
+          "(
           `chat_player_id` SERIAL COMMENT 'Record ID',
 
           `chat_player_player_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Chat player record owner',
@@ -2011,105 +2011,105 @@ 
           CONSTRAINT `FK_chat_player_id` FOREIGN KEY (`chat_player_player_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
 
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
-
-    upd_alter_table('chat', array(
-      "ADD `chat_message_sender_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Message sender ID' AFTER `messageid`",
-      "ADD `chat_message_recipient_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Message recipient ID' AFTER `user`",
+        );
+      }
 
-      "ADD KEY `I_chat_message_sender_id` (`chat_message_sender_id`)",
-      "ADD KEY `I_chat_message_recipient_id` (`chat_message_recipient_id`)",
+      upd_alter_table('chat', array(
+        "ADD `chat_message_sender_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Message sender ID' AFTER `messageid`",
+        "ADD `chat_message_recipient_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Message recipient ID' AFTER `user`",
 
-      "ADD CONSTRAINT `FK_chat_message_sender_user_id` FOREIGN KEY (`chat_message_sender_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      "ADD CONSTRAINT `FK_chat_message_sender_recipient_id` FOREIGN KEY (`chat_message_recipient_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-    ), !$update_tables['chat']['chat_message_sender_id']);
+        "ADD KEY `I_chat_message_sender_id` (`chat_message_sender_id`)",
+        "ADD KEY `I_chat_message_recipient_id` (`chat_message_recipient_id`)",
 
-    upd_alter_table('chat', array(
-      "ADD `chat_message_sender_name` VARCHAR(64) DEFAULT '' COMMENT 'Message sender name' AFTER `chat_message_sender_id`",
-      "ADD `chat_message_recipient_name` VARCHAR(64) DEFAULT '' COMMENT 'Message sender name' AFTER `chat_message_recipient_id`",
-    ), !$update_tables['chat']['chat_message_sender_name']);
+        "ADD CONSTRAINT `FK_chat_message_sender_user_id` FOREIGN KEY (`chat_message_sender_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        "ADD CONSTRAINT `FK_chat_message_sender_recipient_id` FOREIGN KEY (`chat_message_recipient_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+      ), !$update_tables['chat']['chat_message_sender_id']);
 
-    upd_alter_table('users', array(
-      "MODIFY COLUMN `banaday` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'User ban status'",
-    ), strtoupper($update_tables['users']['banaday']['Null']) == 'YES');
+      upd_alter_table('chat', array(
+        "ADD `chat_message_sender_name` VARCHAR(64) DEFAULT '' COMMENT 'Message sender name' AFTER `chat_message_sender_id`",
+        "ADD `chat_message_recipient_name` VARCHAR(64) DEFAULT '' COMMENT 'Message sender name' AFTER `chat_message_recipient_id`",
+      ), !$update_tables['chat']['chat_message_sender_name']);
 
-    upd_alter_table('banned', array(
-      "ADD `ban_user_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Banned user ID' AFTER `ban_id`",
-      "ADD `ban_issuer_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Banner ID' AFTER `ban_until`",
+      upd_alter_table('users', array(
+        "MODIFY COLUMN `banaday` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'User ban status'",
+      ), strtoupper($update_tables['users']['banaday']['Null']) == 'YES');
 
-      "ADD KEY `I_ban_user_id` (`ban_user_id`)",
-      "ADD KEY `I_ban_issuer_id` (`ban_issuer_id`)",
+      upd_alter_table('banned', array(
+        "ADD `ban_user_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Banned user ID' AFTER `ban_id`",
+        "ADD `ban_issuer_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Banner ID' AFTER `ban_until`",
 
-      "ADD CONSTRAINT `FK_ban_user_id` FOREIGN KEY (`ban_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-      "ADD CONSTRAINT `FK_ban_issuer_id` FOREIGN KEY (`ban_issuer_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-    ), !$update_tables['banned']['ban_user_id']);
+        "ADD KEY `I_ban_user_id` (`ban_user_id`)",
+        "ADD KEY `I_ban_issuer_id` (`ban_issuer_id`)",
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 36;
+        "ADD CONSTRAINT `FK_ban_user_id` FOREIGN KEY (`ban_user_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+        "ADD CONSTRAINT `FK_ban_issuer_id` FOREIGN KEY (`ban_issuer_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+      ), !$update_tables['banned']['ban_user_id']);
 
-  case 36:
-    upd_log_version_update();
+      upd_do_query('COMMIT;', true);
+      $new_version = 36;
 
-    upd_alter_table('payment', array(
-      "DROP FOREIGN KEY `FK_payment_user`",
-    ), $update_foreigns['payment']['FK_payment_user']);
+    case 36:
+      upd_log_version_update();
 
-    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`",
-      ), true);
+      upd_alter_table('payment', array(
+        "DROP FOREIGN KEY `FK_payment_user`",
+      ), $update_foreigns['payment']['FK_payment_user']);
 
-      upd_alter_table('chat', array(
-        "ADD CONSTRAINT `FK_chat_message_sender_user_id` FOREIGN KEY (`chat_message_sender_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-        "ADD CONSTRAINT `FK_chat_message_sender_recipient_id` FOREIGN KEY (`chat_message_recipient_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-      ), true);
-    }
+      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`",
+        ), true);
+
+        upd_alter_table('chat', array(
+          "ADD CONSTRAINT `FK_chat_message_sender_user_id` FOREIGN KEY (`chat_message_sender_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+          "ADD CONSTRAINT `FK_chat_message_sender_recipient_id` FOREIGN KEY (`chat_message_recipient_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+        ), true);
+      }
 
-    upd_alter_table('users', array(
-      "ADD `user_time_diff` INT(11) DEFAULT NULL COMMENT 'User time difference with server time' AFTER `onlinetime`",
-      "ADD `user_time_diff_forced` TINYINT(1) DEFAULT 0 COMMENT 'User time difference forced with time zone selection flag' AFTER `user_time_diff`",
-    ), !$update_tables['users']['user_time_diff']);
+      upd_alter_table('users', array(
+        "ADD `user_time_diff` INT(11) DEFAULT NULL COMMENT 'User time difference with server time' AFTER `onlinetime`",
+        "ADD `user_time_diff_forced` TINYINT(1) DEFAULT 0 COMMENT 'User time difference forced with time zone selection flag' AFTER `user_time_diff`",
+      ), !$update_tables['users']['user_time_diff']);
 
-    upd_alter_table('planets', array(
-      "ADD `ship_orbital_heavy` bigint(20) NOT NULL DEFAULT '0' COMMENT 'HOPe - Heavy Orbital Platform'",
-    ), !$update_tables['planets']['ship_orbital_heavy']);
+      upd_alter_table('planets', array(
+        "ADD `ship_orbital_heavy` bigint(20) NOT NULL DEFAULT '0' COMMENT 'HOPe - Heavy Orbital Platform'",
+      ), !$update_tables['planets']['ship_orbital_heavy']);
 
-    upd_check_key('chat_refresh_rate', 5, !isset($config->chat_refresh_rate));
+      upd_check_key('chat_refresh_rate', 5, !isset($config->chat_refresh_rate));
 
-    upd_alter_table('chat_player', array(
-      "ADD `chat_player_refresh_last`  INT(11) NOT NULL DEFAULT 0 COMMENT 'Player last refresh time'",
+      upd_alter_table('chat_player', array(
+        "ADD `chat_player_refresh_last`  INT(11) NOT NULL DEFAULT 0 COMMENT 'Player last refresh time'",
 
-      "ADD KEY `I_chat_player_refresh_last` (`chat_player_refresh_last`)",
-    ), !$update_tables['chat_player']['chat_player_refresh_last']);
+        "ADD KEY `I_chat_player_refresh_last` (`chat_player_refresh_last`)",
+      ), !$update_tables['chat_player']['chat_player_refresh_last']);
 
-    upd_alter_table('ube_report', array(
-      "ADD KEY `I_ube_report_time_combat` (`ube_report_time_combat`)",
-    ), !$update_indexes['ube_report']['I_ube_report_time_combat']);
+      upd_alter_table('ube_report', array(
+        "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'])
-    {
-      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'",
-      ), !$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'",
+        ), !$update_tables['unit']['unit_time_start']);
 
-      upd_do_query(
-        "INSERT INTO {{unit}}
+        upd_do_query(
+          "INSERT INTO {{unit}}
           (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level, unit_time_start, unit_time_finish)
         SELECT
           `powerup_user_id`, " . LOC_USER . ", `powerup_user_id`, `powerup_category`, `powerup_unit_id`, `powerup_unit_level`
           , IF(`powerup_time_start`, FROM_UNIXTIME(`powerup_time_start`), NULL), IF(`powerup_time_finish`, FROM_UNIXTIME(`powerup_time_finish`), NULL)
         FROM {{powerup}}"
-      );
-    }
+        );
+      }
 
-    if(!$update_tables['que'])
-    {
-      upd_create_table('que',
-        "(
+      if(!$update_tables['que'])
+      {
+        upd_create_table('que',
+          "(
           `que_id` SERIAL COMMENT 'Internal que id',
 
           `que_player_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Que owner ID',
@@ -2135,175 +2135,175 @@ 
           CONSTRAINT `FK_que_planet_id` FOREIGN KEY (`que_planet_id`) REFERENCES `{$config->db_prefix}planets` (`id`) ON UPDATE CASCADE ON DELETE CASCADE,
           CONSTRAINT `FK_que_planet_id_origin` FOREIGN KEY (`que_planet_id_origin`) REFERENCES `{$config->db_prefix}planets` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
-    }
+        );
+      }
 
-    // Конвертирум очередь исследований
-    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))
+      // Конвертирум очередь исследований
+      if($update_tables['users']['que'])
       {
-        $que_data = explode(',', $que_row['que']);
-
-        if(!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech')))
+        $que_lines = array();
+        $que_query = upd_do_query("SELECT * FROM {{users}} WHERE `que`");
+        while($que_row = db_fetch($que_query))
         {
-          continue;
-        }
+          $que_data = explode(',', $que_row['que']);
 
-        $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])
-        {
-          $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(!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])
           {
-            $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'])
             {
-              $que_data[QI_PLANET_ID] = 'NULL';
+              $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'])
+              {
+                $que_data[QI_PLANET_ID] = 'NULL';
+              }
             }
           }
-        }
-        else
-        {
-          $que_data[QI_PLANET_ID] = 'NULL';
-        }
+          else
+          {
+            $que_data[QI_PLANET_ID] = 'NULL';
+          }
 
-        $unit_info = get_unit_param($que_data[QI_UNIT_ID]);
-        $unit_level = $que_row[$unit_info[P_NAME]];
-        $unit_factor = $unit_info[P_COST][P_FACTOR] ? $unit_info[P_COST][P_FACTOR] : 1;
-        $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))
+          $unit_info = get_unit_param($que_data[QI_UNIT_ID]);
+          $unit_level = $que_row[$unit_info[P_NAME]];
+          $unit_factor = $unit_info[P_COST][P_FACTOR] ? $unit_info[P_COST][P_FACTOR] : 1;
+          $price_increase = pow($unit_factor, $unit_level);
+          $unit_level++;
+          $unit_cost = array();
+          foreach($unit_info[P_COST] as $resource_id => $resource_amount)
           {
-            continue;
+            if($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase))
+            {
+              continue;
+            }
+            $unit_cost[] = $resource_id . ',' . floor($resource_cost);
           }
-          $unit_cost[] = $resource_id . ',' . floor($resource_cost);
+          $unit_cost = implode(';', $unit_cost);
+
+          $que_lines[] = "({$que_row['id']},{$que_data[QI_PLANET_ID]}," . QUE_RESEARCH . ",{$que_data[QI_TIME]},{$que_data[QI_UNIT_ID]},1," .
+            BUILD_CREATE . ",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
         }
-        $unit_cost = implode(';', $unit_cost);
 
-        $que_lines[] = "({$que_row['id']},{$que_data[QI_PLANET_ID]}," . QUE_RESEARCH . ",{$que_data[QI_TIME]},{$que_data[QI_UNIT_ID]},1," .
-          BUILD_CREATE . ",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
-      }
+        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));
+        }
 
-      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));
+        upd_alter_table('users', array(
+          "DROP COLUMN `que`",
+        ), $update_tables['users']['que']);
       }
 
-      upd_alter_table('users', array(
-        "DROP COLUMN `que`",
-      ), $update_tables['users']['que']);
-    }
-
-
-    upd_check_key('server_que_length_research', 1, !isset($config->server_que_length_research));
 
+      upd_check_key('server_que_length_research', 1, !isset($config->server_que_length_research));
 
-    // Ковертируем технологии в таблицы
-    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))
+      // Ковертируем технологии в таблицы
+      if($update_tables['users']['graviton_tech'])
       {
-        foreach($sn_group_tech as $tech_id)
+        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))
         {
-          if($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)]))
+          foreach($sn_group_tech as $tech_id)
           {
-            $que_lines[] = "({$user_row['id']}," . LOC_USER . ",{$user_row['id']}," . UNIT_TECHNOLOGIES . ",{$tech_id},{$tech_level})";
+            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))
-      {
-        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));
-      }
-
-      upd_alter_table('users', array(
-        "DROP COLUMN `graviton_tech`",
-      ), $update_tables['users']['graviton_tech']);
-    }
 
-    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']);
+        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));
+        }
 
-      foreach(sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id)
-      {
-        $planet_units[get_unit_param($unit_id, P_NAME)] = 1;
+        upd_alter_table('users', array(
+          "DROP COLUMN `graviton_tech`",
+        ), $update_tables['users']['graviton_tech']);
       }
-      $drop_index = array();
-      $create_index = &$drop_index; // array();
-      foreach($planet_units as $unit_name => $unit_create)
+
+      if(!$update_indexes['unit']['I_unit_record_search'])
       {
-        if($update_indexes['planets']['I_' . $unit_name])
+        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)
         {
-          $drop_index[] = "DROP KEY I_{$unit_name}";
+          $planet_units[get_unit_param($unit_id, P_NAME)] = 1;
         }
-        if($update_indexes['planets']['i_' . $unit_name])
+        $drop_index = array();
+        $create_index = &$drop_index; // array();
+        foreach($planet_units as $unit_name => $unit_create)
         {
-          $drop_index[] = "DROP KEY i_{$unit_name}";
-        }
+          if($update_indexes['planets']['I_' . $unit_name])
+          {
+            $drop_index[] = "DROP KEY I_{$unit_name}";
+          }
+          if($update_indexes['planets']['i_' . $unit_name])
+          {
+            $drop_index[] = "DROP KEY i_{$unit_name}";
+          }
 
-        if($unit_create)
-        {
-          $create_index[] = "ADD KEY `I_{$unit_name}` (`id_owner`, {$unit_name} DESC)";
+          if($unit_create)
+          {
+            $create_index[] = "ADD KEY `I_{$unit_name}` (`id_owner`, {$unit_name} DESC)";
+          }
         }
+        upd_alter_table('planets', $drop_index, true);
       }
-      upd_alter_table('planets', $drop_index, true);
-    }
 
-    upd_alter_table('users', array(
-      "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']);
+      upd_alter_table('users', array(
+        "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'])
-    {
-      upd_do_query("UPDATE {{alliance}} SET ally_owner = null WHERE ally_owner not in (select id from {{users}})");
+      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(
-        "ADD CONSTRAINT `FK_alliance_owner` FOREIGN KEY (`ally_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
-      ), !$update_foreigns['alliance']['FK_alliance_owner']);
+        upd_alter_table('alliance', array(
+          "ADD CONSTRAINT `FK_alliance_owner` FOREIGN KEY (`ally_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE",
+        ), !$update_foreigns['alliance']['FK_alliance_owner']);
 
-      upd_do_query("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_ally_id not in (select id from {{alliance}}) OR alliance_negotiation_contr_ally_id not in (select id from {{alliance}})");
+        upd_do_query("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_ally_id not in (select id from {{alliance}}) OR alliance_negotiation_contr_ally_id not in (select id from {{alliance}})");
 
-      upd_do_query("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_ally_id = alliance_negotiation_contr_ally_id");
-      upd_do_query("DELETE FROM {{alliance_diplomacy}} WHERE alliance_diplomacy_ally_id = alliance_diplomacy_contr_ally_id");
-    }
+        upd_do_query("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_ally_id = alliance_negotiation_contr_ally_id");
+        upd_do_query("DELETE FROM {{alliance_diplomacy}} WHERE alliance_diplomacy_ally_id = alliance_diplomacy_contr_ally_id");
+      }
 
-    upd_alter_table('fleets', array(
-      'MODIFY COLUMN `fleet_owner` BIGINT(20) UNSIGNED DEFAULT NULL',
-      "ADD CONSTRAINT `FK_fleet_owner` FOREIGN KEY (`fleet_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
-    ), strtoupper($update_tables['fleets']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED');
+      upd_alter_table('fleets', array(
+        'MODIFY COLUMN `fleet_owner` BIGINT(20) UNSIGNED DEFAULT NULL',
+        "ADD CONSTRAINT `FK_fleet_owner` FOREIGN KEY (`fleet_owner`) REFERENCES `{$config->db_prefix}users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE",
+      ), strtoupper($update_tables['fleets']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !$config->chat_highlight_developer);
+      upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !$config->chat_highlight_developer);
 
-    if(!$update_tables['player_name_history'])
-    {
-      upd_check_key('game_user_changename_cost', 100000, !$config->game_user_changename_cost);
-      upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
+      if(!$update_tables['player_name_history'])
+      {
+        upd_check_key('game_user_changename_cost', 100000, !$config->game_user_changename_cost);
+        upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, $config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
 
-      upd_alter_table('users', array(
-        "CHANGE COLUMN `username` `username` VARCHAR(32) NOT NULL DEFAULT '' COMMENT 'Player name'",
-      ));
+        upd_alter_table('users', array(
+          "CHANGE COLUMN `username` `username` VARCHAR(32) NOT NULL DEFAULT '' COMMENT 'Player name'",
+        ));
 
-      upd_create_table('player_name_history',
-        "(
+        upd_create_table('player_name_history',
+          "(
           `player_id` BIGINT(20) UNSIGNED NULL DEFAULT NULL COMMENT 'Player ID',
           `player_name` VARCHAR(32) NOT NULL COMMENT 'Historical player name',
           `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When player changed name',
@@ -2313,79 +2313,79 @@ 
 
           CONSTRAINT `FK_player_name_history_id` FOREIGN KEY (`player_id`) REFERENCES `{$config->db_prefix}users` (`id`) ON UPDATE CASCADE ON DELETE CASCADE
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
-      );
+        );
 
-      upd_do_query("REPLACE INTO {{player_name_history}} (`player_id`, `player_name`) SELECT `id`, `username` FROM {{users}} WHERE `user_as_ally` IS NULL;");
-    }
+        upd_do_query("REPLACE INTO {{player_name_history}} (`player_id`, `player_name`) SELECT `id`, `username` FROM {{users}} WHERE `user_as_ally` IS NULL;");
+      }
 
-    upd_alter_table('planets', array(
-      "ADD `density` SMALLINT NOT NULL DEFAULT 5500 COMMENT 'Planet average density kg/m3'",
-      "ADD `density_index` TINYINT NOT NULL DEFAULT " . PLANET_DENSITY_STANDARD . " COMMENT 'Planet cached density index'",
-    ), !$update_tables['planets']['density_index']);
+      upd_alter_table('planets', array(
+        "ADD `density` SMALLINT NOT NULL DEFAULT 5500 COMMENT 'Planet average density kg/m3'",
+        "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'])
-    {
-      upd_alter_table('unit', "DROP KEY `unit_id`", $update_indexes['unit']['unit_id']);
+      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']);
-      upd_alter_table('unit', "DROP KEY `I_unit_player_id_temporary`", $update_indexes['unit']['I_unit_player_id_temporary']);
+        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']);
+        upd_alter_table('unit', "DROP KEY `I_unit_player_id_temporary`", $update_indexes['unit']['I_unit_player_id_temporary']);
 
-      $sn_data_artifacts = sn_get_groups('artifacts');
-      $db_changeset = array();
+        $sn_data_artifacts = sn_get_groups('artifacts');
+        $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))
-      {
-        $artifact_list = explode(';', $row['player_artifact_list']);
-        if(!$row['player_artifact_list'] || empty($artifact_list))
-        {
-          continue;
-        }
-        foreach($artifact_list as $key => &$value)
+        $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))
         {
-          $value = explode(',', $value);
-          if(!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]]))
+          $artifact_list = explode(';', $row['player_artifact_list']);
+          if(!$row['player_artifact_list'] || empty($artifact_list))
           {
-            unset($artifact_list[$key]);
             continue;
           }
-          $db_changeset['unit'][] = upd_db_unit_changeset_prepare($value[0], $value[1], $row);
+          foreach($artifact_list as $key => &$value)
+          {
+            $value = explode(',', $value);
+            if(!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]]))
+            {
+              unset($artifact_list[$key]);
+              continue;
+            }
+            $db_changeset['unit'][] = upd_db_unit_changeset_prepare($value[0], $value[1], $row);
+          }
         }
-      }
-      upd_db_changeset_apply($db_changeset);
+        upd_db_changeset_apply($db_changeset);
 
-      upd_alter_table('users', "DROP COLUMN `player_artifact_list`", $update_tables['users']['player_artifact_list']);
-    }
+        upd_alter_table('users', "DROP COLUMN `player_artifact_list`", $update_tables['users']['player_artifact_list']);
+      }
 
-    upd_alter_table('users', array(
-      "DROP COLUMN `spy_tech`",
-      "DROP COLUMN `computer_tech`",
-      "DROP COLUMN `military_tech`",
-      "DROP COLUMN `defence_tech`",
-      "DROP COLUMN `shield_tech`",
-      "DROP COLUMN `energy_tech`",
-      "DROP COLUMN `hyperspace_tech`",
-      "DROP COLUMN `combustion_tech`",
-      "DROP COLUMN `impulse_motor_tech`",
-      "DROP COLUMN `hyperspace_motor_tech`",
-      "DROP COLUMN `laser_tech`",
-      "DROP COLUMN `ionic_tech`",
-      "DROP COLUMN `buster_tech`",
-      "DROP COLUMN `intergalactic_tech`",
-      "DROP COLUMN `expedition_tech`",
-      "DROP COLUMN `colonisation_tech`",
-    ), $update_tables['users']['spy_tech']);
-
-    upd_check_key('payment_currency_exchange_dm_', 2500,             !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
-    upd_check_key('payment_currency_exchange_eur', 0.09259259259259, !$config->payment_currency_exchange_eur);
-    upd_check_key('payment_currency_exchange_rub', 4.0,              !$config->payment_currency_exchange_rub);
-    upd_check_key('payment_currency_exchange_usd', 0.125,            !$config->payment_currency_exchange_usd);
-    upd_check_key('payment_currency_exchange_wme', 0.0952380952381,  !$config->payment_currency_exchange_usd);
-    upd_check_key('payment_currency_exchange_wmr', 4.1,              !$config->payment_currency_exchange_wmr);
-    upd_check_key('payment_currency_exchange_wmu', 1.05,             !$config->payment_currency_exchange_wmu);
-    upd_check_key('payment_currency_exchange_wmz', 0.126582278481,   !$config->payment_currency_exchange_wmz);
+      upd_alter_table('users', array(
+        "DROP COLUMN `spy_tech`",
+        "DROP COLUMN `computer_tech`",
+        "DROP COLUMN `military_tech`",
+        "DROP COLUMN `defence_tech`",
+        "DROP COLUMN `shield_tech`",
+        "DROP COLUMN `energy_tech`",
+        "DROP COLUMN `hyperspace_tech`",
+        "DROP COLUMN `combustion_tech`",
+        "DROP COLUMN `impulse_motor_tech`",
+        "DROP COLUMN `hyperspace_motor_tech`",
+        "DROP COLUMN `laser_tech`",
+        "DROP COLUMN `ionic_tech`",
+        "DROP COLUMN `buster_tech`",
+        "DROP COLUMN `intergalactic_tech`",
+        "DROP COLUMN `expedition_tech`",
+        "DROP COLUMN `colonisation_tech`",
+      ), $update_tables['users']['spy_tech']);
+
+      upd_check_key('payment_currency_exchange_dm_', 2500,             !$config->payment_currency_exchange_dm_ || $config->payment_currency_exchange_dm_ == 1000);
+      upd_check_key('payment_currency_exchange_eur', 0.09259259259259, !$config->payment_currency_exchange_eur);
+      upd_check_key('payment_currency_exchange_rub', 4.0,              !$config->payment_currency_exchange_rub);
+      upd_check_key('payment_currency_exchange_usd', 0.125,            !$config->payment_currency_exchange_usd);
+      upd_check_key('payment_currency_exchange_wme', 0.0952380952381,  !$config->payment_currency_exchange_usd);
+      upd_check_key('payment_currency_exchange_wmr', 4.1,              !$config->payment_currency_exchange_wmr);
+      upd_check_key('payment_currency_exchange_wmu', 1.05,             !$config->payment_currency_exchange_wmu);
+      upd_check_key('payment_currency_exchange_wmz', 0.126582278481,   !$config->payment_currency_exchange_wmz);
 
-    upd_do_query('COMMIT;', true);
-    $new_version = 37;
+      upd_do_query('COMMIT;', true);
+      $new_version = 37;
 
 }

includes/pages/imperator.php

Spacing +21 added lines, -21 removed lines

@@ -53,7 +53,7 @@ 
 //    $same_user = false;
 //  }
 
-  if(!$user_data) {
+  if (!$user_data) {
     message($lang['imp_imperator_none'], $lang['sys_error'], 'index.php', 10);
     die();
   }
@@ -64,15 +64,15 @@ 
   $stat_array = array();
   $query = doquery("SELECT * FROM {{statpoints}} WHERE `stat_type` = 1 AND `id_owner` = {$user_id} ORDER BY `stat_code` DESC;");
   $stat_count = classSupernova::$db->db_affected_rows();
-  while($row = db_fetch($query)) {
-    foreach($stat_fields as $field_db_name => $field_template_name) {
+  while ($row = db_fetch($query)) {
+    foreach ($stat_fields as $field_db_name => $field_template_name) {
       // $stat_count - $row['stat_code'] - для реверсирования ID статы в JS
       $stat_array[$field_template_name]['DATA'][$stat_count - $row['stat_code']] = $row[$field_db_name];
     }
   }
 
   $stat_array_date = $stat_array['STAT_DATE'];
-  foreach($stat_array_date['DATA'] as $key => $value) {
+  foreach ($stat_array_date['DATA'] as $key => $value) {
     $template->assign_block_vars('stat_date', array(
       'ID' => $key,
       'VALUE' => $value,
@@ -85,17 +85,17 @@ 
 
   unset($stat_array['STAT_DATE']);
   $template_data = array();
-  foreach($stat_array as $stat_type => &$stat_type_data) {
+  foreach ($stat_array as $stat_type => &$stat_type_data) {
     $reverse_min_max = strpos($stat_type, '_RANK') !== false;
     $stat_type_data['MIN'] = $reverse_min_max ? max($stat_type_data['DATA']) : min($stat_type_data['DATA']);
     $stat_type_data['MAX'] = $reverse_min_max ? min($stat_type_data['DATA']) : max($stat_type_data['DATA']);
     $stat_type_data['AVG'] = average($stat_type_data['DATA']);
-    foreach($stat_type_data['DATA'] as $key => $value) {
+    foreach ($stat_type_data['DATA'] as $key => $value) {
       // $stat_type_data['PERCENT'][$key] = $stat_type_data['MAX'] - $value ? ($stat_type_data['MAX'] - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $value) : 100;
       $stat_type_data['PERCENT'][$key] = ($stat_type_data['MAX'] - $value ? ($value - $stat_type_data['MIN']) / ($stat_type_data['MAX'] - $stat_type_data['MIN']) : 1) * 100;
       $template_data[$stat_type][$key]['ID'] = $key;
       $template_data[$stat_type][$key]['VALUE'] = $value;
-      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN']  - $value : $value - $stat_type_data['MAX']);
+      $template_data[$stat_type][$key]['DELTA'] = ($reverse_min_max ? $stat_type_data['MIN'] - $value : $value - $stat_type_data['MAX']);
       $template_data[$stat_type][$key]['PERCENT'] = $stat_type_data['PERCENT'][$key];
 
 //$template_data[$stat_type][$key]['PERCENT'] = $key ? $stat_type_data['PERCENT'][$key] : 50; // TODO DEBUG
@@ -103,7 +103,7 @@ 
   }
   // pdump($stat_array['RES_POINTS']);
 
-  foreach($template_data as $stat_type => $stat_type_data) {
+  foreach ($template_data as $stat_type => $stat_type_data) {
     $template->assign_block_vars('stat', array(
       'TYPE' => $stat_type,
       'TEXT' => $lang['imp_stat_types'][$stat_type],
@@ -111,7 +111,7 @@ 
       'MAX' => $stat_array[$stat_type]['MAX'],
       'AVG' => $stat_array[$stat_type]['AVG'],
     ));
-    foreach($stat_type_data as $stat_entry) {
+    foreach ($stat_type_data as $stat_entry) {
       $template->assign_block_vars('stat.entry', $stat_entry);
     }
   }
@@ -119,7 +119,7 @@ 
 
   // pdump($template_data);
 
-  if($same_user) {
+  if ($same_user) {
     rpg_level_up($user, RPG_STRUCTURE);
     rpg_level_up($user, RPG_RAID);
     rpg_level_up($user, RPG_TECH);
@@ -153,29 +153,29 @@ 
     'builder_xp'           => pretty_number($user_data['xpminier']),
     'builder_lvl'          => pretty_number($user_data['lvl_minier']),
     'builder_lvl_st'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier'])),
-    'builder_lvl_up'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier']+1)),
+    'builder_lvl_up'       => pretty_number(rpg_get_miner_xp($user_data['lvl_minier'] + 1)),
     'raid_xp'              => pretty_number($user_data['xpraid']),
     'raid_lvl'             => pretty_number($user_data['lvl_raid']),
-    'raid_lvl_up'          => pretty_number(rpg_get_raider_xp($user_data['lvl_raid']+1)),
+    'raid_lvl_up'          => pretty_number(rpg_get_raider_xp($user_data['lvl_raid'] + 1)),
     'raids'                => pretty_number($user_data['raids']),
     'raidswin'             => pretty_number($user_data['raidswin']),
     'raidsloose'           => pretty_number($user_data['raidsloose']),
     'tech_xp'              => pretty_number($user_data['player_rpg_tech_xp']),
     'tech_lvl'             => pretty_number($user_data['player_rpg_tech_level']),
     'tech_lvl_st'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level'])),
-    'tech_lvl_up'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level']+1)),
+    'tech_lvl_up'          => pretty_number(rpg_get_tech_xp($user_data['player_rpg_tech_level'] + 1)),
 
     'explore_xp'           => pretty_number($user_data['player_rpg_explore_xp']),
     'explore_lvl'          => pretty_number($user_data['player_rpg_explore_level']),
     'explore_lvl_st'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level'])),
-    'explore_lvl_up'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level']+1)),
-
-    'build_points'         => pretty_number( $StatRecord['build_points'] ),
-    'tech_points'          => pretty_number( $StatRecord['tech_points'] ),
-    'fleet_points'         => pretty_number( $StatRecord['fleet_points'] ),
-    'defs_points'          => pretty_number( $StatRecord['defs_points'] ),
-    'res_points'           => pretty_number( $StatRecord['res_points'] ),
-    'total_points'         => pretty_number( $StatRecord['total_points'] ),
+    'explore_lvl_up'       => pretty_number(rpg_get_explore_xp($user_data['player_rpg_explore_level'] + 1)),
+
+    'build_points'         => pretty_number($StatRecord['build_points']),
+    'tech_points'          => pretty_number($StatRecord['tech_points']),
+    'fleet_points'         => pretty_number($StatRecord['fleet_points']),
+    'defs_points'          => pretty_number($StatRecord['defs_points']),
+    'res_points'           => pretty_number($StatRecord['res_points']),
+    'total_points'         => pretty_number($StatRecord['total_points']),
     'user_rank'            => $StatRecord['total_rank'],
     'RANK_DIFF'            => $StatRecord['total_old_rank'] - $StatRecord['total_rank'],
 

includes/pages/techtree.php

Spacing +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
   global $lang, $user, $planetrow;
 
   $tech_tree = array();
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
   {
     $tech_tree[] = array(
       'NAME' => $lang['tech'][$unit_group_id],
       'GROUP_ID' => $unit_group_id,
     );
 
-    foreach($unit_list as $unit_id)
+    foreach ($unit_list as $unit_id)
     {
       $sn_data_unit = get_unit_param($unit_id);
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);

includes/pages/contact.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
   $query = db_user_list("`authlevel` > 0 ORDER BY `authlevel` ASC");
 
   // while($row = db_fetch($query))
-  foreach($query as $row)
+  foreach ($query as $row)
   {
     $template_result['.']['contact'][] = array(
       'NAME'  => $row['username'],

includes/pages/imperium.php

Spacing +18 added lines, -18 removed lines

@@ -22,17 +22,17 @@ 
   $sn_group_factories = sn_get_groups('factories');
   $planet_density = sn_get_groups('planet_density');
 
-  if(sys_get_param('save_production')) {
+  if (sys_get_param('save_production')) {
     $production = sys_get_param('percent');
-    if(is_array($production) && !empty($production)) {
+    if (is_array($production) && !empty($production)) {
       // sn_db_transaction_start();
       $query = array();
       $planet_row_list = db_planet_list_sorted($user, false, '*');
       // while($planet = db_fetch($planet_row_list))
-      foreach($planet_row_list as $planet) {
-        foreach($sn_group_factories as $factory_unit_id) {
+      foreach ($planet_row_list as $planet) {
+        foreach ($sn_group_factories as $factory_unit_id) {
           $unit_db_name_porcent = pname_factory_production_field_name($factory_unit_id);
-          if(
+          if (
             get_unit_param($factory_unit_id, P_MINING_IS_MANAGED)
             && isset($production[$factory_unit_id][$planet['id']])
             && ($actual_porcent = intval($production[$factory_unit_id][$planet['id']] / 10)) >= 0
@@ -43,7 +43,7 @@ 
           }
         }
       }
-      foreach($query as $planet_id => $query_data) {
+      foreach ($query as $planet_id => $query_data) {
         db_planet_set_by_id($planet_id, implode(',', $query_data));
       }
       // sn_db_transaction_commit();
@@ -52,7 +52,7 @@ 
 
   $planet_row_list = db_planet_list_sorted($user);
   // while ($planet = db_fetch($planet_row_list))
-  foreach($planet_row_list as $planet) {
+  foreach ($planet_row_list as $planet) {
     sn_db_transaction_start();
     $global_data = sys_o_get_updated($user, $planet['id'], SN_TIME_NOW, false, true);
     $planets[$planet['id']] = $global_data['planet'];
@@ -64,7 +64,7 @@ 
   $template = gettemplate('imperium', $template);
   $template->assign_var('amount', count($planets) + 2);
 
-  for($i = 100; $i >= 0; $i -= 10) {
+  for ($i = 100; $i >= 0; $i -= 10) {
     $template->assign_block_vars('percent', array('PERCENT' => $i));
   }
 
@@ -79,8 +79,8 @@ 
     $planet_template = tpl_parse_planet($planet);
 
     $planet_fleet_id = 0;
-    $fleet_list = $planet_template['fleet_list'];//flt_get_fleets_to_planet($planet);
-    if($fleet_list['own']['count'])
+    $fleet_list = $planet_template['fleet_list']; //flt_get_fleets_to_planet($planet);
+    if ($fleet_list['own']['count'])
     {
       $planet_fleet_id = "p{$fleet_id}";
       $fleets[] = tpl_parse_fleet_sn($fleet_list['own']['total'], $planet_fleet_id);
@@ -142,19 +142,19 @@ 
     UNIT_DEFENCE => 'defense',
   );
 
-  foreach($show_groups as $unit_group_id => $mode)
+  foreach ($show_groups as $unit_group_id => $mode)
   {
     $template->assign_block_vars('prods', array(
       'NAME' => $lang['tech'][$unit_group_id],
     ));
     $unit_group = get_unit_param('techtree', $unit_group_id);
-    foreach($unit_group as $unit_id)
+    foreach ($unit_group as $unit_id)
     {
       $unit_count = $unit_count_abs = 0;
       $block_vars = array();
       $unit_is_factory = in_array($unit_id, $sn_group_factories) && get_unit_param($unit_id, P_MINING_IS_MANAGED);
       // $unit_db_name = pname_resource_name($unit_id);
-      foreach($planets as $planet)
+      foreach ($planets as $planet)
       {
         $unit_level_plain = mrc_get_level($user, $planet, $unit_id, false, true);
 
@@ -163,7 +163,7 @@ 
         $level_plus['LEVEL_PLUS_GREEN'] = 0;
 
         $level_plus['PERCENT'] = $unit_is_factory ? ($unit_level_plain ? $planet[pname_factory_production_field_name($unit_id)] * 10 : -1) : -1;
-        switch($mode)
+        switch ($mode)
         {
           /*
           case 'structures':
@@ -178,13 +178,13 @@ 
 
           /** @noinspection PhpMissingBreakStatementInspection */
           case 'fleet':
-            $level_plus['LEVEL_PLUS_YELLOW'] = $planet['fleet_list']['own']['total'][$unit_id]<=0 ? $planet['fleet_list']['own']['total'][$unit_id] : "+{$planet['fleet_list']['own']['total'][$unit_id]}";
+            $level_plus['LEVEL_PLUS_YELLOW'] = $planet['fleet_list']['own']['total'][$unit_id] <= 0 ? $planet['fleet_list']['own']['total'][$unit_id] : "+{$planet['fleet_list']['own']['total'][$unit_id]}";
             $total['units'][$unit_id]['LEVEL_PLUS_YELLOW'] += $level_plus['LEVEL_PLUS_YELLOW'];
 
           case 'structures':
           case 'defense':
             $level_plus_build = $ques[$planet['id']]['in_que'][que_get_unit_que($unit_id)][$user['id']][$planet['id']][$unit_id];
-            if($level_plus_build)
+            if ($level_plus_build)
             {
               $level_plus['LEVEL_PLUS_GREEN'] = $level_plus_build < 0 ? $level_plus_build : "+{$level_plus_build}";
               // $level_plus['LEVEL_PLUS_GREEN'] = "+{$level_plus_build}";
@@ -205,7 +205,7 @@ 
         $unit_count_abs += $unit_level_plain + abs($level_plus['LEVEL_PLUS_YELLOW']) + abs($level_plus['LEVEL_PLUS_GREEN']);
       }
 
-      if($unit_count_abs)
+      if ($unit_count_abs)
       {
         $template->assign_block_vars('prods', array(
           'ID'    => $unit_id,
@@ -214,7 +214,7 @@ 
           'MODE'  => $mode,
         ));
 
-        foreach($block_vars as $block_var)
+        foreach ($block_vars as $block_var)
         {
           $template->assign_block_vars('prods.planet', $block_var);
         }