supernova-ws / SuperNova

includes/functions/scheduler_process.php

Spacing +10 added lines, -10 removed lines

@@ -9,19 +9,19 @@ 
   $ts_var_stat_update = strtotime(classSupernova::$config->db_loadItem('var_stat_update'));
   $ts_scheduled_update = sys_schedule_get_prev_run(classSupernova::$config->db_loadItem('stats_schedule'), classSupernova::$config->var_stat_update);
 
-  if(sys_get_param_int('admin_update')) {
+  if (sys_get_param_int('admin_update')) {
     define('USER_LEVEL', isset($user['authlevel']) ? $user['authlevel'] : -1);
-    if(USER_LEVEL > 0) {
+    if (USER_LEVEL > 0) {
       $is_admin_request = true;
       $ts_scheduled_update = SN_TIME_NOW;
     }
   }
 
-  if($ts_scheduled_update > $ts_var_stat_update) {
+  if ($ts_scheduled_update > $ts_var_stat_update) {
     lng_include('admin');
     sn_db_transaction_start();
     $ts_var_stat_update_end = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end'));
-    if(SN_TIME_NOW > $ts_var_stat_update_end) {
+    if (SN_TIME_NOW > $ts_var_stat_update_end) {
       $old_server_status = classSupernova::$config->db_loadItem('game_disable');
       classSupernova::$config->db_saveItem('game_disable', GAME_DISABLE_STAT);
 
@@ -31,14 +31,14 @@ 
 
       $msg = $is_admin_request ? 'admin request' : 'scheduler';
       $next_run = date(FMT_DATE_TIME_SQL, sys_schedule_get_prev_run(classSupernova::$config->stats_schedule, classSupernova::$config->var_stat_update, true));
-      $msg = "Running stat updates: {$msg}. Config->var_stat_update = " . classSupernova::$config->var_stat_update .
-        ', $ts_scheduled_update = ' . date(FMT_DATE_TIME_SQL, $ts_scheduled_update) .
-        ', next_stat_update = ' . $next_run;
+      $msg = "Running stat updates: {$msg}. Config->var_stat_update = ".classSupernova::$config->var_stat_update.
+        ', $ts_scheduled_update = '.date(FMT_DATE_TIME_SQL, $ts_scheduled_update).
+        ', next_stat_update = '.$next_run;
       classSupernova::$debug->warning($msg, 'Stat update', LOG_INFO_STAT_PROCESS);
       $total_time = microtime(true);
 
       // require_once('../includes/sys_stat.php');
-      require_once(SN_ROOT_PHYSICAL . 'includes/includes/sys_stat.php');
+      require_once(SN_ROOT_PHYSICAL.'includes/includes/sys_stat.php');
       sys_stat_calculate();
 
       $total_time = microtime(true) - $total_time;
@@ -57,13 +57,13 @@ 
       classSupernova::$config->db_saveItem('var_stat_update_end', SN_TIME_SQL);
 
       classSupernova::$config->db_saveItem('game_disable', $old_server_status);
-    } elseif($ts_scheduled_update > $ts_var_stat_update) {
+    } elseif ($ts_scheduled_update > $ts_var_stat_update) {
       $timeout = strtotime(classSupernova::$config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW;
       $msg = classSupernova::$config->db_loadItem('var_stat_update_msg');
       $msg = "{$msg} ETA {$timeout} seconds. Please wait...";
     }
     sn_db_transaction_rollback();
-  } elseif($is_admin_request) {
+  } elseif ($is_admin_request) {
     $msg = 'Stat is up to date';
   }
 

includes/functions/rpg_points.php

Spacing +17 added lines, -17 removed lines

@@ -29,32 +29,32 @@ 
 function rpg_points_change($user_id, $change_type, $dark_matter, $comment = '', $already_changed = false) {
   global $dm_change_legit, $user;
 
-  if(!$user_id) {
+  if (!$user_id) {
     return false;
   }
 
   $dm_change_legit = true;
   $sn_data_dark_matter_db_name = pname_resource_name(RES_DARK_MATTER);
 
-  if($already_changed) {
+  if ($already_changed) {
     $rows_affected = 1;
   } else {
     $changeset = array();
     $a_user = db_user_by_id($user_id, true);
-    if($dark_matter < 0) {
+    if ($dark_matter < 0) {
       $dark_matter_exists = mrc_get_level($a_user, null, RES_DARK_MATTER, false, true);
       $dark_matter_exists < 0 ? $dark_matter_exists = 0 : false;
       $metamatter_to_reduce = -$dark_matter - $dark_matter_exists;
-      if($metamatter_to_reduce > 0) {
+      if ($metamatter_to_reduce > 0) {
         $metamatter_exists = mrc_get_level($a_user, null, RES_METAMATTER);
-        if($metamatter_exists < $metamatter_to_reduce) {
+        if ($metamatter_exists < $metamatter_to_reduce) {
           classSupernova::$debug->error('Ошибка снятия ТМ - ММ+ТМ меньше, чем сумма для снятия!', 'Ошибка снятия ТМ', LOG_ERR_INT_NOT_ENOUGH_DARK_MATTER);
         }
-        if(is_array($comment)) {
+        if (is_array($comment)) {
           $comment = call_user_func_array('sprintf', $comment);
         }
 //        mm_points_change($user_id, $change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
-        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: ' . (-$dark_matter) . ' ТМ = ' . $dark_matter_exists . ' ТМ + ' . $metamatter_to_reduce . ' ММ. ' . $comment);
+        classSupernova::$auth->account->metamatter_change($change_type, -$metamatter_to_reduce, 'ММ в ТМ: '.(-$dark_matter).' ТМ = '.$dark_matter_exists.' ТМ + '.$metamatter_to_reduce.' ММ. '.$comment);
         $dark_matter = -$dark_matter_exists;
       }
     } else {
@@ -65,9 +65,9 @@ 
     $rows_affected = classSupernova::$db->db_affected_rows();
   }
 
-  if($rows_affected || !$dark_matter) {
+  if ($rows_affected || !$dark_matter) {
     $page_url = db_escape($_SERVER['SCRIPT_NAME']);
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
     $comment = db_escape($comment);
@@ -75,18 +75,18 @@ 
     $row['username'] = db_escape($row['username']);
     db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment, $row, $page_url);
 
-    if($user['id'] == $user_id) {
+    if ($user['id'] == $user_id) {
       $user['dark_matter'] += $dark_matter;
     }
 
-    if($dark_matter > 0) {
+    if ($dark_matter > 0) {
       $old_referral = db_referral_get_by_id($user_id);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         db_referral_update_dm($user_id, $dark_matter);
         $new_referral = db_referral_get_by_id($user_id);
 
         $partner_bonus = floor($new_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / classSupernova::$config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= classSupernova::$config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL, $partner_bonus, "Incoming From Referral ID {$user_id}");
         }
       }
@@ -103,7 +103,7 @@ 
 function rpg_level_up(&$user, $type, $xp_to_add = 0) {
   $q = 1.03;
 
-  switch($type) {
+  switch ($type) {
     case RPG_STRUCTURE:
       $field_level = 'lvl_minier';
       $field_xp = 'xpminier';
@@ -140,17 +140,17 @@ 
 
   $xp = &$user[$field_xp];
 
-  if($xp_to_add) {
+  if ($xp_to_add) {
     $xp += $xp_to_add;
     db_user_set_by_id($user['id'], "`{$field_xp}` = `{$field_xp}` + '{$xp_to_add}'");
   }
 
   $level = $user[$field_level];
-  while($xp > rpg_xp_for_level($level + 1, $b1, $q)) {
+  while ($xp > rpg_xp_for_level($level + 1, $b1, $q)) {
     $level++;
   }
   $level -= $user[$field_level];
-  if($level > 0) {
+  if ($level > 0) {
     db_user_set_by_id($user['id'], "`{$field_level}` = `{$field_level}` + '{$level}'");
     rpg_points_change($user['id'], $type, $level * 1000, $comment);
     $user[$field_level] += $level;

includes/general/math.php

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 function geometry_progression_sum($n, $b1, $q) {
-  return $q != 1 ? ($b1 * (pow($q, $n) - 1)/($q - 1)) : ($n * $b1);
+  return $q != 1 ? ($b1 * (pow($q, $n) - 1) / ($q - 1)) : ($n * $b1);
 }
 
 function sn_floor($value)
@@ -43,8 +43,8 @@ 
  *
  * @return float|int
  */
-function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false)  {
-  if($cut_extreme) {
+function sn_rand_gauss_range($range_start, $range_end, $round = true, $strict = 4, $cut_extreme = false) {
+  if ($cut_extreme) {
     $range_start--;
     $range_end++;
   }
@@ -60,7 +60,7 @@ 
 {
   $args = func_get_args();
 
-  switch(func_num_args())
+  switch (func_num_args())
   {
     case 0:
       // trigger_error('median() requires at least one parameter',E_USER_WARNING);
@@ -72,7 +72,7 @@ 
     // fallthrough
 
     default:
-      if(!is_array($args))
+      if (!is_array($args))
       {
         // trigger_error('median() requires a list of numbers to operate on or an array of numbers', E_USER_NOTICE);
         return false;
@@ -83,9 +83,9 @@ 
       $n = count($args);
       $h = intval($n / 2);
 
-      if($n % 2 == 0)
+      if ($n % 2 == 0)
       {
-        $median = ($args[$h] + $args[$h-1]) / 2;
+        $median = ($args[$h] + $args[$h - 1]) / 2;
       }
       else
       {
@@ -103,49 +103,49 @@ 
 }
 function linear_calc(&$linear, $from = 0, $logProcess = false)
 {
-  for($i = $from; $i < count($linear); $i++)
+  for ($i = $from; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if ($logProcess) pdump($linear, 'Нормализовано по х'.$from);
 
-  for($i = $from + 1; $i < count($linear); $i++)
+  for ($i = $from + 1; $i < count($linear); $i++)
   {
     $eq = &$linear[$i];
-    for($j = count($eq) - 1; $j >= $from; $j--)
+    for ($j = count($eq) - 1; $j >= $from; $j--)
     {
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if ($logProcess) pdump($linear, 'Подставили х'.$from);
 
-  if($from < count($linear) - 1)
+  if ($from < count($linear) - 1)
   {
     linear_calc($linear, $from + 1, $logProcess);
   }
 
-  if($from)
+  if ($from)
   {
-    for($i = 0; $i < $from; $i++)
+    for ($i = 0; $i < $from; $i++)
     {
       $eq = &$linear[$i];
-      for($j = count($eq) - 1; $j >= $from; $j--)
+      for ($j = count($eq) - 1; $j >= $from; $j--)
       {
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
+    if ($logProcess) pdump($linear, 'Подставили обратно х'.$from);
   }
   else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
-    foreach($linear as $index => &$eq)
+    if ($logProcess) pdump($linear, 'Результат'.$from);
+    foreach ($linear as $index => &$eq)
     {
-      pdump($eq[count($linear)], 'x' . $index);
+      pdump($eq[count($linear)], 'x'.$index);
     }
   }
 }

Braces +14 added lines, -8 removed lines

@@ -86,8 +86,7 @@ 
       if($n % 2 == 0)
       {
         $median = ($args[$h] + $args[$h-1]) / 2;
-      }
-      else
+      } else
       {
         $median = $args[$h];
       }
@@ -111,7 +110,9 @@ 
       $eq[$j] /= $eq[$from];
     }
   }
-  if($logProcess) pdump($linear, 'Нормализовано по х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Нормализовано по х' . $from);
+  }
 
   for($i = $from + 1; $i < count($linear); $i++)
   {
@@ -121,7 +122,9 @@ 
       $eq[$j] -= $linear[$from][$j];
     }
   }
-  if($logProcess) pdump($linear, 'Подставили х' . $from);
+  if($logProcess) {
+    pdump($linear, 'Подставили х' . $from);
+  }
 
   if($from < count($linear) - 1)
   {
@@ -138,11 +141,14 @@ 
         $eq[$j] = $eq[$j] - $eq[$from] * $linear[$from][$j];
       }
     }
-    if($logProcess) pdump($linear, 'Подставили обратно х' . $from);
-  }
-  else
+    if($logProcess) {
+      pdump($linear, 'Подставили обратно х' . $from);
+    }
+  } else
   {
-    if($logProcess) pdump($linear, 'Результат' . $from);
+    if($logProcess) {
+      pdump($linear, 'Результат' . $from);
+    }
     foreach($linear as $index => &$eq)
     {
       pdump($eq[count($linear)], 'x' . $index);

includes/classes/sn_module_payment.php

Spacing +70 added lines, -70 removed lines

@@ -450,7 +450,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;
@@ -471,15 +471,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);
     }
 
@@ -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);
     }
   }
@@ -500,26 +500,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();
       }
     }
@@ -527,89 +527,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']);
     }
 
@@ -636,21 +636,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];
     }
 
@@ -673,7 +673,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);
 
@@ -697,10 +697,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 {
@@ -708,9 +708,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 {
@@ -764,30 +764,30 @@ 
     );
 
     $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) {
-      $value = is_string($value) ? '"' . db_escape($value) . '"' : $value;
+    foreach ($payment as $key => $value) {
+      $value = is_string($value) ? '"'.db_escape($value).'"' : $value;
       $query[] = "`{$key}` = {$value}";
     }
 
-    $this->db->doquery(($replace ? 'REPLACE' : 'INSERT') . ' INTO `{{payment}}` SET ' . implode(',', $query) . ';');
+    $this->db->doquery(($replace ? 'REPLACE' : 'INSERT').' INTO `{{payment}}` SET '.implode(',', $query).';');
 
     return $this->db_get_by_id($this->db->db_insert_id());
   }
 
 
   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);
       }
     }
@@ -796,25 +796,25 @@ 
   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) {
-      $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);
     }
   }
@@ -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/db_mysql_v4.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     !mysql_select_db($settings['name'])
       ? classSupernova::$debug->error_fatal('DB error - cannot find DB on server', $this->mysql_error())
       : false;
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_REPEATABLE_READ . ';')
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_REPEATABLE_READ.';')
       ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level', $this->mysql_error())
       : false;
 

includes/classes/FleetValidator.php

Spacing +1 added lines, -1 removed lines

@@ -802,7 +802,7 @@
    * @return bool
    */
   protected function checkCaptainNotRelocating() {
-    if($this->fleet->mission_type == MT_RELOCATE) {
+    if ($this->fleet->mission_type == MT_RELOCATE) {
       $arriving_captain = mrc_get_level($this->fleet->dbOwnerRow, $this->fleet->dbTargetRow, UNIT_CAPTAIN, true);
     } else {
       $arriving_captain = false;

includes/classes/supernova.php

Spacing +118 added lines, -120 removed lines

@@ -203,7 +203,7 @@ 
 
 
   public static function log_file($message, $spaces = 0) {
-    if(self::$debug) {
+    if (self::$debug) {
       self::$debug->log_file($message, $spaces);
     }
   }
@@ -215,16 +215,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]);
         }
       }
@@ -235,7 +235,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;
     }
 
@@ -246,9 +246,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();
@@ -257,7 +257,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();
     }
@@ -286,12 +286,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
       ||
       // Не заменяются заблокированные записи во время транзакции
@@ -301,7 +301,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);
       }
     }
@@ -309,7 +309,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;
       // Очищаем кэш мягко - что бы удалить очистить связанные данные - кэш локаций и кэш запоросов и всё, что потребуется впредь
@@ -326,7 +326,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]);
     }
 
