supernova-ws / SuperNova

includes/update.php

Braces +21 added lines, -9 removed lines

@@ -399,7 +399,9 @@ 
         $units_levels = array();
         foreach($planet_unit_list as $unit_id) {
           $unit_name = &$units_info[$unit_id][P_NAME];
-          if(!isset($row[$unit_name]) || !$row[$unit_name]) continue;
+          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) {
@@ -413,7 +415,9 @@ 
         if($row['que']) {
           $que = explode(';', $row['que']);
           foreach($que as $que_item) {
-            if(!$que_item) continue;
+            if(!$que_item) {
+              continue;
+            }
 
             $que_item = explode(',', $que_item);
 
@@ -445,9 +449,13 @@ 
           $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) continue;
+            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)) continue;
+              if(!in_array($resource_id, $group_resource_loot)) {
+                continue;
+              }
               $return_resources[$resource_id] += $unit_count * $resource_amount;
             }
           }
@@ -464,11 +472,13 @@ 
         }
       }
 
-      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);
     }
@@ -761,9 +771,11 @@ 
         !empty($strings) ? doquery($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}}");
       }
     }

Spacing +81 added lines, -81 removed lines

@@ -21,7 +21,7 @@ 
    [!] DB code updates
 */
 
-if(!defined('INIT')) {
+if (!defined('INIT')) {
 //  include_once('init.php');
   die('Unauthorized access');
 }
@@ -40,8 +40,8 @@ 
 
 
 //$config->db_loadItem('db_version');
-if($config->db_version == DB_VERSION) {
-} elseif($config->db_version > DB_VERSION) {
+if ($config->db_version == DB_VERSION) {
+} elseif ($config->db_version > DB_VERSION) {
   $config->db_saveItem('var_db_update_end', SN_TIME_NOW);
   die(
     'Internal error! Auotupdater detects DB version greater then can be handled!<br />
@@ -50,7 +50,7 @@ 
   );
 }
 
-if($config->db_version < 26) {
+if ($config->db_version < 26) {
   $sys_log_disabled = true;
 }
 
@@ -69,25 +69,25 @@ 
 $update_tables  = array();
 $update_indexes = array();
 $query = upd_do_query('SHOW TABLES;', true);
-while($row = db_fetch_row($query)) {
+while ($row = 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();
 
     upd_check_key('player_vacation_timeout', PERIOD_WEEK, $config->player_vacation_timeout != PERIOD_WEEK);
-    upd_check_key('player_vacation_time', PERIOD_WEEK ,   $config->player_vacation_time != PERIOD_WEEK);
+    upd_check_key('player_vacation_time', PERIOD_WEEK, $config->player_vacation_time != PERIOD_WEEK);
 
     upd_alter_table('users', "ADD `vacation_next` INT(11) NOT NULL DEFAULT 0 COMMENT 'Next datetime when player can go on vacation'", !$update_tables['users']['vacation_next']);
 
@@ -97,7 +97,7 @@ 
 
     upd_check_key('payment_currency_exchange_mm_', 2500, !$config->payment_currency_exchange_mm_);
 
-    if(!$update_tables['log_metamatter'])
+    if (!$update_tables['log_metamatter'])
     {
       upd_create_table('log_metamatter',
         "(
@@ -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?'",
@@ -141,7 +141,7 @@ 
     ), $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))
+    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");
@@ -160,9 +160,9 @@ 
     LEFT JOIN {{planets}} AS p ON p.id = u.id_planet
     WHERE unit_snid in (" . TECH_EXPEDITION . "," . TECH_COLONIZATION . ")
     FOR UPDATE");
-    while($row = db_fetch($query))
+    while ($row = db_fetch($query))
     {
-      if(!$row['id_planet'])
+      if (!$row['id_planet'])
       {
         continue;
       }
@@ -171,7 +171,7 @@ 
       $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);
       }
@@ -191,7 +191,7 @@ 
     // Вернуть ресы за уже исследованную Экспедиционную технологию
     upd_check_key('player_max_colonies', -1, $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`",
@@ -199,9 +199,9 @@ 
       ), !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',"(
+      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',
 
@@ -215,12 +215,12 @@ 
       "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,
@@ -263,14 +263,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);
@@ -281,7 +281,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',
@@ -366,20 +366,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;
               }
@@ -389,7 +389,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'];
 
@@ -397,12 +397,12 @@ 
 
         // Конвертируем юниты
         $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]) continue;
+          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) {
+          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) . ';');
             $unit_data = array();
@@ -410,10 +410,10 @@ 
         }
 
         // Конвертируем очередь построек
-        if($row['que']) {
+        if ($row['que']) {
           $que = explode(';', $row['que']);
-          foreach($que as $que_item) {
-            if(!$que_item) continue;
+          foreach ($que as $que_item) {
+            if (!$que_item) continue;
 
             $que_item = explode(',', $que_item);
 
@@ -426,8 +426,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;
               }
@@ -441,33 +441,33 @@ 
         }
  
         // Конвертируем очередь верфи
-        if($row['b_hangar_id']) {
-          $return_resources = array(RES_METAL => 0, RES_CRYSTAL => 0, RES_DEUTERIUM => 0, );
+        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) continue;
-            foreach($units_info[$unit_id][P_COST] as $resource_id => $resource_amount) {
-              if(!in_array($resource_id, $group_resource_loot)) continue;
+          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)) 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) . ';');
           $que_data = array();
         }
       }
 
-      if(!empty($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))
+      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);
@@ -477,7 +477,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']);
@@ -573,7 +573,7 @@ 
       "ADD CONSTRAINT `FK_users_browser_id` FOREIGN KEY (`user_last_browser_id`) REFERENCES `{$config->db_prefix}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 `planet_name` VARCHAR(64) NOT NULL DEFAULT '' AFTER `title`",
         "ADD COLUMN `galaxy` SMALLINT(6) UNSIGNED NOT NULL DEFAULT 0 AFTER `title`",
@@ -592,7 +592,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');
@@ -600,7 +600,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",
@@ -608,13 +608,13 @@ 
       ), $update_indexes['log_users_online']['PRIMARY'] != 'online_timestamp,online_aggregated,');
     }
 
-    if(!isset($update_tables['users']['gender'])) {
+    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_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
@@ -627,7 +627,7 @@ 
     }
 
     upd_check_key('player_metamatter_immortal', 100000, !isset($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(
@@ -639,11 +639,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()
@@ -670,7 +670,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,
@@ -738,7 +738,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 '',
@@ -751,9 +751,9 @@ 
 
         $strings = array();
         $query = doquery($query);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $strings[] = '("' . db_escape($row['url']) . '")';
-          if(count($strings) > 100) {
+          if (count($strings) > 100) {
             doquery($query_string . implode(',', $strings));
             $strings = array();
           }
@@ -761,7 +761,7 @@ 
         !empty($strings) ? doquery($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}}");
@@ -786,7 +786,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');
@@ -837,8 +837,8 @@ 
 
     upd_check_key('stats_history_days', 14, !$config->stats_history_days);
 
-    if($config->payment_currency_default != 'USD') {
-      upd_check_key('payment_currency_default',      'USD', true);
+    if ($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);
       upd_check_key('payment_currency_exchange_usd', 1, true);
@@ -920,7 +920,7 @@ 
     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}`
@@ -954,7 +954,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",
@@ -982,12 +982,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 '',
@@ -1045,7 +1045,7 @@ 
     upd_alter_table('security_url', "MODIFY COLUMN `url_string` VARCHAR(250) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''", empty($update_tables['security_url']['ube_report_capture_result']));
 
     // 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 `account_id` bigint(20) unsigned NOT NULL DEFAULT 0",
@@ -1095,7 +1095,7 @@ 
     upd_check_key('event_halloween_2015_code', '', !isset($config->event_halloween_2015_code));
     upd_check_key('event_halloween_2015_timestamp', SN_TIME_SQL, !isset($config->event_halloween_2015_timestamp));
     upd_check_key('event_halloween_2015_units_used', serialize(array()), !isset($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',
@@ -1109,7 +1109,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_debris_id` (`ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC)", // For Best Battles module
@@ -1124,7 +1124,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']);
@@ -1189,7 +1189,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',
@@ -1230,7 +1230,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,
@@ -1247,7 +1247,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,
@@ -1275,18 +1275,18 @@ 
       $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') {
 //      pdump($update_indexes_full['security_browser']['I_browser_user_agent']['browser_user_agent']['Index_type']);
       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);
     }
 
     // #ctv№
-    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']}, " . get_unit_param($unit_id, P_UNIT_TYPE) . ", {$unit_id}, {$unit_count});",
@@ -1321,7 +1321,7 @@ 
 
 classSupernova::$cache->unset_by_prefix('lng_');
 
-if($new_version) {
+if ($new_version) {
   $config->db_saveItem('db_version', $new_version);
   upd_log_message("<font color=green>DB version is now {$new_version}</font>");
 } else {

includes/vars_structures.php

Spacing +12 added lines, -12 removed lines

@@ -15,8 +15,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -33,8 +33,8 @@ 
       'factor' => 1.6,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -51,8 +51,8 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -69,7 +69,7 @@ 
       'factor' => 1.5,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -87,8 +87,8 @@ 
       'factor' => 1.8,
     ),
     P_UNIT_PRODUCTION => array(
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor);},
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
     ),
     P_MINING_IS_MANAGED => true,
   ),
@@ -105,7 +105,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -121,7 +121,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 
@@ -137,7 +137,7 @@ 
       'factor' => 2,
     ),
     'storage' => array(
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
     ),
   ),
 

includes/init/init_functions.php

Spacing +12 added lines, -12 removed lines

@@ -2,25 +2,25 @@ 
 
 // ------------------------------------------------------------------------------------------------------------------------------
 function sn_sys_load_php_files($dir_name, $load_extension = 'php', $modules = false) {
-  if(file_exists($dir_name)) {
+  if (file_exists($dir_name)) {
     $dir = opendir($dir_name);
-    while(($file = readdir($dir)) !== false) {
-      if($file == '..' || $file == '.') {
+    while (($file = readdir($dir)) !== false) {
+      if ($file == '..' || $file == '.') {
         continue;
       }
 
       $full_filename = $dir_name . $file;
-      if($modules && is_dir($full_filename)) {
-        if(file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
+      if ($modules && is_dir($full_filename)) {
+        if (file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
           require_once($full_filename);
           // Registering module
-          if(class_exists($file)) {
+          if (class_exists($file)) {
             new $file($full_filename);
           }
         }
       } else {
         $extension = substr($full_filename, -strlen($load_extension));
-        if($extension == $load_extension) {
+        if ($extension == $load_extension) {
           require_once($full_filename);
         }
       }
@@ -39,11 +39,11 @@ 
  */
 function init_update(&$config) {
   $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
-  if(file_exists($update_file)) {
-    if(filemtime($update_file) > $config->db_loadItem('var_db_update') || $config->db_loadItem('db_version') < DB_VERSION) {
-      if(defined('IN_ADMIN')) {
+  if (file_exists($update_file)) {
+    if (filemtime($update_file) > $config->db_loadItem('var_db_update') || $config->db_loadItem('db_version') < DB_VERSION) {
+      if (defined('IN_ADMIN')) {
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
-        if(SN_TIME_NOW >= $config->db_loadItem('var_db_update_end')) {
+        if (SN_TIME_NOW >= $config->db_loadItem('var_db_update_end')) {
           $config->db_saveItem('var_db_update_end', SN_TIME_NOW + ($config->upd_lock_time ? $config->upd_lock_time : 300));
           sn_db_transaction_commit();
 
@@ -53,7 +53,7 @@ 
           $current_time = time();
           $config->db_saveItem('var_db_update', $current_time);
           $config->db_saveItem('var_db_update_end', $current_time);
-        } elseif(filemtime($update_file) > $config->var_db_update) {
+        } elseif (filemtime($update_file) > $config->var_db_update) {
           $timeout = $config->var_db_update_end - SN_TIME_NOW;
           die(
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />

includes/functions/int_banner_create.php

Spacing +28 added lines, -28 removed lines

@@ -30,29 +30,29 @@ 
   }
   $size = getimagesize(SN_ROOT_PHYSICAL . $img_name);
   $im = imagecreatefrompng(SN_ROOT_PHYSICAL . $img_name);
-  $image = imagecreatetruecolor($size[0],$size[1]);
-  imagecopy($image,$im,0,0,0,0,$size[0],$size[1]);
+  $image = imagecreatetruecolor($size[0], $size[1]);
+  imagecopy($image, $im, 0, 0, 0, 0, $size[0], $size[1]);
   imagedestroy($im);
 
   // Colors
   $color = "FFFFFF";
-  $red = hexdec(substr($color,0,2));
-  $green = hexdec(substr($color,2,4));
-  $blue = hexdec(substr($color,4,6));
-  $select = imagecolorallocate($image,$red,$green,$blue);
+  $red = hexdec(substr($color, 0, 2));
+  $green = hexdec(substr($color, 2, 4));
+  $blue = hexdec(substr($color, 4, 6));
+  $select = imagecolorallocate($image, $red, $green, $blue);
   $txt_shadow = imagecolorallocatealpha($image, 255, 255, 255, 255);
   $txt_color = imagecolorallocatealpha($image, 255, 255, 255, 2);
   $txt_shadow2 = imagecolorallocatealpha($image, 255, 255, 255, 255);
   $txt_color2 = imagecolorallocatealpha($image, 255, 255, 255, 40);
 
-  $fonts = array (
+  $fonts = array(
     'userbar' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_userbar_font,
     'universe' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontUniverse,
     'raids' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontRaids,
     'info' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontInfo,
   );
 
-  if($id)
+  if ($id)
   {
     // Querys
     $user = db_user_by_id($id);
@@ -62,8 +62,8 @@ 
     $b_user = $user['username'];
     $b_ally = $user['ally_name'];
     $b_planet = $planet_row['name'];
-    $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
-    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) ."/{$config->users_amount}";
+    $b_xyz = "[" . $planet_row['galaxy'] . ":" . $planet_row['system'] . ":" . $planet_row['planet'] . "]";
+    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) . "/{$config->users_amount}";
   }
   else
   {
@@ -85,7 +85,7 @@ 
       imagettftext($image, 11, 0, 8, 26, $txt_shadow, $fonts['info'], $b_user);
       imagettftext($image, 11, 0, 6, 23, $txt_color, $fonts['info'], $b_user);
 
-      if($id)
+      if ($id)
       {
         // Player level - right-alligned
         $is = imagettfbbox(11, 0, $fonts['info'], $b_lvl);
@@ -94,37 +94,37 @@ 
 
         // Ally name
         $is = imagettfbbox(9, 0, $fonts['info'], $b_ally);
-        imagettftext($image, 9, 0, 412-$is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
-        imagettftext($image, 9, 0, 410-$is[2], 35, $txt_color, $fonts['info'], $b_ally);
+        imagettftext($image, 9, 0, 412 - $is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
+        imagettftext($image, 9, 0, 410 - $is[2], 35, $txt_color, $fonts['info'], $b_ally);
 
         // Player b_planet
-        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet." ".$b_xyz);
-        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet." ".$b_xyz);
+        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet . " " . $b_xyz);
+        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet . " " . $b_xyz);
 
         //StatPoint
-        $b_points = $lang['ov_points'].": ".pretty_number($user['total_points']);
+        $b_points = $lang['ov_points'] . ": " . pretty_number($user['total_points']);
         $is = imagettfbbox(8, 0, $fonts['info'], $b_points);
-        imagettftext($image, 8, 0, 412-$is[2], 11, $txt_shadow, $fonts['info'], $b_points);
-        imagettftext($image, 8, 0, 410-$is[2], 9, $txt_color, $fonts['info'], $b_points);
+        imagettftext($image, 8, 0, 412 - $is[2], 11, $txt_shadow, $fonts['info'], $b_points);
+        imagettftext($image, 8, 0, 410 - $is[2], 9, $txt_color, $fonts['info'], $b_points);
 
         //Raids Total
         imagettftext($image, 6, 0, 8, 37, $txt_shadow2, $fonts['raids'], $lang['NumberOfRaids']);
         imagettftext($image, 6, 0, 6, 35, $txt_color2, $fonts['raids'], $lang['NumberOfRaids']);
-        $b_points = ": ".pretty_number($user['raids']);
+        $b_points = ": " . pretty_number($user['raids']);
         imagettftext($image, 6, 0, 61, 37, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 35, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Won
         imagettftext($image, 6, 0, 8, 47, $txt_shadow2, $fonts['raids'], $lang['RaidsWin']);
         imagettftext($image, 6, 0, 6, 45, $txt_color2, $fonts['raids'], $lang['RaidsWin']);
-        $b_points = ": ".pretty_number($user['raidswin']);
+        $b_points = ": " . pretty_number($user['raidswin']);
         imagettftext($image, 6, 0, 61, 47, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 45, $txt_color2, $fonts['raids'], $b_points);
 
         //Raids Lost
         imagettftext($image, 6, 0, 8, 57, $txt_shadow2, $fonts['raids'], $lang['RaidsLoose']);
         imagettftext($image, 6, 0, 6, 55, $txt_color2, $fonts['raids'], $lang['RaidsLoose']);
-        $b_points = ": ".pretty_number($user['raidsloose']);
+        $b_points = ": " . pretty_number($user['raidsloose']);
         imagettftext($image, 6, 0, 61, 57, $txt_shadow2, $fonts['raids'], $b_points);
         imagettftext($image, 6, 0, 59, 55, $txt_color2, $fonts['raids'], $b_points);
       }
@@ -137,25 +137,25 @@ 
       $is = imagettfbbox(9, 0, $fonts['userbar'], $b_univ);
       $is = $size[0] - $is[2] - 2;
       imagettftext($image, 9, 0, $is, $size[1] - 3, $txt_shadow, $fonts['userbar'], $b_univ);
-      imagettftext($image, 9, 0, $is-1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
-      imagettftext($image, 22, 0, $is-8, $size[1], $txt_color, $fonts['userbar'], '/');
+      imagettftext($image, 9, 0, $is - 1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
+      imagettftext($image, 22, 0, $is - 8, $size[1], $txt_color, $fonts['userbar'], '/');
 
       // Player name
       imagettftext($image, 9, 0, 4, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_user);
       imagettftext($image, 9, 0, 2, $size[1] - 6, $txt_color, $fonts['userbar'], $b_user);
 
-      if($id)
+      if ($id)
       {
         // Player level - right-alligned
         $isp = imagettfbbox(9, 0, $fonts['userbar'], $b_lvl);
-        imagettftext($image, 9, 0, $is-$isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
-        imagettftext($image, 9, 0, $is-$isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
+        imagettftext($image, 9, 0, $is - $isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
+        imagettftext($image, 9, 0, $is - $isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
       }
   }
 
   //And now convert it back to PNG-8
-  $im_result = imagecreate($size[0],$size[1]);
-  imagecopy($im_result,$image,0,0,0,0,$size[0],$size[1]);
+  $im_result = imagecreate($size[0], $size[1]);
+  imagecopy($im_result, $image, 0, 0, 0, 0, $size[0], $size[1]);
   imagedestroy($image);
   //And save it
   $imagetypes = imagetypes();

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

includes/functions/eco_planet_update.php

Spacing +12 added lines, -12 removed lines

@@ -14,13 +14,13 @@ 
 
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
 
-  if(!$planet) {
+  if (!$planet) {
     return $no_data;
   }
 
-  if(!$no_user_update) {
+  if (!$no_user_update) {
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
-    if(!$user) {
+    if (!$user) {
       // TODO - Убрать позже
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@ 
     $user = db_user_by_id($user, !$simulation, '*', true);
   }
 
-  if(empty($user['id'])) {
+  if (empty($user['id'])) {
     return $no_data;
   }
 
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
     $planet = db_planet_by_vector($planet, '', !$simulation);
   } else {
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
     $planet = db_planet_by_id($planet, !$simulation);
   }
-  if(!is_array($planet) || !isset($planet['id'])) {
+  if (!is_array($planet) || !isset($planet['id'])) {
     return $no_data;
   }
 
@@ -65,15 +65,15 @@ 
     RES_DEUTERIUM => 0,
   );
 
-  switch($planet['planet_type']) {
+  switch ($planet['planet_type']) {
     case PT_PLANET:
-      foreach($resources_increase as $resource_id => &$increment) {
+      foreach ($resources_increase as $resource_id => &$increment) {
         $resource_name = pname_resource_name($resource_id);
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
         $increment = min($increment, max(0, $store_free));
 
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
           global $debug;
           $debug->warning("Player ID {$user['id']} have negative resources on ID {$planet['id']}.{$planet['planet_type']} [{$planet['galaxy']}:{$planet['system']}:{$planet['planet']}]. Difference {$planet[$resource_name]} of {$resource_name}", 'Negative Resources', 501);
         }
@@ -95,13 +95,13 @@ 
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
   $planet['field_current'] = 0;
   $sn_group_build_allow = sn_get_groups('build_allow');
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
     }
   }
 
-  if($simulation) {
+  if ($simulation) {
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
   }
 

includes/functions/qst_quest.php

Spacing +42 added lines, -42 removed lines

@@ -12,34 +12,34 @@ 
 
   $in_admin = defined('IN_ADMIN') && IN_ADMIN === true;
 
-  if($in_admin)
+  if ($in_admin)
   {
     $quest_id = sys_get_param_id('id');
     $quest_name = sys_get_param_str_unsafe('QUEST_NAME');
-    if(!empty($quest_name))
+    if (!empty($quest_name))
     {
       $quest_description = sys_get_param_str_unsafe('QUEST_DESCRIPTION');
       try
       {
         $quest_rewards_list = sys_get_param('QUEST_REWARDS_LIST');
         $quest_rewards = array();
-        foreach($quest_rewards_list as $quest_rewards_id => $quest_rewards_amount)
+        foreach ($quest_rewards_list as $quest_rewards_id => $quest_rewards_amount)
         {
-          if(!in_array($quest_rewards_id, $quest_reward_allowed))
+          if (!in_array($quest_rewards_id, $quest_reward_allowed))
           {
             throw new Exception($lang['qst_adm_err_reward_type']);
           }
 
-          if($quest_rewards_amount < 0)
+          if ($quest_rewards_amount < 0)
           {
             throw new Exception($lang['qst_adm_err_reward_amount']);
           }
-          elseif($quest_rewards_amount > 0)
+          elseif ($quest_rewards_amount > 0)
           {
             $quest_rewards[] = "{$quest_rewards_id},{$quest_rewards_amount}";
           }
         }
-        if(empty($quest_rewards))
+        if (empty($quest_rewards))
         {
           throw new Exception($lang['qst_adm_err_reward_empty']);
         }
@@ -47,13 +47,13 @@ 
         $quest_rewards = implode(';', $quest_rewards);
 
         $quest_unit_id = sys_get_param_int('QUEST_UNIT_ID');
-        if(!in_array($quest_unit_id, $quest_units_allowed))
+        if (!in_array($quest_unit_id, $quest_units_allowed))
         {
           throw new Exception($lang['qst_adm_err_unit_id']);
         }
 
         $quest_unit_amount = sys_get_param_float('QUEST_UNIT_AMOUNT');
-        if($quest_unit_amount <= 0)
+        if ($quest_unit_amount <= 0)
         {
           throw new Exception($lang['qst_adm_err_unit_amount']);
         }
@@ -62,7 +62,7 @@ 
         // TODO: Change quest type
         $quest_type = 0;
 
-        if($mode == 'edit')
+        if ($mode == 'edit')
         {
           $quest_name        = db_escape($quest_name);
           $quest_description = db_escape($quest_description);
@@ -103,7 +103,7 @@ 
       $mode = '';
     };
 
-    switch($mode)
+    switch ($mode)
     {
       case 'del':
         doquery("DELETE FROM {{quest}} WHERE `quest_id` = {$quest_id} LIMIT 1;");
@@ -120,7 +120,7 @@ 
     $query = doquery("SELECT count(*) AS count FROM {{quest}};", '', true);
     $config->db_saveItem('quest_total', $query['count']);
   }
-  elseif(!$user_id)
+  elseif (!$user_id)
   {
     $user_id = $user['id'];
   }
@@ -134,7 +134,7 @@ 
     'IN_ADMIN'  => $in_admin,
   ));
 
-  if($quest)
+  if ($quest)
   {
     $quest_templatized = qst_templatize(qst_quest_parse($quest, false));
   }
@@ -143,19 +143,19 @@ 
     $quest_templatized['quest_rewards_list'] = array();
   }
 
-  foreach($quest_reward_allowed as $unit_id)
+  foreach ($quest_reward_allowed as $unit_id)
   {
     $found = false;
-    foreach($quest_templatized['quest_rewards_list'] as $quest_templatized_reward)
+    foreach ($quest_templatized['quest_rewards_list'] as $quest_templatized_reward)
     {
-      if($quest_templatized_reward['ID'] == $unit_id)
+      if ($quest_templatized_reward['ID'] == $unit_id)
       {
         $found = true;
         break;
       }
     }
 
-    if(!$found)
+    if (!$found)
     {
       $quest_templatized['quest_rewards_list'][$unit_id] = array(
         'ID'     => $unit_id,
@@ -167,12 +167,12 @@ 
 
   qst_assign_to_template($template, $quest_templatized);
 
-  foreach($quest_list as $quest_data)
+  foreach ($quest_list as $quest_data)
   {
     qst_assign_to_template($template, qst_templatize($quest_data, true), 'quest');
   }
 
-  foreach($quest_units_allowed as $unit_id)
+  foreach ($quest_units_allowed as $unit_id)
   {
     $template->assign_block_vars('allowed_unit', array(
       'ID'   => $unit_id,
@@ -185,12 +185,12 @@ 
 {
   $quest_list = array();
 
-  if($user_id)
+  if ($user_id)
   {
-    if($status !== false)
+    if ($status !== false)
     {
       $query_add_where = "AND qs.quest_status_status ";
-      if($status == null)
+      if ($status == null)
       {
         $query_add_where .= "IS NULL";
       }
@@ -210,7 +210,7 @@ 
     ;"
   );
 
-  while($quest = db_fetch($query))
+  while ($quest = db_fetch($query))
   {
     $quest_list[$quest['quest_id']] = qst_quest_parse($quest);
   }
@@ -220,16 +220,16 @@ 
 
 function qst_assign_to_template(&$template, $quest_templatized, $block_name = false)
 {
-  if($block_name)
+  if ($block_name)
   {
     $template->assign_block_vars($block_name, $quest_templatized);
   }
   else
   {
     $template->assign_vars($quest_templatized);
-    if(!empty($quest_templatized['quest_rewards_list']))
+    if (!empty($quest_templatized['quest_rewards_list']))
     {
-      foreach($quest_templatized['quest_rewards_list'] as $quest_reward)
+      foreach ($quest_templatized['quest_rewards_list'] as $quest_reward)
       {
         $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
       }
@@ -251,7 +251,7 @@ 
   global $lang;
 
   $tmp = array();
-  foreach($quest['quest_rewards_list'] as $quest_reward_id => $quest_reward_amount)
+  foreach ($quest['quest_rewards_list'] as $quest_reward_id => $quest_reward_amount)
   {
     $tmp[] = array(
       'ID'     => $quest_reward_id,
@@ -278,9 +278,9 @@ 
 function qst_active_triggers($quest_list)
 {
   $quest_triggers = array();
-  foreach($quest_list as $quest_id => $quest)
+  foreach ($quest_list as $quest_id => $quest)
   {
-    if($quest['quest_status_status'] != QUEST_STATUS_COMPLETE)
+    if ($quest['quest_status_status'] != QUEST_STATUS_COMPLETE)
     {
       list($quest_unit_id, $quest_unit_amount) = explode(',', $quest['quest_conditions']);
       $quest_triggers[$quest_id] = $quest_unit_id;
@@ -292,7 +292,7 @@ 
 
 function qst_reward(&$user, &$rewards, &$quest_list)
 {
-  if(empty($rewards)) return;
+  if (empty($rewards)) return;
 
   global $lang;
 
@@ -300,15 +300,15 @@ 
   $total_rewards = array();
   $comment_dm = '';
 
-  foreach($rewards as $quest_id => $user_data)
-    foreach($user_data as $user_id => $planet_data)
-      foreach($planet_data as $planet_id => $reward_list)
+  foreach ($rewards as $quest_id => $user_data)
+    foreach ($user_data as $user_id => $planet_data)
+      foreach ($planet_data as $planet_id => $reward_list)
       {
         $comment = sprintf($lang['qst_msg_complete_body'], $quest_list[$quest_id]['quest_name']);
         $comment_dm .= isset($reward_list[RES_DARK_MATTER]) ? $comment : '';
 
         $comment_reward = array();
-        foreach($reward_list as $unit_id => $unit_amount)
+        foreach ($reward_list as $unit_id => $unit_amount)
         {
           $comment_reward[] = $unit_amount . ' ' . $lang['tech'][$unit_id];
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
@@ -326,23 +326,23 @@ 
 
   $group_resources = sn_get_groups('resources_loot');
   $quest_rewards_allowed = sn_get_groups('quest_rewards');
-  if(!empty($total_rewards))
+  if (!empty($total_rewards))
   {
-    foreach($total_rewards as $user_id => $planet_data)
+    foreach ($total_rewards as $user_id => $planet_data)
     {
       $user_row = classSupernova::db_get_record_by_id(LOC_USER, $user_id);
-      foreach($planet_data as $planet_id => $unit_data)
+      foreach ($planet_data as $planet_id => $unit_data)
       {
         $local_changeset = array();
-        foreach($unit_data as $unit_id => $unit_amount)
+        foreach ($unit_data as $unit_id => $unit_amount)
         {
-          if(!isset($quest_rewards_allowed[$unit_id])) continue;
+          if (!isset($quest_rewards_allowed[$unit_id])) continue;
 
-          if($unit_id == RES_DARK_MATTER)
+          if ($unit_id == RES_DARK_MATTER)
           {
             rpg_points_change($user['id'], RPG_QUEST, $unit_amount, $comment_dm);
           }
-          elseif(isset($group_resources[$unit_id]))
+          elseif (isset($group_resources[$unit_id]))
           {
             $local_changeset[pname_resource_name($unit_id)] = array('delta' => $unit_amount);
           }
@@ -353,7 +353,7 @@ 
           // unit
         }
 
-        if(!empty($local_changeset))
+        if (!empty($local_changeset))
         {
           $planet_id = $planet_id == 0 && isset($user_row['id_planet']) ? $user_row['id_planet'] : $planet_id;
           $db_changeset[$planet_id ? 'planets' : 'users'][] = array(

Braces +18 added lines, -22 removed lines

@@ -33,8 +33,7 @@ 
           if($quest_rewards_amount < 0)
           {
             throw new Exception($lang['qst_adm_err_reward_amount']);
-          }
-          elseif($quest_rewards_amount > 0)
+          } elseif($quest_rewards_amount > 0)
           {
             $quest_rewards[] = "{$quest_rewards_id},{$quest_rewards_amount}";
           }
@@ -75,8 +74,7 @@ 
               `quest_rewards` = '{$quest_rewards}'
             WHERE `quest_id` = {$quest_id} LIMIT 1;"
           );
-        }
-        else
+        } else
         {
           sn_db_perform('{{quest}}', array(
             'quest_name' => $quest_name,
@@ -94,8 +92,7 @@ 
           msg_send_simple_message('*', 0, 0, MSG_TYPE_PLAYER, $lang['sys_administration'], $lang['news_title'], $text);
         }
         */
-      }
-      catch (Exception $e)
+      } catch (Exception $e)
       {
         message($e->getMessage(), $lang['sys_error']);
       }
@@ -119,8 +116,7 @@ 
     }
     $query = doquery("SELECT count(*) AS count FROM {{quest}};", '', true);
     $config->db_saveItem('quest_total', $query['count']);
-  }
-  elseif(!$user_id)
+  } elseif(!$user_id)
   {
     $user_id = $user['id'];
   }
@@ -137,8 +133,7 @@ 
   if($quest)
   {
     $quest_templatized = qst_templatize(qst_quest_parse($quest, false));
-  }
-  else
+  } else
   {
     $quest_templatized['quest_rewards_list'] = array();
   }
@@ -193,8 +188,7 @@ 
       if($status == null)
       {
         $query_add_where .= "IS NULL";
-      }
-      else
+      } else
       {
         $query_add_where .= "= {$status}";
       }
@@ -223,8 +217,7 @@ 
   if($block_name)
   {
     $template->assign_block_vars($block_name, $quest_templatized);
-  }
-  else
+  } else
   {
     $template->assign_vars($quest_templatized);
     if(!empty($quest_templatized['quest_rewards_list']))
@@ -292,7 +285,9 @@ 
 
 function qst_reward(&$user, &$rewards, &$quest_list)
 {
-  if(empty($rewards)) return;
+  if(empty($rewards)) {
+    return;
+  }
 
   global $lang;
 
@@ -300,11 +295,12 @@ 
   $total_rewards = array();
   $comment_dm = '';
 
-  foreach($rewards as $quest_id => $user_data)
-    foreach($user_data as $user_id => $planet_data)
+  foreach($rewards as $quest_id => $user_data) {
+      foreach($user_data as $user_id => $planet_data)
       foreach($planet_data as $planet_id => $reward_list)
       {
         $comment = sprintf($lang['qst_msg_complete_body'], $quest_list[$quest_id]['quest_name']);
+  }
         $comment_dm .= isset($reward_list[RES_DARK_MATTER]) ? $comment : '';
 
         $comment_reward = array();
@@ -336,17 +332,17 @@ 
         $local_changeset = array();
         foreach($unit_data as $unit_id => $unit_amount)
         {
-          if(!isset($quest_rewards_allowed[$unit_id])) continue;
+          if(!isset($quest_rewards_allowed[$unit_id])) {
+            continue;
+          }
 
           if($unit_id == RES_DARK_MATTER)
           {
             rpg_points_change($user['id'], RPG_QUEST, $unit_amount, $comment_dm);
-          }
-          elseif(isset($group_resources[$unit_id]))
+          } elseif(isset($group_resources[$unit_id]))
           {
             $local_changeset[pname_resource_name($unit_id)] = array('delta' => $unit_amount);
-          }
-          else // Проверим на юниты
+          } else // Проверим на юниты
           {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($unit_id, $unit_amount, $user_row, $planet_id);
           }

includes/functions/flt_mission_missile.php

Spacing +18 added lines, -18 removed lines

@@ -13,7 +13,7 @@ 
 
   $mip_data = get_unit_param(UNIT_DEF_MISSILE_INTERPLANET);
   $MIPDamage = floor(mrc_modify_value($attackerTech, false, TECH_WEAPON, $MIPs * $mip_data[P_ATTACK] * mt_rand(80, 120) / 100));
-  foreach($structures as $key => $structure)
+  foreach ($structures as $key => $structure)
   {
     $unit_info = get_unit_param($key);
     $amplify = isset($mip_data[P_AMPLIFY][$key]) ? $mip_data[P_AMPLIFY][$key] : 1;
@@ -31,9 +31,9 @@ 
   {
     //attacking only selected structure
     $damageDone = $structures[$targetedStructure][$damageTo];
-    $structsDestroyed = min( floor($MIPDamage/$damageDone), $structures[$targetedStructure][0] );
+    $structsDestroyed = min(floor($MIPDamage / $damageDone), $structures[$targetedStructure][0]);
     $structures[$targetedStructure][0] -= $structsDestroyed;
-    $MIPDamage -= $structsDestroyed*$damageDone;
+    $MIPDamage -= $structsDestroyed * $damageDone;
   }
   else
   {
@@ -44,16 +44,16 @@ 
     do
     {
       // finding is there any structure that can be damaged with leftovers of $MIPDamage
-      foreach($can_be_damaged as $key => $unit_id)
+      foreach ($can_be_damaged as $key => $unit_id)
       {
 //debug($structures[$unit_id][0]);
 //debug($structures[$unit_id][$damageTo], $MIPDamage);
-        if($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
+        if ($structures[$unit_id][0] <= 0 || $structures[$unit_id][$damageTo] > $MIPDamage)
         {
           unset($can_be_damaged[$key]);
         }
       }
-      if(empty($can_be_damaged))
+      if (empty($can_be_damaged))
       {
         break;
       }
@@ -72,7 +72,7 @@ 
 //debug($destroyed, 'Actually destroyed');
 
 //print('<hr>');
-    } while($MIPDamage > 0 && !empty($can_be_damaged));
+    } while ($MIPDamage > 0 && !empty($can_be_damaged));
 //debug($MIPDamage, 'MIPDamage left');
   }
 //debug($structures);//die();
@@ -87,8 +87,8 @@ 
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
   }
 
-  $return['structures'] = $structures;     // Structures left after attack
-  $return['metal']      = floor($metal);   // Metal scraps
+  $return['structures'] = $structures; // Structures left after attack
+  $return['metal']      = floor($metal); // Metal scraps
   $return['crystal']    = floor($crystal); // Crystal scraps
 
   return $return;
@@ -112,7 +112,7 @@ 
 
   $iraks = doquery("SELECT * FROM {{iraks}} WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
 
-  while($fleetRow = db_fetch($iraks)) {
+  while ($fleetRow = db_fetch($iraks)) {
     set_time_limit(15);
     $db_changeset = array();
 
@@ -128,9 +128,9 @@ 
 
     $rowAttacker = db_user_by_id($fleetRow['fleet_owner'], true);
 
-    if($target_planet_row['id']) {
+    if ($target_planet_row['id']) {
       $planetDefense = array();
-      foreach(sn_get_groups('defense_active') as $unit_id) {
+      foreach (sn_get_groups('defense_active') as $unit_id) {
         $planetDefense[$unit_id] = array(mrc_get_level($targetUser, $target_planet_row, $unit_id, true, true));
       }
 
@@ -141,7 +141,7 @@ 
         $message = $lang['mip_all_destroyed'];
         $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$missiles, $targetUser, $target_planet_row['id']);
       } else {
-        if($interceptors) {
+        if ($interceptors) {
           $message = sprintf($lang['mip_destroyed'], $interceptors);
           $db_changeset['unit'][] = sn_db_unit_changeset_prepare(UNIT_DEF_MISSILE_INTERCEPTOR, -$interceptors, $targetUser, $target_planet_row['id']);
         }
@@ -149,16 +149,16 @@ 
 
         $attackResult = COE_missileAttack($targetUser, $rowAttacker, $missiles - $interceptors, $planetDefense, $fleetRow['primaer']);
 
-        foreach($attackResult['structures'] as $key => $structure) {
+        foreach ($attackResult['structures'] as $key => $structure) {
           $destroyed = $planetDefense[$key][0] - $structure[0];
-          if($destroyed) {
+          if ($destroyed) {
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($key, -$destroyed, $targetUser, $target_planet_row['id']);
 
             $message .= "&nbsp;&nbsp;{$lang['tech'][$key]} - {$destroyed} {$lang['quantity']}<br>";
           }
         }
 
-        if(!empty($message)) {
+        if (!empty($message)) {
           $message = $lang['mip_defense_destroyed'] . $message . "{$lang['mip_recycled']}{$lang['Metal']}: {$attackResult['metal']}, {$lang['Crystal']}: {$attackResult['crystal']}<br>";
 
           db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
@@ -178,8 +178,8 @@ 
       empty($message) ? $message = $lang['mip_no_defense'] : false;
       // empty($message) && ($message = $lang['mip_no_defense']);
 
-      msg_send_simple_message ( $fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
-      msg_send_simple_message ( $fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message );
+      msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
+      msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, $lang['mip_sender_amd'], $lang['mip_subject_amd'], $message_vorlage . $message);
     }
     doquery("DELETE FROM {{iraks}} WHERE id = '{$fleetRow['id']}';");
   }

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

includes/functions/eco_get_planet_caps.php

Spacing +16 added lines, -16 removed lines

@@ -3,7 +3,7 @@ 
 function eco_get_planet_caps_modify_production(&$item, $key, $data) {
   static $modifiers;
 
-  if(!$modifiers) {
+  if (!$modifiers) {
     $modifiers = sn_get_groups('modifiers');
   }
   $item = floor(mrc_modify_value($data['user'], $data['planet'], $modifiers[MODIFIER_RESOURCE_PRODUCTION], $item));
@@ -15,7 +15,7 @@ 
 
   static $sn_group_modifiers, $config_resource_multiplier, $config_resource_multiplier_plain, $config_eco_scale_storage;
 
-  if(!$sn_group_modifiers) {
+  if (!$sn_group_modifiers) {
     $sn_group_modifiers = sn_get_groups('modifiers');
     $config_resource_multiplier = game_resource_multiplier();
     $config_resource_multiplier_plain = game_resource_multiplier(true);
@@ -26,15 +26,15 @@ 
   $caps['storage'][RES_METAL][0] = $config->eco_planet_storage_metal;
   $caps['storage'][RES_CRYSTAL][0] = $config->eco_planet_storage_crystal;
   $caps['storage'][RES_DEUTERIUM][0] = $config->eco_planet_storage_deuterium;
-  foreach(sn_get_groups('storages') as $unit_id) {
-    foreach(get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
+  foreach (sn_get_groups('storages') as $unit_id) {
+    foreach (get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
       $caps['storage'][$resource_id][$unit_id] = floor($config_eco_scale_storage *
         mrc_modify_value($user, $planet_row, $sn_group_modifiers[MODIFIER_RESOURCE_CAPACITY], $function(mrc_get_level($user, $planet_row, $unit_id)))
       );
     }
   }
 
-  if($planet_row['planet_type'] == PT_MOON) {
+  if ($planet_row['planet_type'] == PT_MOON) {
     return $caps;
   }
 
@@ -46,12 +46,12 @@ 
   $caps['production_full'][RES_DEUTERIUM][0] = floor($config->deuterium_basic_income * $config_resource_multiplier * (isset($planet_density[RES_DEUTERIUM]) ? $planet_density[RES_DEUTERIUM] : 1));
   $caps['production_full'][RES_ENERGY][0] = floor($config->energy_basic_income * $config_resource_multiplier_plain * (isset($planet_density[RES_ENERGY]) ? $planet_density[RES_ENERGY] : 1));
 
-  foreach(sn_get_groups('factories') as $unit_id) {
+  foreach (sn_get_groups('factories') as $unit_id) {
     $unit_data = get_unit_param($unit_id);
     $unit_level = mrc_get_level($user, $planet_row, $unit_id);
     $unit_load = $planet_row[pname_factory_production_field_name($unit_id)];
 
-    foreach($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
+    foreach ($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
       $caps['production_full'][$resource_id][$unit_id] = $function($unit_level, $unit_load, $user, $planet_row)
         * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
         * (isset($planet_density[$resource_id]) ? $planet_density[$resource_id] : 1);
@@ -60,21 +60,21 @@ 
 
   array_walk_recursive($caps['production_full'], 'eco_get_planet_caps_modify_production', array('user' => $user, 'planet' => $planet_row));
 
-  foreach($caps['production_full'] as $resource_id => $resource_data) {
+  foreach ($caps['production_full'] as $resource_id => $resource_data) {
     $caps['total_production_full'][$resource_id] = array_sum($resource_data);
   }
 
   $caps['production'] = $caps['production_full'];
 
-  if($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
+  if ($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
     $deuterium_balance = array_sum($caps['production'][RES_DEUTERIUM]);
     $energy_balance = array_sum($caps['production'][RES_ENERGY]);
-    if($deuterium_balance < 0 || $energy_balance < 0) {
+    if ($deuterium_balance < 0 || $energy_balance < 0) {
       $caps['production'][RES_DEUTERIUM][STRUC_MINE_FUSION] = $caps['production'][RES_ENERGY][STRUC_MINE_FUSION] = 0;
     }
   }
 
-  foreach($caps['production'][RES_ENERGY] as $energy) {
+  foreach ($caps['production'][RES_ENERGY] as $energy) {
     $caps[RES_ENERGY][$energy >= 0 ? BUILD_CREATE : BUILD_DESTROY] += $energy;
   }
 
@@ -84,10 +84,10 @@ 
     ? $caps[RES_ENERGY][BUILD_CREATE] / $caps[RES_ENERGY][BUILD_DESTROY]
     : 1;
 
-  foreach($caps['production'] as $resource_id => &$resource_data) {
-    if($caps['efficiency'] != 1) {
-      foreach($resource_data as $unit_id => &$resource_production) {
-        if(!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
+  foreach ($caps['production'] as $resource_id => &$resource_data) {
+    if ($caps['efficiency'] != 1) {
+      foreach ($resource_data as $unit_id => &$resource_production) {
+        if (!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
           $resource_production = $resource_production * $caps['efficiency'];
         }
       }
@@ -96,7 +96,7 @@ 
     $caps['total'][$resource_id] = $caps['total'][$resource_id] >= 0 ? floor($caps['total'][$resource_id]) : ceil($caps['total'][$resource_id]);
   }
 
-  foreach($caps['storage'] as $resource_id => &$resource_data) {
+  foreach ($caps['storage'] as $resource_id => &$resource_data) {
     $caps['total_storage'][$resource_id] = array_sum($resource_data);
   }
 

includes/functions/scheduler_process.php

Spacing +6 added lines, -6 removed lines

@@ -8,19 +8,19 @@ 
   $ts_var_stat_update = strtotime($config->db_loadItem('var_stat_update'));
   $ts_scheduled_update = sys_schedule_get_prev_run($config->db_loadItem('stats_schedule'), $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($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 = $config->db_loadItem('game_disable');
       $config->db_saveItem('game_disable', GAME_DISABLE_STAT);
 
@@ -56,13 +56,13 @@ 
       $config->db_saveItem('var_stat_update_end', SN_TIME_SQL);
 
       $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($config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW;
       $msg = $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';
   }