Completed
Push — work-fleets ( 1bdd41...8f5403 )
by SuperNova.WS
04:54
created
includes/pages/techtree.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
   global $lang, $user, $planetrow;
15 15
 
16 16
   $tech_tree = array();
17
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
17
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
18 18
   {
19 19
     $tech_tree[] = array(
20 20
       'NAME' => $lang['tech'][$unit_group_id],
21 21
       'GROUP_ID' => $unit_group_id,
22 22
     );
23 23
 
24
-    foreach($unit_list as $unit_id)
24
+    foreach ($unit_list as $unit_id)
25 25
     {
26 26
       $sn_data_unit = get_unit_param($unit_id);
27 27
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);
Please login to merge, or discard this patch.
includes/debug.class.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,11 +140,13 @@
 block discarded – undo
140 140
       $error_backtrace['locks'] = classSupernova::$locks;
141 141
       $error_backtrace['cSN_data'] = classSupernova::$data;
142 142
       foreach($error_backtrace['cSN_data'] as &$location) {
143
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
143
+        foreach($location as $location_id => &$location_data) {
144
+          //          $location_data = $location_id;
144 145
         {
145 146
           $location_data = isset($location_data['username']) ? $location_data['username'] :
146 147
             (isset($location_data['name']) ? $location_data['name'] : $location_id);
147 148
         }
149
+        }
148 150
       }
149 151
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
150 152
     }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Some helpers to sweeten dev's life
4
- */
3
+   * Some helpers to sweeten dev's life
4
+   */
5 5
 
