supernova-ws / SuperNova

includes/classes/db_mysql_v5.php

Spacing +5 added lines, -5 removed lines

@@ -39,19 +39,19 @@
 
     @$this->link = mysqli_connect($settings['server'], $settings['user'], $settings['pass'], $settings['name']);
     if (!is_object($this->link) || $this->link->connect_error) {
-      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #' . $this->link->connect_errno, $this->link->connect_error);
+      classSupernova::$debug->error_fatal('DB Error - cannot connect to server error #'.$this->link->connect_errno, $this->link->connect_error);
     }
 
 
     !$this->mysql_query("/*!40101 SET NAMES 'utf8' */")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 1 error #'.$this->link->errno, $this->link->error)
       : false;
     !$this->mysql_query("SET NAMES 'utf8';")
-      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #' . $this->link->errno, $this->link->error)
+      ? classSupernova::$debug->error_fatal('DB error - cannot set names 2 error #'.$this->link->errno, $this->link->error)
       : false;
 
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_REPEATABLE_READ . ';')
-      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #' . $this->link->errno, $this->link->error)
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_REPEATABLE_READ.';')
+      ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level error #'.$this->link->errno, $this->link->error)
       : false;
 
     $this->connected = true;

includes/classes/PlayerToAccountTranslate.php

Spacing +6 added lines, -6 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;
       }
     }
@@ -88,10 +88,10 @@ 
     $account_translation = array();
 
     $query = static::$db->doquery(
-      "SELECT * FROM {{account_translate}} WHERE `user_id` = {$user_id_safe} " .
-      ($provider_id_unsafe ? "AND `provider_id` = {$provider_id_safe} " : '') .
+      "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/Account.php

Spacing +19 added lines, -19 removed lines

@@ -79,8 +79,8 @@ 
     $this->reset();
     $this->db = is_object($db) ? $db : classSupernova::$db;
 
-    foreach($this->table_check as $table_name) {
-      if(empty($this->db->table_list[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($this->db->table_list[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -104,7 +104,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -125,7 +125,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -242,11 +242,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -276,7 +276,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -363,7 +363,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = '', $already_changed = false) {
     global $mm_change_legit;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       classSupernova::$debug->error('Ошибка при попытке манипуляции с ММ');
 
       return false;
@@ -373,7 +373,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -383,17 +383,17 @@ 
       $result = $this->db->doquery(
         "UPDATE {{account}}
         SET
-          `account_metamatter` = `account_metamatter` + '{$metamatter}'" .
-        ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
+          `account_metamatter` = `account_metamatter` + '{$metamatter}'".
+        ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$classConfig->player_metamatter_immortal}, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '').
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         classSupernova::$debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -402,30 +402,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       classSupernova::$debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = db_referral_get_by_id($user_id_safe);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         db_referral_update_dm($user_id_safe, $dark_matter_from_metamatter);
         $new_referral = db_referral_get_by_id($user_id_safe);
 
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }

includes/classes/skin.php

Spacing +26 added lines, -26 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];
@@ -191,9 +191,9 @@ 
     strpos($skin_path, 'skins/') !== false ? $skin_path = substr($skin_path, 6) : false;
     strpos($skin_path, '/') !== false ? $skin_path = str_replace('/', '', $skin_path) : false;
 
-    $this->root_http_relative = 'skins/' . $skin_path . '/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
+    $this->root_http_relative = 'skins/'.$skin_path.'/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
 //    $this->root_http = SN_ROOT_VIRTUAL . 'skins/' . $skin_path . '/'; // Всегда абсолютный путь от корня сайта
-    $this->root_physical_absolute = SN_ROOT_PHYSICAL . 'skins/' . $skin_path . '/';
+    $this->root_physical_absolute = SN_ROOT_PHYSICAL.'skins/'.$skin_path.'/';
     $this->name = $skin_path;
 //    pdump($this->root_folder);
     // Искать скин среди пользовательских - когда будет конструктор скинов
@@ -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)) {
+      $this->config = parse_ini_file($this->root_physical_absolute.'skin.ini');
+      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,15 +232,15 @@ 
     }
 
     // Пытаемся скомпилировать _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
+        ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL.SKIN_IMAGE_MISSED_FILE_PATH
         // Если есть парент - берем у парента. У предков всегда всё есть
         : $this->parent->compile_image(SKIN_IMAGE_MISSED_FIELD, null);
     }
@@ -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]);
@@ -358,9 +358,9 @@ 
   protected function compile_try_path($image_id, $file_path) {
     // Если первый символ пути '/' - значит это путь от HTTP-корня
     // Откусываем его и пользуем остальное
-    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative . $file_path : substr($file_path, 1);
+    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative.$file_path : substr($file_path, 1);
 
-    return is_file(SN_ROOT_PHYSICAL . $relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL . $relative_path : '';
+    return is_file(SN_ROOT_PHYSICAL.$relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL.$relative_path : '';
   }
 
 
@@ -392,13 +392,13 @@ 
     $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)) {
-        $image_tag = $image_tag . '|html';
-        $image_string = '<img src="' . $image_string . '" />';
+      if (in_array('html', $params)) {
+        $image_tag = $image_tag.'|html';
+        $image_string = '<img src="'.$image_string.'" />';
         $this->container[$image_tag] = $image_string;
       }
     }

