supernova-ws / SuperNova

includes/classes/user_options.php

Spacing +30 added lines, -30 removed lines

@@ -116,8 +116,8 @@ 
 
     $update_cache = false;
 
-    if(!empty($this->to_write)) {
-      foreach($this->to_write as $key => $cork) {
+    if (!empty($this->to_write)) {
+      foreach ($this->to_write as $key => $cork) {
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
         $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
       }
@@ -128,19 +128,19 @@ 
       $update_cache = true;
     }
 
-    if(!empty($this->to_delete)) {
-      foreach($this->to_delete as $key => &$value) {
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
+    if (!empty($this->to_delete)) {
+      foreach ($this->to_delete as $key => &$value) {
+        $value = is_string($key) ? "'" . db_escape($key) . "'" : $key;
       }
 
-      doquery("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
+      doquery("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (" . implode(',', $this->to_delete) . ") ");
       // pdump("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
 
       $this->to_delete = array();
       $update_cache = true;
     }
 
-    if($update_cache) {
+    if ($update_cache) {
       global $sn_cache;
 
       $field_name = $this->cached_name();
@@ -167,7 +167,7 @@ 
   protected function load() {
     global $sn_cache;
 
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
@@ -175,7 +175,7 @@ 
     $this->to_write = array();
     $this->to_delete = array();
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       $this->loaded = true;
       return;
     }
@@ -183,13 +183,13 @@ 
     $field_name = $this->cached_name();
     $a_data = $sn_cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace_recursive($this->data, $a_data);
       return;
     }
 
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -269,14 +269,14 @@ 
     // Если в массиве индекса только один элемент - значит это просто индекс
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
 
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
       $this->load();
     }
 
-    if(is_array($option_id)) {
+    if (is_array($option_id)) {
       $result = $this->data;
-      foreach($option_id as $sub_key) {
-        if(!isset($result) || !isset($result[$sub_key])) {
+      foreach ($option_id as $sub_key) {
+        if (!isset($result) || !isset($result[$sub_key])) {
           $result = null;
           break;
         }
@@ -296,12 +296,12 @@ 
   public function __set($option, $value = null) {
     global $sn_cache;
 
-    if(empty($option) || !$this->user_id) {
+    if (empty($option) || !$this->user_id) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($option) && count($option) == 1) {
+    if (is_array($option) && count($option) == 1) {
       // Разворачиваем его в индекс
       $option = array(reset($option) => $value);
       unset($value);
@@ -310,13 +310,13 @@ 
 
     $to_write = array();
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($option) && isset($value)) {
+    if (is_array($option) && isset($value)) {
       $a_data = &$this->data;
-      foreach($option as $option_id) {
+      foreach ($option as $option_id) {
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
         $a_data = &$a_data[$option_id];
       }
-      if($a_data != $value) {
+      if ($a_data != $value) {
         $a_data = $value;
         $to_write[reset($option)] = null;
       }
@@ -324,10 +324,10 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($option) ? $option = array($option => $value) : false;
 
-      foreach($option as $option_id => $option_value) {
-        if($this->data[$option_id] !== $option_value) {
+      foreach ($option as $option_id => $option_value) {
+        if ($this->data[$option_id] !== $option_value) {
           // TODO - вынести отдельно в обработчик
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
             sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
           }
 
@@ -337,11 +337,11 @@ 
       }
     }
 
-    if(!empty($to_write)) {
+    if (!empty($to_write)) {
       $field_name = $this->cached_name();
       $sn_cache->$field_name = $this->data;
 
-      foreach($to_write as $option_id => &$option_value) {
+      foreach ($to_write as $option_id => &$option_value) {
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
         $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
       }
@@ -353,26 +353,26 @@ 
   protected function load() {
     global $sn_cache;
 
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
     $this->data = $this->defaults;
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       return;
     }
 
     $field_name = $this->cached_name();
     $a_data = $sn_cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace($this->data, $a_data);
       return;
     }
 
     $query = doquery("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -388,7 +388,7 @@ 
     return $this->__get($offset);
   }
   public function offsetSet($offset, $value) {
-    if(!is_null($offset)) {
+    if (!is_null($offset)) {
       // $this->data[$offset] = $value;
       $this->__set($offset, $value);
     } else {

includes/classes/template.php

Spacing +6 added lines, -6 removed lines

@@ -628,7 +628,7 @@ 
       // Re-position template blocks
       for ($i = sizeof($this->_tpldata[$blockname]); $i > $key; $i--)
       {
-        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i-1];
+        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i - 1];
         $this->_tpldata[$blockname][$i]['S_ROW_COUNT'] = $i;
       }
 
@@ -710,13 +710,13 @@ 
   */
   function assign_recursive($values, $name = '')
   {
-    if(isset($values['.']))
+    if (isset($values['.']))
     {
       $values_extra = $values['.'];
       unset($values['.']);
     }
 
-    if(!$name)
+    if (!$name)
     {
       $this->assign_vars($values);
     }
@@ -725,12 +725,12 @@ 
       $this->assign_block_vars($name, $values);
     }
 
-    if(isset($values_extra))
+    if (isset($values_extra))
     {
-      foreach($values_extra as $sub_array_name => $sub_array)
+      foreach ($values_extra as $sub_array_name => $sub_array)
       {
         $new_name = $name . ($name ? '.' : '') . $sub_array_name;
-        foreach($sub_array as $sub_element)
+        foreach ($sub_array as $sub_element)
         {
           $this->assign_recursive($sub_element, $new_name);
         }

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

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;

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/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/init/init_functions.php

Spacing +12 added lines, -12 removed lines

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