supernova-ws / SuperNova

includes/classes/V2PropertyContainer.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     if (is_callable($callable)) {
       $this->accessors[$type][$varName] = $callable;
     } else {
-      throw new Exception('Error assigning callable in ' . get_called_class() . '! Callable typed [' . $type . '] is not a callable or not accessible in the scope');
+      throw new Exception('Error assigning callable in '.get_called_class().'! Callable typed ['.$type.'] is not a callable or not accessible in the scope');
     }
   }
 
@@ -73,7 +73,7 @@ 
   }
 
   public function importRow($row) {
-    if(empty($row)) {
+    if (empty($row)) {
       return;
     }
 

includes/classes/V2Unit/V2UnitModel.php

Spacing +6 added lines, -6 removed lines

@@ -78,12 +78,12 @@ 
     $that = $this;
 
     $this->_container->assignAccessor('type', P_CONTAINER_GETTER,
-      function () use ($that) {
+      function() use ($that) {
         return $that->type;
       }
     );
     $this->_container->assignAccessor('type', P_CONTAINER_SETTER,
-      function ($value) use ($that) {
+      function($value) use ($that) {
         $that->type = $value;
         $array = get_unit_param($value);
         $that->unitInfo = $array;
@@ -99,7 +99,7 @@ 
     $propertyName = 'timeStart';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -109,7 +109,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeStart;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);
@@ -122,7 +122,7 @@ 
     $propertyName = 'timeFinish';
     $fieldName = self::$_properties[$propertyName][P_DB_FIELD];
     $this->_container->assignAccessor($propertyName, P_CONTAINER_IMPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         if (isset($row[$fieldName])) {
           $dateTime = new \DateTime($row[$fieldName]);
         } else {
@@ -132,7 +132,7 @@ 
       }
     );
     $this->_container->assignAccessor($propertyName, P_CONTAINER_EXPORTER,
-      function (&$row) use ($that, $fieldName) {
+      function(&$row) use ($that, $fieldName) {
         $dateTime = $that->timeFinish;
         if ($dateTime instanceof \DateTime) {
           $row[$fieldName] = $dateTime->format(FMT_DATE_TIME_SQL);

includes/classes/Buddy/BuddyView.php

Spacing +4 added lines, -4 removed lines

@@ -27,14 +27,14 @@
     $cBuddy->new_request_text_unsafe = sys_get_param_str_unsafe('request_text');
     $cBuddy->playerArray = $user;
 
-    $cBuddy->playerId = function (BuddyRoutingParams $cBuddy) {
+    $cBuddy->playerId = function(BuddyRoutingParams $cBuddy) {
       return $cBuddy->playerArray['id'];
     };
-    $cBuddy->playerName = function (BuddyRoutingParams $cBuddy) {
+    $cBuddy->playerName = function(BuddyRoutingParams $cBuddy) {
       return $cBuddy->playerArray['username'];
     };
-    $cBuddy->playerNameAndCoordinates = function (BuddyRoutingParams $cBuddy) {
-      return "{$cBuddy->playerArray['username']} " . uni_render_coordinates($cBuddy->playerArray);
+    $cBuddy->playerNameAndCoordinates = function(BuddyRoutingParams $cBuddy) {
+      return "{$cBuddy->playerArray['username']} ".uni_render_coordinates($cBuddy->playerArray);
     };
 
     $result = array();

includes/update.php

Spacing +108 added lines, -108 removed lines

@@ -23,7 +23,7 @@ 
 
 use Vector\Vector;
 
-if(!defined('INIT')) {
+if (!defined('INIT')) {
 //  include_once('init.php');
   die('Unauthorized access');
 }
@@ -41,8 +41,8 @@ 
 classSupernova::$config->debug = 0;
 
 
-if(classSupernova::$config->db_version == DB_VERSION) {
-} elseif(classSupernova::$config->db_version > DB_VERSION) {
+if (classSupernova::$config->db_version == DB_VERSION) {
+} elseif (classSupernova::$config->db_version > DB_VERSION) {
   classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW);
   die(
   'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -51,7 +51,7 @@ 
   );
 }
 
-if(classSupernova::$config->db_version < 26) {
+if (classSupernova::$config->db_version < 26) {
   $sys_log_disabled = true;
 }
 
@@ -70,20 +70,20 @@ 
 $update_tables = array();
 $update_indexes = array();
 $query = upd_do_query('SHOW TABLES;', true);
-while($row = classSupernova::$db->db_fetch_row($query)) {
+while ($row = classSupernova::$db->db_fetch_row($query)) {
   upd_load_table_info($row[0]);
 }
 upd_log_message('Table info loaded. Now looking DB for upgrades...');
 
 upd_do_query('SET FOREIGN_KEY_CHECKS=0;', true);
 
-if($new_version < 37) {
+if ($new_version < 37) {
   require_once('update_old.php');
 }
 
 ini_set('memory_limit', '1024M');
 
-switch($new_version) {
+switch ($new_version) {
   case 37:
     upd_log_version_update();
 
@@ -98,7 +98,7 @@ 
 
     upd_check_key('payment_currency_exchange_mm_', 2500, !classSupernova::$config->payment_currency_exchange_mm_);
 
-    if(!$update_tables['log_metamatter']) {
+    if (!$update_tables['log_metamatter']) {
       upd_create_table('log_metamatter',
         "(
           `id` SERIAL,
@@ -123,7 +123,7 @@ 
       "ADD `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
     ), !$update_tables['payment']['payment_test']);
 
-    if($update_tables['payment']['payment_test']['Default'] == 1) {
+    if ($update_tables['payment']['payment_test']['Default'] == 1) {
       upd_alter_table('payment', array(
         "MODIFY COLUMN `payment_test` TINYINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Is this a test payment?'",
       ));
@@ -139,15 +139,15 @@ 
       "MODIFY COLUMN `metamatter` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Metamatter amount'",
     ), $update_tables['users']['metamatter']['Type'] == 'int(20)');
 
-    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = " . QUE_RESEARCH . " AND que_unit_id IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ") FOR UPDATE");
-    while($row = db_fetch($query)) {
+    $query = upd_do_query("SELECT * FROM {{que}} WHERE `que_type` = ".QUE_RESEARCH." AND que_unit_id IN (".TECH_EXPEDITION.",".TECH_COLONIZATION.") FOR UPDATE");
+    while ($row = db_fetch($query)) {
       $planet_id = ($row['que_planet_id_origin'] ? $row['que_planet_id_origin'] : $row['que_planet_id']);
       upd_do_query("SELECT id FROM {{planets}} WHERE id = {$planet_id} FOR UPDATE");
       $price = sys_unit_str2arr($row['que_unit_price']);
-      upd_do_query("UPDATE {{planets}} SET " .
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
+      upd_do_query("UPDATE {{planets}} SET ".
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
         " WHERE id = {$planet_id}"
       );
       upd_do_query("DELETE FROM {{que}} WHERE que_id = {$row['que_id']}");
@@ -156,10 +156,10 @@ 
     $query = upd_do_query("SELECT unit_id, unit_snid, unit_level, id_planet FROM {{unit}} AS un
     LEFT JOIN {{users}} AS u ON u.id = un.unit_player_id
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
-    WHERE unit_snid IN (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
+    WHERE unit_snid IN (" . TECH_EXPEDITION.",".TECH_COLONIZATION.")
     FOR UPDATE");
-    while($row = db_fetch($query)) {
-      if(!$row['id_planet']) {
+    while ($row = db_fetch($query)) {
+      if (!$row['id_planet']) {
         continue;
       }
 
@@ -167,14 +167,14 @@ 
       $unit_level = $row['unit_level'];
       $price = get_unit_param($unit_id, P_COST);
       $factor = $price['factor'];
-      foreach($price as $resource_id => &$resource_amount) {
+      foreach ($price as $resource_id => &$resource_amount) {
         $resource_amount = $resource_amount * (pow($factor, $unit_level) - 1) / ($factor - 1);
       }
       // upd_do_query
-      upd_do_query($q = "UPDATE {{planets}} SET " .
-        "`metal` = `metal` + " . ($price[RES_METAL] ? $price[RES_METAL] : 0) . "," .
-        "`crystal` = `crystal` + " . ($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0) . "," .
-        "`deuterium` = `deuterium` + " . ($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0) .
+      upd_do_query($q = "UPDATE {{planets}} SET ".
+        "`metal` = `metal` + ".($price[RES_METAL] ? $price[RES_METAL] : 0).",".
+        "`crystal` = `crystal` + ".($price[RES_CRYSTAL] ? $price[RES_CRYSTAL] : 0).",".
+        "`deuterium` = `deuterium` + ".($price[RES_DEUTERIUM] ? $price[RES_DEUTERIUM] : 0).
         " WHERE id = {$row['id_planet']}"
       );
       upd_do_query("DELETE FROM {{unit}} WHERE unit_id = {$row['unit_id']}");
@@ -186,14 +186,14 @@ 
     // Вернуть ресы за уже исследованную Экспедиционную технологию
     upd_check_key('player_max_colonies', -1, classSupernova::$config->player_max_colonies >= 0);
 
-    if(!isset($update_tables['users']['player_rpg_explore_xp'])) {
+    if (!isset($update_tables['users']['player_rpg_explore_xp'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `player_rpg_explore_level` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
         "ADD COLUMN `player_rpg_explore_xp` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `dark_matter`",
       ), !isset($update_tables['users']['player_rpg_explore_xp']));
     }
 
-    if(!$update_tables['log_users_online']) {
+    if (!$update_tables['log_users_online']) {
       upd_create_table('log_users_online', "(
         `online_timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Measure time',
         `online_count` SMALLINT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Users online',
@@ -208,11 +208,11 @@ 
       "ADD `user_time_measured` INT UNSIGNED NOT NULL DEFAULT 0 COMMENT 'When was time diff measured last time' AFTER `onlinetime`",
     ), !$update_tables['users']['user_time_measured']);
 
-    if($update_tables['rw']) {
+    if ($update_tables['rw']) {
       upd_do_query("DROP TABLE IF EXISTS {{rw}};");
     }
 
-    if(!$update_tables['player_award']) {
+    if (!$update_tables['player_award']) {
       upd_create_table('player_award', "(
         `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
         `award_type_id` int(11) DEFAULT NULL COMMENT 'Award type i.e. order, medal, pennant, rank etc',
@@ -254,14 +254,14 @@ 
     upd_log_version_update();
 
 
-    if(!isset($update_tables['planets']['que_processed'])) {
+    if (!isset($update_tables['planets']['que_processed'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `last_update`",
       ), true);
       upd_do_query("UPDATE {{planets}} SET que_processed = last_update;");
     }
 
-    if(!isset($update_tables['users']['que_processed'])) {
+    if (!isset($update_tables['users']['que_processed'])) {
       upd_alter_table('users', array(
         "ADD COLUMN `que_processed` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `onlinetime`",
       ), true);
@@ -269,7 +269,7 @@ 
     }
 
 
-    if(isset($update_tables['planets']['que'])) {
+    if (isset($update_tables['planets']['que'])) {
       $sn_data_aux = array(
         SHIP_SMALL_FIGHTER_WRATH    => array(
           'name' => 'ship_fighter_wrath',
@@ -354,20 +354,20 @@ 
       $unit_data = array();
       $planets = array();
 
-      foreach($planet_unit_list as $unit_id) {
-        if(!($unit_name = get_unit_param($unit_id, P_NAME))) {
+      foreach ($planet_unit_list as $unit_id) {
+        if (!($unit_name = get_unit_param($unit_id, P_NAME))) {
           $unit_name = $sn_data_aux[$unit_id][P_NAME];
         }
-        if(isset($update_tables['planets'][$unit_name])) {
+        if (isset($update_tables['planets'][$unit_name])) {
           $drop[] = "DROP COLUMN `{$unit_name}`";
 
-          if(isset($aux_group[$unit_id])) {
+          if (isset($aux_group[$unit_id])) {
             $units_info[$unit_id] = $sn_data_aux[$unit_id];
             $units_info[$unit_id]['que'] = QUE_HANGAR;
           } else {
             $units_info[$unit_id] = get_unit_param($unit_id);
-            foreach($ques_info as $que_id => $que_data1) {
-              if(in_array($unit_id, $que_data1['unit_list'])) {
+            foreach ($ques_info as $que_id => $que_data1) {
+              if (in_array($unit_id, $que_data1['unit_list'])) {
                 $units_info[$unit_id]['que'] = $que_id;
                 break;
               }
@@ -377,7 +377,7 @@ 
       }
 
       $query = upd_do_query("SELECT * FROM {{planets}} FOR UPDATE");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $user_id = $row['id_owner'];
         $planet_id = $row['id'];
 
@@ -385,25 +385,25 @@ 
 
         // Конвертируем юниты
         $units_levels = array();
-        foreach($planet_unit_list as $unit_id) {
+        foreach ($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) {
+          if (!isset($row[$unit_name]) || !$row[$unit_name]) {
             continue;
           }
           $units_levels[$unit_id] = $row[$unit_name];
-          $unit_data[] = "({$user_id}," . LOC_PLANET . ",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
-          if(count($unit_data) > 30) {
+          $unit_data[] = "({$user_id},".LOC_PLANET.",{$planet_id},{$units_info[$unit_id][P_UNIT_TYPE]},{$unit_id},{$units_levels[$unit_id]})";
+          if (count($unit_data) > 30) {
             $unit_data_max = strlen(implode(',', $unit_data)) > $unit_data_max ? strlen(implode(',', $unit_data)) : $unit_data_max;
-            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+            upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
             $unit_data = array();
           }
         }
 
         // Конвертируем очередь построек
-        if($row['que']) {
+        if ($row['que']) {
           $que = explode(';', $row['que']);
-          foreach($que as $que_item) {
-            if(!$que_item) {
+          foreach ($que as $que_item) {
+            if (!$que_item) {
               continue;
             }
 
@@ -418,8 +418,8 @@ 
             $unit_factor = $unit_cost[P_FACTOR] ? $unit_cost[P_FACTOR] : 1;
             $price_increase = pow($unit_factor, $unit_level);
             // $unit_time = 0;
-            foreach($unit_cost as $resource_id => &$resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($unit_cost as $resource_id => &$resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 unset($unit_cost[$resource_id]);
                 continue;
               }
@@ -433,39 +433,39 @@ 
         }
 
         // Конвертируем очередь верфи
-        if($row['b_hangar_id']) {
+        if ($row['b_hangar_id']) {
           $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0,);
           $hangar_units = sys_unit_str2arr($row['b_hangar_id']);
-          foreach($hangar_units as $unit_id => $unit_count) {
-            if($unit_count <= 0) {
+          foreach ($hangar_units as $unit_id => $unit_count) {
+            if ($unit_count <= 0) {
               continue;
             }
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) {
+            foreach ($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
+              if (!in_array($resource_id, $group_resource_loot)) {
                 continue;
               }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
-          if(array_sum($return_resources) > 0) {
+          if (array_sum($return_resources) > 0) {
             upd_do_query("UPDATE {{planets}} SET `metal` = `metal` + {$return_resources[RES_METAL]}, `crystal` = `crystal` + {$return_resources[RES_CRYSTAL]}, `deuterium` = `deuterium` + {$return_resources[RES_DEUTERIUM]} WHERE `id` = {$planet_id} LIMIT 1");
           }
         }
 
 
-        if(count($que_data) > 10) {
+        if (count($que_data) > 10) {
           $que_data_max = strlen(implode(',', $que_data)) > $que_data_max ? strlen(implode(',', $que_data)) : $que_data_max;
-          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_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_data) . ';');
+          upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_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_data).';');
           $que_data = array();
         }
       }
 
-      if(!empty($unit_data)) {
-        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES ' . implode(',', $unit_data) . ';');
+      if (!empty($unit_data)) {
+        upd_do_query('REPLACE INTO {{unit}} (`unit_player_id`, `unit_location_type`, `unit_location_id`, `unit_type`, `unit_snid`, `unit_level`) VALUES '.implode(',', $unit_data).';');
       }
 
-      if(!empty($que_data)) {
-        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_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_data) . ';');
+      if (!empty($que_data)) {
+        upd_do_query('INSERT INTO {{que}} (`que_player_id`, `que_planet_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_data).';');
       }
 
       upd_alter_table('planets', $drop, true);
@@ -475,7 +475,7 @@ 
       JOIN `{{users}}` AS u ON a.`id` = u.`user_as_ally` AND `user_as_ally` IS NOT NULL AND `username` = ''
       SET u.`username` = CONCAT('[', a.`ally_tag`, ']');");
 
-    if($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
+    if ($update_indexes['statpoints']['I_stats_id_ally'] != 'id_ally,stat_type,stat_code,') {
       upd_do_query("SET FOREIGN_KEY_CHECKS=0;");
       upd_alter_table('statpoints', "DROP FOREIGN KEY `FK_stats_id_ally`", $update_foreigns['statpoints']['FK_stats_id_ally']);
       upd_alter_table('statpoints', "DROP KEY `I_stats_id_ally`", $update_indexes['statpoints']['I_stats_id_ally']);
@@ -571,7 +571,7 @@ 
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{{security_browser}}` (`browser_id`) ON DELETE SET NULL ON UPDATE CASCADE",
     ), !isset($update_tables['users']['user_last_proxy']));
 
-    if(!isset($update_tables['notes']['planet_type'])) {
+    if (!isset($update_tables['notes']['planet_type'])) {
       upd_alter_table('notes', array(
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
         "ADD COLUMN `system` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `galaxy`",
@@ -589,7 +589,7 @@ 
     upd_alter_table('users', "ADD COLUMN `user_bot` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['users']['user_bot']));
     upd_alter_table('unit', "ADD KEY `I_unit_type_snid` (unit_type, unit_snid) USING BTREE", !$update_indexes['unit']['I_unit_type_snid']);
 
-    if($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
+    if ($update_tables['users']['settings_tooltiptime']['Type'] != 'smallint(5) unsigned') {
       upd_alter_table('users', array(
         "MODIFY COLUMN `settings_tooltiptime` smallint(5) unsigned NOT NULL DEFAULT '500'",
       ), $update_tables['users']['settings_tooltiptime']['Type'] != 'smallint');
@@ -597,7 +597,7 @@ 
       upd_do_query("UPDATE `{{users}}` SET settings_tooltiptime = 500;");
     }
 
-    if(!isset($update_tables['log_users_online']['online_aggregated'])) {
+    if (!isset($update_tables['log_users_online']['online_aggregated'])) {
       upd_alter_table('log_users_online', "ADD COLUMN `online_aggregated` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0", !isset($update_tables['log_users_online']['online_aggregated']));
       upd_alter_table('log_users_online', array(
         "DROP PRIMARY KEY",
@@ -605,13 +605,13 @@ 
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
     }
 
-    if(!isset($update_tables['users']['gender'])) {
-      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT " . GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
-      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', " . GENDER_FEMALE . ", IF(UPPER(`sex`) = 'M', " . GENDER_MALE . ", " . GENDER_UNKNOWN . "));");
+    if (!isset($update_tables['users']['gender'])) {
+      upd_alter_table('users', "ADD COLUMN `gender` TINYINT(1) UNSIGNED NOT NULL DEFAULT ".GENDER_UNKNOWN, !isset($update_tables['users']['gender']));
+      upd_do_query("UPDATE {{users}} SET `gender` = IF(UPPER(`sex`) = 'F', ".GENDER_FEMALE.", IF(UPPER(`sex`) = 'M', ".GENDER_MALE.", ".GENDER_UNKNOWN."));");
     }
     upd_alter_table('users', "DROP COLUMN `sex`", isset($update_tables['users']['sex']));
 
-    if(!$update_tables['users']['dark_matter_total']) {
+    if (!$update_tables['users']['dark_matter_total']) {
       upd_alter_table('users', "ADD `dark_matter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Dark Matter amount ever gained' AFTER `dark_matter`", !$update_tables['users']['dark_matter_total']);
       upd_do_query(
         "UPDATE `{{users}}` AS u
@@ -624,7 +624,7 @@ 
     }
 
     upd_check_key('player_metamatter_immortal', 100000, !isset(classSupernova::$config->player_metamatter_immortal));
-    if(!$update_tables['users']['metamatter_total']) {
+    if (!$update_tables['users']['metamatter_total']) {
       upd_alter_table('users', "ADD `metamatter_total` BIGINT(20) NOT NULL DEFAULT 0 COMMENT 'Total Metamatter amount ever bought'", !$update_tables['users']['metamatter_total']);
 
       upd_do_query(
@@ -636,11 +636,11 @@ 
             (SELECT IF(sum(amount) IS NULL, 0, sum(amount)) FROM {{log_metamatter}} AS mm WHERE mm.user_id = u.id AND mm.amount > 0)
           );");
     }
-    if(!isset($update_tables['users']['immortal'])) {
+    if (!isset($update_tables['users']['immortal'])) {
       upd_alter_table('users', "ADD COLUMN `immortal` TIMESTAMP NULL", !isset($update_tables['users']['immortal']));
       upd_do_query("UPDATE {{users}} SET `immortal` = NOW() WHERE `metamatter_total` > 0;");
     }
-    if(isset($update_tables['player_award'])) {
+    if (isset($update_tables['player_award'])) {
       upd_do_query(
         "UPDATE {{users}} AS u JOIN {{player_award}} AS pa ON u.id = pa.player_id
           SET metamatter_total = 1, immortal = NOW()
@@ -667,7 +667,7 @@ 
       CONSTRAINT `FK_user_id` FOREIGN KEY (`user_id`) REFERENCES `{{users}}` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;");
 
-    if(empty($update_tables['blitz_statpoints'])) {
+    if (empty($update_tables['blitz_statpoints'])) {
       upd_create_table('blitz_statpoints', " (
         `stat_date` int(11) NOT NULL DEFAULT '0',
         `id_owner` bigint(20) unsigned DEFAULT NULL,
@@ -735,7 +735,7 @@ 
       CONSTRAINT `FK_survey_votes_survey_parent_id` FOREIGN KEY (`survey_parent_id`) REFERENCES `{{survey}}` (`survey_id`) ON DELETE CASCADE ON UPDATE CASCADE
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
 
-    if(empty($update_tables['security_url'])) {
+    if (empty($update_tables['security_url'])) {
       upd_create_table('security_url', " (
         `url_id` int unsigned NOT NULL AUTO_INCREMENT,
         `url_string` VARCHAR(250) NOT NULL DEFAULT '',
@@ -748,17 +748,17 @@ 
 
         $strings = array();
         $query = classSupernova::$db->doExecute($query);
-        while($row = db_fetch($query)) {
-          $strings[] = '("' . db_escape($row['url']) . '")';
-          if(count($strings) > 100) {
-            classSupernova::$db->doExecute($query_string . implode(',', $strings));
+        while ($row = db_fetch($query)) {
+          $strings[] = '("'.db_escape($row['url']).'")';
+          if (count($strings) > 100) {
+            classSupernova::$db->doExecute($query_string.implode(',', $strings));
             $strings = array();
           }
         }
-        !empty($strings) ? classSupernova::$db->doExecute($query_string . implode(',', $strings)) : false;
+        !empty($strings) ? classSupernova::$db->doExecute($query_string.implode(',', $strings)) : false;
       }
 
-      if(isset($update_tables['counter']['page'])) // TODO REMOVE
+      if (isset($update_tables['counter']['page'])) // TODO REMOVE
       {
         update_security_url("SELECT DISTINCT `page` AS url FROM {{counter}}");
         update_security_url("SELECT DISTINCT `url` AS url FROM {{counter}}");
@@ -783,7 +783,7 @@ 
       "ADD CONSTRAINT `FK_counter_page_url_id` FOREIGN KEY (`page_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
       "ADD CONSTRAINT `FK_counter_plain_url_id` FOREIGN KEY (`plain_url_id`) REFERENCES `{{security_url}}` (`url_id`) ON DELETE CASCADE ON UPDATE CASCADE",
     ), !isset($update_tables['counter']['device_id']));
-    if(isset($update_tables['counter']['ip'])) {
+    if (isset($update_tables['counter']['ip'])) {
       // upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `user_proxy` = `proxy`, `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` SET `user_ip` = INET_ATON(`ip`), `visit_time` = FROM_UNIXTIME(`time`)');
       upd_do_query('UPDATE `{{counter}}` AS c JOIN {{security_url}} AS u ON u.url_string = c.page SET c.page_url_id = u.url_id');
@@ -834,7 +834,7 @@ 
 
     upd_check_key('stats_history_days', 14, !classSupernova::$config->stats_history_days);
 
-    if(classSupernova::$config->payment_currency_default != 'USD') {
+    if (classSupernova::$config->payment_currency_default != 'USD') {
       upd_check_key('payment_currency_default', 'USD', true);
       upd_check_key('payment_currency_exchange_dm_', 20000, true);
       upd_check_key('payment_currency_exchange_mm_', 20000, true);
@@ -891,7 +891,7 @@ 
 
     $virtual_exploded = explode('/', SN_ROOT_VIRTUAL_PARENT);
     // TODO - переделать всё на db_loadItem... НАВЕРНОЕ
-    upd_check_key('server_email', 'root@' . $virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
+    upd_check_key('server_email', 'root@'.$virtual_exploded[2], !classSupernova::$config->db_loadItem('server_email'));
 
     upd_alter_table('survey_votes', array(
       "DROP FOREIGN KEY `FK_survey_votes_user`",
@@ -917,12 +917,12 @@ 
     function propagade_player_options($old_option_name, $new_option_id) {
       global $update_tables;
 
-      if(!empty($update_tables['users'][$old_option_name])) {
+      if (!empty($update_tables['users'][$old_option_name])) {
         upd_do_query(
           "REPLACE INTO {{player_options}} (`player_id`, `option_id`, `value`)
           SELECT `id`, {$new_option_id}, `{$old_option_name}`
           FROM {{users}}
-          WHERE `user_as_ally` is null and `user_bot` = " . USER_BOT_PLAYER);
+          WHERE `user_as_ally` is null and `user_bot` = ".USER_BOT_PLAYER);
         // TODO - UNCOMMENT !!!
         upd_alter_table('users', array("DROP COLUMN `{$old_option_name}`",));
       }
@@ -951,7 +951,7 @@ 
 
 
     // 2015-08-03 15:05:26 40a6.0
-    if(empty($update_tables['planets']['position_original'])) {
+    if (empty($update_tables['planets']['position_original'])) {
       upd_alter_table('planets', array(
         "ADD COLUMN `position_original` smallint NOT NULL DEFAULT 0",
         "ADD COLUMN `field_max_original` smallint NOT NULL DEFAULT 0",
@@ -966,7 +966,7 @@ 
       upd_do_query('UPDATE {{planets}} SET `position_original` = `planet`, `field_max_original` = `field_max`, `temp_min_original` = `temp_min`, `temp_max_original` = `temp_max`;');
 
       // Миграция тяжмета в оливин
-      upd_do_query('UPDATE {{planets}} SET `density_index` = ' . PLANET_DENSITY_METAL_PERIDOT . ' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
+      upd_do_query('UPDATE {{planets}} SET `density_index` = '.PLANET_DENSITY_METAL_PERIDOT.' WHERE `density_index` = 7'); // deprecated define('PLANET_DENSITY_METAL_HEAVY', 7);
 
       // Добавляем планету-странника
       upd_check_key('game_maxPlanet', 16, Vector::$knownPlanets == 15);
@@ -979,12 +979,12 @@ 
 
     // 2015-08-27 19:14:05 40a10.0
     // Старая версия таблицы
-    if(!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
+    if (!empty($update_tables['account']['account_is_global']) || empty($update_tables['account']['account_immortal'])) {
       upd_drop_table('account');
       upd_drop_table('account_translate');
     }
 
-    if(empty($update_tables['account'])) {
+    if (empty($update_tables['account'])) {
       upd_create_table('account', " (
           `account_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT '',
@@ -1003,7 +1003,7 @@ 
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;");
 
       upd_create_table('account_translate', " (
-          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider',
+          `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider',
           `provider_account_id` bigint(20) unsigned NOT NULL COMMENT 'Account ID on provider',
           `user_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
           `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -1018,12 +1018,12 @@ 
             (`account_id`, `account_name`, `account_password`, `account_salt`, `account_email`, `account_register_time`, `account_language`, `account_metamatter`, `account_metamatter_total`, `account_immortal`)
           SELECT
             `id`, `username`, `password`, `salt`, `email_2`, FROM_UNIXTIME(register_time), `lang`, `metamatter`, `metamatter_total`, `immortal`
-          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER . ";"
+          FROM {{users}} WHERE `user_as_ally` IS NULL AND `user_bot` = " . USER_BOT_PLAYER.";"
       );
 
       upd_do_query(
         "REPLACE INTO {{account_translate}} (`provider_id`, `provider_account_id`, `user_id`, `timestamp`)
-          SELECT " . ACCOUNT_PROVIDER_LOCAL . ", a.account_id, u.id, a.`account_register_time`
+          SELECT " . ACCOUNT_PROVIDER_LOCAL.", a.account_id, u.id, a.`account_register_time`
             FROM {{users}} AS u
             JOIN {{account}} AS a ON
               a.account_name = u.username
@@ -1038,7 +1038,7 @@ 
 
 
     // 2015-09-05 17:07:15 40a10.17
-    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT " . UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
+    upd_alter_table('ube_report', "ADD COLUMN `ube_report_capture_result` tinyint unsigned NOT NULL DEFAULT ".UBE_CAPTURE_DISABLED, empty($update_tables['ube_report']['ube_report_capture_result']));
 
 
     // 2015-09-07 21:11:48 40a10.19
@@ -1046,18 +1046,18 @@ 
 
 
     // 2015-09-24 11:39:37 40a10.25
-    if(empty($update_tables['log_metamatter']['provider_id'])) {
+    if (empty($update_tables['log_metamatter']['provider_id'])) {
       upd_alter_table('log_metamatter', array(
-        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Account provider'",
+        "ADD COLUMN `provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Account provider'",
         "ADD COLUMN `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
         "ADD COLUMN `account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
-        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '" . SN_ROOT_VIRTUAL . "'",
+        "ADD COLUMN `server_name` varchar(128) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL DEFAULT '".SN_ROOT_VIRTUAL."'",
       ), empty($update_tables['log_metamatter']['provider_id']));
 
       upd_do_query("UPDATE {{log_metamatter}} SET `account_id` = `user_id`, `account_name` = `username`");
 
       upd_alter_table('payment', array(
-        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT " . ACCOUNT_PROVIDER_LOCAL . " COMMENT 'Payment account provider'",
+        "ADD COLUMN `payment_provider_id` tinyint unsigned NOT NULL DEFAULT ".ACCOUNT_PROVIDER_LOCAL." COMMENT 'Payment account provider'",
         "ADD COLUMN `payment_account_id` bigint(20) unsigned NOT NULL",
         "ADD COLUMN `payment_account_name` varchar(32) CHARACTER SET utf8 NOT NULL DEFAULT ''",
       ), !$update_tables['payment']['payment_account_id']);
@@ -1098,7 +1098,7 @@ 
     upd_check_key('event_halloween_2015_code', '', !isset(classSupernova::$config->event_halloween_2015_code));
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset(classSupernova::$config->event_halloween_2015_timestamp));
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset(classSupernova::$config->event_halloween_2015_units_used));
-    if(empty($update_tables['log_halloween_2015'])) {
+    if (empty($update_tables['log_halloween_2015'])) {
       upd_create_table('log_halloween_2015', " (
       `log_hw2015_id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
       `player_id` bigint(20) unsigned NOT NULL COMMENT 'User ID',
@@ -1113,7 +1113,7 @@ 
 
 
     // 2015-11-28 06:30:27 40a19.21
-    if(!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
+    if (!isset($update_tables['ube_report']['ube_report_debris_total_in_metal'])) {
       upd_alter_table('ube_report', array(
         "ADD COLUMN `ube_report_debris_total_in_metal` DECIMAL(65,0) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'Total debris in metal'",
         "ADD KEY `I_ube_report_time_debris_id` (`ube_report_time_process` DESC, `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC)", // For Best Battles module
@@ -1128,7 +1128,7 @@ 
 
 
     // 2015-12-06 15:10:58 40b1.0
-    if(!empty($update_indexes['planets']['I_metal_mine'])) {
+    if (!empty($update_indexes['planets']['I_metal_mine'])) {
       upd_alter_table('planets', "DROP KEY `I_metal`", $update_indexes['planets']['I_metal']);
       upd_alter_table('planets', "DROP KEY `I_ship_sattelite_sloth`", $update_indexes['planets']['I_ship_sattelite_sloth']);
       upd_alter_table('planets', "DROP KEY `I_ship_bomber_envy`", $update_indexes['planets']['I_ship_bomber_envy']);
@@ -1191,7 +1191,7 @@ 
   case 40:
     upd_log_version_update();
 
-    if(empty($update_tables['festival'])) {
+    if (empty($update_tables['festival'])) {
       upd_create_table('festival', " (
           `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
           `start` datetime NOT NULL COMMENT 'Festival start datetime',
@@ -1232,7 +1232,7 @@ 
       );
     }
 
-    if(empty($update_tables['festival_unit'])) {
+    if (empty($update_tables['festival_unit'])) {
       upd_create_table('festival_unit', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1249,7 +1249,7 @@ 
     }
 
     // 2015-12-21 06:06:09 41a0.12
-    if(empty($update_tables['festival_unit_log'])) {
+    if (empty($update_tables['festival_unit_log'])) {
       upd_create_table('festival_unit_log', " (
           `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
           `highspot_id` int(10) unsigned DEFAULT NULL,
@@ -1279,19 +1279,19 @@ 
       $update_tables['security_browser']['browser_user_agent']['Collation'] == 'latin1_bin'
     );
 
-    if($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
+    if ($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type'] == 'BTREE') {
       upd_alter_table('security_browser', "DROP KEY `I_browser_user_agent`", true);
       upd_alter_table('security_browser', "ADD KEY `I_browser_user_agent` (`browser_user_agent`) USING HASH", true);
     }
 
-    if(!empty($update_tables['fleets']['fleet_array'])) {
+    if (!empty($update_tables['fleets']['fleet_array'])) {
       $query = upd_do_query("SELECT * FROM {{fleets}}");
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         $unit_list = sys_unit_str2arr($row['fleet_array']);
-        foreach($unit_list as $unit_id => $unit_count) {
+        foreach ($unit_list as $unit_id => $unit_count) {
           upd_do_query(
             "REPLACE INTO {{unit}} (`unit_player_id`,`unit_location_type`,`unit_location_id`,`unit_type`,`unit_snid`,`unit_level`) VALUES
-              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
+              ({$row['fleet_owner']}, ".LOC_FLEET.", {$row['fleet_id']}, 200, {$unit_id}, {$unit_count});",
 //              ({$row['fleet_owner']}, " . LOC_FLEET . ", {$row['fleet_id']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
             true
           );
@@ -1325,11 +1325,11 @@ 
 
 classSupernova::$cache->unset_by_prefix('lng_');
 
-if($new_version) {
+if ($new_version) {
   classSupernova::$config->db_saveItem('db_version', $new_version);
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
 } else {
-  upd_log_message("DB version didn't changed from " . classSupernova::$config->db_version);
+  upd_log_message("DB version didn't changed from ".classSupernova::$config->db_version);
 }
 
 classSupernova::$config->db_loadAll();

includes/classes/debug.php

Spacing +75 added lines, -76 removed lines

@@ -32,10 +32,10 @@ 
 
 defined('INSIDE') || die();
 
-if(php_sapi_name() == "cli") {
+if (php_sapi_name() == "cli") {
   // In cli-mode
   define('__DEBUG_CRLF', "\r\n");
-  define('__DEBUG_LINE', '-------------------------------------------------' . __DEBUG_CRLF);
+  define('__DEBUG_LINE', '-------------------------------------------------'.__DEBUG_CRLF);
 } else {
   // Not in cli-mode
   define('__DEBUG_CRLF', '<br />');
@@ -52,17 +52,17 @@ 
   public function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
-      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
+    if ($this->log_file_handler === null) {
+      $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL.'/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
-      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
+    if ($this->log_file_handler) {
+      @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()).str_repeat(' ', $ident + 1).$message."\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
   }
@@ -82,7 +82,7 @@ 
   }
 
   public function echo_log() {
-    echo '<br><table><tr><td class=k colspan=4><a href="' . SN_ROOT_PHYSICAL . "admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
+    echo '<br><table><tr><td class=k colspan=4><a href="'.SN_ROOT_PHYSICAL."admin/settings.php\">Debug Log</a>:</td></tr>{$this->log}</table>";
     die();
   }
 
@@ -92,25 +92,25 @@ 
     $result = array();
     $transaction_id = classSupernova::$db->getTransaction()->getNextQueryTransactionId();
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
         ($a_trace['type']
           ? ($a_trace['type'] == '->'
-            ? "({$a_trace['class']})" . get_class($a_trace['object'])
+            ? "({$a_trace['class']})".get_class($a_trace['object'])
             : $a_trace['class']
-          ) . $a_trace['type']
+          ).$a_trace['type']
           : ''
-        ) . $a_trace['function'] . '()';
+        ).$a_trace['function'].'()';
 
       $file = str_replace(SN_ROOT_PHYSICAL, '', str_replace('\\', '/', $a_trace['file']));
 
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -124,26 +124,26 @@ 
   public function dump($dump = false, $force_base = false, $deadlock = false) {
     global $user, $planetrow;
 
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -151,22 +151,21 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = SnCache::getLocks();
       $error_backtrace['cSN_data'] = SnCache::getData();
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) {
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = SnCache::getQueries();
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
-        foreach($this->log_array as $log) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -195,14 +194,14 @@ 
   public function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $sys_stop_log_hit, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -214,16 +213,16 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($userId) . "',
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
+        `log_time` = '" . time()."', `log_code` = '".db_escape($error_code)."', `log_sender` = '".db_escape($userId)."',
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
 //        ($error_backtrace ? ", `log_dump` = '" . db_escape(serialize($error_backtrace)) . "'" : '') . ";";
-      ", `log_dump` = '" . ($error_backtrace ? db_escape(serialize($error_backtrace)) : '') . "'" . ";";
-      classSupernova::$db->doExecute($query, true) or die($fatal_error . classSupernova::$db->db_error());
+      ", `log_dump` = '".($error_backtrace ? db_escape(serialize($error_backtrace)) : '')."'".";";
+      classSupernova::$db->doExecute($query, true) or die($fatal_error.classSupernova::$db->db_error());
 
-      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>" . classSupernova::$db->db_insert_id() . "</b>";
+      $message = "Пожалуйста, свяжитесь с админом, если ошибка повторится. Ошибка №: <b>".classSupernova::$db->db_insert_id()."</b>";
 
       $sys_stop_log_hit = true;
       $sys_log_disabled = true;
@@ -233,7 +232,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print(__DEBUG_LINE);
         pdump($value, $name);
       }
@@ -245,7 +244,7 @@ 
   public function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
@@ -254,12 +253,12 @@ 
 
     $userId = empty($user['id']) ? 0 : $user['id'];
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
-        `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($userId) . "',
-        `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
-        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE))) . "'" .
-        ", `log_dump` = '" . ($error_backtrace ? db_escape(serialize($error_backtrace)) : '') . "'" . ";";
+        `log_time` = '" . time()."', `log_code` = '".db_escape($log_code)."', `log_sender` = '".db_escape($userId)."',
+        `log_username` = '" . db_escape($user['user_name'])."', `log_title` = '".db_escape($title)."',  `log_text` = '".db_escape($message)."',
+        `log_page` = '" . db_escape(strpos($_SERVER['SCRIPT_NAME'], SN_ROOT_RELATIVE) === false ? $_SERVER['SCRIPT_NAME'] : substr($_SERVER['SCRIPT_NAME'], strlen(SN_ROOT_RELATIVE)))."'".
+        ", `log_dump` = '".($error_backtrace ? db_escape(serialize($error_backtrace)) : '')."'".";";
       classSupernova::$db->doExecute($query, true);
     } else {
 //        // TODO Здесь надо писать в файло
@@ -272,11 +271,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -285,31 +284,31 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
-    $dumper = mt_rand(10, 99) . '|' . $varname;
+    $dumper = mt_rand(10, 99).'|'.$varname;
   }
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == TYPE_STRING) {
-    $dumper .= '(' . strlen($value) . ')';
+  if ($type == TYPE_STRING) {
+    $dumper .= '('.strlen($value).')';
     $value = dump($value, '', -1);
-  } elseif($type == TYPE_BOOLEAN) {
+  } elseif ($type == TYPE_BOOLEAN) {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $props = get_class_vars(get_class($value));
-    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
-    foreach($props as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
+    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
+    foreach ($props as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
       $dumper .= dump($value->$key, '', $level + 1);
     }
     $value = '';
-  } elseif($type == TYPE_ARRAY) {
-    $dumper .= '(' . count($value) . ')';
-    foreach($value as $key => $val) {
-      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
+  } elseif ($type == TYPE_ARRAY) {
+    $dumper .= '('.count($value).')';
+    foreach ($value as $key => $val) {
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, '', -1).' => ';
       $dumper .= dump($val, '', $level + 1);
     }
     $value = '';
@@ -328,24 +327,24 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
-    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
-      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
-      $backtrace[1]['function'] .
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+    $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '').
+      (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '').
+      $backtrace[1]['function'].
       (!empty($backtrace[0]['file'])
         ? (
-          ' (' . substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN) .
-          (!empty($backtrace[0]['line']) ? ':' . $backtrace[0]['line'] : '') .
+          ' ('.substr($backtrace[0]['file'], SN_ROOT_PHYSICAL_STR_LEN).
+          (!empty($backtrace[0]['line']) ? ':'.$backtrace[0]['line'] : '').
           ')'
         )
         : ''
       );
-    $caller = "\r\n" . $caller;
+    $caller = "\r\n".$caller;
   }
 
-  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">' .
-    dump($value, $varname) .
-    $caller .
+  print('<pre style="text-align: left; background-color: #111111; color: #0A0; font-family: Courier, monospace !important; padding: 1em 0; font-weight: 800; font-size: 14px;">'.
+    dump($value, $varname).
+    $caller.
     '</pre>'
   );
 }
@@ -355,24 +354,24 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print(mt_rand() . __DEBUG_CRLF);
+  print(mt_rand().__DEBUG_CRLF);
 }
 
 function pc($prePrint = false) {
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print(__DEBUG_CRLF);
   }
-  print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
+  print($_PRINT_COUNT_VALUE.__DEBUG_CRLF);
 }
 
 function prep($message) {
-  print('<pre>' . $message . '</pre>');
+  print('<pre>'.$message.'</pre>');
 }
 
 function backtrace_no_arg() {
@@ -396,9 +395,9 @@ 
  */
 function pdie($message = '', $level = 0) {
   $backtrace = debug_backtrace();
-  for($i = 0; $i < $level; $i++) {
+  for ($i = 0; $i < $level; $i++) {
     array_pop($backtrace);
   }
 
-  die(__DEBUG_LINE . ($message ? $message . ' @ ' : '') . $backtrace[0]['file'] . ':' . $backtrace[0]['line']);
+  die(__DEBUG_LINE.($message ? $message.' @ ' : '').$backtrace[0]['file'].':'.$backtrace[0]['line']);
 }

includes/classes/userOptions.php

Spacing +37 added lines, -37 removed lines

@@ -122,30 +122,30 @@ 
 
     $update_cache = false;
 
-    if(!empty($this->to_write)) {
-      foreach($this->to_write as $key => $cork) {
+    if (!empty($this->to_write)) {
+      foreach ($this->to_write as $key => $cork) {
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
-        $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
+        $this->to_write[$key] = "({$this->user_id}, '".db_escape($key)."', '".db_escape($value)."')";
       }
 
-      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES " . implode(',', $this->to_write));
+      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES ".implode(',', $this->to_write));
 
       $this->to_write = array();
       $update_cache = true;
     }
 
-    if(!empty($this->to_delete)) {
-      foreach($this->to_delete as $key => &$value) {
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
+    if (!empty($this->to_delete)) {
+      foreach ($this->to_delete as $key => &$value) {
+        $value = is_string($key) ? "'".db_escape($key)."'" : $key;
       }
 
-      classSupernova::$db->doDelete("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
+      classSupernova::$db->doDelete("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (".implode(',', $this->to_delete).") ");
 
       $this->to_delete = array();
       $update_cache = true;
     }
 
-    if($update_cache) {
+    if ($update_cache) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
     }
@@ -164,11 +164,11 @@ 
     $this->load();
   }
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
@@ -176,7 +176,7 @@ 
     $this->to_write = array();
     $this->to_delete = array();
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       $this->loaded = true;
       return;
     }
@@ -184,13 +184,13 @@ 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace_recursive($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -267,7 +267,7 @@ 
   }
 
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   // TODO - serialize/unserialize options
@@ -275,14 +275,14 @@ 
     // Если в массиве индекса только один элемент - значит это просто индекс
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
 
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
       $this->load();
     }
 
-    if(is_array($option_id)) {
+    if (is_array($option_id)) {
       $result = $this->data;
-      foreach($option_id as $sub_key) {
-        if(!isset($result) || !isset($result[$sub_key])) {
+      foreach ($option_id as $sub_key) {
+        if (!isset($result) || !isset($result[$sub_key])) {
           $result = null;
           break;
         }
@@ -300,12 +300,12 @@ 
    * @param null|mixed $value
    */
   public function __set($option, $value = null) {
-    if(empty($option) || !$this->user_id) {
+    if (empty($option) || !$this->user_id) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($option) && count($option) == 1) {
+    if (is_array($option) && count($option) == 1) {
       // Разворачиваем его в индекс
       $option = array(reset($option) => $value);
       unset($value);
@@ -314,13 +314,13 @@ 
 
     $to_write = array();
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($option) && isset($value)) {
+    if (is_array($option) && isset($value)) {
       $a_data = &$this->data;
-      foreach($option as $option_id) {
+      foreach ($option as $option_id) {
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
         $a_data = &$a_data[$option_id];
       }
-      if($a_data != $value) {
+      if ($a_data != $value) {
         $a_data = $value;
         $to_write[reset($option)] = null;
       }
@@ -328,11 +328,11 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($option) ? $option = array($option => $value) : false;
 
-      foreach($option as $option_id => $option_value) {
-        if($this->data[$option_id] !== $option_value) {
+      foreach ($option as $option_id => $option_value) {
+        if ($this->data[$option_id] !== $option_value) {
           // TODO - вынести отдельно в обработчик
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
-            sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
+            sn_setcookie(SN_COOKIE.'_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
           }
 
           $this->data[$option_id] = $option_value;
@@ -341,40 +341,40 @@ 
       }
     }
 
-    if(!empty($to_write)) {
+    if (!empty($to_write)) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
 
-      foreach($to_write as $option_id => &$option_value) {
+      foreach ($to_write as $option_id => &$option_value) {
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
-        $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
+        $to_write[$option_id] = "({$this->user_id}, '".db_escape($option_id)."', '".db_escape($option_value)."')";
       }
 
-      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES " . implode(',', $to_write));
+      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES ".implode(',', $to_write));
     }
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
     $this->data = $this->defaults;
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       return;
     }
 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -390,7 +390,7 @@ 
     return $this->__get($offset);
   }
   public function offsetSet($offset, $value) {
-    if(!is_null($offset)) {
+    if (!is_null($offset)) {
       // $this->data[$offset] = $value;
       $this->__set($offset, $value);
     } else {

includes/classes/classPersistent.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         $qry[] = "('{$item_name}', '{$item_value}')";
       }
     }
-    classSupernova::$db->doReplace("REPLACE INTO `{{" . $this->table_name . "}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES " . implode(',', $qry) . ";");
+    classSupernova::$db->doReplace("REPLACE INTO `{{".$this->table_name."}}` (`{$this->sql_index_field}`, `{$this->sql_value_field}`) VALUES ".implode(',', $qry).";");
 
     // И только после взятия блокировок - меняем значения в кэше
     foreach ($item_list as $item_name => $item_value) {

includes/classes/DBStaticMessages.php

Spacing +10 added lines, -10 removed lines

@@ -114,7 +114,7 @@ 
       $owners = array();
     } else {
       $insert_values = array();
-      $insert_template = "('%u'," . str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
+      $insert_template = "('%u',".str_replace('%', '%%', " '{$sender}', '{$timestamp}', '{$message_type}', '{$from}', '{$subject}', '{$text}')");
 
       foreach ($owners as $owner) {
         if ($user['id'] != $owner) {
@@ -155,7 +155,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'];
@@ -253,7 +253,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'];
 
@@ -422,7 +422,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;");
@@ -470,7 +470,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
@@ -478,7 +478,7 @@ 
   }
 
   public static function db_message_insert_all($message_type, $from, $subject, $text) {
-    return classSupernova::$db->doInsert('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsert('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}, '{$from}', '{$subject}', '{$text}' FROM {{users}}");
   }
 
@@ -488,7 +488,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;
   }
@@ -505,15 +505,15 @@ 
    * @param $int_type_selected
    */
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
-    classSupernova::$db->doDelete("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
+    classSupernova::$db->doDelete("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')".($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
   }
 
   /**
    * @param $insert_values
    */
   public static function db_message_insert($insert_values) {
-    classSupernova::$db->doInsert('INSERT INTO `{{messages}}` (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
-      'VALUES ' . implode(',', $insert_values));
+    classSupernova::$db->doInsert('INSERT INTO `{{messages}}` (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
+      'VALUES '.implode(',', $insert_values));
   }
 
 }

includes/classes/sn_module_payment.php

Spacing +73 added lines, -73 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 {
@@ -762,22 +762,22 @@ 
     );
 
     $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}";
     }
 
-    $longQuery = ' INTO `{{payment}}` SET ' . implode(',', $query) . ';';
-    if($replace) {
-      $this->db->doReplace('REPLACE' . $longQuery);
+    $longQuery = ' INTO `{{payment}}` SET '.implode(',', $query).';';
+    if ($replace) {
+      $this->db->doReplace('REPLACE'.$longQuery);
     } else {
-      $this->db->doInsert('INSERT' . $longQuery);
+      $this->db->doInsert('INSERT'.$longQuery);
     }
 
     return $this->db_get_by_id($this->db->db_insert_id());
@@ -785,12 +785,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);
       }
     }
@@ -799,25 +799,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) {
-      $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);
     }
   }
@@ -840,8 +840,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 {
@@ -888,7 +888,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'];
@@ -930,11 +930,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}",
     );
   }