includes/classes/DBLock.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
 
 
   public function addPlayerLock($table, $playerIdFieldName) {
-    $this->lock_player[$table . '-' . $playerIdFieldName] = array($table, $playerIdFieldName);
+    $this->lock_player[$table.'-'.$playerIdFieldName] = array($table, $playerIdFieldName);
   }
 }

includes/classes/FleetList.php

Spacing +25 added lines, -25 removed lines

@@ -33,18 +33,18 @@ 
     $fleets_added = array();
 
     $query = doquery(
-      "SELECT * FROM `{{fleets}}`" .
-      (!empty($where_safe) ? " WHERE {$where_safe}" : '') .
+      "SELECT * FROM `{{fleets}}`".
+      (!empty($where_safe) ? " WHERE {$where_safe}" : '').
       " FOR UPDATE;"
     );
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       /**
        * @var Fleet $fleet
        */
       $fleet = $this->_createElement();
       $fleet->dbRowParse($row);
 
-      if(isset($this[$fleet->dbId])) {
+      if (isset($this[$fleet->dbId])) {
         // Нужно ли ????
         classSupernova::$debug->error('Fleet list already set');
       }
@@ -121,11 +121,11 @@ 
   public static function dbGetFleetListCurrentTick() {
     return static::dbGetFleetList(
       "
-    (`fleet_start_time` <= " . SN_TIME_NOW . " AND `fleet_mess` = 0)
+    (`fleet_start_time` <= " . SN_TIME_NOW." AND `fleet_mess` = 0)
     OR
-    (`fleet_end_stay` <= " . SN_TIME_NOW . " AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
+    (`fleet_end_stay` <= " . SN_TIME_NOW." AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
     OR
-    (`fleet_end_time` <= " . SN_TIME_NOW . ")");
+    (`fleet_end_time` <= " . SN_TIME_NOW.")");
   }
 
   /**
@@ -145,7 +145,7 @@ 
     AND `fleet_end_planet` = {$planet_row['planet']}
     AND `fleet_end_type`   = {$planet_row['planet_type']}
     AND `fleet_owner` = {$fleet_owner_id}
-    AND `fleet_mission` IN (" . MT_ATTACK . "," . MT_ACS . "," . MT_DESTROY . ")
+    AND `fleet_mission` IN (".MT_ATTACK.",".MT_ACS.",".MT_DESTROY.")
     AND `fleet_mess` = 0"
     );
   }
@@ -170,7 +170,7 @@ 
    * @return static
    */
   public static function dbGetFleetListAndMissileByCoordinates($coordinates, $for_phalanx = false) {
-    if(empty($coordinates) || !is_array($coordinates)) {
+    if (empty($coordinates) || !is_array($coordinates)) {
       return array();
     }
 
@@ -199,8 +199,8 @@ 
      * @var Fleet[] $array_of_Fleet
      */
     $array_of_Fleet = array();
-    if(!empty($fleet_db_list) && $fleet_db_list->count()) {
-      foreach($fleet_db_list->_container as $fleet_id => $objFleet) {
+    if (!empty($fleet_db_list) && $fleet_db_list->count()) {
+      foreach ($fleet_db_list->_container as $fleet_id => $objFleet) {
         $array_of_Fleet[$fleet_id] = $objFleet;
       }
       $planet_fleets = flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet);
@@ -225,16 +225,16 @@ 
     return static::dbGetFleetList(
       "(
       fleet_start_galaxy = {$galaxy}
-      AND fleet_start_system = {$system}" .
-      ($planet ? " AND fleet_start_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 1") .
+      AND fleet_start_system = {$system}".
+      ($planet ? " AND fleet_start_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 1").
       ") OR (
       fleet_end_galaxy = {$galaxy}
-      AND fleet_end_system = {$system}" .
-      ($planet ? " AND fleet_end_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 0") .
+      AND fleet_end_system = {$system}".
+      ($planet ? " AND fleet_end_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 0").
       ")"
     );
   }
@@ -246,10 +246,10 @@ 
    */
   public function dbMergeMissileList($where) {
     $query = doquery(
-      "SELECT * FROM `{{iraks}}`" .
-      (!empty($where) ? " WHERE {$where}" : '') .
+      "SELECT * FROM `{{iraks}}`".
+      (!empty($where) ? " WHERE {$where}" : '').
       " FOR UPDATE;");
-    while($missile_db_row = db_fetch($query)) {
+    while ($missile_db_row = db_fetch($query)) {
       /**
        * @var Fleet $objFleet
        */
@@ -271,7 +271,7 @@ 
    */
   public static function dbGetFleetListAndMissileINCOMING($owner_id) {
     $owner_id_safe = idval($owner_id);
-    if(empty($owner_id_safe)) {
+    if (empty($owner_id_safe)) {
       return array();
     }
 
@@ -305,10 +305,10 @@ 
    */
   public static function fleet_count_flying($player_id, $mission_id = 0) {
     $player_id_safe = idval($player_id);
-    if(!empty($player_id_safe)) {
+    if (!empty($player_id_safe)) {
       $mission_id_safe = intval($mission_id);
       $result = static::db_fleet_count(
-        "`fleet_owner` = {$player_id_safe}" .
+        "`fleet_owner` = {$player_id_safe}".
         ($mission_id_safe ? " AND `fleet_mission` = {$mission_id_safe}" : '')
       );
     } else {

includes/template.php

Spacing +83 added lines, -83 removed lines

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

includes/alliance/ali_info.inc

Spacing +14 added lines, -14 removed lines

@@ -1,37 +1,37 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_info', true);
 
-if($mode == 'exit') {
-  if($ally['ally_owner'] == $user['id']) {
+if ($mode == 'exit') {
+  if ($ally['ally_owner'] == $user['id']) {
     message(classLocale::$lang['Owner_cant_go_out'], classLocale::$lang['Alliance']);
   }
 
-  if(sys_get_param_int('ali_info_leave_confirm')) {
+  if (sys_get_param_int('ali_info_leave_confirm')) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_tag` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
     db_ally_list_recalc_counts();
     sn_db_transaction_commit();
     message(sprintf(classLocale::$lang['ali_info_leave_success'], $ally['ally_name']), classLocale::$lang['sys_alliance']);
   }
-} elseif($mode == 'ainfo') {
+} elseif ($mode == 'ainfo') {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag) {
+  if ($tag) {
     $ally = db_ally_get_by_tag($tag);
-  } elseif($id_ally) {
+  } elseif ($id_ally) {
     $ally = db_ally_get_by_id($id_ally);
   }
 
-  if(!$ally) {
+  if (!$ally) {
     message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description']) {
+  if (!$ally['ally_description']) {
     $ally['ally_description'] = classLocale::$lang['Ally_nodescription'];
   }
 
@@ -43,9 +43,9 @@ 
 } else {
   $page_header = classLocale::$lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id']) {
+  if ($ally['ally_owner'] == $user['id']) {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
-  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
+  } elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
     $range = $ranks[$user['ally_rank_id']]['name'];
   } else {
     $range = classLocale::$lang['member'];
@@ -86,8 +86,8 @@ 
 ));
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation) {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
+foreach ($relations as $relation) {
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],
       'RELATION' => classLocale::$lang['ali_dip_relations'][$relation['alliance_diplomacy_relation']],
@@ -106,4 +106,4 @@ 
 
 ali_render();
 
-display($template, classLocale::$lang['your_alliance'] . ' [' . $ally['ally_name'] . ']');
+display($template, classLocale::$lang['your_alliance'].' ['.$ally['ally_name'].']');

includes/alliance/ali_internal_admin_rights.inc

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message(classLocale::$lang['ali_adm_lastRank'], classLocale::$lang['ali_adm_rights_title']);
   }
@@ -53,17 +53,17 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
-      $rank_data['N' . $i] = $ally_rights[$i];
+      $rank_data['R'.$i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
+      $rank_data['N'.$i] = $ally_rights[$i];
     }
 
     $template->assign_block_vars('rank', $rank_data);