supernova-ws / SuperNova

includes/classes/sn_module_payment.php

Spacing +67 added lines, -67 removed lines

@@ -448,7 +448,7 @@ 
   public function compile_request($request) {
     global $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;
@@ -469,15 +469,15 @@ 
     $this->payment_currency = classSupernova::$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);
     }
 
@@ -486,7 +486,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);
     }
   }
@@ -498,26 +498,26 @@ 
    * @throws Exception
    */
   protected function payment_request_process($options = array()) {
-    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);
+        sys_redirect(SN_ROOT_VIRTUAL.'metamatter.php?payment_id='.$this->payment_id);
         die();
       }
     }
@@ -525,89 +525,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)) {
-      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));
+    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) {
-        throw new Exception(classLocale::$lang['pay_msg_request_server_wrong'] . " {$this->request_server_id} вместо " . SN_ROOT_VIRTUAL, SN_PAYMENT_REQUEST_SERVER_WRONG);
+      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) {
-        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);
+      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) {
-        throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid'] . " пришло {$request_money_out} денег вместо {$this->payment_external_amount} денег", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
+      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);
+        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 = classSupernova::$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']);
     }
 
@@ -634,21 +634,21 @@ 
     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();
-      classSupernova::$debug->warning('Результат операции: код ' . $response['result'] . ' сообщение "' . $response['message'] . '"', 'Успешный платёж', LOG_INFO_PAYMENT);
+      classSupernova::$debug->warning('Результат операции: код '.$response['result'].' сообщение "'.$response['message'].'"', 'Успешный платёж', LOG_INFO_PAYMENT);
     } else {
       sn_db_transaction_rollback();
-      classSupernova::$debug->warning('Результат операции: код ' . $response['result'] . ' сообщение "' . $response['message'] . '"', 'Ошибка платежа', LOG_INFO_PAYMENT, true);
+      classSupernova::$debug->warning('Результат операции: код '.$response['result'].' сообщение "'.$response['message'].'"', 'Ошибка платежа', LOG_INFO_PAYMENT, true);
     }
 
     // Переводим код результата из СН в код платежной системы
-    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];
     }
 
@@ -671,7 +671,7 @@ 
     $currency_from = strtolower($currency_from);
     $currency_to = strtolower($currency_to);
 
-    if($currency_from != $currency_to) {
+    if ($currency_from != $currency_to) {
       $exchange_from = get_exchange_rate($currency_from);
       $exchange_to = get_exchange_rate($currency_to);
 
@@ -695,10 +695,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 {
@@ -706,9 +706,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 {
@@ -761,7 +761,7 @@ 
       'payment_external_lots' => $this->payment_dark_matter_paid / get_mm_cost(),
     );
 
-    if($this->payment_id) {
+    if ($this->payment_id) {
       $payment['payment_id'] = $this->payment_id;
       classSupernova::$gc->db->doReplaceSet('payment', $payment);
     } else {
@@ -773,12 +773,12 @@ 
 
 
   public 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);
       }
     }
@@ -787,25 +787,25 @@ 
   public function payment_cancel(&$payment) {
     die('{НЕ РАБОТАЕТ! СООБЩИТЕ АДМИНИСТРАЦИИ!}');
 
-    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) {
-      $comment_unsafe = $payment['payment_comment'] = classLocale::$lang['pay_msg_request_payment_cancelled'] .' ' . $payment['payment_comment'];
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+      $comment_unsafe = $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['payment_id'], $payment['payment_status'], $comment_unsafe);
       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);
     }
   }
@@ -828,8 +828,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 {
@@ -876,7 +876,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'];
@@ -918,11 +918,11 @@ 
   protected function generate_description() {
     // TODO - системная локализация
     $this->description_generated = array(
-      PAYMENT_DESCRIPTION_100 => substr("{$this->payment_dark_matter_gained} ММ аккаунт [{$this->account->account_name}] ID {$this->account->account_id} на " . SN_ROOT_VIRTUAL, 0, 100),
-      PAYMENT_DESCRIPTION_250 => substr("Оплата {$this->payment_dark_matter_gained} ММ для аккаунта [{$this->payment_user_name}] ID {$this->payment_user_id} на сервере " . SN_ROOT_VIRTUAL, 0, 250),
-      PAYMENT_DESCRIPTION_MAX => ($this->payment_test ? "ТЕСТОВЫЙ ПЛАТЕЖ! " : '') .
-        "Платеж от аккаунта '{$this->payment_account_name}' ID {$this->payment_account_id} игрока '{$this->payment_user_name}' ID {$this->payment_user_id} на сервере " . SN_ROOT_VIRTUAL .
-        " сумма {$this->payment_amount} {$this->payment_currency} за {$this->payment_dark_matter_paid} ММ (начислено {$this->payment_dark_matter_gained} ММ)" .
+      PAYMENT_DESCRIPTION_100 => substr("{$this->payment_dark_matter_gained} ММ аккаунт [{$this->account->account_name}] ID {$this->account->account_id} на ".SN_ROOT_VIRTUAL, 0, 100),
+      PAYMENT_DESCRIPTION_250 => substr("Оплата {$this->payment_dark_matter_gained} ММ для аккаунта [{$this->payment_user_name}] ID {$this->payment_user_id} на сервере ".SN_ROOT_VIRTUAL, 0, 250),
+      PAYMENT_DESCRIPTION_MAX => ($this->payment_test ? "ТЕСТОВЫЙ ПЛАТЕЖ! " : '').
+        "Платеж от аккаунта '{$this->payment_account_name}' ID {$this->payment_account_id} игрока '{$this->payment_user_name}' ID {$this->payment_user_id} на сервере ".SN_ROOT_VIRTUAL.
+        " сумма {$this->payment_amount} {$this->payment_currency} за {$this->payment_dark_matter_paid} ММ (начислено {$this->payment_dark_matter_gained} ММ)".
         " через '{$this->manifest['name']}' сумма {$this->payment_external_amount} {$this->payment_external_currency}",
     );
   }

includes/classes/DBStaticChat.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
       JOIN {{users}} AS u ON u.id = cp.chat_player_player_id
     WHERE
       `chat_player_refresh_last` >= '{$sql_date}'
-      AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ")
+      AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.")
       {$ally_add}
     ORDER BY authlevel DESC, `username`");
   }

includes/classes/DBStaticMessages.php

Spacing +8 added lines, -8 removed lines

@@ -115,7 +115,7 @@ 
         sys_user_options_unpack($owner_row);
 
         if ($force || !$message_class['switchable'] || $owner_row["opt_{$message_class_name}"]) {
-          $insert_values[] = "('" . idval($owner) . "', '{$sender}', '{$timestamp}', '{$message_type}', '" . db_escape($from_unsafe) . "', '" . db_escape($subject_unsafe) . "', '" . db_escape($text_unsafe) . "')";
+          $insert_values[] = "('".idval($owner)."', '{$sender}', '{$timestamp}', '{$message_type}', '".db_escape($from_unsafe)."', '".db_escape($subject_unsafe)."', '".db_escape($text_unsafe)."')";
         }
 
         // TODO - allow sending HTML email only from admin
@@ -159,7 +159,7 @@ 
     $sendList = array();
     $list = '';
     $query = DBStaticUser::db_user_list(
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
       false, 'id, username');
     foreach ($query as $u) {
       $sendList[] = $u['id'];
@@ -248,7 +248,7 @@ 
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
 
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
 
@@ -416,7 +416,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -460,7 +460,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
       "ORDER BY
   `message_id` DESC
 LIMIT
@@ -473,7 +473,7 @@ 
     $subject_safe = db_escape($subject_unsafe);
     $text_safe = db_escape($text_unsafe);
 
-    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type_safe}, '{$from_safe}', '{$subject_safe}', '{$text_safe}' FROM {{users}}");
   }
 
@@ -483,7 +483,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_message_count_by_type($int_type_selected) {
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
 
     return $page_max;
   }
@@ -507,7 +507,7 @@ 
    */
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
     $where[] = "message_time <= UNIX_TIMESTAMP('{$delete_date}')";
-    if($int_type_selected >= 0) {
+    if ($int_type_selected >= 0) {
       $where['message_type'] = $int_type_selected;
     }
     classSupernova::$db->doDeleteDeprecated(TABLE_MESSAGES, $where);

includes/alliance/ali_internal_admin_mail.inc

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_can_send_mails) {
+if (!$user_can_send_mails) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
 }
 
 $POST_text = sys_get_param_str('text');
 $internalAliSendTextUnsafe = sys_get_param_str_unsafe('text');
