Completed
Push — trunk ( 9bb608...09520e )
by SuperNova.WS
04:21
created
language/ru/buildings.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,9 @@
 block discarded – undo
24 24
 * DO NOT CHANGE
25 25
 */
26 26
 
27
-if (!defined('INSIDE')) die();
27
+if (!defined('INSIDE')) {
28
+  die();
29
+}
28 30
 
29 31
 $a_lang_array = array(
30 32
   'built' => 'Построено',
Please login to merge, or discard this patch.
language/en/buildings.mo.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,9 @@
 block discarded – undo
26 26
 * DO NOT CHANGE
27 27
 */
28 28
 
29
-if (!defined('INSIDE')) die();
29
+if (!defined('INSIDE')) {
30
+  die();
31
+}
30 32
 
31 33
 
32 34
 $a_lang_array = array(
Please login to merge, or discard this patch.
classes/Core/Autoloader.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -27,17 +27,17 @@  discard block
 block discarded – undo
27 27
    * @param string $class - Fully-qualified path with namespaces
28 28
    */
29 29
   public static function autoloader($class) {
30
-    foreach(static::$folders as $data) {
30
+    foreach (static::$folders as $data) {
31 31
       $theClassFile = $class;
32 32
 
33
-      if($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
33
+      if ($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
34 34
         $theClassFile = substr($class, strlen($data[static::P_PREFIX]));
35 35
       }
36 36
 
37 37
       $classFullFileName = str_replace('\\', '/', $data[static::P_FOLDER] . $theClassFile) . DOT_PHP_EX;
38
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
38
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
39 39
         require_once($classFullFileName);
40
-        if(method_exists($class, '_constructorStatic')) {
40
+        if (method_exists($class, '_constructorStatic')) {
41 41
           $class::_constructorStatic();
42 42
         }
43 43
       }
@@ -49,20 +49,20 @@  discard block
 block discarded – undo
49 49
    * @param string $classPrefix - PHP class prefix to ignore. Can be whole namespace or part of it
50 50
    */
51 51
   public static function register($absoluteClassRoot, $classPrefix = '') {
52
-    if(!static::$autoloaderRegistered) {
52
+    if (!static::$autoloaderRegistered) {
53 53
       spl_autoload_register(array(__CLASS__, 'autoloader'));
54 54
       static::$autoloaderRegistered = true;
55 55
     }
56 56
 
57 57
     $absoluteClassRoot = str_replace('\\', '/', SN_ROOT_PHYSICAL . $absoluteClassRoot);
58 58
 
59
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
59
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
60 60
       // TODO - throw new \Exception("There is some error when installing autoloader for '{$absoluteClassRoot}' class prefix '{$classPrefix}'");
61 61
       return;
62 62
     }
63 63
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
64 64
 
65
-    if($classPrefix && strrpos($classPrefix, 1) != '\\') {
65
+    if ($classPrefix && strrpos($classPrefix, 1) != '\\') {
66 66
       $classPrefix .= '\\';
67 67
     }
68 68
 
Please login to merge, or discard this patch.
includes/includes/eco_bld_structures.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 function sn_eco_build($que_type, &$auser, &$planet) {
19 19
   global $lang, $config, $template_result;
20 20
 
21
-  if($ally_id = sys_get_param_id('ally_id')) {
21
+  if ($ally_id = sys_get_param_id('ally_id')) {
22 22
     define('SN_IN_ALLY', true);
23 23
     $ranks = \Alliance\Alliance::ally_get_ranks($auser['ally']);
24
-    if($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
24
+    if ($ranks[$auser['ally_rank_id']]['admin'] || $auser['ally']['ally_owner'] == $auser['id']) {
25 25
       $user = &$auser['ally']['player'];
26 26
       $planet = array(
27 27
         'metal'     => $user['metal'],
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
     }
32 32
   }
33 33
 
34
-  if(!$user) {
34
+  if (!$user) {
35 35
     $user = &$auser;
36 36
   }
37 37
 
38
-  switch($action = sys_get_param_escaped('action')) {
38
+  switch ($action = sys_get_param_escaped('action')) {
39 39
     case 'create': // Add unit to que for build
40 40
     case 'create_autoconvert': // Add unit to que for build
41 41
     case 'destroy': // Add unit to que for remove
@@ -52,23 +52,23 @@  discard block
 block discarded – undo
52 52
 
53 53
   $group_missile = sn_get_groups('missile');
54 54
   $silo_capacity_free = 0;
55
-  if($que_type == QUE_STRUCTURES) {
55
+  if ($que_type == QUE_STRUCTURES) {
56 56
     $build_unit_list = sn_get_groups('build_allow');
57 57
     $build_unit_list = $build_unit_list[$planet['planet_type']];
58 58
     $artifact_id = ART_NANO_BUILDER;
59 59
     $page_header = $lang['tech'][UNIT_STRUCTURES];
60
-  } elseif($que_type == QUE_RESEARCH) {
61
-    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
60
+  } elseif ($que_type == QUE_RESEARCH) {
61
+    if (!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
62 62
       messageBox($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
63 63
     }
64 64
 
65
-    if(eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
65
+    if (eco_unit_busy($user, $planet, UNIT_TECHNOLOGIES)) {
66 66
       messageBox($lang['eco_bld_msg_err_laboratory_upgrading'], $lang['tech'][UNIT_TECHNOLOGIES]);
67 67
     }
68 68
     $build_unit_list = sn_get_groups('tech');
69 69
     $artifact_id = ART_HEURISTIC_CHIP;
70 70
     $page_header = $lang['eco_bld_research_page_name'] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
71
-  } elseif($que_type == QUE_MERCENARY) {
71
+  } elseif ($que_type == QUE_MERCENARY) {
72 72
 //    if(!mrc_get_level($user, $planet, STRUC_LABORATORY)) {
73 73
 //      messageBox($lang['no_laboratory'], $lang['tech'][UNIT_TECHNOLOGIES]);
74 74
 //    }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     $artifact_id = 0;
81 81
     $page_header = $lang['tech'][UNIT_MERCENARIES] . ($user['user_as_ally'] ? " {$lang['sys_of_ally']} {$user['username']}" : '');
82 82
   } else {
83
-    if(mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
83
+    if (mrc_get_level($user, $planet, STRUC_FACTORY_HANGAR) == 0) {
84 84
       messageBox($lang['need_hangar'], $lang['tech'][STRUC_FACTORY_HANGAR]);
85 85
     }
86 86
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     $artifact_id = 0;
90 90
 
91 91
     $silo_capacity_free = mrc_get_level($user, $planet, STRUC_SILO) * get_unit_param(STRUC_SILO, P_CAPACITY);
92
-    foreach($group_missile as $unit_id) {
92
+    foreach ($group_missile as $unit_id) {
93 93
       $silo_capacity_free -= (mrc_get_level($user, $planet, $unit_id, false, true) + (isset($in_que[$unit_id]) && $in_que[$unit_id] ? $in_que[$unit_id] : 0)) * get_unit_param($unit_id, P_UNIT_SIZE);
94 94
     }
95 95
     $silo_capacity_free = max(0, $silo_capacity_free);
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
   */
107 107
 
108 108
   $template = gettemplate('buildings_builds', true);
109
-  if(!empty($operation_result)) {
109
+  if (!empty($operation_result)) {
110 110
     $template_result['.']['result'][] = $operation_result;
111 111
   }
112 112
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
   $record_index = 0;
138 138
 
139
-  foreach($build_unit_list as $unit_id) {
139
+  foreach ($build_unit_list as $unit_id) {
140 140
     $level_base = mrc_get_level($user, $planet, $unit_id, false, true);
141 141
     $level_effective = mrc_get_level($user, $planet, $unit_id);
142 142
     $level_in_que = $in_que[$unit_id];
@@ -159,12 +159,12 @@  discard block
 block discarded – undo
159 159
     $can_build = $unit_info[P_MAX_STACK] ? max(0, $unit_info[P_MAX_STACK] - $level_in_que - $level_effective) : $build_data['CAN'][BUILD_CREATE];
160 160
     // Restricting $can_build by free silo capacity
161 161
     $can_build = ($unit_is_missile = in_array($unit_id, $group_missile)) ? min($can_build, floor($silo_capacity_free / $unit_info[P_UNIT_SIZE])) : $can_build;
162
-    if(!$can_build) {
163
-      if(!$build_data['CAN'][BUILD_CREATE]) {
162
+    if (!$can_build) {
163
+      if (!$build_data['CAN'][BUILD_CREATE]) {
164 164
         $build_data['RESULT'][BUILD_CREATE] = BUILD_NO_RESOURCES;
165
-      } elseif($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
165
+      } elseif ($unit_is_missile && $silo_capacity_free < $unit_info[P_UNIT_SIZE]) {
166 166
         $build_data['RESULT'][BUILD_CREATE] = BUILD_SILO_FULL;
167
-      } elseif($unit_info[P_MAX_STACK]) {
167
+      } elseif ($unit_info[P_MAX_STACK]) {
168 168
         $build_data['RESULT'][BUILD_CREATE] = BUILD_MAX_REACHED;
169 169
       }
170 170
     }
@@ -232,14 +232,14 @@  discard block
 block discarded – undo
232 232
       'MAP_IS_RESOURCE' => !empty($unit_info[P_UNIT_PRODUCTION]),
233 233
     );
234 234
 
235
-    if($unit_stackable) {
235
+    if ($unit_stackable) {
236 236
       $level_production_base = array(
237 237
         'ACTUAL_SHIELD' => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_SHIELD), $unit_info['shield'])),
238 238
         'ACTUAL_ARMOR'  => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_ARMOR), $unit_info['armor'])),
239 239
         'ACTUAL_WEAPON' => HelperString::numberFloorAndFormat(mrc_modify_value($user, false, array(MRC_ADMIRAL, TECH_WEAPON), $unit_info['attack'])),
240 240
       );
241 241
 
242
-      if($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
242
+      if ($unit_info[P_UNIT_TYPE] == UNIT_SHIPS) {
243 243
         $ship_data = get_ship_data($unit_id, $user);
244 244
 
245 245
         $level_production_base += array(
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
         );
250 250
       }
251 251
 
252
-      if($unit_info[P_UNIT_PRODUCTION]) {
253
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
254
-          if($resource_income =
252
+      if ($unit_info[P_UNIT_PRODUCTION]) {
253
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
254
+          if ($resource_income =
255 255
             floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc(1, 10, $user, $planet)
256 256
               * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
257 257
               * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -261,11 +261,11 @@  discard block
 block discarded – undo
261 261
         }
262 262
       }
263 263
       $production['.']['resource'][] = $level_production_base;
264
-    } elseif($unit_info[P_UNIT_PRODUCTION]) {
264
+    } elseif ($unit_info[P_UNIT_PRODUCTION]) {
265 265
       $level_production_base = array();
266 266
       $element_level_start = $level_effective + $in_que[$unit_id];
267
-      foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
268
-        if($resource_income =
267
+      foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
268
+        if ($resource_income =
269 269
           floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($element_level_start, 10, $user, $planet)
270 270
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
271 271
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
@@ -275,24 +275,24 @@  discard block
 block discarded – undo
275 275
       }
276 276
 
277 277
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
278
-      for($i = 0; $i < 6; $i++) {
278
+      for ($i = 0; $i < 6; $i++) {
279 279
         $level_production = array('LEVEL' => $level_start + $i);
280
-        foreach($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
281
-          if(
280
+        foreach ($unit_info[P_UNIT_PRODUCTION] as $resource_id => $resource_calc) {
281
+          if (
282 282
           $resource_income = floor(mrc_modify_value($user, $planet, $sn_modifiers_resource, $resource_calc($level_start + $i, 10, $user, $planet)
283 283
             * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
284 284
             * (isset($density_info[$resource_id]) ? $density_info[$resource_id] : 1)))
285 285
           ) {
286 286
             $level_production['R' . $resource_id] = $resource_income;
287 287
             $level_production['D' . $resource_id] = $resource_income - $level_production_base[$resource_id];
288
-            if($level_production['D' . $resource_id] == 0) {
288
+            if ($level_production['D' . $resource_id] == 0) {
289 289
               $level_production['D' . $resource_id] = '-';
290 290
             }
291 291
           }
292 292
         }
293 293
         $production['.']['resource'][] = $level_production;
294 294
       }
295
-    } elseif($unit_id == TECH_ASTROTECH) {
295
+    } elseif ($unit_id == TECH_ASTROTECH) {
296 296
       $element_level_start = $level_effective + $in_que[$unit_id];
297 297
       $level_production_base = array(
298 298
         UNIT_PLAYER_EXPEDITIONS_MAX => get_player_max_expeditons($user, $element_level_start),
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
       );
301 301
 
302 302
       $level_start = $level_base_and_que > 1 ? $level_effective + $level_in_que - 1 : 1;
303
-      for($i = 0; $i < 6; $i++) {
303
+      for ($i = 0; $i < 6; $i++) {
304 304
         $level_production = array('LEVEL' => $level_start + $i);
305 305
         $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] = get_player_max_expeditons($user, $level_start + $i);
306 306
         $level_production['D' . UNIT_PLAYER_EXPEDITIONS_MAX] = $level_production['R' . UNIT_PLAYER_EXPEDITIONS_MAX] - $level_production_base[UNIT_PLAYER_EXPEDITIONS_MAX];
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
     $template_result['.']['production'][] = $production;
322 322
   }
323 323
 
324
-  foreach($lang['player_option_building_sort'] as $sort_id => $sort_text) {
324
+  foreach ($lang['player_option_building_sort'] as $sort_id => $sort_text) {
325 325
     $template->assign_block_vars('sort_values', array(
326 326
       'VALUE' => $sort_id,
327 327
       'TEXT'  => $sort_text,
@@ -330,8 +330,8 @@  discard block
 block discarded – undo
330 330
 
331 331
   $sort_option = classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $que_type)];
332 332
   $sort_option_inverse = classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $que_type)];
333
-  if($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
334
-    switch($sort_option) {
333
+  if ($sort_option || $sort_option_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
334
+    switch ($sort_option) {
335 335
       case PLAYER_OPTION_SORT_NAME:
336 336
         $sort_option_field = 'NAME';
337 337
       break;
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
       break;
347 347
     }
348 348
     $sort_option_inverse_closure = $sort_option_inverse ? -1 : 1;
349
-    usort($template_result['.']['production'], function ($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
349
+    usort($template_result['.']['production'], function($a, $b) use ($sort_option_field, $sort_option_inverse_closure) {
350 350
       return $a[$sort_option_field] < $b[$sort_option_field] ? -1 * $sort_option_inverse_closure : (
351 351
       $a[$sort_option_field] > $b[$sort_option_field] ? 1 * $sort_option_inverse_closure : 0
352 352
       );
Please login to merge, or discard this patch.