6 6
 /*
7 7
  * debug.class.php ::  Clase Debug, maneja reporte de eventos
Please login to merge, or discard this patch.
Spacing   +37 added lines, -38 removed lines patch added patch discarded remove patch
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
   function log_file($message, $ident_change = 0) {
51 51
     static $ident = 0;
52 52
 
53
-    if(!defined('SN_DEBUG_LOG')) {
53
+    if (!defined('SN_DEBUG_LOG')) {
54 54
       return;
55 55
     }
56 56
 
57
-    if($this->log_file_handler === null) {
57
+    if ($this->log_file_handler === null) {
58 58
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
59 59
       @fwrite($this->log_file_handler, "\r\n\r\n");
60 60
     }
61 61
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
62
-    if($this->log_file_handler) {
62
+    if ($this->log_file_handler) {
63 63
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
64 64
     }
65 65
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
     $result = array();
91 91
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
92 92
     $result[] = "tID {$transaction_id}";
93
-    foreach($backtrace as $a_trace) {
94
-      if(in_array($a_trace['function'], $exclude_functions)) {
93
+    foreach ($backtrace as $a_trace) {
94
+      if (in_array($a_trace['function'], $exclude_functions)) {
95 95
         continue;
96 96
       }
97 97
       $function =
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
       // $result[] = "{$function} ({$a_trace['line']})'{$file}'";
109 109
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
110 110
 
111
-      if(!$long_comment) {
111
+      if (!$long_comment) {
112 112
         break;
113 113
       }
114 114
     }
@@ -120,26 +120,26 @@  discard block
 block discarded – undo
120 120
   }
121 121
 
122 122
   function dump($dump = false, $force_base = false, $deadlock = false) {
123
-    if($dump === false) {
123
+    if ($dump === false) {
124 124
       return;
125 125
     }
126 126
 
127 127
     $error_backtrace = array();
128 128
     $base_dump = false;
129 129
 
130
-    if($force_base === true) {
130
+    if ($force_base === true) {
131 131
       $base_dump = true;
132 132
     }
133 133
 
134
-    if($dump === true) {
134
+    if ($dump === true) {
135 135
       $base_dump = true;
136 136
     } else {
137
-      if(!is_array($dump)) {
137
+      if (!is_array($dump)) {
138 138
         $dump = array('var' => $dump);
139 139
       }
140 140
 
141
-      foreach($dump as $dump_var_name => $dump_var) {
142
-        if($dump_var_name == 'base_dump') {
141
+      foreach ($dump as $dump_var_name => $dump_var) {
142
+        if ($dump_var_name == 'base_dump') {
143 143
           $base_dump = $dump_var;
144 144
         } else {
145 145
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -148,26 +148,25 @@  discard block
 block discarded – undo
148 148
     }
149 149
 
150 150
 //    if($deadlock && ($q = db_fetch(classSupernova::$db->__db_query('SHOW ENGINE INNODB STATUS')))) {
151
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
151
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
152 152
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
153 153
       $error_backtrace['locks'] = classSupernova::$locks;
154 154
       $error_backtrace['cSN_data'] = classSupernova::$data;
155
-      foreach($error_backtrace['cSN_data'] as &$location) {
156
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
155
+      foreach ($error_backtrace['cSN_data'] as &$location) {
156
+        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
157 157
         {
158
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
159
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
158
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
160 159
         }
161 160
       }
162 161
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
163 162
     }
164 163
 
165
-    if($base_dump) {
166
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
164
+    if ($base_dump) {
165
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
167 166
 //        ;
168 167
 //      }
169 168
 //      {
170
-        foreach($this->log_array as $log) {
169
+        foreach ($this->log_array as $log) {
171 170
           $error_backtrace['queries'][] = $log;
172 171
         }
173 172
       }
@@ -198,14 +197,14 @@  discard block
 block discarded – undo
198 197
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
199 198
     global $sys_stop_log_hit, $sys_log_disabled, $user;
200 199
 
201
-    if(empty(classSupernova::$db->connected)) {
200
+    if (empty(classSupernova::$db->connected)) {
202 201
       // TODO - писать ошибку в файл
203 202
       die('SQL server currently unavailable. Please contact Administration...');
204 203
     }
205 204
 
206 205
     sn_db_transaction_rollback();
207 206
 
208
-    if(classSupernova::$config->debug == 1) {
207
+    if (classSupernova::$config->debug == 1) {
209 208
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
210 209
       echo "<table>{$this->log}</table>";
211 210
     }
@@ -215,7 +214,7 @@  discard block
 block discarded – undo
215 214
     $error_text = db_escape($message);
216 215
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
217 216
 
218
-    if(!$sys_log_disabled) {
217
+    if (!$sys_log_disabled) {
219 218
       $query = "INSERT INTO `{{logs}}` SET
220 219
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
221 220
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -233,7 +232,7 @@  discard block
 block discarded – undo
233 232
       ob_start();
234 233
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
235 234
 
236
-      foreach($error_backtrace as $name => $value) {
235
+      foreach ($error_backtrace as $name => $value) {
237 236
         print(__DEBUG_LINE);
238 237
         pdump($value, $name);
239 238
       }
@@ -245,14 +244,14 @@  discard block
 block discarded – undo
245 244
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
246 245
     global $user, $sys_log_disabled;
247 246
 
248
-    if(empty(classSupernova::$db->connected)) {
247
+    if (empty(classSupernova::$db->connected)) {
249 248
       // TODO - писать ошибку в файл
250 249
       die('SQL server currently unavailable. Please contact Administration...');
251 250
     }
252 251
 
253 252
     $error_backtrace = $this->dump($dump, false);
254 253
 
255
-    if(!$sys_log_disabled) {
254
+    if (!$sys_log_disabled) {
256 255
       $query = "INSERT INTO `{{logs}}` SET
257 256
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
258 257
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -270,11 +269,11 @@  discard block
 block discarded – undo
270 269
 // Dump variables nicer then var_dump()
271 270
 
272 271
 function dump($value, $varname = null, $level = 0, $dumper = '') {
273
-  if(isset($varname)) {
272
+  if (isset($varname)) {
274 273
     $varname .= " = ";
275 274
   }
276 275
 
277
-  if($level == -1) {
276
+  if ($level == -1) {
278 277
     $trans[' '] = '&there4;';
279 278
     $trans["\t"] = '&rArr;';
280 279
     $trans["\n"] = '&para;;';
@@ -283,7 +282,7 @@  discard block
 block discarded – undo
283 282
 
284 283
     return strtr(htmlspecialchars($value), $trans);
285 284
   }
286
-  if($level == 0) {
285
+  if ($level == 0) {
287 286
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
288 287
     $dumper = mt_rand(10, 99) . '|' . $varname;
289 288
   }
@@ -291,22 +290,22 @@  discard block
 block discarded – undo
291 290
   $type = gettype($value);
292 291
   $dumper .= $type;
293 292
 
294
-  if($type == 'string') {
293
+  if ($type == 'string') {
295 294
     $dumper .= '(' . strlen($value) . ')';
296 295
     $value = dump($value, '', -1);
297
-  } elseif($type == 'boolean') {
296
+  } elseif ($type == 'boolean') {
298 297
     $value = ($value ? 'true' : 'false');
299
-  } elseif($type == 'object') {
298
+  } elseif ($type == 'object') {
300 299
     $props = get_class_vars(get_class($value));
301 300
     $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
302
-    foreach($props as $key => $val) {
301
+    foreach ($props as $key => $val) {
303 302
       $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
304 303
       $dumper .= dump($value->$key, '', $level + 1);
305 304
     }
306 305
     $value = '';
307
-  } elseif($type == 'array') {
306
+  } elseif ($type == 'array') {
308 307
     $dumper .= '(' . count($value) . ')';
309
-    foreach($value as $key => $val) {
308
+    foreach ($value as $key => $val) {
310 309
       $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, '', -1) . ' => ';
311 310
       $dumper .= dump($val, '', $level + 1);
312 311
     }
@@ -326,7 +325,7 @@  discard block
 block discarded – undo
326 325
 //  $backtrace = $backtrace[1];
327 326
 
328 327
   $caller = '';
329
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
328
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
330 329
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
331 330
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
332 331
       $backtrace[1]['function'] .
@@ -353,7 +352,7 @@  discard block
 block discarded – undo
353 352
 }
354 353
 
355 354
 function pr($prePrint = false) {
356
-  if($prePrint) {
355
+  if ($prePrint) {
357 356
     print(__DEBUG_CRLF);
358 357
   }
359 358
   print(mt_rand() . __DEBUG_CRLF);
@@ -363,7 +362,7 @@  discard block
 block discarded – undo
363 362
   global $_PRINT_COUNT_VALUE;
364 363
   $_PRINT_COUNT_VALUE++;
365 364
 
366
-  if($prePrint) {
365
+  if ($prePrint) {
367 366
     print(__DEBUG_CRLF);
368 367
   }
369 368
   print($_PRINT_COUNT_VALUE . __DEBUG_CRLF);
Please login to merge, or discard this patch.
includes/functions/eco_planet_update.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -14,13 +14,13 @@  discard block
 block discarded – undo
14 14
 
15 15
   $no_data = array('user' => false, 'planet' => false, 'que' => false);
16 16
 
17
-  if(!$planet) {
17
+  if (!$planet) {
18 18
     return $no_data;
19 19
   }
20 20
 
21
-  if(!$no_user_update) {
21
+  if (!$no_user_update) {
22 22
     $user = intval(is_array($user) && $user['id'] ? $user['id'] : $user);
23
-    if(!$user) {
23
+    if (!$user) {
24 24
       // TODO - Убрать позже
25 25
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sys_o_get_updated() - USER пустой!</h1>');
26 26
       $backtrace = debug_backtrace();
@@ -32,17 +32,17 @@  discard block
 block discarded – undo
32 32
     $user = db_user_by_id($user, !$simulation, '*', true);
33 33
   }
34 34
 
35
-  if(empty($user['id'])) {
35
+  if (empty($user['id'])) {
36 36
     return $no_data;
37 37
   }
38 38
 
39
-  if(is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
39
+  if (is_array($planet) && isset($planet['galaxy']) && $planet['galaxy']) {
40 40
     $planet = db_planet_by_vector($planet, '', !$simulation);
41 41
   } else {
42 42
     $planet = intval(is_array($planet) && isset($planet['id']) ? $planet['id'] : $planet);
43 43
     $planet = db_planet_by_id($planet, !$simulation);
44 44
   }
45
-  if(!is_array($planet) || !isset($planet['id'])) {
45
+  if (!is_array($planet) || !isset($planet['id'])) {
46 46
     return $no_data;
47 47
   }
48 48
 
@@ -65,15 +65,15 @@  discard block
 block discarded – undo
65 65
     RES_DEUTERIUM => 0,
66 66
   );
67 67
 
68
-  switch($planet['planet_type']) {
68
+  switch ($planet['planet_type']) {
69 69
     case PT_PLANET:
70
-      foreach($resources_increase as $resource_id => &$increment) {
70
+      foreach ($resources_increase as $resource_id => &$increment) {
71 71
         $resource_name = pname_resource_name($resource_id);
72 72
         $increment = $caps_real['total'][$resource_id] * $ProductionTime / 3600;
73 73
         $store_free = $caps_real['total_storage'][$resource_id] - $planet[$resource_name];
74 74
         $increment = min($increment, max(0, $store_free));
75 75
 
76
-        if($planet[$resource_name] + $increment < 0 && !$simulation) {
76
+        if ($planet[$resource_name] + $increment < 0 && !$simulation) {
77 77
           global $debug;
78 78
           $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);
79 79
         }
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
95 95
   // TODO пересчитывать размер планеты только при постройке чего-нибудь и при покупке сектора
96 96
   $planet['field_current'] = 0;
97 97
   $sn_group_build_allow = sn_get_groups('build_allow');
98
-  if(is_array($sn_group_build_allow[$planet['planet_type']])) {
99
-    foreach($sn_group_build_allow[$planet['planet_type']] as $building_id) {
98
+  if (is_array($sn_group_build_allow[$planet['planet_type']])) {
99
+    foreach ($sn_group_build_allow[$planet['planet_type']] as $building_id) {
100 100
       $planet['field_current'] += mrc_get_level($user, $planet, $building_id, !$simulation, true);
101 101
     }
102 102
   }
103 103
 
104
-  if($simulation) {
104
+  if ($simulation) {
105 105
     return array('user' => $user, 'planet' => $planet, 'que' => $que);
106 106
   }
107 107
 
Please login to merge, or discard this patch.
includes/functions/eco_get_planet_caps.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 function eco_get_planet_caps_modify_production(&$item, $key, $data) {
4 4
   static $modifiers;
5 5
 
6
-  if(!$modifiers) {
6
+  if (!$modifiers) {
7 7
     $modifiers = sn_get_groups('modifiers');
8 8
   }
9 9
   $item = floor(mrc_modify_value($data['user'], $data['planet'], $modifiers[MODIFIER_RESOURCE_PRODUCTION], $item));
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
   static $sn_group_modifiers, $config_resource_multiplier, $config_resource_multiplier_plain, $config_eco_scale_storage;
17 17
 
18
-  if(!$sn_group_modifiers) {
18
+  if (!$sn_group_modifiers) {
19 19
     $sn_group_modifiers = sn_get_groups('modifiers');
20 20
     $config_resource_multiplier = game_resource_multiplier();
21 21
     $config_resource_multiplier_plain = game_resource_multiplier(true);
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
   $caps['storage'][RES_METAL][0] = $config->eco_planet_storage_metal;
27 27
   $caps['storage'][RES_CRYSTAL][0] = $config->eco_planet_storage_crystal;
28 28
   $caps['storage'][RES_DEUTERIUM][0] = $config->eco_planet_storage_deuterium;
29
-  foreach(sn_get_groups('storages') as $unit_id) {
30
-    foreach(get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
29
+  foreach (sn_get_groups('storages') as $unit_id) {
30
+    foreach (get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
31 31
       $caps['storage'][$resource_id][$unit_id] = floor($config_eco_scale_storage *
32 32
         mrc_modify_value($user, $planet_row, $sn_group_modifiers[MODIFIER_RESOURCE_CAPACITY], $function(mrc_get_level($user, $planet_row, $unit_id)))
33 33
       );
34 34
     }
35 35
   }
36 36
 
37
-  if($planet_row['planet_type'] == PT_MOON) {
37
+  if ($planet_row['planet_type'] == PT_MOON) {
38 38
     return $caps;
39 39
   }
40 40
 
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
   $caps['production_full'][RES_DEUTERIUM][0] = floor($config->deuterium_basic_income * $config_resource_multiplier * (isset($planet_density[RES_DEUTERIUM]) ? $planet_density[RES_DEUTERIUM] : 1));
47 47
   $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));
48 48
 
49
-  foreach(sn_get_groups('factories') as $unit_id) {
49
+  foreach (sn_get_groups('factories') as $unit_id) {
50 50
     $unit_data = get_unit_param($unit_id);
51 51
     $unit_level = mrc_get_level($user, $planet_row, $unit_id);
52 52
     $unit_load = $planet_row[pname_factory_production_field_name($unit_id)];
53 53
 
54
-    foreach($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
54
+    foreach ($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
55 55
       $caps['production_full'][$resource_id][$unit_id] = $function($unit_level, $unit_load, $user, $planet_row)
56 56
         * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
57 57
         * (isset($planet_density[$resource_id]) ? $planet_density[$resource_id] : 1);
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 
61 61
   array_walk_recursive($caps['production_full'], 'eco_get_planet_caps_modify_production', array('user' => $user, 'planet' => $planet_row));
62 62
 
63
-  foreach($caps['production_full'] as $resource_id => $resource_data) {
63
+  foreach ($caps['production_full'] as $resource_id => $resource_data) {
64 64
     $caps['total_production_full'][$resource_id] = array_sum($resource_data);
65 65
   }
66 66
 
67 67
   $caps['production'] = $caps['production_full'];
68 68
 
69
-  if($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
69
+  if ($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
70 70
     $deuterium_balance = array_sum($caps['production'][RES_DEUTERIUM]);
71 71
     $energy_balance = array_sum($caps['production'][RES_ENERGY]);
72
-    if($deuterium_balance < 0 || $energy_balance < 0) {
72
+    if ($deuterium_balance < 0 || $energy_balance < 0) {
73 73
       $caps['production'][RES_DEUTERIUM][STRUC_MINE_FUSION] = $caps['production'][RES_ENERGY][STRUC_MINE_FUSION] = 0;
74 74
     }
75 75
   }
76 76
 
77
-  foreach($caps['production'][RES_ENERGY] as $energy) {
77
+  foreach ($caps['production'][RES_ENERGY] as $energy) {
78 78
     $caps[RES_ENERGY][$energy >= 0 ? BUILD_CREATE : BUILD_DESTROY] += $energy;
79 79
   }
80 80
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
     ? $caps[RES_ENERGY][BUILD_CREATE] / $caps[RES_ENERGY][BUILD_DESTROY]
85 85
     : 1;
86 86
 
87
-  foreach($caps['production'] as $resource_id => &$resource_data) {
88
-    if($caps['efficiency'] != 1) {
89
-      foreach($resource_data as $unit_id => &$resource_production) {
90
-        if(!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
87
+  foreach ($caps['production'] as $resource_id => &$resource_data) {
88
+    if ($caps['efficiency'] != 1) {
89
+      foreach ($resource_data as $unit_id => &$resource_production) {
90
+        if (!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
91 91
           $resource_production = $resource_production * $caps['efficiency'];
92 92
         }
93 93
       }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     $caps['total'][$resource_id] = $caps['total'][$resource_id] >= 0 ? floor($caps['total'][$resource_id]) : ceil($caps['total'][$resource_id]);
97 97
   }
98 98
 
99
-  foreach($caps['storage'] as $resource_id => &$resource_data) {
99
+  foreach ($caps['storage'] as $resource_id => &$resource_data) {
100 100
     $caps['total_storage'][$resource_id] = array_sum($resource_data);
101 101
   }
102 102
 
Please login to merge, or discard this patch.
includes/functions/scheduler_process.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,19 +8,19 @@  discard block
 block discarded – undo
8 8
   $ts_var_stat_update = strtotime($config->db_loadItem('var_stat_update'));
9 9
   $ts_scheduled_update = sys_schedule_get_prev_run($config->db_loadItem('stats_schedule'), $config->var_stat_update);
10 10
 
11
-  if(sys_get_param_int('admin_update')) {
11
+  if (sys_get_param_int('admin_update')) {
12 12
     define('USER_LEVEL', isset($user['authlevel']) ? $user['authlevel'] : -1);
13
-    if(USER_LEVEL > 0) {
13
+    if (USER_LEVEL > 0) {
14 14
       $is_admin_request = true;
15 15
       $ts_scheduled_update = SN_TIME_NOW;
16 16
     }
17 17
   }
18 18
 
19
-  if($ts_scheduled_update > $ts_var_stat_update) {
19
+  if ($ts_scheduled_update > $ts_var_stat_update) {
20 20
     lng_include('admin');
21 21
     sn_db_transaction_start();
22 22
     $ts_var_stat_update_end = strtotime($config->db_loadItem('var_stat_update_end'));
23
-    if(SN_TIME_NOW > $ts_var_stat_update_end) {
23
+    if (SN_TIME_NOW > $ts_var_stat_update_end) {
24 24
       $old_server_status = $config->db_loadItem('game_disable');
25 25
       $config->db_saveItem('game_disable', GAME_DISABLE_STAT);
26 26
 
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
       $config->db_saveItem('var_stat_update_end', SN_TIME_SQL);
57 57
 
58 58
       $config->db_saveItem('game_disable', $old_server_status);
59
-    } elseif($ts_scheduled_update > $ts_var_stat_update) {
59
+    } elseif ($ts_scheduled_update > $ts_var_stat_update) {
60 60
       $timeout = strtotime($config->db_loadItem('var_stat_update_end')) - SN_TIME_NOW;
61 61
       $msg = $config->db_loadItem('var_stat_update_msg');
62 62
       $msg = "{$msg} ETA {$timeout} seconds. Please wait...";
63 63
     }
64 64
     sn_db_transaction_rollback();
65
-  } elseif($is_admin_request) {
65
+  } elseif ($is_admin_request) {
66 66
     $msg = 'Stat is up to date';
67 67
   }
68 68
 
Please login to merge, or discard this patch.
includes/functions/sys_bbcode.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -107,23 +107,23 @@
 block discarded – undo
107 107
 
108 108
   !empty($config->url_faq) ? $msg = str_replace('faq://', $config->url_faq, $msg) : false;
109 109
 
110
-  foreach($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
-    if($auth_level > $author_auth) {
110
+  foreach ($supernova->design['bbcodes'] as $auth_level => $replaces) {
111
+    if ($auth_level > $author_auth) {
112 112
       continue;
113 113
     }
114 114
 
115
-    foreach($replaces as $key => $html) {
116
-      $msg = preg_replace(''.$key.'', $html, $msg);
115
+    foreach ($replaces as $key => $html) {
116
+      $msg = preg_replace('' . $key . '', $html, $msg);
117 117
     }
118 118
   }
119 119
 
120
-  foreach($supernova->design['smiles'] as $auth_level => $replaces) {
121
-    if($auth_level > $author_auth) {
120
+  foreach ($supernova->design['smiles'] as $auth_level => $replaces) {
121
+    if ($auth_level > $author_auth) {
122 122
       continue;
123 123
     }
124 124
 
125
-    foreach($replaces as $key => $imgName) {
126
-      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU","<img src=\"design/images/smileys/".$imgName.".gif\" align=\"absmiddle\" title=\"".$key."\" alt=\"".$key."\">",$msg);
125
+    foreach ($replaces as $key => $imgName) {
126
+      $msg = preg_replace("#" . addcslashes($key, '()[]{}') . "#isU", "<img src=\"design/images/smileys/" . $imgName . ".gif\" align=\"absmiddle\" title=\"" . $key . "\" alt=\"" . $key . "\">", $msg);
127 127
     }
128 128
   }
129 129
 
Please login to merge, or discard this patch.
captcha.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,16 +2,16 @@
 block discarded – undo
2 2
 // Captcha code for registration - really didn't work alot :(
3 3
 
4 4
 session_start();
5
-$en=100;
6
-$boy=25;
7
-$sayi = mt_rand(0,9999999);
5
+$en = 100;
6
+$boy = 25;
7
+$sayi = mt_rand(0, 9999999);
8 8
 $_SESSION['captcha'] = $sayi;
9
-$tuval = imagecreatetruecolor($en,$boy);
10
-$b = imagecolorallocate($tuval,175,238,238);
11
-$s = imagecolorallocate($tuval,0,0,0);
12
-imagefill($tuval,0,0,$s);
13
-imageline($tuval,20,50,$en,$boy,$b);
14
-imagestring($tuval,3,27,7,$sayi,$b);
9
+$tuval = imagecreatetruecolor($en, $boy);
10
+$b = imagecolorallocate($tuval, 175, 238, 238);
11
+$s = imagecolorallocate($tuval, 0, 0, 0);
12
+imagefill($tuval, 0, 0, $s);
13
+imageline($tuval, 20, 50, $en, $boy, $b);
14
+imagestring($tuval, 3, 27, 7, $sayi, $b);
15 15
 Header("content-type:image/gif");
16 16
 imagegif($tuval);
17 17
 imagedestroy($tuval);
Please login to merge, or discard this patch.
quest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@
 block discarded – undo
7 7
  *
8 8
  */