@@ -360,15 +360,15 @@ 
    */
   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>');
+      print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - '.$error_msg.'</h1>');
       $backtrace = debug_backtrace();
       array_shift($backtrace);
       pdump($backtrace);
@@ -381,12 +381,12 @@ 
   public static function db_transaction_start($level = '') {
     static::db_transaction_check(null);
 
-    $level ? doquery('SET TRANSACTION ISOLATION LEVEL ' . $level) : false;
+    $level ? doquery('SET TRANSACTION ISOLATION LEVEL '.$level) : false;
 
     static::$transaction_id++;
     doquery('START TRANSACTION');
 
-    if(classSupernova::$config->db_manual_lock_enabled) {
+    if (classSupernova::$config->db_manual_lock_enabled) {
       classSupernova::$config->db_loadItem('var_db_manually_locked');
       classSupernova::$config->db_saveItem('var_db_manually_locked', SN_TIME_SQL);
     }
@@ -401,7 +401,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);
     }
@@ -413,7 +413,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();
     }
     doquery('ROLLBACK');
@@ -441,8 +441,8 @@ 
    */
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
-    foreach($tables as $table_name => $condition) {
-      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+    foreach ($tables as $table_name => $condition) {
+      self::$db->doquery("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 
@@ -484,17 +484,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();
@@ -502,24 +502,24 @@ 
           $query = static::db_query(
             "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-            ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+            ($filter ? ' WHERE '.$filter : '').
             ($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,
-              $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
+              $parent_id_field.(count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
           }
           //pdump($filter, 'Транзакция - родители заблокированы ' . $owner_location_type);
         }
@@ -527,10 +527,10 @@ 
 
       //pdump($filter, 'Выбираем записи и заносим их в кыш-память ' . $owner_location_type);
       $query = static::db_query(
-        "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+        "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]];
@@ -538,14 +538,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;
           }
         }
@@ -564,16 +564,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
 
@@ -589,7 +589,7 @@ 
   }
 
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) {
+    if (!($set = trim($set))) {
       return false;
     }
 
@@ -598,9 +598,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);
@@ -619,8 +619,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 могли быть "данные по умолчанию"
@@ -642,8 +642,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 могли быть "данные по умолчанию"
@@ -659,15 +659,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);
       }
