supernova-ws / SuperNova

phalanx.php

Spacing +8 added lines, -8 removed lines

@@ -18,17 +18,17 @@ 
 
 $sensorLevel = mrc_get_level($user, $planetrow, STRUC_MOON_PHALANX);
 if (!intval($sensorLevel)) {
-  message (classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_nosensoravailable'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 if ($planetrow['planet_type'] != PT_MOON) {
-  message (classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_onlyformoons'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $scan_galaxy  = sys_get_param_int('galaxy');
 $scan_system  = sys_get_param_int('system');
 $scan_planet  = sys_get_param_int('planet');
-$scan_planet_type  = 1; // sys_get_param_int('planettype');
+$scan_planet_type = 1; // sys_get_param_int('planettype');
 $id = sys_get_param_id('id');
 
 $source_galaxy = $planetrow['galaxy'];
@@ -38,9 +38,9 @@ 
 $sensorRange = GetPhalanxRange($sensorLevel);
 
 $system_distance = abs($source_system - $scan_system);
-if($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
+if ($system_distance > $sensorRange || $scan_galaxy != $source_galaxy)
 {
-  message (classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_rangeerror'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 $cost = $sensorLevel * 1000;
@@ -51,14 +51,14 @@ 
 }
 
 $planet_scanned = db_planet_by_gspt($scan_galaxy, $scan_system, $scan_planet, $scan_planet_type);
-if(!$planet_scanned['id'])
+if (!$planet_scanned['id'])
 {
   message(classLocale::$lang['phalanx_planet_not_exists'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
-if($planet_scanned['destruyed'])
+if ($planet_scanned['destruyed'])
 {
-  message (classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
+  message(classLocale::$lang['phalanx_planet_destroyed'], classLocale::$lang['tech'][STRUC_MOON_PHALANX], '', 3);
 }
 
 db_planet_set_by_id($user['current_planet'], "deuterium = deuterium - {$cost}");

includes/classes/sn_module_payment.php

Spacing +55 added lines, -55 removed lines

@@ -450,7 +450,7 @@ 
   public function compile_request($request) {
     global $config, $user;
 
-    if(!(classSupernova::$auth->account instanceof Account)) {
+    if (!(classSupernova::$auth->account instanceof Account)) {
       // TODO - throw new Exception($lang['pay_msg_mm_request_amount_invalid'], SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT);
     }
     $this->account = classSupernova::$auth->account;
@@ -471,15 +471,15 @@ 
     $this->payment_currency = $config->payment_currency_default;
     $this->payment_amount = self::currency_convert($this->payment_dark_matter_paid, 'MM_', $this->payment_currency);
 
-    if(empty($this->payment_external_currency) && !empty($this->config['currency'])) {
+    if (empty($this->payment_external_currency) && !empty($this->config['currency'])) {
       $this->payment_external_currency = $this->config['currency'];
     }
-    if(empty($this->payment_external_currency)) {
+    if (empty($this->payment_external_currency)) {
       throw new Exception(classLocale::$lang['pay_error_internal_no_external_currency_set'], SN_PAYMENT_ERROR_INTERNAL_NO_EXTERNAL_CURRENCY_SET);
     }
 
     $this->payment_external_amount = self::currency_convert($this->payment_dark_matter_paid, 'MM_', $this->payment_external_currency);
-    if($this->payment_external_amount < 0.01) {
+    if ($this->payment_external_amount < 0.01) {
       throw new Exception(classLocale::$lang['pay_msg_mm_request_amount_invalid'], SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT);
     }
 
@@ -488,7 +488,7 @@ 
     $this->generate_description();
 
     $this->db_insert();
-    if(!$this->is_exists) {
+    if (!$this->is_exists) {
       throw new Exception(classLocale::$lang['pay_msg_request_error_db_payment_create'], SN_PAYMENT_REQUEST_DB_ERROR_PAYMENT_CREATE);
     }
   }
@@ -503,24 +503,24 @@ 
   protected function payment_request_process($options = array()) {
     global $lang, $config;
 
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       throw new Exception(classLocale::$lang['pay_msg_module_disabled'], SN_MODULE_DISABLED);
     }
 
     // Если есть payment_id - загружаем под него данные
-    if(!empty($this->payment_params['payment_id'])) {
+    if (!empty($this->payment_params['payment_id'])) {
       $this->request_payment_id = sys_get_param_id($this->payment_params['payment_id']);
-      if(!$this->request_payment_id) {
+      if (!$this->request_payment_id) {
         throw new Exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_INTERNAL_ID_WRONG);
       }
 
-      if(!$this->db_get_by_id($this->request_payment_id)) {
+      if (!$this->db_get_by_id($this->request_payment_id)) {
         throw new Exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_INTERNAL_ID_WRONG);
       }
 
       // Проверяем - был ли этот платеж обработан?
       // TODO - Статусы бывают разные. Нужен спецфлаг payment_processed
-      if($this->payment_status != PAYMENT_STATUS_NONE) {
+      if ($this->payment_status != PAYMENT_STATUS_NONE) {
         sn_db_transaction_rollback();
         sys_redirect(SN_ROOT_VIRTUAL . 'metamatter.php?payment_id=' . $this->payment_id);
         die();
@@ -530,89 +530,89 @@ 
     // Пытаемся получить из запроса ИД аккаунта
     $request_account_id = !empty($this->payment_params['account_id']) ? sys_get_param_id($this->payment_params['account_id']) : 0;
     // Если в запросе нет ИД аккаунта - пытаемся использовать payment_account_id
-    if(empty($request_account_id) && !empty($this->payment_account_id)) {
+    if (empty($request_account_id) && !empty($this->payment_account_id)) {
       $request_account_id = $this->payment_account_id;
     }
     // Если теперь у нас нету ИД аккаунта ни в запросе, ни в записи таблицы - можно паниковать
-    if(empty($request_account_id)) {
+    if (empty($request_account_id)) {
       // TODO - аккаунт
       throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'], $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
     // Если нет записи в таблице - тогда берем payment_account_id из запроса
-    if(empty($this->payment_account_id)) {
+    if (empty($this->payment_account_id)) {
       $this->payment_account_id = $request_account_id;
     }
     // Если у нас отличаются ИД аккаунта в запросе и ИД аккаунта в записи - тоже можно паниковать
-    if($this->payment_account_id != $request_account_id) {
+    if ($this->payment_account_id != $request_account_id) {
       // TODO - Поменять сообщение об ошибке
       throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'], $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
     // Проверяем существование аккаунта с данным ИД
-    if(!$this->account->db_get_by_id($this->payment_account_id)) {
+    if (!$this->account->db_get_by_id($this->payment_account_id)) {
       throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'] . ' ID ' . $this->payment_account_id, $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
 
     // TODO Проверка на сервер_ид - как бы и не нужна, наверное?
-    if(!empty($this->payment_params['server_id'])) {
+    if (!empty($this->payment_params['server_id'])) {
       $this->request_server_id = sys_get_param_str($this->payment_params['server_id']);
-      if(SN_ROOT_VIRTUAL != $this->request_server_id) {
+      if (SN_ROOT_VIRTUAL != $this->request_server_id) {
         throw new Exception(classLocale::$lang['pay_msg_request_server_wrong'] . " {$this->request_server_id} вместо " . SN_ROOT_VIRTUAL, SN_PAYMENT_REQUEST_SERVER_WRONG);
       }
     }
 
     // Сверка количества оплаченной ММ с учётом бонусов
-    if(!empty($this->payment_params['payment_dark_matter_gained'])) {
+    if (!empty($this->payment_params['payment_dark_matter_gained'])) {
       $request_mm_amount = sys_get_param_id($this->payment_params['payment_dark_matter_gained']);
-      if($request_mm_amount != $this->payment_dark_matter_gained && $this->is_loaded) {
+      if ($request_mm_amount != $this->payment_dark_matter_gained && $this->is_loaded) {
         throw new Exception(classLocale::$lang['pay_msg_mm_request_amount_invalid'] . " пришло {$request_mm_amount} ММ вместо {$this->payment_dark_matter_gained} ММ", SN_PAYMENT_REQUEST_MM_AMOUNT_INVALID);
       }
       empty($this->payment_dark_matter_gained) ? $this->payment_dark_matter_gained = $request_mm_amount : false;
     }
-    if(empty($this->payment_dark_matter_paid)) {
+    if (empty($this->payment_dark_matter_paid)) {
       // TODO - обратный расчёт из gained
     }
 
     // Проверка наличия внешнего ИД платежа
-    if(!empty($this->payment_params['payment_external_id'])) {
+    if (!empty($this->payment_params['payment_external_id'])) {
       $request_payment_external_id = sys_get_param_id($this->payment_params['payment_external_id']);
-      if(empty($request_payment_external_id)) {
+      if (empty($request_payment_external_id)) {
         throw new exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_EXTERNAL_ID_WRONG);
-      } elseif(!empty($this->payment_external_id) && $this->payment_external_id != $request_payment_external_id) {
+      } elseif (!empty($this->payment_external_id) && $this->payment_external_id != $request_payment_external_id) {
         // TODO - Может быть поменять сообщение
         throw new exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_EXTERNAL_ID_WRONG);
       }
       $this->payment_external_id = $request_payment_external_id;
     }
     // Сверка суммы, запрошенной СН к оплате
-    if(!empty($this->payment_params['payment_external_money'])) {
+    if (!empty($this->payment_params['payment_external_money'])) {
       $request_money_out = sys_get_param_float($this->payment_params['payment_external_money']);
-      if($request_money_out != $this->payment_external_amount && $this->is_loaded) {
+      if ($request_money_out != $this->payment_external_amount && $this->is_loaded) {
         throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid'] . " пришло {$request_money_out} денег вместо {$this->payment_external_amount} денег", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
       }
       empty($this->payment_external_amount) ? $this->payment_external_amount = $request_money_out : false;
     }
     // Заполняем поле валюты платёжной системы
-    if(!empty($this->payment_params['payment_external_currency'])) {
+    if (!empty($this->payment_params['payment_external_currency'])) {
       $this->payment_external_currency = sys_get_param_str($this->payment_params['payment_external_currency']);
-      if(empty($this->payment_external_currency)) {
+      if (empty($this->payment_external_currency)) {
         // TODO - поменять сообщение
         throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid'] . " {$this->payment_external_currency}", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
       }
     }
-    if(empty($this->payment_external_currency)) {
+    if (empty($this->payment_external_currency)) {
       $this->payment_external_currency = $this->config['currency'];
     }
 
     // Заполнение внутренней суммы и валюты из внешних данных
-    if(empty($this->payment_currency)) {
+    if (empty($this->payment_currency)) {
       $this->payment_currency = $config->payment_currency_default;
     }
-    if(empty($this->payment_amount) && !empty($this->payment_external_currency)) {
+    if (empty($this->payment_amount) && !empty($this->payment_external_currency)) {
       $this->payment_amount = self::currency_convert($this->payment_external_amount, $this->payment_external_currency, $this->payment_currency);
     }
 
     // TODO - Тестовый режим
-    if(!empty($this->payment_params['test'])) {
+    if (!empty($this->payment_params['test'])) {
       $this->payment_test = $this->config['test'] || sys_get_param_int($this->payment_params['test']);
     }
 
@@ -641,12 +641,12 @@ 
     sn_db_transaction_start();
     try {
       $response = $this->payment_request_process();
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       $response['result'] = $e->getCode();
       $response['message'] = $e->getMessage();
     }
 
-    if($response['result'] == SN_PAYMENT_REQUEST_OK) {
+    if ($response['result'] == SN_PAYMENT_REQUEST_OK) {
       sn_db_transaction_commit();
       $debug->warning('Результат операции: код ' . $response['result'] . ' сообщение "' . $response['message'] . '"', 'Успешный платёж', LOG_INFO_PAYMENT);
     } else {
@@ -655,7 +655,7 @@ 
     }
 
     // Переводим код результата из СН в код платежной системы
-    if(is_array($this->result_translations) && !empty($this->result_translations)) {
+    if (is_array($this->result_translations) && !empty($this->result_translations)) {
       $response['result'] = isset($this->result_translations[$response['result']]) ? $this->result_translations[$response['result']] : $this->result_translations[SN_PAYMENT_REQUEST_UNDEFINED_ERROR];
     }
 
@@ -680,7 +680,7 @@ 
     $currency_from = strtolower($currency_from);
     $currency_to = strtolower($currency_to);
 
-    if($currency_from != $currency_to) {
+    if ($currency_from != $currency_to) {
 //      $config_currency_from_name = 'payment_currency_exchange_' . $currency_from;
 //      $config_currency_to_name = 'payment_currency_exchange_' . $currency_to;
 
@@ -710,10 +710,10 @@ 
   public static function bonus_calculate($dark_matter, $direct = true, $return_bonus = false) {
     $bonus = 0;
     $dark_matter_new = $dark_matter;
-    if(!empty(self::$bonus_table) && $dark_matter >= self::$bonus_table[0]) {
-      if($direct) {
-        foreach(self::$bonus_table as $dm_for_bonus => $multiplier) {
-          if($dm_for_bonus <= $dark_matter) {
+    if (!empty(self::$bonus_table) && $dark_matter >= self::$bonus_table[0]) {
+      if ($direct) {
+        foreach (self::$bonus_table as $dm_for_bonus => $multiplier) {
+          if ($dm_for_bonus <= $dark_matter) {
             $dark_matter_new = $dark_matter * (1 + $multiplier);
             $bonus = $multiplier;
           } else {
@@ -721,9 +721,9 @@ 
           }
         }
       } else {
-        foreach(self::$bonus_table as $dm_for_bonus => $multiplier) {
+        foreach (self::$bonus_table as $dm_for_bonus => $multiplier) {
           $temp = $dm_for_bonus * (1 + $multiplier);
-          if($dark_matter >= $temp) {
+          if ($dark_matter >= $temp) {
             $dark_matter_new = round($dark_matter / (1 + $multiplier));
             $bonus = $multiplier;
           } else {
@@ -779,13 +779,13 @@ 
     );
 
     $replace = false;
-    if($this->payment_id) {
+    if ($this->payment_id) {
       $payment['payment_id'] = $this->payment_id;
       $replace = true;
     }
 
     $query = array();
-    foreach($payment as $key => $value) {
+    foreach ($payment as $key => $value) {
       $value = is_string($value) ? '"' . db_escape($value) . '"' : $value;
       $query[] = "`{$key}` = {$value}";
     }
@@ -797,12 +797,12 @@ 
 
 
   function payment_adjust_mm_new() {
-    if(!$this->payment_test) {
+    if (!$this->payment_test) {
       // Not a test payment. Adding DM to account
       $this->account = new Account($this->db);
       $this->account->db_get_by_id($this->payment_account_id);
       $result = $this->account->metamatter_change(RPG_PURCHASE, $this->payment_dark_matter_gained, $this->payment_comment);
-      if(!$result) {
+      if (!$result) {
         throw new Exception('Ошибка начисления ММ', SN_METAMATTER_ERROR_ADJUST);
       }
     }
@@ -812,25 +812,25 @@ 
     die('{НЕ РАБОТАЕТ! СООБЩИТЕ АДМИНИСТРАЦИИ!}');
     global $lang;
 
-    if(!isset($payment['payment_status'])) {
+    if (!isset($payment['payment_status'])) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_not_found'], SN_PAYMENT_REQUEST_ORDER_NOT_FOUND);
     }
 
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
-      $safe_comment = db_escape($payment['payment_comment'] = classLocale::$lang['pay_msg_request_payment_cancelled'] .' ' . $payment['payment_comment']);
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+      $safe_comment = db_escape($payment['payment_comment'] = classLocale::$lang['pay_msg_request_payment_cancelled'] . ' ' . $payment['payment_comment']);
 
-      if(!$payment['payment_test']) {
+      if (!$payment['payment_test']) {
         $result = $this->account->metamatter_change(RPG_PURCHASE_CANCEL, -$payment['payment_dark_matter_gained'], $payment['payment_comment']);
-        if(!$result) {
+        if (!$result) {
           throw new exception('Ошибка начисления ММ', SN_METAMATTER_ERROR_ADJUST);
         }
       }
       $payment['payment_status'] = PAYMENT_STATUS_CANCELED;
       db_payment_update($payment, $safe_comment);
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancel_complete'], SN_PAYMENT_REQUEST_OK);
-    } elseif($payment['payment_status'] == PAYMENT_STATUS_CANCELED) {
+    } elseif ($payment['payment_status'] == PAYMENT_STATUS_CANCELED) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancelled_already'], SN_PAYMENT_REQUEST_OK);
-    } elseif($payment['payment_status'] == PAYMENT_STATUS_NONE) {
+    } elseif ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancel_not_complete'], SN_PAYMENT_REQUEST_PAYMENT_NOT_COMPLETE);
     }
   }
@@ -844,8 +844,8 @@ 
 
   protected function db_complete_payment() {
     // TODO - поле payment_processed
-    if($this->payment_status == PAYMENT_STATUS_NONE) {
-      if(!defined('PAYMENT_EXPIRE_TIME') || PAYMENT_EXPIRE_TIME == 0 || empty($this->payment_date) || strtotime($this->payment_date) + PAYMENT_EXPIRE_TIME <= SN_TIME_NOW) {
+    if ($this->payment_status == PAYMENT_STATUS_NONE) {
+      if (!defined('PAYMENT_EXPIRE_TIME') || PAYMENT_EXPIRE_TIME == 0 || empty($this->payment_date) || strtotime($this->payment_date) + PAYMENT_EXPIRE_TIME <= SN_TIME_NOW) {
         $this->payment_adjust_mm_new();
         $this->payment_status = PAYMENT_STATUS_COMPLETE;
       } else {
@@ -892,7 +892,7 @@ 
   protected function db_assign_payment($payment = null) {
     $this->payment_reset();
 
-    if(is_array($payment) && isset($payment['payment_id'])) {
+    if (is_array($payment) && isset($payment['payment_id'])) {
       $this->payment_id = $payment['payment_id'];
       $this->payment_status = $payment['payment_status'];
       $this->payment_date = $payment['payment_date'];

includes/classes/supernova.php

Spacing +103 added lines, -105 removed lines

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

Braces +12 added lines, -4 removed lines

@@ -573,7 +573,8 @@ 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if($result = static::db_query($q = "UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) {
+      // TODO Как-то вернуть может быть LIMIT 1 ?
     {
       if(static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
@@ -581,6 +582,7 @@ 
 
         // Тут именно так, а не cache_unset - что бы в кэшах автоматически обновилась запись. Будет нужно на будущее
         static::$data[$location_type][$record_id] = null;
+    }
         // Вытаскиваем обновленную запись
         static::db_get_record_by_id($location_type, $record_id);
         static::cache_clear($location_type, false); // Мягкий сброс - только $queries
@@ -622,9 +624,11 @@ 
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
     if($result = static::db_query("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
+      }
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
         $result = static::db_get_record_by_id($location_type, $record_id);
         // Очищаем второстепенные кэши - потому что вставленная запись могла повлиять на результаты запросов или локация или еще чего
@@ -669,10 +673,12 @@ 
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
     if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
+      }
     }
 
     return $result;
@@ -689,12 +695,14 @@ 
 //static::db_get_record_list($location_type, $condition, false, true);
 
     if($result = static::db_query("DELETE FROM `{{{$table_name}}}` WHERE {$condition}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if(static::$db->db_affected_rows()) {
+        // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         // TODO - когда будет структурированный $condition можно будет делать только cache_unset по нужным записям
         static::cache_clear($location_type);
       }
+      }
     }
 
     return $result;

includes/alliance/ali_internal_members.inc

Spacing +15 added lines, -15 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)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -10,11 +10,11 @@ 
 */
 // Changing rank for single user
 $id_user = sys_get_param_id('id_user');
-if(isset($_GET['id_rank']))
+if (isset($_GET['id_rank']))
 {
   $id_rank = sys_get_param_int('id_rank');
 }
-if($id_user && isset($id_rank) && $user_admin){
+if ($id_user && isset($id_rank) && $user_admin) {
   db_user_set_by_id($id_user, "`ally_rank_id` = {$id_rank}");
 }
 
@@ -43,7 +43,7 @@ 
 }
 
 $sort1 = sys_get_param_int('sort1');
-if($sort1>5 || $sort1<0) $sort1 = 0;
+if ($sort1 > 5 || $sort1 < 0) $sort1 = 0;
 $sort1s = array(
   0 => '`ally_rank_id` %1$s;',
   1 => '`username` %1$s;',
@@ -59,7 +59,7 @@ 
   'id, username, galaxy, system, planet, onlinetime, ally_rank_id, ally_register_time, total_points');
 
 // while ($userRow = db_fetch($userList))
-foreach($userList as $userRow)
+foreach ($userList as $userRow)
 {
   $i++;
   if (!isset($ranks[$userRow['ally_rank_id']]))
@@ -69,17 +69,17 @@ 
 
   if ($ally['ally_owner'] == $userRow['id'])
   {
-    $ally_range = ($ally['ally_owner_range'])?$ally['ally_owner_range']:classLocale::$lang['Founder'];
+    $ally_range = ($ally['ally_owner_range']) ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
   }
   else
   {
-    if($user_admin)
+    if ($user_admin)
     {
       $ally_range = '<select onchange="window.location=\'alliance.php?mode=admin&edit=members&id_user=' . $userRow['id'] . '&id_rank=\' + this.value">';
 
-      foreach($ranks as $rankID => $rankArray){
+      foreach ($ranks as $rankID => $rankArray) {
         $ally_range .= '<option value="' . $rankID . '"';
-        if($rankID == $userRow['ally_rank_id'])
+        if ($rankID == $userRow['ally_rank_id'])
           $ally_range .= " selected";
         $ally_range .= '>' . $rankArray['name'];
         $ally_range .= '</option>';
@@ -93,9 +93,9 @@ 
   }
 
   $last_active = time() - $userRow["onlinetime"];
-  if($user_admin)
+  if ($user_admin)
   {
-    if ( $last_active < 60 )
+    if ($last_active < 60)
     {
       $tmp = "lime>{$lang['On']}";
     }
@@ -106,12 +106,12 @@ 
     }
     elseif ($last_active < 60 * 60 * 24)
     {
-      $last_active = round( $last_active / (60 * 60));
+      $last_active = round($last_active / (60 * 60));
       $tmp = "green>{$last_active} {$lang['sys_hrs_short']}";
     }
     else
     {
-      $last_active = round( $last_active / (60 * 60 * 24));
+      $last_active = round($last_active / (60 * 60 * 24));
       if ($last_active < 7)
       {
         $tmp = "yellow";
@@ -129,9 +129,9 @@ 
   }
   else
   {
-    if($user_onlinestatus)
+    if ($user_onlinestatus)
     {
-      if ( $last_active < 60 * 5 )
+      if ($last_active < 60 * 5)
       {
         $tmp = "lime>{$lang['On']}";
       }

includes/general.php

Spacing +144 added lines, -144 removed lines

@@ -14,24 +14,24 @@ 
 function sn_function_call($func_name, $func_arg = array()) {
   // All data in classSupernova::$functions should be normalized to valid 'callable' state: '<function_name>'|array('<object_name>', '<method_name>')
 
-  if(is_array(classSupernova::$functions[$func_name]) && !is_callable(classSupernova::$functions[$func_name])) {
+  if (is_array(classSupernova::$functions[$func_name]) && !is_callable(classSupernova::$functions[$func_name])) {
     // Chain-callable functions should be made as following:
     // 1. Never use incomplete calls with parameters "by default"
     // 2. Reserve last parameter for cumulative result
     // 3. Use same format for original value and cumulative result (if there is original value)
     // 4. Honor cumulative result
     // 5. Return cumulative result
-    foreach(classSupernova::$functions[$func_name] as $func_chain_name) {
+    foreach (classSupernova::$functions[$func_name] as $func_chain_name) {
       // По идее - это уже тут не нужно, потому что оно все должно быть callable к этому моменту
       // Но для старых модулей...
-      if(is_callable($func_chain_name)) {
+      if (is_callable($func_chain_name)) {
         $result = call_user_func_array($func_chain_name, $func_arg);
       }
     }
   } else {
     // TODO: This is left for backward compatibility. Appropriate code should be rewrote!
     $func_name = isset(classSupernova::$functions[$func_name]) && is_callable(classSupernova::$functions[$func_name]) ? classSupernova::$functions[$func_name] : ('sn_' . $func_name);
-    if(is_callable($func_name)) {
+    if (is_callable($func_name)) {
       $result = call_user_func_array($func_name, $func_arg);
     }
   }
@@ -46,9 +46,9 @@ 
  * @param string $page_name - имя страницы, для которого должен был быть выполнен хук
  */
 function execute_hooks(&$hook_list, &$template, $hook_type = null, $page_name = null) {
-  if(!empty($hook_list)) {
-    foreach($hook_list as $hook) {
-      if(is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
+  if (!empty($hook_list)) {
+    foreach ($hook_list as $hook) {
+      if (is_callable($hook_call = (is_string($hook) ? $hook : (is_array($hook) ? $hook['callable'] : $hook->callable)))) {
         $template = call_user_func($hook_call, $template, $hook_type, $page_name);
       }
     }
@@ -148,9 +148,9 @@ 
 
 function pretty_number($n, $floor = true, $color = false, $limit = false, $style = null) {
   $n = floatval($n);
-  if(is_int($floor)) {
+  if (is_int($floor)) {
     $n = round($n, $floor); // , PHP_ROUND_HALF_DOWN
-  } elseif($floor === true) {
+  } elseif ($floor === true) {
     $n = floor($n);
     $floor = 0;
   } else {
@@ -160,14 +160,14 @@ 
   $ret = $n;
 
   $suffix = '';
-  if($limit) {
-    if($ret > 0) {
-      while($ret > $limit) {
+  if ($limit) {
+    if ($ret > 0) {
+      while ($ret > $limit) {
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
     } else {
-      while($ret < -$limit) {
+      while ($ret < -$limit) {
         $suffix .= 'k';
         $ret = round($ret / 1000);
       }
@@ -177,16 +177,16 @@ 
   $ret = number_format($ret, $floor, ',', '.');
   $ret .= $suffix;
 
-  if($color !== false) {
-    if($color === true) {
+  if ($color !== false) {
+    if ($color === true) {
       $class = $n == 0 ? 'zero' : ($n > 0 ? 'positive' : 'negative');
-    } elseif($color >= 0) {
+    } elseif ($color >= 0) {
       $class = $n == $color ? 'zero' : ($n < $color ? 'positive' : 'negative');
     } else {
       $class = ($n == -$color) ? 'zero' : ($n < -$color ? 'negative' : 'positive');
     }
 
-    if(!isset($style)) {
+    if (!isset($style)) {
       $ret = "<span class='{$class}'>{$ret}</span>";
     } else {
       $ret = $style ? $ret = $class : $ret = array('text' => $ret, 'class' => $class);
@@ -311,11 +311,11 @@ 
 
 function sys_get_param_phone($param_name, $default = '') {
   $phone_raw = sys_get_param_str_unsafe($param_name, $default = '');
-  if($phone_raw) {
+  if ($phone_raw) {
     $phone = $phone_raw[0] == '+' ? '+' : '';
-    for($i = 0; $i < strlen($phone_raw); $i++) {
+    for ($i = 0; $i < strlen($phone_raw); $i++) {
       $ord = ord($phone_raw[$i]);
-      if($ord >= 48 && $ord <= 57) {
+      if ($ord >= 48 && $ord <= 57) {
         $phone .= $phone_raw[$i];
       }
     }
@@ -332,7 +332,7 @@ 
 }
 
 function CheckAbandonPlanetState(&$planet) {
-  if($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW) {
+  if ($planet['destruyed'] && $planet['destruyed'] <= SN_TIME_NOW) {
     db_planet_delete_by_id($planet['id']);
   }
 }
@@ -341,7 +341,7 @@ 
   global $config;
 
   static $rate, $sn_group_resources_all, $sn_group_resources_loot;
-  if(!$rate) {
+  if (!$rate) {
     $sn_group_resources_all = sn_get_groups('resources_all');
     $sn_group_resources_loot = sn_get_groups('resources_loot');
 
@@ -351,19 +351,19 @@ 
   }
 
   $unit_cost_data = get_unit_param($unit_id, 'cost');
-  if(!is_array($unit_cost_data)) {
+  if (!is_array($unit_cost_data)) {
     return array('total' => 0);
   }
   $factor = isset($unit_cost_data['factor']) ? $unit_cost_data['factor'] : 1;
   $cost_array = array(BUILD_CREATE => array(), 'total' => 0);
   $unit_level = $unit_level > 0 ? $unit_level : 0;
-  foreach($unit_cost_data as $resource_id => $resource_amount) {
-    if(!in_array($resource_id, $sn_group_resources_all)) {
+  foreach ($unit_cost_data as $resource_id => $resource_amount) {
+    if (!in_array($resource_id, $sn_group_resources_all)) {
       continue;
     }
 //    $cost_array[BUILD_CREATE][$resource_id] = $resource_amount * ($factor == 1 ? $unit_level : ((pow($factor, $unit_level) - $factor) / ($factor - 1)));
     $cost_array[BUILD_CREATE][$resource_id] = round($resource_amount * ($factor == 1 ? $unit_level : ((1 - pow($factor, $unit_level)) / (1 - $factor))));
-    if(in_array($resource_id, $sn_group_resources_loot)) {
+    if (in_array($resource_id, $sn_group_resources_loot)) {
       $cost_array['total'] += $cost_array[BUILD_CREATE][$resource_id] * $rate[$resource_id];
     }
   }
@@ -438,19 +438,19 @@ 
   $mercenary_level = 0;
   $unit_db_name = pname_resource_name($unit_id);
 
-  if(in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
+  if (in_array($unit_id, sn_get_groups(array('plans', 'mercenaries', 'tech', 'artifacts')))) {
     $unit = classSupernova::db_get_unit_by_location($user['id'], LOC_USER, $user['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
+  } elseif (in_array($unit_id, sn_get_groups(array('structures', 'fleet', 'defense')))) {
     $unit = classSupernova::db_get_unit_by_location(is_array($user) ? $user['id'] : $planet['id_owner'], LOC_PLANET, $planet['id'], $unit_id);
     $mercenary_level = is_array($unit) && $unit['unit_level'] ? $unit['unit_level'] : 0;
-  } elseif(in_array($unit_id, sn_get_groups('governors'))) {
+  } elseif (in_array($unit_id, sn_get_groups('governors'))) {
     $mercenary_level = $unit_id == $planet['PLANET_GOVERNOR_ID'] ? $planet['PLANET_GOVERNOR_LEVEL'] : 0;
-  } elseif($unit_id == RES_DARK_MATTER) {
+  } elseif ($unit_id == RES_DARK_MATTER) {
     $mercenary_level = $user[$unit_db_name] + ($plain || $user['user_as_ally'] ? 0 : classSupernova::$auth->account->account_metamatter);
-  } elseif($unit_id == RES_METAMATTER) {
+  } elseif ($unit_id == RES_METAMATTER) {
     $mercenary_level = classSupernova::$auth->account->account_metamatter; //$user[$unit_db_name];
-  } elseif(in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
+  } elseif (in_array($unit_id, sn_get_groups(array('resources_loot'))) || $unit_id == UNIT_SECTOR) {
     $mercenary_level = !empty($planet) ? $planet[$unit_db_name] : $user[$unit_db_name];
   }
 
@@ -460,19 +460,19 @@ 
 function mrc_modify_value(&$user, $planet = array(), $mercenaries, $value) { return sn_function_call(__FUNCTION__, array(&$user, $planet, $mercenaries, $value)); }
 
 function sn_mrc_modify_value(&$user, $planet = array(), $mercenaries, $value, $base_value = null) {
-  if(!is_array($mercenaries)) {
+  if (!is_array($mercenaries)) {
     $mercenaries = array($mercenaries);
   }
 
   $base_value = isset($base_value) ? $base_value : $value;
 
-  foreach($mercenaries as $mercenary_id) {
+  foreach ($mercenaries as $mercenary_id) {
     $mercenary_level = mrc_get_level($user, $planet, $mercenary_id);
 
     $mercenary = get_unit_param($mercenary_id);
     $mercenary_bonus = $mercenary['bonus'];
 
-    switch($mercenary['bonus_type']) {
+    switch ($mercenary['bonus_type']) {
       case BONUS_PERCENT_CUMULATIVE:
         $value *= 1 + $mercenary_level * $mercenary_bonus / 100;
       break;
@@ -503,7 +503,7 @@ 
   $allowed_length = strlen($allowed_chars);
 
   $random_string = '';
-  for($i = 0; $i < $length; $i++) {
+  for ($i = 0; $i < $length; $i++) {
     $random_string .= $allowed_chars[mt_rand(0, $allowed_length - 1)];
   }
 
@@ -523,12 +523,12 @@ 
 
   $options = '';
   $option_list = array();
-  foreach($user_option_list as $option_group_id => $option_group) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
     $option_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value) {
-      if(!isset($user[$option_name])) {
+    foreach ($option_group as $option_name => $option_value) {
+      if (!isset($user[$option_name])) {
         $user[$option_name] = $option_value;
-      } elseif($user[$option_name] == '') {
+      } elseif ($user[$option_name] == '') {
         $user[$option_name] = 0;
       }
       $options .= "{$option_name}^{$user[$option_name]}|";
@@ -548,16 +548,16 @@ 
   $option_list = array();
   $option_string_list = explode('|', $user['options']);
 
-  foreach($option_string_list as $option_string) {
+  foreach ($option_string_list as $option_string) {
     list($option_name, $option_value) = explode('^', $option_string);
     $option_list[$option_name] = $option_value;
   }
 
   $final_list = array();
-  foreach($user_option_list as $option_group_id => $option_group) {
+  foreach ($user_option_list as $option_group_id => $option_group) {
     $final_list[$option_group_id] = array();
-    foreach($option_group as $option_name => $option_value) {
-      if(!isset($option_list[$option_name])) {
+    foreach ($option_group as $option_name => $option_value) {
+      if (!isset($option_list[$option_name])) {
         $option_list[$option_name] = $option_value;
       }
       $user[$option_name] = $final_list[$option_group_id][$option_name] = $option_list[$option_name];
@@ -571,12 +571,12 @@ 
 
 function sys_unit_str2arr($fleet_string) {
   $fleet_array = array();
-  if(!empty($fleet_string)) {
+  if (!empty($fleet_string)) {
     $arrTemp = explode(';', $fleet_string);
-    foreach($arrTemp as $temp) {
-      if($temp) {
+    foreach ($arrTemp as $temp) {
+      if ($temp) {
         $temp = explode(',', $temp);
-        if(!empty($temp[0]) && !empty($temp[1])) {
+        if (!empty($temp[0]) && !empty($temp[1])) {
           $fleet_array[$temp[0]] += $temp[1];
         }
       }
@@ -588,13 +588,13 @@ 
 
 function sys_unit_arr2str($unit_list) {
   $fleet_string = array();
-  if(isset($unit_list)) {
-    if(!is_array($unit_list)) {
+  if (isset($unit_list)) {
+    if (!is_array($unit_list)) {
       $unit_list = array($unit_list => 1);
     }
 
-    foreach($unit_list as $unit_id => $unit_count) {
-      if($unit_id && $unit_count) {
+    foreach ($unit_list as $unit_id => $unit_count) {
+      if ($unit_id && $unit_count) {
         $fleet_string[] = "{$unit_id},{$unit_count}";
       }
     }
@@ -621,7 +621,7 @@ 
   $body = str_replace("\r\n", "\n", $body);
   $body = str_replace("\n", "\r\n", $body);
 
-  if($html) {
+  if ($html) {
     $body = '<html><head><base href="' . SN_ROOT_VIRTUAL . '"></head><body>' . nl2br($body) . '</body></html>';
   }
 
@@ -665,21 +665,21 @@ 
 }
 
 function sn_ali_fill_user_ally(&$user) {
-  if(!$user['ally_id']) {
+  if (!$user['ally_id']) {
     return;
   }
 
-  if(!isset($user['ally'])) {
+  if (!isset($user['ally'])) {
     $user['ally'] = db_ally_get_by_id($user['ally_id']);
   }
 
-  if(!isset($user['ally']['player'])) {
+  if (!isset($user['ally']['player'])) {
     $user['ally']['player'] = db_user_by_id($user['ally']['ally_user_id'], true, '*', false);
   }
 }
 
 function sn_get_url_contents($url) {
-  if(function_exists('curl_init')) {
+  if (function_exists('curl_init')) {
     $crl = curl_init();
     $timeout = 5;
     curl_setopt($crl, CURLOPT_URL, $url);
@@ -714,10 +714,10 @@ 
 
 function get_ship_data($ship_id, $user) {
   $ship_data = array();
-  if(in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
-    foreach(get_unit_param($ship_id, 'engine') as $engine_info) {
+  if (in_array($ship_id, sn_get_groups(array('fleet', 'missile')))) {
+    foreach (get_unit_param($ship_id, 'engine') as $engine_info) {
       $tech_level = intval(mrc_get_level($user, false, $engine_info['tech']));
-      if(empty($ship_data) || $tech_level >= $engine_info['min_level']) {
+      if (empty($ship_data) || $tech_level >= $engine_info['min_level']) {
         $ship_data = $engine_info;
         $ship_data['tech_level'] = $tech_level;
       }
@@ -729,7 +729,7 @@ 
   return $ship_data;
 }
 
-if(!function_exists('strptime')) {
+if (!function_exists('strptime')) {
   function strptime($date, $format) {
     $masks = array(
       '%d' => '(?P<d>[0-9]{2})',
@@ -742,12 +742,12 @@ 
     );
 
     $rexep = "#" . strtr(preg_quote($format), $masks) . "#";
-    if(preg_match($rexep, $date, $out)) {
+    if (preg_match($rexep, $date, $out)) {
       $ret = array(
-        "tm_sec"  => (int)$out['S'],
-        "tm_min"  => (int)$out['M'],
-        "tm_hour" => (int)$out['H'],
-        "tm_mday" => (int)$out['d'],
+        "tm_sec"  => (int) $out['S'],
+        "tm_min"  => (int) $out['M'],
+        "tm_hour" => (int) $out['H'],
+        "tm_mday" => (int) $out['d'],
         "tm_mon"  => $out['m'] ? $out['m'] - 1 : 0,
         "tm_year" => $out['Y'] > 1900 ? $out['Y'] - 1900 : 0,
       );
@@ -762,7 +762,7 @@ 
 function sn_sys_sector_buy($redirect = 'overview.php') {
   global $user, $planetrow;
 
-  if(!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
+  if (!sys_get_param_str('sector_buy') || $planetrow['planet_type'] != PT_PLANET) {
     return;
   }
 
@@ -775,9 +775,9 @@ 
 //  $planetrow = $planetrow['planet'];
   $sector_cost = eco_get_build_data($user, $planetrow, UNIT_SECTOR, mrc_get_level($user, $planetrow, UNIT_SECTOR), true);
   $sector_cost = $sector_cost[BUILD_CREATE][RES_DARK_MATTER];
-  if($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
+  if ($sector_cost <= mrc_get_level($user, null, RES_DARK_MATTER)) {
     $planet_name_text = uni_render_planet($planetrow);
-    if(rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf(classLocale::$lang['sys_sector_purchase_log'],
+    if (rpg_points_change($user['id'], RPG_SECTOR, -$sector_cost, sprintf(classLocale::$lang['sys_sector_purchase_log'],
         $user['username'], $user['id'], $planet_name_text, classLocale::$lang['sys_planet_type'][$planetrow['planet_type']], $planetrow['id'], $sector_cost)
     )) {
       $sector_db_name = pname_resource_name(UNIT_SECTOR);
@@ -792,30 +792,30 @@ 
 }
 
 function sn_sys_handler_add(&$functions, $handler_list, $class_module_name = '', $sub_type = '') {
-  if(isset($handler_list) && is_array($handler_list) && !empty($handler_list)) {
-    foreach($handler_list as $function_name => $function_data) {
-      if(is_string($function_data)) {
+  if (isset($handler_list) && is_array($handler_list) && !empty($handler_list)) {
+    foreach ($handler_list as $function_name => $function_data) {
+      if (is_string($function_data)) {
         $override_with = &$function_data;
-      } elseif(isset($function_data['callable'])) {
+      } elseif (isset($function_data['callable'])) {
         $override_with = &$function_data['callable'];
       }
 
       $overwrite = $override_with[0] == '*';
-      if($overwrite) {
+      if ($overwrite) {
         $override_with = substr($override_with, 1);
       }
 
-      if(($point_position = strpos($override_with, '.')) === false && $class_module_name) {
+      if (($point_position = strpos($override_with, '.')) === false && $class_module_name) {
         $override_with = array($class_module_name, $override_with);
-      } elseif($point_position == 0) {
+      } elseif ($point_position == 0) {
         $override_with = substr($override_with, 1);
-      } elseif($point_position > 0) {
+      } elseif ($point_position > 0) {
         $override_with = array(substr($override_with, 0, $point_position), substr($override_with, $point_position + 1));
       }
 
-      if($overwrite) {
+      if ($overwrite) {
         $functions[$function_name] = array();
-      } elseif(!isset($functions[$function_name])) {
+      } elseif (!isset($functions[$function_name])) {
         $functions[$function_name] = array();
         $sn_function_name = 'sn_' . $function_name . ($sub_type ? '_' . $sub_type : '');
         $functions[$function_name][] = $sn_function_name;
@@ -831,15 +831,15 @@ 
 function player_nick_render_to_html($result, $options = false) {
   // TODO - обрабатывать разные случаи: $user, $render_nick_array, $string
 
-  if(is_string($result) && strpos($result, ':{i:')) {
+  if (is_string($result) && strpos($result, ':{i:')) {
     $result = player_nick_uncompact($result);
   }
 
-  if(is_array($result)) {
-    if(isset($result['id'])) {
+  if (is_array($result)) {
+    if (isset($result['id'])) {
       $result = player_nick_render_current_to_array($result, $options);
     }
-    if(!isset($result[NICK_HTML])) {
+    if (!isset($result[NICK_HTML])) {
       $result = player_nick_render_array_to_html($result);
     }
     unset($result[NICK_HTML]);
@@ -862,7 +862,7 @@ 
   try {
     $result = unserialize($nick_string);
     // ksort($result); // Всегда ksort-ый в player_nick_compact()
-  } catch(exception $e) {
+  } catch (exception $e) {
     $result = strpos($nick_string, ':{i:') ? null : $nick_string; // fallback if it is already string - for old chat strings, for example
   }
 
@@ -875,20 +875,20 @@ 
   global $config, $user;
 
   // ALL STRING ARE UNSAFE!!!
-  if(isset($nick_array[NICK_BIRTHSDAY])) {
+  if (isset($nick_array[NICK_BIRTHSDAY])) {
     $result[NICK_BIRTHSDAY] = '<img src="design/images/birthday.png" />';
   }
 
-  if(isset($nick_array[NICK_VACATION])) {
+  if (isset($nick_array[NICK_VACATION])) {
     $result[NICK_VACATION] = '<img src="design/images/icon_vacation.png" />';
   }
 
-  if(isset($nick_array[NICK_GENDER])) {
+  if (isset($nick_array[NICK_GENDER])) {
     $result[NICK_GENDER] = '<img src="' . ($user['dpath'] ? $user['dpath'] : DEFAULT_SKINPATH) . 'images/gender_' . $nick_array[NICK_GENDER] . '.png" />';
   }
 
-  if(isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
-    switch($nick_array[NICK_AUTH_LEVEL]) {
+  if (isset($nick_array[NICK_AUTH_LEVEL]) || isset($nick_array[NICK_PREMIUM])) {
+    switch ($nick_array[NICK_AUTH_LEVEL]) {
       case 4:
         $highlight = $config->chat_highlight_developer;
       break;
@@ -909,20 +909,20 @@ 
         $highlight = isset($nick_array[NICK_PREMIUM]) ? $config->chat_highlight_premium : '';
     }
 
-    if($highlight) {
+    if ($highlight) {
       list($result[NICK_HIGHLIGHT], $result[NICK_HIGHLIGHT_END]) = explode('$1', $highlight);
     }
     // $result = preg_replace("#(.+)#", $highlight, $result);
   }
 
-  if(isset($nick_array[NICK_CLASS])) {
+  if (isset($nick_array[NICK_CLASS])) {
     $result[NICK_CLASS] = '<span ' . $nick_array[NICK_CLASS] . '>';
     $result[NICK_CLASS_END] = '</span>';
   }
 
   $result[NICK_NICK] = sys_safe_output($nick_array[NICK_NICK]);
 
-  if(isset($nick_array[NICK_ALLY])) {
+  if (isset($nick_array[NICK_ALLY])) {
     $result[NICK_ALLY] = '[' . sys_safe_output($nick_array[NICK_ALLY]) . ']';
   }
 
@@ -946,32 +946,32 @@ 
   */
 
 
-  if($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
+  if ($render_user['user_birthday'] && ($options === true || isset($options['icons']) || isset($options['birthday'])) && (date('Y', SN_TIME_NOW) . date('-m-d', strtotime($render_user['user_birthday'])) == date('Y-m-d', SN_TIME_NOW))) {
     $result[NICK_BIRTHSDAY] = '';
   }
 
-  if($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
+  if ($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['gender']) && $options['gender'])) {
     $result[NICK_GENDER] = $render_user['gender'] == GENDER_UNKNOWN ? 'unknown' : ($render_user['gender'] == GENDER_FEMALE ? 'female' : 'male');
   }
 
-  if(($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
+  if (($options === true || (isset($options['icons']) && $options['icons']) || (isset($options['vacancy']) && $options['vacancy'])) && $render_user['vacation']) {
     $result[NICK_VACATION] = $render_user['vacation'];
   }
 
-  if($options === true || (isset($options['color']) && $options['color'])) {
-    if($user_auth_level = $render_user['authlevel']) {
+  if ($options === true || (isset($options['color']) && $options['color'])) {
+    if ($user_auth_level = $render_user['authlevel']) {
       $result[NICK_AUTH_LEVEL] = $user_auth_level;
     }
-    if($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
+    if ($user_premium = mrc_get_level($render_user, false, UNIT_PREMIUM)) {
       $result[NICK_PREMIUM] = $user_premium;
     }
   }
 
-  if((isset($options['class']) && $options['class'])) {
+  if ((isset($options['class']) && $options['class'])) {
     $result[NICK_CLASS] = (isset($result_options[NICK_CLASS]) ? ' ' . $result_options[NICK_CLASS] : '') . $options['class'];
   }
 
-  if($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
+  if ($render_user['ally_tag'] && ($options === true || (isset($options['ally']) && $options['ally']))) {
     $result[NICK_ALLY] = $render_user['ally_tag'];
   }
 
@@ -989,25 +989,25 @@ 
 
   $user_skip_list = array();
 
-  if($config->stats_hide_admins) {
+  if ($config->stats_hide_admins) {
     $user_skip_list[] = '`authlevel` > 0';
   }
 
-  if($config->stats_hide_player_list) {
+  if ($config->stats_hide_player_list) {
     $temp = explode(',', $config->stats_hide_player_list);
-    foreach($temp as $user_id) {
+    foreach ($temp as $user_id) {
       $user_id = floatval($user_id);
-      if($user_id) {
+      if ($user_id) {
         $user_skip_list[] = '`id` = ' . $user_id;
       }
     }
   }
 
-  if(!empty($user_skip_list)) {
+  if (!empty($user_skip_list)) {
     $user_skip_list = implode(' OR ', $user_skip_list);
     $user_skip_query = db_user_list($user_skip_list);
-    if(!empty($user_skip_query)) {
-      foreach($user_skip_query as $user_skip_row) {
+    if (!empty($user_skip_query)) {
+      foreach ($user_skip_query as $user_skip_row) {
         $result[$user_skip_row['id']] = $user_skip_row['id'];
       }
     }
@@ -1038,7 +1038,7 @@ 
 
 function sn_sn_get_groups($groups, &$result) {
   $result = is_array($result) ? $result : array();
-  foreach($groups = is_array($groups) ? $groups : array($groups) as $group_name) {
+  foreach ($groups = is_array($groups) ? $groups : array($groups) as $group_name) {
     $result += is_array($a_group = get_unit_param(UNIT_GROUP, $group_name)) ? $a_group : array();
   }
 
@@ -1066,8 +1066,8 @@ 
   $sn_data_unit = get_unit_param($unit_id);
 
   $result = is_array($result) ? $result : array();
-  if($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && $config->empire_mercenary_temporary)) {
-    foreach($sn_data_unit[$field] as $require_id => $require_level) {
+  if ($sn_data_unit[$field] && !($sn_data_unit[P_UNIT_TYPE] == UNIT_MERCENARIES && $config->empire_mercenary_temporary)) {
+    foreach ($sn_data_unit[$field] as $require_id => $require_level) {
       $level_got = mrc_get_level($user, $planetrow, $require_id);
       $level_basic = mrc_get_level($user, $planetrow, $require_id, false, true);
       $result[] = array(
@@ -1091,16 +1091,16 @@ 
 
   $ranks = array();
 
-  if($ally['ranklist']) {
+  if ($ally['ranklist']) {
     $str_ranks = explode(';', $ally['ranklist']);
-    foreach($str_ranks as $str_rank) {
-      if(!$str_rank) {
+    foreach ($str_ranks as $str_rank) {
+      if (!$str_rank) {
         continue;
       }
 
       $tmp = explode(',', $str_rank);
       $rank_id = count($ranks);
-      foreach($ally_rights as $key => $value) {
+      foreach ($ally_rights as $key => $value) {
         $ranks[$rank_id][$value] = $tmp[$key];
       }
     }
@@ -1116,8 +1116,8 @@ 
 }
 
 function array_merge_recursive_numeric($array1, $array2) {
-  if(!empty($array2) && is_array($array2)) {
-    foreach($array2 as $key => $value) {
+  if (!empty($array2) && is_array($array2)) {
+    foreach ($array2 as $key => $value) {
 //    if(!isset($array1[$key]) || !is_array($array1[$key])) {
 //      $array1[$key] = $value;
 //    } else {
@@ -1132,7 +1132,7 @@ 
 
 function sn_sys_array_cumulative_sum(&$array) {
   $accum = 0;
-  foreach($array as &$value) {
+  foreach ($array as &$value) {
     $accum += $value;
     $value = $accum;
   }
@@ -1142,7 +1142,7 @@ 
   $sn_data_density = sn_get_groups('planet_density');
   $density_price_chart = array();
 
-  foreach($sn_data_density as $density_id => $density_data) {
+  foreach ($sn_data_density as $density_id => $density_data) {
     // Отсекаем записи с RARITY = 0 - служебные записи и супер-ядра
     $density_data[UNIT_PLANET_DENSITY_RARITY] ? $density_price_chart[$density_id] = $density_data[UNIT_PLANET_DENSITY_RARITY] : false;
   }
@@ -1150,7 +1150,7 @@ 
 
   $total_rarity = array_sum($density_price_chart);
 
-  foreach($density_price_chart as &$density_data) {
+  foreach ($density_price_chart as &$density_data) {
     $density_data = ceil($total_rarity / $density_data * $planet_row['field_max'] * PLANET_DENSITY_TO_DARK_MATTER_RATE);
   }
 
@@ -1158,18 +1158,18 @@ 
 }
 
 function sn_sys_planet_core_transmute(&$user, &$planetrow) {
-  if(!sys_get_param_str('transmute')) {
+  if (!sys_get_param_str('transmute')) {
     return array();
   }
 
   global $lang;
 
   try {
-    if($planetrow['planet_type'] != PT_PLANET) {
+    if ($planetrow['planet_type'] != PT_PLANET) {
       throw new exception(classLocale::$lang['ov_core_err_not_a_planet'], ERR_ERROR);
     }
 
-    if($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
+    if ($planetrow['density_index'] == ($new_density_index = sys_get_param_id('density_type'))) {
       throw new exception(classLocale::$lang['ov_core_err_same_density'], ERR_WARNING);
     }
 
@@ -1183,7 +1183,7 @@ 
     $planet_density_index = $planetrow['density_index'];
 
     $density_price_chart = planet_density_price_chart($planetrow);
-    if(!isset($density_price_chart[$new_density_index])) {
+    if (!isset($density_price_chart[$new_density_index])) {
       // Hack attempt
       throw new exception(classLocale::$lang['ov_core_err_denisty_type_wrong'], ERR_ERROR);
     }
@@ -1192,13 +1192,13 @@ 
     // $transmute_cost = get_unit_param(UNIT_PLANET_DENSITY, 'cost');
     // $transmute_cost = $transmute_cost[RES_DARK_MATTER] * $density_price_chart[$new_density_index];
     $transmute_cost = $density_price_chart[$new_density_index];
-    if($user_dark_matter < $transmute_cost) {
+    if ($user_dark_matter < $transmute_cost) {
       throw new exception(classLocale::$lang['ov_core_err_no_dark_matter'], ERR_ERROR);
     }
 
     $sn_data_planet_density = sn_get_groups('planet_density');
-    foreach($sn_data_planet_density as $key => $value) {
-      if($key == $new_density_index) {
+    foreach ($sn_data_planet_density as $key => $value) {
+      if ($key == $new_density_index) {
         break;
       }
       $prev_density_index = $key;
@@ -1229,7 +1229,7 @@ 
       'STATUS'  => ERR_NONE,
       'MESSAGE' => sprintf(classLocale::$lang['ov_core_err_none'], classLocale::$lang['uni_planet_density_types'][$planet_density_index], classLocale::$lang['uni_planet_density_types'][$new_density_index], $new_density),
     );
-  } catch(exception $e) {
+  } catch (exception $e) {
     sn_db_transaction_rollback();
     $result = array(
       'STATUS'  => $e->getCode(),
@@ -1242,8 +1242,8 @@ 
 
 function sn_module_get_active_count($group = '*') {
   $active_modules = 0;
-  if(isset(sn_module::$sn_module_list[$group]) && is_array(sn_module::$sn_module_list[$group])) {
-    foreach(sn_module::$sn_module_list[$group] as $payment_module) {
+  if (isset(sn_module::$sn_module_list[$group]) && is_array(sn_module::$sn_module_list[$group])) {
+    foreach (sn_module::$sn_module_list[$group] as $payment_module) {
       $active_modules += $payment_module->manifest['active'];
     }
   }
@@ -1254,7 +1254,7 @@ 
 function get_resource_exchange() {
   static $rates;
 
-  if(!$rates) {
+  if (!$rates) {
     global $config;
 
     $rates = array(
@@ -1264,7 +1264,7 @@ 
       RES_DARK_MATTER => 'rpg_exchange_darkMatter',
     );
 
-    foreach($rates as &$rate) {
+    foreach ($rates as &$rate) {
       $rate = $config->$rate;
     }
   }
@@ -1275,12 +1275,12 @@ 
 function get_unit_cost_in(&$cost, $in_resource = RES_METAL) {
   static $rates;
 
-  if(!$rates) {
+  if (!$rates) {
     $rates = get_resource_exchange();
   }
 
   $metal_cost = 0;
-  foreach($cost as $resource_id => $resource_value) {
+  foreach ($cost as $resource_id => $resource_value) {
     $metal_cost += $rates[$resource_id] * $resource_value;
   }
 
@@ -1290,8 +1290,8 @@ 
 function get_player_max_expeditons(&$user, $astrotech = -1) { return sn_function_call(__FUNCTION__, array(&$user, $astrotech, &$result)); }
 
 function sn_get_player_max_expeditons(&$user, $astrotech = -1, &$result = 0) {
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_EXPEDITIONS_MAX])) {
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
       $user[UNIT_PLAYER_EXPEDITIONS_MAX] = $astrotech >= 1 ? floor(sqrt($astrotech - 1)) : 0;
     }
@@ -1309,8 +1309,8 @@ 
 function get_player_max_colonies(&$user, $astrotech = -1) {
   global $config;
 
-  if($astrotech == -1) {
-    if(!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
+  if ($astrotech == -1) {
+    if (!isset($user[UNIT_PLAYER_COLONIES_MAX])) {
 
       $expeditions = get_player_max_expeditons($user);
       $astrotech = mrc_get_level($user, false, TECH_ASTROTECH);
@@ -1355,10 +1355,10 @@ 
 
   // pdump($powerup_unit, '$powerup_unit');
   $level_current = $term_original = $time_left = 0;
-  if($is_upgrade) {
+  if ($is_upgrade) {
     $time_finish = strtotime($powerup_unit['unit_time_finish']);
     $time_left = max(0, $time_finish - SN_TIME_NOW);
-    if($time_left > 0) {
+    if ($time_left > 0) {
       $term_original = $time_finish - strtotime($powerup_unit['unit_time_start']);
       $level_current = $powerup_unit['unit_level'];
     }
@@ -1366,22 +1366,22 @@ 
 
   $level_max = $level_max > $powerup_data[P_MAX_STACK] ? $level_max : $powerup_data[P_MAX_STACK];
   $original_cost = 0;
-  for($i = 1; $i <= $level_max; $i++) {
+  for ($i = 1; $i <= $level_max; $i++) {
     $base_cost = eco_get_total_cost($powerup_id, $i);
     $base_cost = $base_cost[BUILD_CREATE][RES_DARK_MATTER];
-    foreach($sn_powerup_buy_discounts as $period => $discount) {
+    foreach ($sn_powerup_buy_discounts as $period => $discount) {
       $upgrade_price = floor($base_cost * $discount * $period / PERIOD_MONTH);
       $result[$i][$period] = $upgrade_price;
       $original_cost = $is_upgrade && $i == $level_current && $period <= $term_original ? $upgrade_price : $original_cost;
     }
   }
 
-  if($is_upgrade && $time_left) {
+  if ($is_upgrade && $time_left) {
     $term_original = round($term_original / PERIOD_DAY);
     $time_left = min(floor($time_left / PERIOD_DAY), $term_original);
     $cost_left = $term_original > 0 ? ceil($time_left / $term_original * $original_cost) : 0;
 
-    array_walk_recursive($result, function (&$value) use ($cost_left) {
+    array_walk_recursive($result, function(&$value) use ($cost_left) {
       $value -= $cost_left;
     });
   }
@@ -1439,7 +1439,7 @@ 
 
 function print_rr($var, $capture = false) {
   $print = '<pre>' . htmlspecialchars(print_r($var, true)) . '</pre>';
-  if($capture) {
+  if ($capture) {
     return $print;
   } else {
     print($print);

resources.php

Indentation +9 added lines, -9 removed lines

@@ -92,9 +92,9 @@ 
 
 for ($Option = 10; $Option >= 0; $Option--)
 {
- $template->assign_block_vars('option', array(
-   'VALUE' => $Option * 10,
- ));
+  $template->assign_block_vars('option', array(
+    'VALUE' => $Option * 10,
+  ));
 }
 
 $caps_real = eco_get_planet_caps($user, $planetrow, 3600);
@@ -163,14 +163,14 @@ 
 int_calc_storage_bar(RES_DEUTERIUM);
 
 $template->assign_vars(array(
- 'PLANET_NAME'          => $planetrow['name'],
- 'PLANET_TYPE'          => $planetrow['planet_type'],
- 'PLANET_DENSITY_INDEX' => $planet_density_index,
- 'PLANET_CORE_TEXT'     => classLocale::$lang['uni_planet_density_types'][$planet_density_index],
+  'PLANET_NAME'          => $planetrow['name'],
+  'PLANET_TYPE'          => $planetrow['planet_type'],
+  'PLANET_DENSITY_INDEX' => $planet_density_index,
+  'PLANET_CORE_TEXT'     => classLocale::$lang['uni_planet_density_types'][$planet_density_index],
 
- 'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
+  'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
 
- 'PAGE_HINT'            => classLocale::$lang['res_hint'],
+  'PAGE_HINT'            => classLocale::$lang['res_hint'],
 ));
 
 display($template, classLocale::$lang['res_planet_production']);

admin/planet_compensate.php

Spacing +24 added lines, -24 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
@@ -25,7 +25,7 @@ 
 $username_unsafe = sys_get_param_str_unsafe('username');
 $username = sys_get_param_escaped('username');
 
-if($galaxy_src)
+if ($galaxy_src)
 {
   sn_db_transaction_start();
   $errors = array();
@@ -35,41 +35,41 @@ 
   $planet = sys_o_get_updated($owner, array('galaxy' => $galaxy_src, 'system' => $system_src, 'planet' => $planet_src, 'planet_type' => 1), SN_TIME_NOW);
   $que    = $planet['que'];
   $planet = $planet['planet'];
-  if(!$planet)
+  if (!$planet)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_0'];
   }
 
-  if($planet['destruyed'])
+  if ($planet['destruyed'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_1'];
   }
 
-  if($planet['id_owner'] != $owner['id'] || !$username)
+  if ($planet['id_owner'] != $owner['id'] || !$username)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_4'];
   }
 
   $destination = sys_o_get_updated($owner, array('galaxy' => $galaxy_dst, 'system' => $system_dst, 'planet' => $planet_dst, 'planet_type' => 1), SN_TIME_NOW);
   $destination = $destination['planet'];
-  if(!$destination)
+  if (!$destination)
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_2'];
   }
 
-  if($planet['id'] == $destination['id'])
+  if ($planet['id'] == $destination['id'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_5'];
   }
 
-  if($planet['id_owner'] != $destination['id_owner'])
+  if ($planet['id_owner'] != $destination['id_owner'])
   {
     $errors[] = classLocale::$lang['adm_pl_comp_err_3'];
   }
 
-  if(!empty($errors))
+  if (!empty($errors))
   {
-    foreach($errors as $error)
+    foreach ($errors as $error)
     {
       $template->assign_block_vars('error', array(
         'TEXT' => $error,
@@ -83,14 +83,14 @@ 
     killer_add_planet($planet);
 
     $moon = db_planet_by_gspt($galaxy_src, $system_src, $planet_src, PT_MOON, true);
-    if($moon)
+    if ($moon)
     {
       $moon = sys_o_get_updated($owner, $moon, SN_TIME_NOW);
       $moon = $moon['planet'];
       killer_add_planet($moon);
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id)
+    foreach (sn_get_groups('resources_loot') as $resource_id)
     {
       $resource_name = pname_resource_name($resource_id);
       $template->assign_var("{$resource_name}_cost", $final_cost[$resource_id]);
@@ -98,13 +98,13 @@ 
       $template->assign_var("{$resource_name}_bonus", $final_cost[$resource_id]);
     }
 
-    if($_GET['btn_confirm'])
+    if ($_GET['btn_confirm'])
     {
       $time = SN_TIME_NOW + PERIOD_DAY;
 
       db_unit_list_delete($planet['id_owner'], LOC_PLANET, $planet['id']);
       db_planet_set_by_id($planet['id'], "id_owner = 0, destruyed = {$time}");
-      if($moon)
+      if ($moon)
       {
         db_unit_list_delete($planet['id_owner'], LOC_PLANET, $moon['id']);
         db_planet_set_by_id($moon['id'], "id_owner = 0, destruyed = {$time}");
@@ -131,7 +131,7 @@ 
   'username' => $username,
 ));
 
-display(parsetemplate($template, $parse), classLocale::$lang['adm_pl_comp_title'], false, '', true );
+display(parsetemplate($template, $parse), classLocale::$lang['adm_pl_comp_title'], false, '', true);
 
 function killer_add_planet($planet)
 {
@@ -146,34 +146,34 @@ 
   }
   */
 
-  foreach(sn_get_groups('structures') as $unit_id)
+  foreach (sn_get_groups('structures') as $unit_id)
   {
     $build_level = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($build_level > 0)
+    if ($build_level > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
       $build_factor = $unit_cost['factor'] != 1 ? (1 - pow($unit_cost['factor'], $build_level)) / (1 - $unit_cost['factor']) : $unit_cost['factor'];
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $build_factor) : 0;
       }
     }
   }
 
-  foreach(sn_get_groups(array('defense', 'fleet')) as $unit_id)
+  foreach (sn_get_groups(array('defense', 'fleet')) as $unit_id)
   {
     $unit_count = mrc_get_level($user, $planet, $unit_id, true, true);
-    if($unit_count > 0)
+    if ($unit_count > 0)
     {
       $unit_cost = get_unit_param($unit_id, 'cost');
-      foreach($sn_group_resources_loot as $resource_id)
+      foreach ($sn_group_resources_loot as $resource_id)
       {
         $final_cost[$resource_id] += isset($unit_cost[$resource_id]) && $unit_cost[$resource_id] > 0 ? floor($unit_cost[$resource_id] * $unit_count) : 0;
       }
     }
   }
 
-  foreach($sn_group_resources_loot as $resource_id)
+  foreach ($sn_group_resources_loot as $resource_id)
   {
     $final_cost[$resource_id] += floor(mrc_get_level($user, $planet, $resource_id, true, true));
   }

admin/paneladmina.php

Spacing +26 added lines, -26 removed lines

@@ -8,13 +8,13 @@ 
  * @copyright 2008 by ??????? for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3)
+if ($user['authlevel'] < 3)
 {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
@@ -34,9 +34,9 @@ 
 
 // Afficher les templates
 if (isset($GET_result)) {
-  switch ($GET_result){
+  switch ($GET_result) {
     case 'usr_search':
-      $SelUser = db_user_by_username('%'. $Pattern .'%', false, '*', true, true);
+      $SelUser = db_user_by_username('%' . $Pattern . '%', false, '*', true, true);
       $UsrMain = db_planet_by_id($SelUser['id_planet'], false, 'name');
 
       $bloc                   = classLocale::$lang;
@@ -44,14 +44,14 @@ 
       $bloc['answer2']        = $SelUser['username'];
       $bloc['answer3']        = $SelUser['user_lastip'];
       $bloc['answer4']        = $SelUser['email'];
-      $bloc['answer5']        = classLocale::$lang['adm_usr_level'][ $SelUser['authlevel'] ];
-      $bloc['answer6']        = classLocale::$lang['adm_usr_genre'][ $SelUser['gender'] ];
-      $bloc['answer7']        = "[".$SelUser['id_planet']."] ".$UsrMain['name'];
-      $bloc['answer8']        = "[".$SelUser['galaxy'].":".$SelUser['system'].":".$SelUser['planet']."] ";
+      $bloc['answer5']        = classLocale::$lang['adm_usr_level'][$SelUser['authlevel']];
+      $bloc['answer6']        = classLocale::$lang['adm_usr_genre'][$SelUser['gender']];
+      $bloc['answer7']        = "[" . $SelUser['id_planet'] . "] " . $UsrMain['name'];
+      $bloc['answer8']        = "[" . $SelUser['galaxy'] . ":" . $SelUser['system'] . ":" . $SelUser['planet'] . "] ";
       $bloc['qst_quest_complete'] = get_quest_amount_complete($SelUser['id']);
       $bloc['user_id'] = $SelUser['id'];
       $SubPanelTPL            = gettemplate('admin/admin_panel_asw1');
-      $parse['adm_sub_form2'] = parsetemplate( $SubPanelTPL, $bloc );
+      $parse['adm_sub_form2'] = parsetemplate($SubPanelTPL, $bloc);
       break;
 
     case 'usr_data':
@@ -69,10 +69,10 @@ 
 
       $selected_user = db_user_by_username($Pattern, false, 'id');
       $QryUpdate = db_user_set_by_id($selected_user['id'], "`authlevel` = '{$NewLvl}'");
-      $Message    = classLocale::$lang['adm_mess_lvl1']. " ". $Pattern ." ".classLocale::$lang['adm_mess_lvl2'];
-      $Message   .= "<font color=\"red\">".classLocale::$lang['adm_usr_level'][ $NewLvl ]."</font>!";
+      $Message    = classLocale::$lang['adm_mess_lvl1'] . " " . $Pattern . " " . classLocale::$lang['adm_mess_lvl2'];
+      $Message   .= "<font color=\"red\">" . classLocale::$lang['adm_usr_level'][$NewLvl] . "</font>!";
 
-      AdminMessage ( $Message, classLocale::$lang['adm_mod_level'] );
+      AdminMessage($Message, classLocale::$lang['adm_mod_level']);
       break;
 
     case 'ip_search':
@@ -81,12 +81,12 @@ 
       $bloc['adm_this_ip']    = $ip;
       $SelUser = db_user_list("`user_lastip` = '{$ip}'");
       //while ( $Usr = db_fetch($SelUser) ) {
-      foreach($SelUser as $Usr) {
+      foreach ($SelUser as $Usr) {
         $UsrMain = db_planet_by_id($Usr['id_planet'], false, 'name');
-        $bloc['adm_plyer_lst'] .= "<tr><th>".$Usr['username']."</th><th>[".$Usr['galaxy'].":".$Usr['system'].":".$Usr['planet']."] ".$UsrMain['name']."</th></tr>";
+        $bloc['adm_plyer_lst'] .= "<tr><th>" . $Usr['username'] . "</th><th>[" . $Usr['galaxy'] . ":" . $Usr['system'] . ":" . $Usr['planet'] . "] " . $UsrMain['name'] . "</th></tr>";
       }
       $SubPanelTPL            = gettemplate('admin/admin_panel_asw2');
-      $parse['adm_sub_form2'] = parsetemplate( $SubPanelTPL, $bloc );
+      $parse['adm_sub_form2'] = parsetemplate($SubPanelTPL, $bloc);
       break;
     default:
       break;
@@ -95,14 +95,14 @@ 
 
 // Traiter les reponses aux formulaires
 if (isset($GET_action)) {
-  $bloc                   = classLocale::$lang;
-  switch ($GET_action){
+  $bloc = classLocale::$lang;
+  switch ($GET_action) {
     case 'usr_search':
-      $SubPanelTPL            = gettemplate('admin/admin_panel_frm1');
+      $SubPanelTPL = gettemplate('admin/admin_panel_frm1');
       break;
 
     case 'usr_data':
-      $SubPanelTPL            = gettemplate('admin/admin_panel_frm4');
+      $SubPanelTPL = gettemplate('admin/admin_panel_frm4');
       break;
 
     case 'usr_level':
@@ -115,21 +115,21 @@ 
 
 
       for ($Lvl = 0; $Lvl < 4; $Lvl++) {
-        $bloc['adm_level_lst'] .= '<option value="'. $Lvl .'">'. classLocale::$lang['adm_usr_level'][ $Lvl ] ."</option>";
+        $bloc['adm_level_lst'] .= '<option value="' . $Lvl . '">' . classLocale::$lang['adm_usr_level'][$Lvl] . "</option>";
       }
-      $SubPanelTPL            = gettemplate('admin/admin_panel_frm3');
+      $SubPanelTPL = gettemplate('admin/admin_panel_frm3');
       break;
 
     case 'ip_search':
-      $SubPanelTPL            = gettemplate('admin/admin_panel_frm2');
+      $SubPanelTPL = gettemplate('admin/admin_panel_frm2');
       break;
 
     default:
       break;
   }
-  $parse['adm_sub_form2'] = parsetemplate( $SubPanelTPL, $bloc );
+  $parse['adm_sub_form2'] = parsetemplate($SubPanelTPL, $bloc);
 }
 
-$page = parsetemplate( $PanelMainTPL, $parse );
-display( $page, classLocale::$lang['panel_mainttl'], false, '', true );
+$page = parsetemplate($PanelMainTPL, $parse);
+display($page, classLocale::$lang['panel_mainttl'], false, '', true);
 ?>

admin/settings.php

Spacing +11 added lines, -11 removed lines

@@ -8,18 +8,18 @@ 
  * @copyright 2008 by ??????? for XNova
  */
 
-define('INSIDE'  , true);
-define('INSTALL' , false);
+define('INSIDE', true);
+define('INSTALL', false);
 define('IN_ADMIN', true);
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 $template = gettemplate('admin/settings', true);
 
-if(sys_get_param('save')) {
+if (sys_get_param('save')) {
   $config->game_name               = sys_get_param_str_unsafe('game_name');
   $config->game_mode               = sys_get_param_int('game_mode');
   $config->game_speed              = sys_get_param_float('game_speed', 1);
@@ -29,7 +29,7 @@ 
   $config->url_faq                 = sys_get_param_str_unsafe('url_faq');
   $config->url_forum               = sys_get_param_str_unsafe('url_forum');
   $config->url_rules               = sys_get_param_str_unsafe('url_rules');
-  $config->url_purchase_metamatter         = sys_get_param_str_unsafe('url_purchase_metamatter');
+  $config->url_purchase_metamatter = sys_get_param_str_unsafe('url_purchase_metamatter');
   $config->game_disable            = sys_get_param_int('game_disable');
   $config->game_disable_reason     = sys_get_param_str_unsafe('game_disable_reason');
   $config->server_updater_check_auto = sys_get_param_int('server_updater_check_auto');
@@ -96,8 +96,8 @@ 
   $config->stats_schedule          = sys_get_param_str('stats_schedule');
 
   $config->empire_mercenary_base_period = sys_get_param_int('empire_mercenary_base_period');
-  if($config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
-    if($config->empire_mercenary_temporary) {
+  if ($config->empire_mercenary_temporary != sys_get_param_int('empire_mercenary_temporary')) {
+    if ($config->empire_mercenary_temporary) {
       db_unit_list_admin_delete_mercenaries_finished();
     } else {
       db_unit_list_admin_set_mercenaries_expire_time($config->empire_mercenary_base_period);
@@ -140,21 +140,21 @@ 
 //  'STATS_SCHEDULE' => $config->stats_hide_player_list,
 ));
 
-foreach(classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
+foreach (classLocale::$lang['sys_game_disable_reason'] as $id => $name) {
   $template->assign_block_vars('sys_game_disable_reason', array(
     'ID'   => $id,
     'NAME' => $name,
   ));
 }
 
-foreach(classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
+foreach (classLocale::$lang['sys_game_mode'] as $mode_id => $mode_name) {
   $template->assign_block_vars('game_modes', array(
     'ID'   => $mode_id,
     'NAME' => $mode_name,
   ));
 }
 
-foreach(classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
+foreach (classLocale::$lang['adm_opt_ver_response'] as $ver_id => $ver_response) {
   $template->assign_block_vars('ver_response', array(
     'ID'   => $ver_id,
     'NAME' => js_safe_string($ver_response),
@@ -162,7 +162,7 @@ 
 }
 
 $lang_list = lng_get_list();
-foreach($lang_list as $lang_id => $lang_data) {
+foreach ($lang_list as $lang_id => $lang_data) {
   $template->assign_block_vars('game_languages', array(
     'ID'   => $lang_id,
     'NAME' => "{$lang_data['LANG_NAME_NATIVE']} ({$lang_data['LANG_NAME_ENGLISH']})",