9 9
 
10
-define('INSIDE'  , true);
11
-define('INSTALL' , false);
10
+define('INSIDE', true);
11
+define('INSTALL', false);
12 12
 
13 13
 require('common.' . substr(strrchr(__FILE__, '.'), 1));
14 14
 
Please login to merge, or discard this patch.
jumpgate.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -115,8 +115,7 @@
 block discarded – undo
115 115
     ));
116 116
 
117 117
     display($template, $lang['tech'][STRUC_MOON_GATE]);
118
-  }
119
-  else
118
+  } else
120 119
   {
121 120
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
122 121
   }
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -14,39 +14,39 @@  discard block
 block discarded – undo
14 14
 
15 15
 lng_include('fleet');
16 16
 
17
-if($TargetPlanet = sys_get_param_id('jmpto'))
17
+if ($TargetPlanet = sys_get_param_id('jmpto'))
18 18
 {
19 19
   sn_db_transaction_start();
20 20
   db_user_by_id($user['id'], true, 'id');
21 21
   $planetrow = db_planet_by_id($planetrow['id'], true);
22
-  if(!($NextJumpTime = uni_get_time_to_jump($planetrow)))
22
+  if (!($NextJumpTime = uni_get_time_to_jump($planetrow)))
23 23
   {
24 24
     $TargetGate = db_planet_by_id($TargetPlanet, true, '`id`, `last_jump_time`');
25
-    if(mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
25
+    if (mrc_get_level($user, $TargetGate, STRUC_MOON_GATE) > 0)
26 26
     {
27
-      $NextDestTime = uni_get_time_to_jump ( $TargetGate );
28
-      if(!$NextDestTime)
27
+      $NextDestTime = uni_get_time_to_jump($TargetGate);
28
+      if (!$NextDestTime)
29 29
       {
30 30
         // $SubQueryOri = "";
31 31
         // $SubQueryDes = "";
32 32
         $ship_list = sys_get_param('ships');
33 33
         $db_changeset = array();
34
-        foreach($ship_list as $ship_id => $ship_count)
34
+        foreach ($ship_list as $ship_id => $ship_count)
35 35
         {
36
-          if(!in_array($ship_id, sn_get_groups('fleet')))
36
+          if (!in_array($ship_id, sn_get_groups('fleet')))
37 37
           {
38 38
             continue;
39 39
           }
40 40
 
41 41
           $ship_count = max(0, min(floor($ship_count), mrc_get_level($user, $planetrow, $ship_id)));
42
-          if($ship_count)
42
+          if ($ship_count)
43 43
           {
44 44
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, -$ship_count, $user, $planetrow['id']);
45 45
             $db_changeset['unit'][] = sn_db_unit_changeset_prepare($ship_id, $ship_count, $user, $TargetGate['id']);
46 46
           }
47 47
         }
48 48
         // Dit monsieur, y avait quelque chose a envoyer ???
49
-        if(!empty($db_changeset))
49
+        if (!empty($db_changeset))
50 50
         {
51 51
           db_planet_set_by_id($TargetGate['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
52 52
           db_planet_set_by_id($planetrow['id'], "`last_jump_time` = " . SN_TIME_NOW . "");
@@ -55,31 +55,31 @@  discard block
 block discarded – undo
55 55
           db_user_set_by_id($user['id'], "`current_planet` = '{$TargetGate['id']}'");
56 56
 
57 57
           $planetrow['last_jump_time'] = SN_TIME_NOW;
58
-          $RetMessage = classLocale::$lang['gate_jump_done'] ." - ". pretty_time(uni_get_time_to_jump($planetrow));
58
+          $RetMessage = classLocale::$lang['gate_jump_done'] . " - " . pretty_time(uni_get_time_to_jump($planetrow));
59 59
         } else {
60 60
           $RetMessage = classLocale::$lang['gate_wait_data'];
61 61
         }
62 62
       } else {
63
-        $RetMessage = classLocale::$lang['gate_wait_dest'] ." - ". pretty_time($NextDestTime);
63
+        $RetMessage = classLocale::$lang['gate_wait_dest'] . " - " . pretty_time($NextDestTime);
64 64
       }
65 65
     } else {
66 66
       $RetMessage = classLocale::$lang['gate_no_dest_g'];
67 67
     }
68 68
   } else {
69
-    $RetMessage = classLocale::$lang['gate_wait_star'] ." - ". pretty_time($NextJumpTime);
69
+    $RetMessage = classLocale::$lang['gate_wait_star'] . " - " . pretty_time($NextJumpTime);
70 70
   }
71 71
   sn_db_transaction_commit();
72 72
   message($RetMessage, classLocale::$lang['tech'][STRUC_MOON_GATE], "jumpgate.php", 10);
73 73
 } else {
74 74
   $template = gettemplate('jumpgate', true);
75
-  if(mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
75
+  if (mrc_get_level($user, $planetrow, STRUC_MOON_GATE) > 0)
76 76
   {
77 77
     $Combo = '';
78 78
     $MoonList = db_planet_list_moon_other($user['id'], $planetrow['id']);
79 79
     // while($CurMoon = db_fetch($MoonList))
80
-    foreach($MoonList as $CurMoon)
80
+    foreach ($MoonList as $CurMoon)
81 81
     {
82
-      if(mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
82
+      if (mrc_get_level($user, $CurMoon, STRUC_MOON_GATE) >= 1)
83 83
       {
84 84
         $NextJumpTime = uni_get_time_to_jump($CurMoon);
85 85
         $template->assign_block_vars('moon', array(
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
       }
94 94
     }
95 95
 
96
-    foreach(sn_get_groups('fleet') as $Ship)
96
+    foreach (sn_get_groups('fleet') as $Ship)
97 97
     {
98
-      if(($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
98
+      if (($ship_count = mrc_get_level($user, $planetrow, $Ship)) <= 0)
99 99
       {
100 100
         continue;
101 101
       }
Please login to merge, or discard this patch.