@@ -677,7 +677,7 @@ 
   }
 
   public static function db_del_record_list($location_type, $condition) {
-    if(!($condition = trim($condition))) {
+    if (!($condition = trim($condition))) {
       return false;
     }
 
@@ -686,8 +686,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 по нужным записям
@@ -734,20 +734,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;
             }
@@ -756,7 +756,7 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
@@ -764,7 +764,7 @@ 
       // self::db_get_record_list(LOC_USER, "`username` " . ($like ? 'LIKE' : '='). " '{$username_safe}'");
 
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         , true);
       static::cache_set(LOC_USER, $user['id'], $user); // В кэш-юзер так же заполнять индексы
     }
@@ -774,17 +774,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;
           }
@@ -792,11 +792,11 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $email_safe = db_escape($email_unsafe);
       $user = static::db_query(
-        "SELECT * FROM {{users}} WHERE LOWER(`email_2`) = '{$email_safe}'" .
+        "SELECT * FROM {{users}} WHERE LOWER(`email_2`) = '{$email_safe}'".
         ($use_both ? " OR LOWER(`email`) = '{$email_safe}'" : '')
         , true);
 
@@ -811,7 +811,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);
 
@@ -833,7 +833,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];
     }
 
@@ -849,15 +849,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)) {
-      $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 (!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) {
           // 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];
         }
@@ -865,8 +865,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;
       }
     }