-if($internalAliSendTextUnsafe) {
-  message(classLocale::$lang['members_who_recived_message'] . DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
+if ($internalAliSendTextUnsafe) {
+  message(classLocale::$lang['members_who_recived_message'].DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
 }
 
-$r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
-if($ranks) {
-  foreach($ranks as $id => $array) {
-    $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
+$r_list = "<option value=\"-1\">".classLocale::$lang['All_players']."</option>";
+if ($ranks) {
+  foreach ($ranks as $id => $array) {
+    $r_list .= "<option value=\"".$id."\">".$array['name']."</option>";
   }
 }
 

includes/update_old.php

Spacing +132 added lines, -132 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('IN_UPDATE') || IN_UPDATE !== true) {
+if (!defined('IN_UPDATE') || IN_UPDATE !== true) {
   die('Hack attempt');
 }
 
-switch($new_version) {
+switch ($new_version) {
   case 0:
   case 1:
   case 2:
@@ -32,7 +32,7 @@ 
     );
     upd_drop_table('lunas');
 
-    if($update_tables['galaxy']) {
+    if ($update_tables['galaxy']) {
       upd_do_query(
         'UPDATE `{{planets}}`
           LEFT JOIN `{{galaxy}}` ON {{galaxy}}.id_planet = {{planets}}.id
@@ -82,12 +82,12 @@ 
     );
     upd_add_more_time();
 
-    if($update_tables['users']['rpg_points']) {
+    if ($update_tables['users']['rpg_points']) {
       upd_do_query(
         "UPDATE {{users}} AS u
           RIGHT JOIN {{referrals}} AS r
-            ON r.id_partner = u.id AND r.dark_matter >= " . classSupernova::$config->rpg_bonus_divisor . "
-        SET u.rpg_points = u.rpg_points + FLOOR(r.dark_matter/" . classSupernova::$config->rpg_bonus_divisor . ");"
+            ON r.id_partner = u.id AND r.dark_matter >= " . classSupernova::$config->rpg_bonus_divisor."
+        SET u.rpg_points = u.rpg_points + FLOOR(r.dark_matter/" . classSupernova::$config->rpg_bonus_divisor.");"
       );
     }
 
@@ -175,18 +175,18 @@ 
     upd_alter_table('planets', "ADD `governor_level` smallint unsigned NOT NULL DEFAULT '0' COMMENT 'Governor level'", !$update_tables['planets']['governor_level']);
     upd_alter_table('planets', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'Planet que'", !$update_tables['planets']['que']);
 
-    if($update_tables['planets']['b_building']) {
+    if ($update_tables['planets']['b_building']) {
       $planet_query = upd_do_query('SELECT * FROM {{planets}} WHERE `b_building` <> 0;');
       $const_que_structures = QUE_STRUCTURES;
-      while($planet_data = db_fetch($planet_query)) {
+      while ($planet_data = db_fetch($planet_query)) {
         $old_que = explode(';', $planet_data['b_building_id']);
-        foreach($old_que as $old_que_item_string) {
-          if(!$old_que_item_string) {
+        foreach ($old_que as $old_que_item_string) {
+          if (!$old_que_item_string) {
             continue;
           }
 
           $old_que_item = explode(',', $old_que_item_string);
-          if($old_que_item[4] == 'build') {
+          if ($old_que_item[4] == 'build') {
             $old_que_item[4] = BUILD_CREATE;
           } else {
             $old_que_item[4] = BUILD_DESTROY;
@@ -219,7 +219,7 @@ 
       ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
     );
 
-    if($update_tables['users']['urlaubs_until']) {
+    if ($update_tables['users']['urlaubs_until']) {
       upd_alter_table('users', "ADD `vacation` int(11) NOT NULL DEFAULT '0' COMMENT 'Time when user can leave vacation mode'", !$update_tables['users']['vacation']);
       upd_do_query('UPDATE {{users}} SET `vacation` = `urlaubs_until` WHERE `urlaubs_modus` <> 0;');
       upd_alter_table('users', 'DROP COLUMN `urlaubs_until`, DROP COLUMN `urlaubs_modus`, DROP COLUMN `urlaubs_modus_time`', $update_tables['users']['urlaubs_until']);
@@ -269,12 +269,12 @@ 
     ), !$update_tables['logs']['log_timestamp']);
     upd_do_query('DELETE FROM `{{logs}}` WHERE `log_code` = 303;');
 
-    if($update_tables['errors']) {
+    if ($update_tables['errors']) {
       upd_do_query('INSERT INTO `{{logs}}` (`log_code`, `log_sender`, `log_title`, `log_text`, `log_page`, `log_time`) SELECT 500, `error_sender`, `error_type`, `error_text`, `error_page`, `error_time` FROM `{{errors}}`;');
-      if($update_tables['errors_backup']) {
+      if ($update_tables['errors_backup']) {
         upd_drop_table('errors_backup');
       }
-      upd_alter_table('errors', ' RENAME TO ' . classSupernova::$config->db_prefix . 'errors_backup');
+      upd_alter_table('errors', ' RENAME TO '.classSupernova::$config->db_prefix.'errors_backup');
 
       upd_drop_table('errors');
     }
@@ -332,7 +332,7 @@ 
 
     upd_alter_table('users', 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci');
 
-    if(!$update_tables['shortcut']) {
+    if (!$update_tables['shortcut']) {
       upd_create_table('shortcut',
         "(
           `shortcut_id` SERIAL,
@@ -356,10 +356,10 @@ 
       $temp_planet_types = array(PT_PLANET, PT_DEBRIS, PT_MOON);
 
       $query = upd_do_query("SELECT id, fleet_shortcut FROM {{users}} WHERE fleet_shortcut > '';");
-      while($user_data = db_fetch($query)) {
+      while ($user_data = db_fetch($query)) {
         $shortcuts = explode("\r\n", $user_data['fleet_shortcut']);
-        foreach($shortcuts as $shortcut) {
-          if(!$shortcut) {
+        foreach ($shortcuts as $shortcut) {
+          if (!$shortcut) {
             continue;
           }
 
@@ -370,7 +370,7 @@ 
           $shortcut[3] = intval($shortcut[3]);
           $shortcut[4] = intval($shortcut[4]);
 
-          if($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types)) {
+          if ($shortcut[0] && $shortcut[1] && $shortcut[2] && $shortcut[3] && in_array($shortcut[4], $temp_planet_types)) {
             $db_prefix = classSupernova::$config->db_prefix;
             upd_do_query("INSERT INTO {$db_prefix}shortcut (shortcut_user_id, shortcut_galaxy, shortcut_system, shortcut_planet, shortcut_planet_type, shortcut_text) VALUES ({$user_data['id']}, {$shortcut[1]}, {$shortcut[2]}, {$shortcut[3]}, {$shortcut[4]}, '{$shortcut[0]}');", true);
           }
@@ -523,7 +523,7 @@ 
 
     upd_check_key('quest_total', 0, !isset(classSupernova::$config->quest_total));
 
-    for($i = 0; $i < 25; $i++) {
+    for ($i = 0; $i < 25; $i++) {
       upd_alter_table('alliance', array("DROP INDEX `id_{$i}`",), $update_indexes['alliance']["id_{$i}"]);
       upd_alter_table('users', array("DROP INDEX `id_{$i}`",), $update_indexes['users']["id_{$i}"]);
       upd_alter_table('planets', array("DROP INDEX `id_{$i}`",), $update_indexes['planets']["id_{$i}"]);
@@ -551,7 +551,7 @@ 
       "ADD `msg_admin` bigint(11) unsigned DEFAULT '0' AFTER mnl_buildlist"
     ), !$update_tables['users']['msg_admin']);
 
-    if(!$update_foreigns['users']['FK_users_ally_id']) {
+    if (!$update_foreigns['users']['FK_users_ally_id']) {
       upd_alter_table('users', array(
         'MODIFY COLUMN `ally_name` VARCHAR(32) DEFAULT NULL',
         'MODIFY COLUMN `ally_id` BIGINT(20) UNSIGNED DEFAULT NULL',
@@ -573,7 +573,7 @@ 
     ), strtoupper($update_tables['planets']['debris_metal']['Type']) != 'BIGINT(20) UNSIGNED');
 
     $illegal_moon_query = upd_do_query("SELECT id FROM `{{planets}}` WHERE `id_owner` <> 0 AND `planet_type` = 3 AND `parent_planet` <> 0 AND `parent_planet` NOT IN (SELECT `id` FROM {{planets}} WHERE `planet_type` = 1);");
-    while($illegal_moon_row = db_fetch($illegal_moon_query)) {
+    while ($illegal_moon_row = db_fetch($illegal_moon_query)) {
       upd_do_query("DELETE FROM {{planets}} WHERE id = {$illegal_moon_row['id']} LIMIT 1;", true);
     }
 
@@ -610,16 +610,16 @@ 
     upd_do_query('COMMIT;', true);
 
     $records = 1;
-    while($records) {
+    while ($records) {
       upd_do_query('START TRANSACTION;', true);
       $query = upd_do_query("SELECT * FROM {{LOGS}} WHERE log_code = 102 ORDER BY log_id LIMIT 1000;");
       $records = classSupernova::$db->db_num_rows($query);
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $result = preg_match('/^Player ID (\d+) Dark Matter was adjusted with (\-?\d+). Reason: (.+)$/', $row['log_text'], $matches);
 
         $reason = RPG_NONE;
         $comment = $matches[3];
-        switch($matches[3]) {
+        switch ($matches[3]) {
           case 'Level Up For Structure Building':
             $reason = RPG_STRUCTURE;
           break;
@@ -635,22 +635,22 @@ 
           break;
 
           default:
-            if(preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2)) {
+            if (preg_match('/^Using Black Market page (\d+)$/', $comment, $matches2)) {
               $reason = RPG_MARKET;
-            } elseif(preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Spent for officer (.+) ID (\d+)$/', $comment, $matches2)) {
               $reason = RPG_MERCENARY;
               $comment = "Spent for mercenary {$matches2[1]} GUID {$matches2[2]}";
-            } elseif(preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Incoming From Referral ID\ ?(\d+)$/', $comment, $matches2)) {
               $reason = RPG_REFERRAL;
               $comment = "Incoming from referral ID {$matches[1]}";
-            } elseif(preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2)) {
+            } elseif (preg_match('/^Through admin interface for user .* ID \d+ (.*)$/', $comment, $matches2)) {
               $reason = RPG_ADMIN;
               $comment = $matches2[1];
             }
           break;
         }
 
-        if($matches[2]) {
+        if ($matches[2]) {
           $row['log_username'] = db_escape($row['log_username']);
           $row['log_page'] = db_escape($row['log_page']);
           $comment = db_escape($comment);
@@ -669,12 +669,12 @@ 
       upd_do_query('COMMIT;', true);
     }
 
-    foreach($update_tables as $table_name => $cork) {
-      $row = db_fetch(upd_do_query("SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '" . classSupernova::$config->db_prefix . "{$table_name}';", true));
-      if($row['ENGINE'] != 'InnoDB') {
+    foreach ($update_tables as $table_name => $cork) {
+      $row = db_fetch(upd_do_query("SELECT * FROM information_schema.TABLES WHERE TABLE_SCHEMA = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '".classSupernova::$config->db_prefix."{$table_name}';", true));
+      if ($row['ENGINE'] != 'InnoDB') {
         upd_alter_table($table_name, 'ENGINE=InnoDB', true);
       }
-      if($row['TABLE_COLLATION'] != 'utf8_general_ci') {
+      if ($row['TABLE_COLLATION'] != 'utf8_general_ci') {
         upd_alter_table($table_name, 'CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci', true);
       }
     }
@@ -694,7 +694,7 @@ 
       "CHANGE COLUMN `governor_level` `PLANET_GOVERNOR_LEVEL` SMALLINT(5) NOT NULL DEFAULT 0",
     ), !$update_tables['planets']['PLANET_GOVERNOR_ID']);
 
-    if($update_tables['users']['rpg_geologue']) {
+    if ($update_tables['users']['rpg_geologue']) {
       classSupernova::$db->doUpdateOld("UPDATE `{{users}}` SET `dark_matter` = `dark_matter` + (`rpg_geologue` + `rpg_ingenieur` + `rpg_constructeur` + `rpg_technocrate` + `rpg_scientifique` + `rpg_defenseur`) * 3;");
 
       upd_alter_table('users', array(
@@ -707,7 +707,7 @@ 
       ), $update_tables['users']['rpg_geologue']);
     }
 
-    if($update_tables['users']['rpg_bunker']) {
+    if ($update_tables['users']['rpg_bunker']) {
       classSupernova::$db->doUpdateOld("UPDATE {{users}} SET `dark_matter` = `dark_matter` + (`rpg_bunker`) * 3;");
 
       upd_alter_table('users', array(
@@ -757,7 +757,7 @@ 
     ), !isset($update_tables['alliance']['total_rank']));
     classSupernova::$db->doUpdateOld("UPDATE {{alliance}} AS a JOIN {{statpoints}} AS sp ON sp.id_owner = a.id AND sp.stat_code = 1 AND sp.stat_type = 2 SET a.total_rank = sp.total_rank, a.total_points = sp.total_points;");
 
-    if(!isset($update_tables['users']['ally_tag'])) {
+    if (!isset($update_tables['users']['ally_tag'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `ally_tag` varchar(8) DEFAULT NULL AFTER `ally_id`",
       ), !isset($update_tables['users']['ally_tag']));
@@ -772,7 +772,7 @@ 
       "ADD COLUMN `player_artifact_list` TEXT",
     ), !isset($update_tables['users']['player_artifact_list']));
 
-    if(!isset($update_tables['users']['player_rpg_tech_xp'])) {
+    if (!isset($update_tables['users']['player_rpg_tech_xp'])) {
       upd_check_key('eco_scale_storage', 1, !isset(classSupernova::$config->eco_scale_storage));
 
       upd_alter_table('users', array(
@@ -802,7 +802,7 @@ 
       "MODIFY COLUMN `ally_owner` BIGINT(20) UNSIGNED DEFAULT NULL",
     ), strtoupper($update_tables['alliance']['ally_owner']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    if(strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_diplomacy']['alliance_diplomacy_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('alliance_diplomacy', array(
         "DROP FOREIGN KEY `FK_diplomacy_ally_id`",
         "DROP FOREIGN KEY `FK_diplomacy_contr_ally_id`"
@@ -817,7 +817,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_negotiation']['alliance_negotiation_ally_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('alliance_negotiation', array(
         "DROP FOREIGN KEY `FK_negotiation_ally_id`",
         "DROP FOREIGN KEY `FK_negotiation_contr_ally_id`"
@@ -833,7 +833,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['alliance_requests']['id_user']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{alliance_requests}} WHERE id_user NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
 
       upd_alter_table('alliance_requests', array(
@@ -847,7 +847,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['annonce']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{annonce}} WHERE USER NOT IN (SELECT username FROM {{users}});', true);
 
       upd_alter_table('annonce', array(
@@ -860,7 +860,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['bashing']['bashing_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('bashing', array(
         "DROP FOREIGN KEY `FK_bashing_user_id`",
         "DROP FOREIGN KEY `FK_bashing_planet_id`",
@@ -875,7 +875,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['buddy']['id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{buddy}} WHERE sender NOT IN (SELECT id FROM {{users}}) OR OWNER NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('buddy', array(
@@ -913,7 +913,7 @@ 
       "MODIFY COLUMN `fleet_resource_deuterium` DECIMAL(65,0) DEFAULT '0'",
     ), strtoupper($update_tables['fleets']['fleet_resource_metal']['Type']) != 'DECIMAL(65,0)');
 
-    if(strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['iraks']['fleet_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{iraks}} WHERE OWNER NOT IN (SELECT id FROM {{users}}) OR zielid NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('iraks', array(
@@ -937,7 +937,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['notes']['owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{notes}} WHERE OWNER NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('notes', array(
@@ -1062,7 +1062,7 @@ 
       "DROP COLUMN `b_hangar_plus`",
     ), isset($update_tables['planets']['b_hangar_plus']));
 
-    if(strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['referrals']['id_partner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{referrals}} WHERE id NOT IN (SELECT id FROM {{users}}) OR id_partner NOT IN (SELECT id FROM {{users}});', true);
 
       upd_alter_table('referrals', array(
@@ -1081,7 +1081,7 @@ 
       "MODIFY COLUMN `id_owner2` BIGINT(20) UNSIGNED",
     ), strtoupper($update_tables['rw']['id_owner1']['Type']) != 'BIGINT(20) UNSIGNED');
 
-    if(strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['shortcut']['shortcut_user_id']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{shortcut}} WHERE shortcut_user_id NOT IN (SELECT id FROM {{users}}) OR shortcut_planet_id NOT IN (SELECT id FROM {{planets}});', true);
 
       upd_alter_table('shortcut', array(
@@ -1096,7 +1096,7 @@ 
       ), true);
     }
 
-    if(strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['statpoints']['id_owner']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_do_query('DELETE FROM {{statpoints}} WHERE id_owner NOT IN (SELECT id FROM {{users}}) OR id_ally NOT IN (SELECT id FROM {{alliance}});', true);
 
       upd_alter_table('statpoints', array(
@@ -1250,7 +1250,7 @@ 
       "DROP COLUMN `settings_allylogo`",
     ), isset($update_tables['users']['settings_allylogo']));
 
-    if(!isset($update_tables['powerup'])) {
+    if (!isset($update_tables['powerup'])) {
       upd_do_query("DROP TABLE IF EXISTS {{mercenaries}};");
 
       upd_create_table('powerup',
@@ -1280,24 +1280,24 @@ 
 
       $update_query_template = "UPDATE {{users}} SET id = id %s WHERE id = %d LIMIT 1;";
       $user_list = upd_do_query("SELECT * FROM {{users}};");
-      while($user_row = db_fetch($user_list)) {
+      while ($user_row = db_fetch($user_list)) {
         $update_query_str = '';
-        foreach(sn_get_groups('mercenaries') as $mercenary_id) {
+        foreach (sn_get_groups('mercenaries') as $mercenary_id) {
           $mercenary_data_name = get_unit_param($mercenary_id, P_NAME);
-          if($mercenary_level = $user_row[$mercenary_data_name]) {
+          if ($mercenary_level = $user_row[$mercenary_data_name]) {
             $update_query_str = ", `{$mercenary_data_name}` = 0";
             upd_do_query("DELETE FROM {{powerup}} WHERE powerup_user_id = {$user_row['id']} AND powerup_unit_id = {$mercenary_id} LIMIT 1;");
             upd_do_query("INSERT {{powerup}} SET powerup_user_id = {$user_row['id']}, powerup_unit_id = {$mercenary_id}, powerup_unit_level = {$mercenary_level};");
           }
         }
 
-        if($update_query_str) {
+        if ($update_query_str) {
           upd_do_query(sprintf($update_query_template, $update_query_str, $user_row['id']));
         }
       }
     }
 
-    if(!isset($update_tables['universe'])) {
+    if (!isset($update_tables['universe'])) {
       upd_create_table('universe',
         "(
           `universe_galaxy` SMALLINT UNSIGNED NOT NULL DEFAULT '0',
@@ -1320,7 +1320,7 @@ 
 
     // ------------------------------------------------------------------------
     // Modifying tables
-    if(strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED') {
+    if (strtoupper($update_tables['users']['user_as_ally']['Type']) != 'BIGINT(20) UNSIGNED') {
       upd_alter_table('users', array(
         "ADD COLUMN user_as_ally BIGINT(20) UNSIGNED DEFAULT NULL",
 
@@ -1341,7 +1341,7 @@ 
     // ------------------------------------------------------------------------
     // Creating players for allies
     $ally_row_list = classSupernova::$db->doSelect("SELECT `id`, `ally_tag` FROM {{alliance}} WHERE ally_user_id IS NULL;");
-    while($ally_row = db_fetch($ally_row_list)) {
+    while ($ally_row = db_fetch($ally_row_list)) {
       classSupernova::$db->doInsertSet(TABLE_USERS, array(
         'username'      => "[{$ally_row['ally_tag']}]",
         'register_time' => SN_TIME_NOW,
@@ -1354,12 +1354,12 @@ 
     // Renaming old ally players TODO: Remove on release
     upd_do_query("UPDATE {{users}} AS u LEFT JOIN {{alliance}} AS a ON u.user_as_ally = a.id SET u.username = CONCAT('[', a.ally_tag, ']') WHERE u.user_as_ally IS NOT NULL AND u.username = '';");
     // Setting last online time to old ally players TODO: Remove on release
-    upd_do_query("UPDATE {{users}} SET `onlinetime` = " . SN_TIME_NOW . " WHERE onlinetime = 0;");
+    upd_do_query("UPDATE {{users}} SET `onlinetime` = ".SN_TIME_NOW." WHERE onlinetime = 0;");
 
     // ------------------------------------------------------------------------
     // Creating planets for allies
     $ally_user_list = classSupernova::$db->doSelect("SELECT `id`, `username` FROM {{users}} WHERE `user_as_ally` IS NOT NULL AND `id_planet` = 0;");
-    while($ally_user_row = db_fetch($ally_user_list)) {
+    while ($ally_user_row = db_fetch($ally_user_list)) {
       classSupernova::$db->doInsertSet(TABLE_PLANETS, array(
         'name'        => $ally_user_row['username'],
         'last_update' => SN_TIME_NOW,
@@ -1394,10 +1394,10 @@ 
     // Adding db field
     upd_alter_table('users', "ADD `que` varchar(4096) NOT NULL DEFAULT '' COMMENT 'User que'", !$update_tables['users']['que']);
     // Converting old data to new one and dropping old fields
-    if($update_tables['users']['b_tech_planet']) {
+    if ($update_tables['users']['b_tech_planet']) {
       $query = classSupernova::$db->doSelect("SELECT * FROM `{{planets}}` WHERE `b_tech_id` <> 0;");
-      while($planet_row = db_fetch($query)) {
-        $que_item_string = "{$planet_row['b_tech_id']},1," . max(0, $planet_row['b_tech'] - SN_TIME_NOW) . "," . BUILD_CREATE . "," . QUE_RESEARCH;
+      while ($planet_row = db_fetch($query)) {
+        $que_item_string = "{$planet_row['b_tech_id']},1,".max(0, $planet_row['b_tech'] - SN_TIME_NOW).",".BUILD_CREATE.",".QUE_RESEARCH;
         classSupernova::$db->doUpdateOld("UPDATE {{users}} SET `que` = '{$que_item_string}' WHERE `id` = {$planet_row['id_owner']} LIMIT 1;");
       }
 
@@ -1409,10 +1409,10 @@ 
       upd_alter_table('users', "DROP COLUMN `b_tech_planet`", $update_tables['users']['b_tech_planet']);
     }
 
-    if(!$update_tables['powerup']['powerup_category']) {
+    if (!$update_tables['powerup']['powerup_category']) {
       upd_alter_table('powerup', "ADD COLUMN `powerup_category` SMALLINT NOT NULL DEFAULT 0 AFTER `powerup_planet_id`", !$update_tables['powerup']['powerup_category']);
 
-      classSupernova::$db->doUpdateOld("UPDATE {{powerup}} SET powerup_category = " . BONUS_MERCENARY);
+      classSupernova::$db->doUpdateOld("UPDATE {{powerup}} SET powerup_category = ".BONUS_MERCENARY);
     }
 
     upd_check_key('rpg_cost_info', 10000, !isset(classSupernova::$config->rpg_cost_info));
@@ -1430,7 +1430,7 @@ 
     upd_check_key('ali_bonus_brackets', 10, !isset(classSupernova::$config->ali_bonus_brackets));
     upd_check_key('ali_bonus_brackets_divisor', 50, !isset(classSupernova::$config->ali_bonus_brackets_divisor));
 
-    if(!classSupernova::$config->db_loadItem('rpg_flt_explore')) {
+    if (!classSupernova::$config->db_loadItem('rpg_flt_explore')) {
       $inflation_rate = 1000;
 
       classSupernova::$config->db_saveItem('rpg_cost_banker', classSupernova::$config->rpg_cost_banker * $inflation_rate);
@@ -1447,17 +1447,17 @@ 
       classSupernova::$db->doUpdateOld("UPDATE {{users}} SET `dark_matter` = `dark_matter` * {$inflation_rate};");
 
       $query = classSupernova::$db->doSelect("SELECT * FROM `{{quest}}`");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $query_add = '';
         $quest_reward_list = explode(';', $row['quest_rewards']);
-        foreach($quest_reward_list as &$quest_reward) {
+        foreach ($quest_reward_list as &$quest_reward) {
           list($reward_resource, $reward_amount) = explode(',', $quest_reward);
-          if($reward_resource == RES_DARK_MATTER) {
-            $quest_reward = "{$reward_resource}," . $reward_amount * 1000;
+          if ($reward_resource == RES_DARK_MATTER) {
+            $quest_reward = "{$reward_resource},".$reward_amount * 1000;
           }
         }
         $new_rewards = implode(';', $quest_reward_list);
-        if($new_rewards != $row['quest_rewards']) {
+        if ($new_rewards != $row['quest_rewards']) {
           classSupernova::$db->doUpdateOld("UPDATE {{quest}} SET `quest_rewards` = '{$new_rewards}' WHERE quest_id = {$row['quest_id']} LIMIT 1;");
         }
       }
@@ -1487,7 +1487,7 @@ 
     upd_check_key('user_birthday_range', 30, !isset(classSupernova::$config->user_birthday_range));
     upd_check_key('user_birthday_celebrate', 0, !isset(classSupernova::$config->user_birthday_celebrate));
 
-    if(!isset($update_tables['payment'])) {
+    if (!isset($update_tables['payment'])) {
       upd_alter_table('users', array(
         "ADD KEY `I_user_id_name` (`id`, `username`)",
       ), !$update_indexes['users']['I_user_id_name']);
@@ -1521,15 +1521,15 @@ 
     upd_check_key('payment_lot_price', 1, !isset(classSupernova::$config->payment_lot_price));
 
     // Updating category for Mercenaries
-    upd_do_query("UPDATE {{powerup}} SET powerup_category = " . UNIT_MERCENARIES . " WHERE powerup_unit_id > 600 AND powerup_unit_id < 700;");
+    upd_do_query("UPDATE {{powerup}} SET powerup_category = ".UNIT_MERCENARIES." WHERE powerup_unit_id > 600 AND powerup_unit_id < 700;");
 
     // Convert Destructor to Death Star schematic
     upd_do_query("UPDATE {{powerup}}
-      SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS . ", powerup_unit_id = " . UNIT_PLAN_SHIP_DEATH_STAR . "
+      SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS.", powerup_unit_id = ".UNIT_PLAN_SHIP_DEATH_STAR."
       WHERE (powerup_time_start = 0 OR powerup_time_finish >= UNIX_TIMESTAMP()) AND powerup_unit_id = 612;");
     // Convert Assasin to SuperNova schematic
     upd_do_query("UPDATE {{powerup}}
-      SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS . ", powerup_unit_id = " . UNIT_PLAN_SHIP_SUPERNOVA . "
+      SET powerup_time_start = 0, powerup_time_finish = 0, powerup_category = " . UNIT_PLANS.", powerup_unit_id = ".UNIT_PLAN_SHIP_SUPERNOVA."
       WHERE (powerup_time_start = 0 OR powerup_time_finish >= UNIX_TIMESTAMP()) AND powerup_unit_id = 614;");
 
     upd_alter_table('iraks', array(
@@ -1538,7 +1538,7 @@ 
     ), !$update_tables['iraks']['fleet_start_type']);
 
 
-    if(!$update_tables['payment']['payment_status']) {
+    if (!$update_tables['payment']['payment_status']) {
       upd_alter_table('payment', array(
         "ADD COLUMN `payment_status` INT DEFAULT 0 COMMENT 'Payment status' AFTER `payment_id`",
 
@@ -1553,7 +1553,7 @@ 
       ), !$update_tables['payment']['payment_status']);
     }
 
-    upd_do_query("UPDATE {{powerup}} SET powerup_time_start = 0, powerup_time_finish = 0 WHERE powerup_category = " . UNIT_PLANS . ";");
+    upd_do_query("UPDATE {{powerup}} SET powerup_time_start = 0, powerup_time_finish = 0 WHERE powerup_category = ".UNIT_PLANS.";");
 
     upd_check_key('server_start_date', date('d.m.Y', SN_TIME_NOW), !isset(classSupernova::$config->server_start_date));
     upd_check_key('server_que_length_structures', 5, !isset(classSupernova::$config->server_que_length_structures));
@@ -1565,7 +1565,7 @@ 
 
     upd_check_key('chat_highlight_premium', '<span class="nick_premium">$1</span>', !isset(classSupernova::$config->chat_highlight_premium));
 
-    upd_do_query("UPDATE {{planets}} SET `PLANET_GOVERNOR_LEVEL` = CEILING(`PLANET_GOVERNOR_LEVEL`/2) WHERE PLANET_GOVERNOR_ID = " . MRC_ENGINEER . " AND `PLANET_GOVERNOR_LEVEL` > 8;");
+    upd_do_query("UPDATE {{planets}} SET `PLANET_GOVERNOR_LEVEL` = CEILING(`PLANET_GOVERNOR_LEVEL`/2) WHERE PLANET_GOVERNOR_ID = ".MRC_ENGINEER." AND `PLANET_GOVERNOR_LEVEL` > 8;");
 
 
     upd_do_query('COMMIT;', true);
@@ -1622,7 +1622,7 @@ 
       "ADD INDEX `I_owner_priority_time` (`owner`, `priority`, `time`)",
     ), !$update_indexes['notes']['I_owner_priority_time']);
 
-    if(!$update_tables['buddy']['BUDDY_ID']) {
+    if (!$update_tables['buddy']['BUDDY_ID']) {
       upd_alter_table('buddy', array(
         "CHANGE COLUMN `id` `BUDDY_ID` SERIAL COMMENT 'Buddy\Buddy table row ID'",
         "CHANGE COLUMN `active` `BUDDY_STATUS` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Buddy\Buddy request status'",
@@ -1643,16 +1643,16 @@ 
 
       $query = upd_do_query("SELECT `BUDDY_ID`, `BUDDY_SENDER_ID`, `BUDDY_OWNER_ID` FROM {{buddy}} ORDER BY `BUDDY_ID`;");
       $found = $lost = array();
-      while($row = db_fetch($query)) {
-        $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']) . ';' . max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
-        if(!isset($found[$index])) {
+      while ($row = db_fetch($query)) {
+        $index = min($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']).';'.max($row['BUDDY_SENDER_ID'], $row['BUDDY_OWNER_ID']);
+        if (!isset($found[$index])) {
           $found[$index] = $row['BUDDY_ID'];
         } else {
           $lost[] = $row['BUDDY_ID'];
         }
       }
       $lost = implode(',', $lost);
-      if($lost) {
+      if ($lost) {
         upd_do_query("DELETE FROM {{buddy}} WHERE `BUDDY_ID` IN ({$lost})");
       }
 
@@ -1673,7 +1673,7 @@ 
 
     upd_do_query("UPDATE {{users}} SET `ally_name` = NULL, `ally_tag` = NULL, ally_register_time = 0, ally_rank_id = 0 WHERE `ally_id` IS NULL");
 
-    if(!$update_tables['ube_report']) {
+    if (!$update_tables['ube_report']) {
       upd_create_table('ube_report',
         "(
           `ube_report_id` SERIAL COMMENT 'Report ID',
@@ -1714,7 +1714,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_player']) {
+    if (!$update_tables['ube_report_player']) {
       upd_create_table('ube_report_player',
         "(
           `ube_report_player_id` SERIAL COMMENT 'Record ID',
@@ -1735,7 +1735,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_fleet']) {
+    if (!$update_tables['ube_report_fleet']) {
       upd_create_table('ube_report_fleet',
         "(
           `ube_report_fleet_id` SERIAL COMMENT 'Record DB ID',
@@ -1765,7 +1765,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_unit']) {
+    if (!$update_tables['ube_report_unit']) {
       // TODO: Сохранять так же имя корабля - на случай конструкторов - не, хуйня. Конструктор может давать имена разные на разных языках
       // Может сохранять имена удаленных кораблей долго?
 
@@ -1802,7 +1802,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_fleet']) {
+    if (!$update_tables['ube_report_outcome_fleet']) {
       upd_create_table('ube_report_outcome_fleet',
         "(
           `ube_report_outcome_fleet_id` SERIAL COMMENT 'Record DB ID',
@@ -1831,7 +1831,7 @@ 
       );
     }
 
-    if(!$update_tables['ube_report_outcome_unit']) {
+    if (!$update_tables['ube_report_outcome_unit']) {
       upd_create_table('ube_report_outcome_unit',
         "(
           `ube_report_outcome_unit_id` SERIAL COMMENT 'Record DB ID',
@@ -1852,7 +1852,7 @@ 
       );
     }
 
-    if(!$update_tables['unit']) {
+    if (!$update_tables['unit']) {
       upd_create_table('unit',
         "(
           `unit_id` SERIAL COMMENT 'Record ID',
@@ -1871,7 +1871,7 @@ 
       );
     }
 
-    if(!$update_tables['captain']) {
+    if (!$update_tables['captain']) {
       upd_create_table('captain',
         "(
           `captain_id` SERIAL COMMENT 'Record ID',
@@ -1891,7 +1891,7 @@ 
       );
     }
 
-    if(!$update_tables['fleets']['fleet_start_planet_id']) {
+    if (!$update_tables['fleets']['fleet_start_planet_id']) {
       upd_alter_table('fleets', array(
         "ADD `fleet_start_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Fleet start planet ID' AFTER `fleet_start_time`",
         "ADD `fleet_end_planet_id` BIGINT(20) UNSIGNED DEFAULT NULL COMMENT 'Fleet end planet ID' AFTER `fleet_end_stay`",
@@ -1913,7 +1913,7 @@ 
 
     upd_alter_table('fleets', array("DROP COLUMN `processing_start`"), $update_tables['fleets']['processing_start']);
 
-    if(!$update_tables['chat_player']) {
+    if (!$update_tables['chat_player']) {
       upd_create_table('chat_player',
         "(
           `chat_player_id` SERIAL COMMENT 'Record ID',
@@ -1975,7 +1975,7 @@ 
       "DROP FOREIGN KEY `FK_payment_user`",
     ), $update_foreigns['payment']['FK_payment_user']);
 
-    if($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;') {
+    if ($update_foreigns['chat']['FK_chat_message_sender_user_id'] != 'chat_message_sender_id,users,id;') {
       upd_alter_table('chat', array(
         "DROP FOREIGN KEY `FK_chat_message_sender_user_id`",
         "DROP FOREIGN KEY `FK_chat_message_sender_recipient_id`",
@@ -2008,7 +2008,7 @@ 
       "ADD KEY `I_ube_report_time_combat` (`ube_report_time_combat`)",
     ), !$update_indexes['ube_report']['I_ube_report_time_combat']);
 
-    if(!$update_tables['unit']['unit_time_start']) {
+    if (!$update_tables['unit']['unit_time_start']) {
       upd_alter_table('unit', array(
         "ADD COLUMN `unit_time_start` DATETIME NULL DEFAULT NULL COMMENT 'Unit activation start time'",
         "ADD COLUMN `unit_time_finish` DATETIME NULL DEFAULT NULL COMMENT 'Unit activation end time'",
@@ -2018,13 +2018,13 @@ 
         "INSERT INTO {{unit}}
           (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level, unit_time_start, unit_time_finish)
         SELECT
-          `powerup_user_id`, " . LOC_USER . ", `powerup_user_id`, `powerup_category`, `powerup_unit_id`, `powerup_unit_level`
+          `powerup_user_id`, " . LOC_USER.", `powerup_user_id`, `powerup_category`, `powerup_unit_id`, `powerup_unit_level`
           , IF(`powerup_time_start`, FROM_UNIXTIME(`powerup_time_start`), NULL), IF(`powerup_time_finish`, FROM_UNIXTIME(`powerup_time_finish`), NULL)
         FROM {{powerup}}"
       );
     }
 
-    if(!$update_tables['que']) {
+    if (!$update_tables['que']) {
       upd_create_table('que',
         "(
           `que_id` SERIAL COMMENT 'Internal que id',
@@ -2056,25 +2056,25 @@ 
     }
 
     // Конвертирум очередь исследований
-    if($update_tables['users']['que']) {
+    if ($update_tables['users']['que']) {
       $que_lines = array();
       $que_query = upd_do_query("SELECT * FROM {{users}} WHERE `que`");
-      while($que_row = db_fetch($que_query)) {
+      while ($que_row = db_fetch($que_query)) {
         $que_data = explode(',', $que_row['que']);
 
-        if(!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech'))) {
+        if (!in_array($que_data[QI_UNIT_ID], sn_get_groups('tech'))) {
           continue;
         }
 
         $que_data[QI_TIME] = $que_data[QI_TIME] >= 0 ? $que_data[QI_TIME] : 0;
         // Если планета пустая - ставим главку
         $que_data[QI_PLANET_ID] = $que_data[QI_PLANET_ID] ? $que_data[QI_PLANET_ID] : $que_row['id_planet'];
-        if($que_data[QI_PLANET_ID]) {
+        if ($que_data[QI_PLANET_ID]) {
           $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
-          if(!$que_planet_check['id']) {
+          if (!$que_planet_check['id']) {
             $que_data[QI_PLANET_ID] = $que_row['id_planet'];
             $que_planet_check = db_fetch(upd_do_query("SELECT `id` FROM {{planets}} WHERE `id` = {$que_data[QI_PLANET_ID]}"));
-            if(!$que_planet_check['id']) {
+            if (!$que_planet_check['id']) {
               $que_data[QI_PLANET_ID] = 'NULL';
             }
           }
@@ -2088,20 +2088,20 @@ 
         $price_increase = pow($unit_factor, $unit_level);
         $unit_level++;
         $unit_cost = array();
-        foreach($unit_info[P_COST] as $resource_id => $resource_amount) {
-          if($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase)) {
+        foreach ($unit_info[P_COST] as $resource_id => $resource_amount) {
+          if ($resource_id === P_FACTOR || $resource_id == RES_ENERGY || !($resource_cost = $resource_amount * $price_increase)) {
             continue;
           }
-          $unit_cost[] = $resource_id . ',' . floor($resource_cost);
+          $unit_cost[] = $resource_id.','.floor($resource_cost);
         }
         $unit_cost = implode(';', $unit_cost);
 
-        $que_lines[] = "({$que_row['id']},{$que_data[QI_PLANET_ID]}," . QUE_RESEARCH . ",{$que_data[QI_TIME]},{$que_data[QI_UNIT_ID]},1," .
-          BUILD_CREATE . ",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
+        $que_lines[] = "({$que_row['id']},{$que_data[QI_PLANET_ID]},".QUE_RESEARCH.",{$que_data[QI_TIME]},{$que_data[QI_UNIT_ID]},1,".
+          BUILD_CREATE.",{$unit_level},{$que_data[QI_TIME]},'{$unit_cost}')";
       }
 
-      if(!empty($que_lines)) {
-        upd_do_query('INSERT INTO `{{que}}` (`que_player_id`,`que_planet_id_origin`,`que_type`,`que_time_left`,`que_unit_id`,`que_unit_amount`,`que_unit_mode`,`que_unit_level`,`que_unit_time`,`que_unit_price`) VALUES ' . implode(',', $que_lines));
+      if (!empty($que_lines)) {
+        upd_do_query('INSERT INTO `{{que}}` (`que_player_id`,`que_planet_id_origin`,`que_type`,`que_time_left`,`que_unit_id`,`que_unit_amount`,`que_unit_mode`,`que_unit_level`,`que_unit_time`,`que_unit_price`) VALUES '.implode(',', $que_lines));
       }
 
       upd_alter_table('users', array(
@@ -2114,23 +2114,23 @@ 
 
 
     // Ковертируем технологии в таблицы
-    if($update_tables['users']['graviton_tech']) {
-      upd_do_query("DELETE FROM {{unit}} WHERE unit_type = " . UNIT_TECHNOLOGIES);
+    if ($update_tables['users']['graviton_tech']) {
+      upd_do_query("DELETE FROM {{unit}} WHERE unit_type = ".UNIT_TECHNOLOGIES);
 
       $que_lines = array();
       $user_query = upd_do_query("SELECT * FROM {{users}}");
       upd_add_more_time(300);
       $sn_group_tech = sn_get_groups('tech');
-      while($user_row = db_fetch($user_query)) {
-        foreach($sn_group_tech as $tech_id) {
-          if($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)])) {
-            $que_lines[] = "({$user_row['id']}," . LOC_USER . ",{$user_row['id']}," . UNIT_TECHNOLOGIES . ",{$tech_id},{$tech_level})";
+      while ($user_row = db_fetch($user_query)) {
+        foreach ($sn_group_tech as $tech_id) {
+          if ($tech_level = intval($user_row[get_unit_param($tech_id, P_NAME)])) {
+            $que_lines[] = "({$user_row['id']},".LOC_USER.",{$user_row['id']},".UNIT_TECHNOLOGIES.",{$tech_id},{$tech_level})";
           }
         }
       }
 
-      if(!empty($que_lines)) {
-        upd_do_query("INSERT INTO {{unit}} (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level) VALUES " . implode(',', $que_lines));
+      if (!empty($que_lines)) {
+        upd_do_query("INSERT INTO {{unit}} (unit_player_id, unit_location_type, unit_location_id, unit_type, unit_snid, unit_level) VALUES ".implode(',', $que_lines));
       }
 
       upd_alter_table('users', array(
@@ -2138,25 +2138,25 @@ 
       ), $update_tables['users']['graviton_tech']);
     }
 
-    if(!$update_indexes['unit']['I_unit_record_search']) {
+    if (!$update_indexes['unit']['I_unit_record_search']) {
       upd_alter_table('unit', array(
         "ADD KEY `I_unit_record_search` (`unit_snid`,`unit_player_id`,`unit_level` DESC,`unit_id`)",
       ), !$update_indexes['unit']['I_unit_record_search']);
 
-      foreach(sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id) {
+      foreach (sn_get_groups(array('structures', 'fleet', 'defense')) as $unit_id) {
         $planet_units[get_unit_param($unit_id, P_NAME)] = 1;
       }
       $drop_index = array();
       $create_index = &$drop_index; // array();
-      foreach($planet_units as $unit_name => $unit_create) {
-        if($update_indexes['planets']['I_' . $unit_name]) {
+      foreach ($planet_units as $unit_name => $unit_create) {
+        if ($update_indexes['planets']['I_'.$unit_name]) {
           $drop_index[] = "DROP KEY I_{$unit_name}";
         }
-        if($update_indexes['planets']['i_' . $unit_name]) {
+        if ($update_indexes['planets']['i_'.$unit_name]) {
           $drop_index[] = "DROP KEY i_{$unit_name}";
         }
 
-        if($unit_create) {
+        if ($unit_create) {
           $create_index[] = "ADD KEY `I_{$unit_name}` (`id_owner`, {$unit_name} DESC)";
         }
       }
@@ -2167,7 +2167,7 @@ 
       "ADD `user_time_utc_offset` INT(11) DEFAULT NULL COMMENT 'User time difference with server time' AFTER `user_time_diff`",
     ), !$update_tables['users']['user_time_utc_offset']);
 
-    if(!$update_foreigns['alliance']['FK_alliance_owner']) {
+    if (!$update_foreigns['alliance']['FK_alliance_owner']) {
       upd_do_query("UPDATE {{alliance}} SET ally_owner = NULL WHERE ally_owner NOT IN (SELECT id FROM {{users}})");
 
       upd_alter_table('alliance', array(
@@ -2187,7 +2187,7 @@ 
 
     upd_check_key('chat_highlight_developer', '<span class="nick_developer">$1</span>', !classSupernova::$config->chat_highlight_developer);
 
-    if(!$update_tables['player_name_history']) {
+    if (!$update_tables['player_name_history']) {
       upd_check_key('game_user_changename_cost', 100000, !classSupernova::$config->game_user_changename_cost);
       upd_check_key('game_user_changename', SERVER_PLAYER_NAME_CHANGE_PAY, classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_PAY);
 
@@ -2213,10 +2213,10 @@ 
 
     upd_alter_table('planets', array(
       "ADD `density` SMALLINT NOT NULL DEFAULT 5500 COMMENT 'Planet average density kg/m3'",
-      "ADD `density_index` TINYINT NOT NULL DEFAULT " . PLANET_DENSITY_STANDARD . " COMMENT 'Planet cached density index'",
+      "ADD `density_index` TINYINT NOT NULL DEFAULT ".PLANET_DENSITY_STANDARD." COMMENT 'Planet cached density index'",
     ), !$update_tables['planets']['density_index']);
 
-    if($update_tables['users']['player_artifact_list']) {
+    if ($update_tables['users']['player_artifact_list']) {
       upd_alter_table('unit', "DROP KEY `unit_id`", $update_indexes['unit']['unit_id']);
 
       upd_alter_table('unit', "ADD KEY `I_unit_player_location_snid` (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_snid`)", !$update_indexes['unit']['I_unit_player_location_snid']);
@@ -2226,14 +2226,14 @@ 
       $db_changeset = array();
 
       $query = upd_do_query("SELECT `id`, `player_artifact_list` FROM {{users}} WHERE `player_artifact_list` IS NOT NULL AND `player_artifact_list` != '' FOR UPDATE");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $artifact_list = explode(';', $row['player_artifact_list']);
-        if(!$row['player_artifact_list'] || empty($artifact_list)) {
+        if (!$row['player_artifact_list'] || empty($artifact_list)) {
           continue;
         }
-        foreach($artifact_list as $key => &$value) {
+        foreach ($artifact_list as $key => &$value) {
           $value = explode(',', $value);
-          if(!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]])) {
+          if (!isset($value[1]) || $value[1] <= 0 || !isset($sn_data_artifacts[$value[0]])) {
             unset($artifact_list[$key]);
             continue;
           }

includes/classes/DBRow.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
 
       return;
     }
@@ -161,7 +161,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;");
+    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;");
     if (empty($db_row)) {
       return;
     }
@@ -193,7 +193,7 @@ 
     if ($this->isNew()) {
       // No DB_ID - new unit
       if ($this->isEmpty()) {
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
       }
       $this->dbInsert();
     } else {
@@ -202,7 +202,7 @@ 
         $this->dbDelete();
       } else {
         if (!sn_db_transaction_check(false)) {
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
         }
         $this->dbUpdate();
       }
@@ -230,13 +230,13 @@ 
   // TODO - protected
   public function dbInsert() {
     if (!$this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
     }
 
     $fieldSet = $this->dbMakeFieldSet(false);
 
     if (!static::$db->doInsertSet(static::$_table, $fieldSet)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
     $this->_dbId = static::$db->db_insert_id();
 
@@ -250,7 +250,7 @@ 
   public function dbUpdate() {
     // TODO - Update
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldUpdate());
   }
@@ -261,7 +261,7 @@ 
   // TODO - protected
   public function dbDelete() {
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
     }
     classSupernova::$gc->db->doDeleteRowWhere(static::$_table, array(static::$_dbIdFieldName => $this->_dbId));
     $this->_dbId = 0;
@@ -447,7 +447,7 @@ 
       }
     }
 
-    if(empty($set)) {
+    if (empty($set)) {
       $theResult = true;
     } else {
       $theResult = classSupernova::$db->doUpdateRowAdjust(

includes/includes/market_trader.inc

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
+if ((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
   classSupernova::$debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -26,11 +26,11 @@ 
 
   // $dm_db_name = pname_resource_name(RES_DARK_MATTER);
   $exchangeTo = in_array($exchangeTo = sys_get_param_int('exchangeTo'), sn_get_groups('resources_trader')) ? $exchangeTo : 0;
-  if($exchangeTo && is_array($tradeList = $_POST['spend'])) {
+  if ($exchangeTo && is_array($tradeList = $_POST['spend'])) {
     $value = 0;
 
     sn_db_transaction_start();
-    if($planetrow['id_owner']) {
+    if ($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
     }
@@ -40,26 +40,26 @@ 
     }
 
     $fields = array();
-    foreach(sn_get_groups('resources_trader') as $resource_id) {
+    foreach (sn_get_groups('resources_trader') as $resource_id) {
       $amount = floatval($tradeList[$resource_id]);
-      if($amount < 0) {
+      if ($amount < 0) {
         classSupernova::$debug->error('Trying to supply negative resource amount on Black Market Page', 'Hack Attempt', 305);
       }
 
-      if($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
+      if ($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
         continue;
       }
 
       $sign = '+';
-      if($exchangeTo == RES_DARK_MATTER) {
+      if ($exchangeTo == RES_DARK_MATTER) {
         $amount = floor($tradeList[RES_DARK_MATTER] / 3 * $rates[RES_DARK_MATTER] / $rates[$resource_id]);
         $value += $amount;
       } else {
         $value += floor($amount * $rates[$resource_id] / $rates[$exchangeTo]);
-        if($resource_id == RES_DARK_MATTER) {
+        if ($resource_id == RES_DARK_MATTER) {
           $amount = 0;
         } else {
-          if(mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
+          if (mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
             $intError = MARKET_NO_RESOURCES;
             break;
           }
@@ -68,7 +68,7 @@ 
         }
       }
 
-      if($amount) {
+      if ($amount) {
         $fields[pname_resource_name($resource_id)] = "{$sign} {$amount}";
       }
     }
@@ -78,8 +78,8 @@ 
     $intError = $value <= 0 ? MARKET_ZERO_DEAL : $intError;
     $intError = mrc_get_level($user, null, RES_DARK_MATTER) < $operation_cost ? MARKET_NO_DM : $intError;
 
-    if($intError == MARKET_DEAL) {
-      if($exchangeTo != RES_DARK_MATTER) {
+    if ($intError == MARKET_DEAL) {
+      if ($exchangeTo != RES_DARK_MATTER) {
         $amountExchangeTo = floor($value);
         $fields[pname_resource_name($exchangeTo)] = $amountExchangeTo;
       }
@@ -115,8 +115,8 @@ 
     'EXCHANGE_TO_RESOURCE_ID' => $exchangeTo,
   ));
 
-  foreach(sn_get_groups('resources_trader') as $resource_id) {
-    if($resource_id == RES_DARK_MATTER) {
+  foreach (sn_get_groups('resources_trader') as $resource_id) {
+    if ($resource_id == RES_DARK_MATTER) {
       $amount = floor(mrc_get_level($user, null, RES_DARK_MATTER) - classSupernova::$config->rpg_cost_trader);
     } else {
       $amount = floor(mrc_get_level($user, $planetrow, $resource_id));

includes/classes/Fleet.php

Spacing +30 added lines, -30 removed lines

@@ -408,31 +408,31 @@ 
 
     return classSupernova::$db->doSelect(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS f " .
+      "SELECT 1 FROM {{fleets}} AS f ".
 
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " .
+      "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ".
 
       // Блокировка всех прилетающих и улетающих флотов, если нужно
       // TODO - lock fleets by COORDINATES
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination
-      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') .
+      ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : '').
 
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу планеты-цели
-      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') .
+      ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '').
       // Блокировка планеты-цели
-      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') .
+      ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели
 //      ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') .
 
 
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '').
       // Блокировка всех юнитов, принадлежащих владельцу флота
-      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') .
+      ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '').
       // Блокировка планеты отправления
-      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') .
+      ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '').
       // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота
 //      ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') .
 
@@ -449,11 +449,11 @@ 
   public function dbGetLockById($dbId) {
     classSupernova::$db->doSelect(
     // Блокировка самого флота
-      "SELECT 1 FROM {{fleets}} AS FLEET0 " .
+      "SELECT 1 FROM {{fleets}} AS FLEET0 ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " .
+      "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ".
       // Блокировка всех юнитов, принадлежащих этому флоту
-      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ".
 
       // Без предварительной выборки неизвестно - куда летит этот флот.
       // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота.
@@ -469,9 +469,9 @@ 
         FLEET1.fleet_end_planet = FLEET0.fleet_end_planet
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
-      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " .
+      "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ".
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " .
+      "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET2 ON
         FLEET2.fleet_mess = 1   AND FLEET0.fleet_mess = 0 AND
@@ -481,7 +481,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT2 ON
-        UNIT2.unit_location_type = " . LOC_FLEET . " AND
+        UNIT2.unit_location_type = " . LOC_FLEET." AND
         UNIT2.unit_location_id = FLEET2.fleet_id
       " .
       // Lock fleet owner
@@ -498,11 +498,11 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT3 ON
-        UNIT3.unit_location_type = " . LOC_FLEET . " AND
+        UNIT3.unit_location_type = " . LOC_FLEET." AND
         UNIT3.unit_location_id = FLEET3.fleet_id
       " .
       // Lock fleet owner
-      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " .
+      "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ".
 
       "LEFT JOIN {{fleets}} AS FLEET4 ON
         FLEET4.fleet_mess = 1   AND FLEET0.fleet_mess = 1 AND
@@ -512,7 +512,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этим флотам
       "LEFT JOIN {{unit}} as UNIT4 ON
-        UNIT4.unit_location_type = " . LOC_FLEET . " AND
+        UNIT4.unit_location_type = " . LOC_FLEET." AND
         UNIT4.unit_location_id = FLEET4.fleet_id
       " .
       // Lock fleet owner
@@ -534,7 +534,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT5 ON
-        UNIT5.unit_location_type = " . LOC_PLANET . " AND
+        UNIT5.unit_location_type = " . LOC_PLANET." AND
         UNIT5.unit_location_id = PLANETS5.id
       " .
 
@@ -552,7 +552,7 @@ 
       " .
       // Блокировка всех юнитов, принадлежащих этой планете
       "LEFT JOIN {{unit}} as UNIT6 ON
-        UNIT6.unit_location_type = " . LOC_PLANET . " AND
+        UNIT6.unit_location_type = " . LOC_PLANET." AND
         UNIT6.unit_location_id = PLANETS6.id
       " .
       "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE"
@@ -671,7 +671,7 @@ 
       } elseif ($this->isResource($unit_id)) {
         $this->resource_list[$unit_id] = $unit_count;
       } else {
-        throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
+        throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG);
       }
     }
   }
@@ -805,7 +805,7 @@ 
    * @param int $unit_count
    */
   public function shipSetCount($unit_id, $unit_count = 0) {
-    pdump(__CLASS__ . '->' . __FUNCTION__);
+    pdump(__CLASS__.'->'.__FUNCTION__);
     $this->shipAdjustCount($unit_id, $unit_count, true);
   }
 
@@ -1005,7 +1005,7 @@ 
    */
   public function resourcesSet($resource_list) {
     if (!empty($this->propertiesAdjusted['resource_list'])) {
-      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR);
+      throw new PropertyAccessException('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR);
     }
     $this->resourcesAdjust($resource_list, true);
   }
@@ -1039,7 +1039,7 @@ 
       // Check for negative unit value
       if ($this->resource_list[$resource_id] < 0) {
         // TODO
-        throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR);
+        throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR);
       }
     }
   }
@@ -1220,7 +1220,7 @@ 
 
   protected function printErrorIfNoShips() {
     if ($this->unitList->unitsCount() <= 0) {
-      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5);
+      message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5);
     }
   }
 
@@ -1608,14 +1608,14 @@ 
       if (FLIGHT_ALLOWED == $validateResult[$missionType]) {
         $this->allowed_missions[$missionType] = $mission;
       } else {
-        if($missionType == $this->mission_type) {
+        if ($missionType == $this->mission_type) {
         }
         unset($this->allowed_missions[$missionType]);
       }
     }
 
-    if(empty($this->allowed_missions)) {
-      if($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
+    if (empty($this->allowed_missions)) {
+      if ($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) {
         throw new ExceptionFleetInvalid($validateResult[$this->mission_type], $validateResult[$this->mission_type]);
       } else {
         throw new ExceptionFleetInvalid(FLIGHT_MISSION_IMPOSSIBLE, FLIGHT_MISSION_IMPOSSIBLE);
@@ -1844,7 +1844,7 @@ 
     $template_result['.']['fleets'][] = $this->renderFleet(SN_TIME_NOW, $timeMissionJob);
 
     $template_result += array(
-      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''),
+      'mission'         => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''),
       'dist'            => pretty_number($this->travelData['distance']),
       'speed'           => pretty_number($this->travelData['fleet_speed']),
       'deute_need'      => pretty_number($this->travelData['consumption']),

includes/db.php

Spacing +13 added lines, -13 removed lines

@@ -42,15 +42,15 @@ 
 
   $group = sn_get_groups('resources_loot');
 
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_units() вызван для не-ресурсов!');
     }
 
-    if(empty($unit_amount)) {
+    if (empty($unit_amount)) {
       continue;
     }
 
@@ -59,7 +59,7 @@ 
     $unit_location = sys_get_unit_location($user, $planet, $unit_id);
 
     // Changing value in object
-    switch($unit_location) {
+    switch ($unit_location) {
       case LOC_USER:
         $user[$unit_db_name] += $unit_amount;
         break;
@@ -77,30 +77,30 @@ 
 function sn_db_perform($table, $values, $type = 'insert', $options = false) {
   $field_set = '';
 
-  switch($type) {
+  switch ($type) {
     case 'delete':
       $query = 'DELETE FROM';
       break;
 
     case 'insert':
       $query = 'INSERT INTO';
-      if(isset($options['__multi'])) {
+      if (isset($options['__multi'])) {
         // Here we generate mass-insert set
         break;
       }
     case 'update':
-      if(!$query) {
+      if (!$query) {
         $query = 'UPDATE';
       }
 
-      foreach($values as $field => &$value) {
+      foreach ($values as $field => &$value) {
         $value_type = gettype($value);
         if ($value_type == TYPE_STRING) {
-          $value = "'" . db_escape($value) . "'";
+          $value = "'".db_escape($value)."'";
         }
         $value = "`{$field}` = {$value}";
       }
-      $field_set = 'SET ' . implode(', ', $values);
+      $field_set = 'SET '.implode(', ', $values);
       break;
 
   };
@@ -121,12 +121,12 @@ 
   $field_set['__IS_SAFE'] = true;
 }
 function sn_db_field_set_make_safe($field_set, $serialize = false) {
-  if(!is_array($field_set)) {
+  if (!is_array($field_set)) {
     die('$field_set is not an array!');
   }
 
   $result = array();
-  foreach($field_set as $field => $value) {
+  foreach ($field_set as $field => $value) {
     $field = db_escape(trim($field));
     switch (true) {
       case is_int($value):
@@ -142,7 +142,7 @@ 
         $serialize ? $value = serialize($value) : die('$value is object or array with no $serialize');
 
       case is_string($value):
-        $value = '"' . db_escape($value) . '"';
+        $value = '"'.db_escape($value).'"';
         break;
 
       case is_null($value):