@@ -901,7 +901,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()');
     }
@@ -911,16 +911,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) {
-      $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
+    } elseif ($planet_id) {
+      $query[] = "(`que_planet_id` = {$planet_id}".($que_type ? '' : ' OR que_planet_id IS NULL').")";
     }
-    if($que_type) {
+    if ($que_type) {
       $query[] = "`que_type` = {$que_type}";
     }
 
@@ -953,13 +953,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);
@@ -974,7 +974,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,
@@ -1043,9 +1043,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';
@@ -1067,35 +1067,33 @@ 
     }
 
     $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']) {
-          $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
-        } elseif($field_data['set']) {
+        if ($field_data['delta']) {
+          $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
+        } elseif ($field_data['set']) {
           $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
         }
 
-        if($value) {
-          $fields[] = $condition . $value;
+        if ($value) {
+          $fields[] = $condition.$value;
         }
       }
       $conditions[P_FIELDS_STR] = implode(',', $fields);
     }
 
     $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('Неподдерживаемый тип условия');
@@ -1112,7 +1110,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;
@@ -1127,16 +1125,16 @@ 
         die('Неподдерживаемая операция в classSupernova::db_changeset_condition_compile');
     }
 
-    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR] . ' ' . $conditions[P_FIELDS_STR] . (' WHERE ' . $conditions[P_WHERE_STR]);
+    $conditions[P_QUERY_STR] = $conditions[P_ACTION_STR].' '.$conditions[P_FIELDS_STR].(' WHERE '.$conditions[P_WHERE_STR]);
   }
 
   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'))
@@ -1145,19 +1143,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;
@@ -1239,13 +1237,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);
@@ -1285,7 +1283,7 @@ 
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     //self::$db_prefix = $dbsettings['prefix'];
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
@@ -1317,7 +1315,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); // Полный дамп запросов в рил-тайме. Подойдет любое значение
@@ -1329,7 +1327,7 @@ 
     defined('DEBUG_SQL_ERROR') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
     defined('DEBUG_SQL_COMMENT_LONG') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
 
-    if(defined('BE_DEBUG') || static::$config->debug) {
+    if (defined('BE_DEBUG') || static::$config->debug) {
       @define('BE_DEBUG', true);
       @ini_set('display_errors', 1);
       @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);

includes/classes/db_mysql.php

Spacing +54 added lines, -54 removed lines

@@ -65,7 +65,7 @@ 
   public function load_db_settings() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
 
     $this->dbsettings = $dbsettings;
   }
@@ -73,23 +73,23 @@ 
   public function sn_db_connect($external_db_settings = null) {
     $this->db_disconnect();
 
-    if(!empty($external_db_settings) && is_array($external_db_settings)) {
+    if (!empty($external_db_settings) && is_array($external_db_settings)) {
       $this->dbsettings = $external_db_settings;
     }
 
-    if(empty($this->dbsettings)) {
+    if (empty($this->dbsettings)) {
       $this->load_db_settings();
     }
 
     // TODO - фатальные (?) ошибки на каждом шагу. Хотя - скорее Эксепшны
-    if(!empty($this->dbsettings)) {
+    if (!empty($this->dbsettings)) {
       $driver_name = empty($this->dbsettings['sn_driver']) ? 'db_mysql_v5' : $this->dbsettings['sn_driver'];
       $this->driver = new $driver_name();
       $this->db_prefix = $this->dbsettings['prefix'];
 
       $this->connected = $this->connected || $this->driver_connect();
 
-      if($this->connected) {
+      if ($this->connected) {
         $this->table_list = $this->db_get_table_list();
         // TODO Проверка на пустоту
       }
@@ -101,11 +101,11 @@ 
   }
 
   protected function driver_connect() {
-    if(!is_object($this->driver)) {
+    if (!is_object($this->driver)) {
       classSupernova::$debug->error_fatal('DB Error - No driver for MySQL found!');
     }
 
-    if(!method_exists($this->driver, 'mysql_connect')) {
+    if (!method_exists($this->driver, 'mysql_connect')) {
       classSupernova::$debug->error_fatal('DB Error - WRONG MySQL driver!');
     }
 
@@ -113,7 +113,7 @@ 
   }
 
   public function db_disconnect() {
-    if($this->connected) {
+    if ($this->connected) {
       $this->connected = !$this->driver_disconnect();
       $this->connected = false;
     }
@@ -128,9 +128,9 @@ 
    */
   public function replaceTablePlaceholders($query) {
     $sql = $query;
-    if(strpos($sql, '{{') !== false) {
-      foreach($this->table_list as $tableName) {
-        $sql = str_replace("{{{$tableName}}}", $this->db_prefix . $tableName, $sql);
+    if (strpos($sql, '{{') !== false) {
+      foreach ($this->table_list as $tableName) {
+        $sql = str_replace("{{{$tableName}}}", $this->db_prefix.$tableName, $sql);
       }
     }
 
@@ -142,7 +142,7 @@ 
    * @param       $fetch
    */
   protected function logQuery($query, $fetch) {
-    if(!classSupernova::$config->debug) {
+    if (!classSupernova::$config->debug) {
       return;
     }
 
@@ -150,7 +150,7 @@ 
     $arr = debug_backtrace();
     $file = end(explode('/', $arr[0]['file']));
     $line = $arr[0]['line'];
-    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> " . ($fetch ? '+' : '&nbsp;') . " </th></tr>");
+    classSupernova::$debug->add("<tr><th>Query {$this->queryCount}: </th><th>$query</th><th>{$file} @ {$line}</th><th>&nbsp;</th><th> ".($fetch ? '+' : '&nbsp;')." </th></tr>");
   }
 
 
@@ -160,18 +160,18 @@ 
    * @return void
    */
   protected function commentQuery(&$sql) {
-    if(!defined('DEBUG_SQL_COMMENT')) {
+    if (!defined('DEBUG_SQL_COMMENT')) {
       return;
     }
     $backtrace = debug_backtrace();
     $sql_comment = classSupernova::$debug->compact_backtrace($backtrace, defined('DEBUG_SQL_COMMENT_LONG'));
 
-    $sql_commented = '/* ' . implode("<br />", $sql_comment) . '<br /> */ ' . preg_replace("/\s+/", ' ', $sql);
-    if(defined('DEBUG_SQL_ONLINE')) {
+    $sql_commented = '/* '.implode("<br />", $sql_comment).'<br /> */ '.preg_replace("/\s+/", ' ', $sql);
+    if (defined('DEBUG_SQL_ONLINE')) {
       classSupernova::$debug->warning($sql_commented, 'SQL Debug', LOG_DEBUG_SQL);
     }
 
-    if(defined('DEBUG_SQL_ERROR')) {
+    if (defined('DEBUG_SQL_ERROR')) {
       array_unshift($sql_comment, preg_replace("/\s+/", ' ', $sql));
       classSupernova::$debug->add_to_array($sql_comment);
     }
@@ -180,11 +180,11 @@ 
   }
 
   public function doquery($query, $table = '', $fetch = false, $skip_query_check = false) {
-    if(!is_string($table)) {
+    if (!is_string($table)) {
       $fetch = $table;
     }
 
-    if(!$this->connected) {
+    if (!$this->connected) {
       $this->sn_db_connect();
     }
 
@@ -195,7 +195,7 @@ 
 
     $sql = $this->replaceTablePlaceholders($query);
     $this->commentQuery($sql);
-    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error() . "<br />$sql<br />", 'SQL Error') : false;
+    !($sqlquery = $this->db_sql_query($sql)) ? classSupernova::$debug->error(db_error()."<br />$sql<br />", 'SQL Error') : false;
 
     return $fetch ? $this->db_fetch($sqlquery) : $sqlquery;
   }
@@ -205,7 +205,7 @@ 
   protected function security_watch_user_queries($query) {
     global $user;
 
-    if(
+    if (
       !$this->isWatching // Not already watching
       && !empty(classSupernova::$config->game_watchlist_array) // There is some players in watchlist
       && in_array($user['id'], classSupernova::$config->game_watchlist_array) // Current player is in watchlist
@@ -213,11 +213,11 @@ 
     ) {
       $this->isWatching = true;
       $msg = "\$query = \"{$query}\"\n\r";
-      if(!empty($_POST)) {
-        $msg .= "\n\r" . dump($_POST, '$_POST');
+      if (!empty($_POST)) {
+        $msg .= "\n\r".dump($_POST, '$_POST');
       }
-      if(!empty($_GET)) {
-        $msg .= "\n\r" . dump($_GET, '$_GET');
+      if (!empty($_GET)) {
+        $msg .= "\n\r".dump($_GET, '$_GET');
       }
       classSupernova::$debug->warning($msg, "Watching user {$user['id']}", 399, array('base_dump' => true));
       $this->isWatching = false;
@@ -228,7 +228,7 @@ 
   public function security_query_check_bad_words($query) {
     global $user, $dm_change_legit, $mm_change_legit;
 
-    switch(true) {
+    switch (true) {
       case stripos($query, 'RUNCATE TABL') != false:
       case stripos($query, 'ROP TABL') != false:
       case stripos($query, 'ENAME TABL') != false:
@@ -239,37 +239,37 @@ 
       case stripos($query, 'RPG_POINTS') != false && stripos(trim($query), 'UPDATE ') === 0 && !$dm_change_legit:
       case stripos($query, 'METAMATTER') != false && stripos(trim($query), 'UPDATE ') === 0 && !$mm_change_legit:
       case stripos($query, 'AUTHLEVEL') != false && $user['authlevel'] < 3 && stripos($query, 'SELECT') !== 0:
-        $report = "Hacking attempt (" . date("d.m.Y H:i:s") . " - [" . time() . "]):\n";
+        $report = "Hacking attempt (".date("d.m.Y H:i:s")." - [".time()."]):\n";
         $report .= ">Database Inforamation\n";
-        $report .= "\tID - " . $user['id'] . "\n";
-        $report .= "\tUser - " . $user['username'] . "\n";
-        $report .= "\tAuth level - " . $user['authlevel'] . "\n";
-        $report .= "\tAdmin Notes - " . $user['adminNotes'] . "\n";
-        $report .= "\tCurrent Planet - " . $user['current_planet'] . "\n";
-        $report .= "\tUser IP - " . $user['user_lastip'] . "\n";
-        $report .= "\tUser IP at Reg - " . $user['ip_at_reg'] . "\n";
-        $report .= "\tUser Agent- " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tCurrent Page - " . $user['current_page'] . "\n";
-        $report .= "\tRegister Time - " . $user['register_time'] . "\n";
+        $report .= "\tID - ".$user['id']."\n";
+        $report .= "\tUser - ".$user['username']."\n";
+        $report .= "\tAuth level - ".$user['authlevel']."\n";
+        $report .= "\tAdmin Notes - ".$user['adminNotes']."\n";
+        $report .= "\tCurrent Planet - ".$user['current_planet']."\n";
+        $report .= "\tUser IP - ".$user['user_lastip']."\n";
+        $report .= "\tUser IP at Reg - ".$user['ip_at_reg']."\n";
+        $report .= "\tUser Agent- ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tCurrent Page - ".$user['current_page']."\n";
+        $report .= "\tRegister Time - ".$user['register_time']."\n";
         $report .= "\n";
 
         $report .= ">Query Information\n";
-        $report .= "\tQuery - " . $query . "\n";
+        $report .= "\tQuery - ".$query."\n";
         $report .= "\n";
 
         $report .= ">\$_SERVER Information\n";
-        $report .= "\tIP - " . $_SERVER['REMOTE_ADDR'] . "\n";
-        $report .= "\tHost Name - " . $_SERVER['HTTP_HOST'] . "\n";
-        $report .= "\tUser Agent - " . $_SERVER['HTTP_USER_AGENT'] . "\n";
-        $report .= "\tRequest Method - " . $_SERVER['REQUEST_METHOD'] . "\n";
-        $report .= "\tCame From - " . $_SERVER['HTTP_REFERER'] . "\n";
-        $report .= "\tPage is - " . $_SERVER['SCRIPT_NAME'] . "\n";
-        $report .= "\tUses Port - " . $_SERVER['REMOTE_PORT'] . "\n";
-        $report .= "\tServer Protocol - " . $_SERVER['SERVER_PROTOCOL'] . "\n";
+        $report .= "\tIP - ".$_SERVER['REMOTE_ADDR']."\n";
+        $report .= "\tHost Name - ".$_SERVER['HTTP_HOST']."\n";
+        $report .= "\tUser Agent - ".$_SERVER['HTTP_USER_AGENT']."\n";
+        $report .= "\tRequest Method - ".$_SERVER['REQUEST_METHOD']."\n";
+        $report .= "\tCame From - ".$_SERVER['HTTP_REFERER']."\n";
+        $report .= "\tPage is - ".$_SERVER['SCRIPT_NAME']."\n";
+        $report .= "\tUses Port - ".$_SERVER['REMOTE_PORT']."\n";
+        $report .= "\tServer Protocol - ".$_SERVER['SERVER_PROTOCOL']."\n";
 
         $report .= "\n--------------------------------------------------------------------------------------------------\n";
 
-        $fp = fopen(SN_ROOT_PHYSICAL . 'badqrys.txt', 'a');
+        $fp = fopen(SN_ROOT_PHYSICAL.'badqrys.txt', 'a');
         fwrite($fp, $report);
         fclose($fp);
 
@@ -290,11 +290,11 @@ 
     $prefix_length = strlen($this->db_prefix);
 
     $tl = array();
-    while($row = $this->db_fetch($query)) {
-      foreach($row as $table_name) {
-        if(strpos($table_name, $this->db_prefix) === 0) {
+    while ($row = $this->db_fetch($query)) {
+      foreach ($row as $table_name) {
+        if (strpos($table_name, $this->db_prefix) === 0) {
           $table_name = substr($table_name, $prefix_length);
-        } elseif($prefixed_only) {
+        } elseif ($prefixed_only) {
           continue;
         }
         // $table_name = str_replace($db_prefix, '', $table_name);
@@ -389,7 +389,7 @@ 
     $result = array();
 
     $status = explode('  ', $this->driver->mysql_stat());
-    foreach($status as $value) {
+    foreach ($status as $value) {
       $row = explode(': ', $value);
       $result[$row[0]] = $row[1];
     }
@@ -405,10 +405,10 @@ 
     $result = array();
 
     $query = $this->db_sql_query('SHOW STATUS;');
-    if(is_bool($query)) {
+    if (is_bool($query)) {
       throw new Exception('Result of SHOW STATUS command is boolean - which should never happen. Connection to DB is lost?');
     }
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       $result[$row['Variable_name']] = $row['Value'];
     }
 

includes/classes/db_mysql_v5.php

Spacing +5 added lines, -5 removed lines

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