Completed
Push — trunk ( e1d59e...0e0d9a )
by SuperNova.WS
04:35
created
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 = SN::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $que_type)];
332 332
   $sort_option_inverse = SN::$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.
includes/includes/flt_page0.inc 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -5,9 +5,9 @@  discard block
 block discarded – undo
5 5
 // @version 1.0
6 6
 // @copyright 2008 by Chlorel for XNova
7 7
 
8
-if($fleet_ship_sort = sys_get_param_id('sort_elements')) {
8
+if ($fleet_ship_sort = sys_get_param_id('sort_elements')) {
9 9
   define('IN_AJAX', true);
10
-  if(!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
10
+  if (!empty($lang['player_option_fleet_ship_sort'][$fleet_ship_sort])) {
11 11
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT, $fleet_ship_sort);
12 12
     // player_save_option($user, PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE, sys_get_param_id('fleet_ship_sort_inverse', 0));
13 13
     SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT] = $fleet_ship_sort;
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
   die();
17 17
 }
18 18
 
19
-if(SN_IN_FLEET !== true) {
19
+if (SN_IN_FLEET !== true) {
20 20
   $debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
21 21
 }
22 22
 
23 23
 lng_include('overview');
24 24
 
25
-if(!$planetrow) {
25
+if (!$planetrow) {
26 26
   messageBox($lang['fl_noplanetrow'], $lang['fl_error']);
27 27
 }
28 28
 
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 
31 31
 $record_index = 0;
32 32
 $ship_list = array();
33
-foreach(sn_get_groups('fleet') as $n => $unit_id) {
33
+foreach (sn_get_groups('fleet') as $n => $unit_id) {
34 34
   $unit_level = mrc_get_level($user, $planetrow, $unit_id, false, true);
35
-  if($unit_level > 0) {
35
+  if ($unit_level > 0) {
36 36
     $ship_data = get_ship_data($unit_id, $user);
37 37
     $ship_list[$unit_id] = array(
38 38
       '__INDEX'     => $record_index++,
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 
53 53
 $fleet_ship_sort = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT];
54 54
 $fleet_ship_sort_inverse = SN::$user_options[PLAYER_OPTION_FLEET_SHIP_SORT_INVERSE];
55
-if($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
56
-  switch($fleet_ship_sort) {
55
+if ($fleet_ship_sort || $fleet_ship_sort_inverse != PLAYER_OPTION_SORT_ORDER_PLAIN) {
56
+  switch ($fleet_ship_sort) {
57 57
     case PLAYER_OPTION_SORT_NAME: $fleet_ship_sort_field = 'NAME'; break;
58 58
     case PLAYER_OPTION_SORT_SPEED: $fleet_ship_sort_field = 'SPEED'; break;
59 59
     case PLAYER_OPTION_SORT_COUNT: $fleet_ship_sort_field = 'AMOUNT'; break;
@@ -68,11 +68,11 @@  discard block
 block discarded – undo
68 68
   });
69 69
 }
70 70
 
71
-foreach($ship_list as $ship_data) {
71
+foreach ($ship_list as $ship_data) {
72 72
   $template->assign_block_vars('ships', $ship_data);
73 73
 }
74 74
 
75
-foreach($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
75
+foreach ($lang['player_option_fleet_ship_sort'] as $sort_id => $sort_text) {
76 76
   $template->assign_block_vars('ship_sort_list', array(
77 77
     'VALUE' => $sort_id,
78 78
     'TEXT' => $sort_text,
Please login to merge, or discard this patch.
includes/functions/_news.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@
 block discarded – undo
46 46
       'ANNOUNCE'        => SN::$gc->bbCodeParser->expandBbCode($announce['strAnnounce'], intval($announce['authlevel'])),
47 47
       'DETAIL_URL'      => $announce['detail_url'],
48 48
       'USER_NAME'       =>
49
-        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) :
50
-          js_safe_string($announce['user_name']),
49
+        isset($users[$announce['user_id']]) && $users[$announce['user_id']] ? player_nick_render_to_html($users[$announce['user_id']], array('color' => true)) : js_safe_string($announce['user_name']),
51 50
       'NEW'             => $announce['unix_time'] + $config->game_news_actual >= SN_TIME_NOW,
52 51
       'FUTURE'          => $announce['unix_time'] > SN_TIME_NOW,
53 52
       'SURVEY_ID'       => $announce['survey_id'],
Please login to merge, or discard this patch.
blitz_register.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
2 2
 
3 3
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
4 4
 
5
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
5
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
6 6
   $error_message = SN::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
7 7
     !SN::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
8 8
   );
9 9
 
10
-  if($error_message) {
10
+  if ($error_message) {
11 11
     messageBox($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
12 12
     die();
13 13
   }
@@ -17,12 +17,12 @@  discard block
 block discarded – undo
17 17
 $current_round = intval(SN::$config->db_loadItem('game_blitz_register_round'));
18 18
 $current_price = intval(SN::$config->db_loadItem('game_blitz_register_price'));
19 19
 
20
-if(SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
20
+if (SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
21 21
   sn_db_transaction_start();
22 22
   $user = db_user_by_id($user['id'], true);
23 23
   $is_registered = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
24
-  if(sys_get_param_str('register_me')) {
25
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
24
+  if (sys_get_param_str('register_me')) {
25
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
26 26
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
27 27
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
28 28
       SN::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -43,17 +43,17 @@  discard block
 block discarded – undo
43 43
 $blitz_players = 0;
44 44
 $blitz_prize_dark_matter = 0;
45 45
 $blitz_prize_places = 0;
46
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
47
-  if(sys_get_param_str('generate')) {
46
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
47
+  if (sys_get_param_str('generate')) {
48 48
     $next_id = 0;
49 49
     $query = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
50
-    while($row = db_fetch($query)) {
50
+    while ($row = db_fetch($query)) {
51 51
       $next_id++;
52 52
       $blitz_name = 'Игрок' . $next_id;
53 53
       $blitz_password = sys_random_string(8);
54 54
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
55 55
     }
56
-  } elseif(sys_get_param_str('import_generated')) {
56
+  } elseif (sys_get_param_str('import_generated')) {
57 57
     // ЭТО НА БЛИЦЕ!!!
58 58
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
59 59
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     $system = $system_step;
76 76
     $planet = round(SN::$config->game_maxPlanet / 2);
77 77
 
78
-    foreach($imported_string as &$string_data) {
78
+    foreach ($imported_string as &$string_data) {
79 79
       $string_data = explode(',', $string_data);
80 80
       $username_safe = $string_data[0];
81 81
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], Universe::MOON_MAX_SIZE, false);
91 91
 
92
-      if(($system += $system_step) >= SN::$config->game_maxSystem) {
92
+      if (($system += $system_step) >= SN::$config->game_maxSystem) {
93 93
         $galaxy++;
94 94
         $system = $system_step;
95 95
       }
@@ -98,13 +98,13 @@  discard block
 block discarded – undo
98 98
 
99 99
     SN::$config->db_saveItem('users_amount', SN::$config->users_amount + $new_players);
100 100
     // generated_string
101
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
101
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
102 102
     $blitz_result = explode(';', $blitz_result_string);
103 103
     $blitz_last_update = $blitz_result[0]; // Пока не используется
104 104
     unset($blitz_result[0]);
105
-    foreach($blitz_result as $blitz_result_data) {
105
+    foreach ($blitz_result as $blitz_result_data) {
106 106
       $blitz_result_data = explode(',', $blitz_result_data);
107
-      if(count($blitz_result_data) == 5) {
107
+      if (count($blitz_result_data) == 5) {
108 108
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
109 109
         doquery(
110 110
           "UPDATE `{{blitz_registrations}}` SET
@@ -118,15 +118,15 @@  discard block
 block discarded – undo
118 118
     $blitz_result = array();
119 119
   }
120 120
 
121
-  if(SN::$config->game_mode == GAME_BLITZ) {
121
+  if (SN::$config->game_mode == GAME_BLITZ) {
122 122
     $blitz_result = array(SN::$config->db_loadItem('var_stat_update'));
123 123
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
124
-    while($row = db_fetch($query)) {
124
+    while ($row = db_fetch($query)) {
125 125
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
126 126
     }
127 127
   } else {
128 128
     $query = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
129
-    while($row = db_fetch($query)) {
129
+    while ($row = db_fetch($query)) {
130 130
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
131 131
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
132 132
       $blitz_players++;
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
     'Игрок40'
142 142
     */
143 143
 
144
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
144
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
145 145
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
146 146
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
147 147
       sn_db_transaction_start();
148 148
       $query = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
149
-      while($row = db_fetch($query)) {
150
-        if(!$row['blitz_place']) {
149
+      while ($row = db_fetch($query)) {
150
+        if (!$row['blitz_place']) {
151 151
           continue;
152 152
         }
153 153
 
@@ -155,15 +155,15 @@  discard block
 block discarded – undo
155 155
         $blitz_prize_places_actual--;
156 156
 
157 157
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
158
-pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}",$row['id']);
159
-        if($reward) {
158
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
159
+        if ($reward) {
160 160
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
161 161
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
162 162
           ));
163 163
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$current_round};");
164 164
         }
165 165
 
166
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
166
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
167 167
           break;
168 168
         }
169 169
       }
@@ -183,12 +183,12 @@  discard block
 block discarded – undo
183 183
     JOIN {{users}} AS u ON u.id = br.user_id
184 184
   WHERE br.`round_number` = {$current_round}
185 185
   order by `blitz_place`, `timestamp`;");
186
-while($row = db_fetch($query)) {
186
+while ($row = db_fetch($query)) {
187 187
   $tpl_player_data = array(
188 188
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
189 189
   );
190 190
 
191
-  if(SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
191
+  if (SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
192 192
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
193 193
     $tpl_player_data = array_merge($tpl_player_data, array(
194 194
       'ID' => $row['id'],
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
   }
202 202
 
203 203
   $template->assign_block_vars('registrations', $tpl_player_data);
204
-  if($row['id'] == $user['id']) {
204
+  if ($row['id'] == $user['id']) {
205 205
     $player_registered = $row;
206 206
   }
207 207
 }
Please login to merge, or discard this patch.
includes/pages/options.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
     unset($player_options[PLAYER_OPTION_TUTORIAL_CURRENT]);
402 402
   }
403 403
 
404
-  array_walk($player_options, function (&$value) {
404
+  array_walk($player_options, function(&$value) {
405 405
     // TODO - Когда будет больше параметров - сделать больше проверок
406 406
     $value = intval($value);
407 407
   });
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
           $user['id'],
451 451
           RPG_NAME_CHANGE,
452 452
           -$config->game_user_changename_cost,
453
-          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username,])
453
+          vsprintf('Пользователь ID %1$d сменил имя с "%2$s" на "%3$s"', [$user['id'], $user['username'], $username, ])
454 454
         );
455 455
 
456 456
       case SERVER_PLAYER_NAME_CHANGE_FREE:
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin_diplomacy.inc 2 patches
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@  discard block
 block discarded – undo
67 67
       ->doInsert();
68 68
 
69 69
     $accept_offer = false;
70
-  }
71
-  else
70
+  } else
72 71
   {
73 72
     $accept_offer = true;
74 73
     $autoAccept = true;
@@ -80,8 +79,7 @@  discard block
 block discarded – undo
80 79
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
81 80
     );
82 81
   }
83
-}
84
-else
82
+} else
85 83
 {
86 84
   $offer_id = sys_get_param_id('offer_id');
87 85
   if($offer_id)
@@ -92,31 +90,26 @@  discard block
 block discarded – undo
92 90
     if(!$negotiation)
93 91
     {
94 92
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
95
-    }
96
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
93
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
97 94
     {
98 95
       // TODO: Add log of hack attempt
99 96
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
100
-    }
101
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
97
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
102 98
     {
103 99
       if($offer_answer == 'accept')
104 100
       {
105 101
         // TODO: Add log of hack attempt
106 102
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
107
-      }
108
-      elseif($offer_answer == 'deny')
103
+      } elseif($offer_answer == 'deny')
109 104
       {
110 105
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
111 106
       }
112
-    }
113
-    else
107
+    } else
114 108
     {
115 109
       if($offer_answer == 'accept')
116 110
       {
117 111
         $accept_offer = true;
118
-      }
119
-      elseif($offer_answer == 'deny')
112
+      } elseif($offer_answer == 'deny')
120 113
       {
121 114
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
122 115
       }
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 use Alliance\DBStaticAlly;
4 4
 use \DBAL\DbQuery;
5 5
 
6
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
6
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
7 7
 {
8 8
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
9 9
 }
@@ -18,28 +18,28 @@  discard block
 block discarded – undo
18 18
 $ally_name_safe = db_escape($user['ally_name']);
19 19
 
20 20
 $autoAccept = false;
21
-if(sys_get_param_str('ali_dip_offer_make'))
21
+if (sys_get_param_str('ali_dip_offer_make'))
22 22
 {
23 23
   $alliance_negotiation_relation = sys_get_param_str('alliance_negotiation_relation');
24
-  if(!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
24
+  if (!array_key_exists($alliance_negotiation_relation, $sn_diplomacy_relation_list))
25 25
   {
26 26
     messageBox($lang['ali_dip_err_wrong_offer'], $page_title);
27 27
   }
28 28
 
29 29
   $alliance_negotiation_contr_ally_id = sys_get_param_id('alliance_negotiation_contr_ally_id');
30
-  if($alliance_negotiation_contr_ally_id == $user['ally_id'])
30
+  if ($alliance_negotiation_contr_ally_id == $user['ally_id'])
31 31
   {
32 32
     messageBox($lang['ali_dip_err_same_ally'], $page_title);
33 33
   }
34 34
 
35 35
   $contr_ally_row = doquery("SELECT `ally_name` FROM {{alliance}} WHERE `id` = {$alliance_negotiation_contr_ally_id} LIMIT 1;", '', true);
36
-  if(!$contr_ally_row)
36
+  if (!$contr_ally_row)
37 37
   {
38 38
     messageBox($lang['ali_dip_err_no_ally'], $page_title);
39 39
   }
40 40
 
41 41
   $relation_current_id = ali_relation($user['ally_id'], $alliance_negotiation_contr_ally_id);
42
-  if($alliance_negotiation_relation == $relation_current_id)
42
+  if ($alliance_negotiation_relation == $relation_current_id)
43 43
   {
44 44
     messageBox(sprintf($lang['ali_dip_err_offer_same'], $lang['ali_dip_relations'][$alliance_negotiation_relation]), $page_title);
45 45
   }
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
   $relation_new = $sn_diplomacy_relation_list[$alliance_negotiation_relation];
53 53
   $relation_current = $sn_diplomacy_relation_list[$relation_current_id];
54
-  if($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
54
+  if ($relation_new['enter_delay'] == -1 || $relation_current['exit_delay'] == -1)
55 55
   {
56 56
     DbQuery::build()
57 57
       ->setTable('alliance_negotiation')
@@ -85,39 +85,39 @@  discard block
 block discarded – undo
85 85
 else
86 86
 {
87 87
   $offer_id = sys_get_param_id('offer_id');
88
-  if($offer_id)
88
+  if ($offer_id)
89 89
   {
90 90
     $offer_answer = sys_get_param_str('answer');
91 91
 
92 92
     $negotiation = doquery("SELECT * FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;", '', true);
93
-    if(!$negotiation)
93
+    if (!$negotiation)
94 94
     {
95 95
       messageBox($lang['ali_dip_err_offer_none'], $page_title);
96 96
     }
97
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
97
+    elseif ($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
98 98
     {
99 99
       // TODO: Add log of hack attempt
100 100
       messageBox($lang['ali_dip_err_offer_alien'], $page_title);
101 101
     }
102
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
102
+    elseif ($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
103 103
     {
104
-      if($offer_answer == 'accept')
104
+      if ($offer_answer == 'accept')
105 105
       {
106 106
         // TODO: Add log of hack attempt
107 107
         messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
108 108
       }
109
-      elseif($offer_answer == 'deny')
109
+      elseif ($offer_answer == 'deny')
110 110
       {
111 111
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
112 112
       }
113 113
     }
114 114
     else
115 115
     {
116
-      if($offer_answer == 'accept')
116
+      if ($offer_answer == 'accept')
117 117
       {
118 118
         $accept_offer = true;
119 119
       }
120
-      elseif($offer_answer == 'deny')
120
+      elseif ($offer_answer == 'deny')
121 121
       {
122 122
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
123 123
       }
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
   }
126 126
 }
127 127
 
128
-if($accept_offer)
128
+if ($accept_offer)
129 129
 {
130 130
   sn_db_transaction_start();
131 131
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
   sn_db_transaction_commit();
186 186
 }
187 187
 
188
-foreach($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
188
+foreach ($sn_diplomacy_relation_list as $diplomacy_relation_id => $diplomacy_relation)
189 189
 {
190 190
   $template->assign_block_vars('relation', array(
191 191
     'ID'   => $diplomacy_relation_id,
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 }
195 195
 
196 196
 $query = doquery("SELECT id, ally_name, ally_tag FROM {{alliance}} WHERE `id` != {$user['ally_id']} ORDER BY ally_name;");
197
-while($alliance = db_fetch($query))
197
+while ($alliance = db_fetch($query))
198 198
 {
199 199
   $template->assign_block_vars('alliance', array(
200 200
     'ID'   => $alliance['id'],
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
   WHERE
214 214
     alliance_negotiation_ally_id = {$user['ally_id']} OR alliance_negotiation_contr_ally_id = {$user['ally_id']};"
215 215
 );
216
-while($offer = db_fetch($query))
216
+while ($offer = db_fetch($query))
217 217
 {
218 218
   $template->assign_block_vars('offer', array(
219 219
     'ID'       => $offer['alliance_negotiation_id'],
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
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
   protected static $autoloaderRegistered = false;
25 25
 
26 26
   protected static function _constructorStatic() {
27
-    if(!static::$autoloaderRegistered) {
27
+    if (!static::$autoloaderRegistered) {
28 28
       spl_autoload_register(array(__CLASS__, 'autoloader'));
29 29
       static::$autoloaderRegistered = true;
30 30
     }
@@ -36,17 +36,17 @@  discard block
 block discarded – undo
36 36
   public static function autoloader($class) {
37 37
     static::_constructorStatic();
38 38
 
39
-    foreach(static::$folders as $data) {
39
+    foreach (static::$folders as $data) {
40 40
       $theClassFile = $class;
41 41
 
42
-      if($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
42
+      if ($data[static::P_PREFIX] && strrpos($class, $data[static::P_PREFIX]) !== false) {
43 43
         $theClassFile = substr($class, strlen($data[static::P_PREFIX]));
44 44
       }
45 45
 
46 46
       $classFullFileName = str_replace('\\', '/', $data[static::P_FOLDER] . $theClassFile) . DOT_PHP_EX;
47
-      if(file_exists($classFullFileName) && is_file($classFullFileName)) {
47
+      if (file_exists($classFullFileName) && is_file($classFullFileName)) {
48 48
         require_once($classFullFileName);
49
-        if(method_exists($class, '_constructorStatic')) {
49
+        if (method_exists($class, '_constructorStatic')) {
50 50
           $class::_constructorStatic();
51 51
         }
52 52
       }
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 
63 63
     $absoluteClassRoot = str_replace('\\', '/', SN_ROOT_PHYSICAL . $absoluteClassRoot);
64 64
 
65
-    if(!($absoluteClassRoot = realpath($absoluteClassRoot))) {
65
+    if (!($absoluteClassRoot = realpath($absoluteClassRoot))) {
66 66
       // TODO - throw new \Exception("There is some error when installing autoloader for '{$absoluteClassRoot}' class prefix '{$classPrefix}'");
67 67
       return;
68 68
     }
69 69
     $absoluteClassRoot = str_replace('\\', '/', $absoluteClassRoot) . '/';
70 70
 
71
-    if($classPrefix && strrpos($classPrefix, 1) != '\\') {
71
+    if ($classPrefix && strrpos($classPrefix, 1) != '\\') {
72 72
       $classPrefix .= '\\';
73 73
     }
74 74
 
Please login to merge, or discard this patch.
metamatter.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 }
113 113
 
114 114
 $payment_methods_available = array_combine(array_keys(sn_module_payment::$payment_methods), array_fill(0, count(sn_module_payment::$payment_methods), null));
115
-array_walk($payment_methods_available, function (&$value, $index) {
115
+array_walk($payment_methods_available, function(&$value, $index) {
116 116
   $value = !empty(sn_module_payment::$payment_methods[$index]) ? array_combine(array_keys(sn_module_payment::$payment_methods[$index]), array_fill(0, count(sn_module_payment::$payment_methods[$index]), null)) : $value;
117 117
 });
118 118
 
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 if ($request['metamatter'] && $payment_module_request) {
224 224
   try {
225 225
     $paymentModuleReal = SN::$gc->modules->getModule($payment_module_request);
226
-    if(!is_object($paymentModuleReal)) {
226
+    if (!is_object($paymentModuleReal)) {
227 227
       throw new Exception('{ Менеджер модулей вернул null вместо платёжного модуля для }' . $payment_module_request, ERR_ERROR);
228 228
     }
229 229
     /**
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
   'PLAYER_CURRENCY'              => $player_currency,
313 313
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
314 314
 
315
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
315
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
316 316
   'UNIT_AMOUNT_TEXT'            => HelperString::numberFloorAndFormat($request['metamatter']),
317 317
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
318 318
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,
Please login to merge, or discard this patch.
classes/core_auth.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -191,18 +191,18 @@  discard block
 block discarded – undo
191 191
     // TODO Хотя тут может получится вечный цикл - ПОДУМАТЬ
192 192
     // TODO Тут же можно пробовать провести попытку слияния аккаунтов - хотя это и очень небезопасно
193 193
 
194
-    if(sys_get_param('login_player_register_logout')) {
194
+    if (sys_get_param('login_player_register_logout')) {
195 195
       $this->logout();
196 196
     }
197 197
 
198 198
     $original_suggest = '';
199 199
     // Смотрим - есть ли у нас данные от пользователя
200
-    if(($player_name_submitted = sys_get_param('submit_player_name'))) {
200
+    if (($player_name_submitted = sys_get_param('submit_player_name'))) {
201 201
       // Попытка регистрации нового игрока из данных, введенных пользователем
202 202
       $this->player_suggested_name = sys_get_param_str_unsafe('player_suggested_name');
203 203
     } else {
204
-      foreach($this->providers_authorised as $provider) {
205
-        if($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
204
+      foreach ($this->providers_authorised as $provider) {
205
+        if ($this->player_suggested_name = $provider->player_name_suggest()) { // OK 4.5
206 206
           $original_suggest = $provider->player_name_suggest();
207 207
           break;
208 208
         }
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
     }
211 211
 
212 212
     // Если у нас провайдеры не дают имени и пользователь не дал свой вариант - это у нас первый логин в игру
213
-    if(!$this->player_suggested_name) {
213
+    if (!$this->player_suggested_name) {
214 214
       $max_user_id = db_player_get_max_id(); // 4.5
215 215
       // TODO - предлагать имя игрока по локали
216 216
 
@@ -219,15 +219,15 @@  discard block
 block discarded – undo
219 219
         sn_db_transaction_rollback();
220 220
         $this->player_suggested_name = 'Emperor ' . mt_rand($max_user_id + 1, $max_user_id + 1000);
221 221
         sn_db_transaction_start();
222
-      } while(db_player_name_exists($this->player_suggested_name));
222
+      } while (db_player_name_exists($this->player_suggested_name));
223 223
 
224 224
     }
225 225
 
226
-    if($player_name_submitted) {
226
+    if ($player_name_submitted) {
227 227
       $this->register_player_db_create($this->player_suggested_name); // OK 4.5
228
-      if($this->register_status == LOGIN_SUCCESS) {
228
+      if ($this->register_status == LOGIN_SUCCESS) {
229 229
         sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
230
-      } elseif($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
230
+      } elseif ($this->register_status == REGISTER_ERROR_PLAYER_NAME_EXISTS && $original_suggest == $this->player_suggested_name) {
231 231
         // self::$player_suggested_name .= ' ' . $this->account->account_id;
232 232
       }
233 233
 //      if(self::$login_status != LOGIN_SUCCESS) {
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         : false
252 252
       );
253 253
 
254
-    if($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
254
+    if ($this->register_status == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
255 255
       $prohibited_characters = array_map(function($value) {
256 256
         return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
257 257
       }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
@@ -284,18 +284,18 @@  discard block
 block discarded – undo
284 284
 
285 285
     // !self::$is_init ? self::init() : false;
286 286
 
287
-    if(!SN::$gc->modules->countModulesInGroup('auth')) {
287
+    if (!SN::$gc->modules->countModulesInGroup('auth')) {
288 288
       die('{Не обнаружено ни одного провайдера авторизации в core_auth::login()!}');
289 289
     }
290 290
 
291 291
     !empty($_POST) ? self::flog(dump($_POST, '$_POST')) : false;
292 292
     !empty($_GET) ? self::flog(dump($_GET, '$_GET')) : false;
293
-    !empty($_COOKIE) ? self::flog(dump($_COOKIE,'$_COOKIE')) : false;
293
+    !empty($_COOKIE) ? self::flog(dump($_COOKIE, '$_COOKIE')) : false;
294 294
 
295 295
     $this->auth_reset(); // OK v4.5
296 296
 
297 297
     $this->providers = array();
298
-    foreach(SN::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) {
298
+    foreach (SN::$gc->modules->getModulesInGroup('auth', true) as $module_name => $module) {
299 299
       /**
300 300
        * @var auth_abstract $module
301 301
        */
@@ -304,10 +304,10 @@  discard block
 block discarded – undo
304 304
 
305 305
     // $this->providers = array_reverse($this->providers, true); // НИНАДА! СН-аккаунт должен всегда авторизироваться первым!
306 306
 //pdump($this->providers);
307
-    foreach($this->providers as $provider_id => $provider) {
307
+    foreach ($this->providers as $provider_id => $provider) {
308 308
       $login_status = $provider->login(); // OK v4.5
309 309
       self::flog(($provider->manifest['name'] . '->' . 'login_try - ') . (empty($provider->account->account_id) ? $lang['sys_login_messages'][$provider->account_login_status] : dump($provider)));
310
-      if($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
310
+      if ($login_status == LOGIN_SUCCESS && is_object($provider->account) && $provider->account instanceof Account && $provider->account->account_id) {
311 311
         $this->providers_authorised[$provider_id] = &$this->providers[$provider_id];
312 312
 
313 313
         $this->user_id_to_provider = array_replace_recursive(
@@ -315,20 +315,20 @@  discard block
 block discarded – undo
315 315
           // static::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
316 316
           PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id) // OK 4.5
317 317
         );
318
-      } elseif($login_status != LOGIN_UNDEFINED) {
318
+      } elseif ($login_status != LOGIN_UNDEFINED) {
319 319
         $this->provider_error_list[$provider_id] = $login_status;
320 320
       }
321 321
     }
322 322
 
323
-    if(empty($this->providers_authorised)) {
323
+    if (empty($this->providers_authorised)) {
324 324
       // Ни один аккаунт не авторизирован
325 325
       // Проверяем - есть ли у нас ошибки в аккаунтах?
326
-      if(!empty($this->provider_error_list)) {
326
+      if (!empty($this->provider_error_list)) {
327 327
         // Если есть - выводим их
328 328
         self::$login_status = reset($this->provider_error_list);
329 329
         $providerError = $this->providers[key($this->provider_error_list)]->account_login_message;
330 330
 
331
-        if(!empty($providerError)) {
331
+        if (!empty($providerError)) {
332 332
           self::$login_message = $providerError;
333 333
         }
334 334
       }
@@ -343,12 +343,12 @@  discard block
 block discarded – undo
343 343
       // В self::$accessible_user_row_list - список доступных игроков для данных аккаунтов с соответствующими записями из таблицы `users`
344 344
 
345 345
       // Остались ли у нас в списке доступные игроки?
346
-      if(empty($this->accessible_user_row_list)) {
346
+      if (empty($this->accessible_user_row_list)) {
347 347
         // Нет ни одного игрока ни на одном авторизированном аккаунте
348 348
         // Надо регать нового игрока
349 349
 
350 350
         // Сейчас происходит процесс регистрации игрока?
351
-        if(!$this->is_player_register) {
351
+        if (!$this->is_player_register) {
352 352
           // Нет - отправляем на процесс регистрации
353 353
           $partner_id = sys_get_param_int('id_ref', sys_get_param_int('partner_id'));
354 354
           sys_redirect(SN_ROOT_VIRTUAL . 'index.php?page=player_register&player_register=1' . ($partner_id ? '&id_ref=' . $partner_id : ''));
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
         // Да, есть доступные игроки, которые так же прописаны в базе
358 358
         $this->get_active_user(); // 4.5
359 359
 
360
-        if($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
360
+        if ($this->is_impersonating = !empty($_COOKIE[SN_COOKIE_U_I]) ? $_COOKIE[SN_COOKIE_U_I] : 0) {
361 361
           $a_user = db_user_by_id($this->is_impersonating);
362 362
           $this->impersonator_username = $a_user['username'];
363 363
         }
@@ -365,9 +365,9 @@  discard block
 block discarded – undo
365 365
 
366 366
         //Прописываем текущего игрока на все авторизированные аккаунты
367 367
         // TODO - ИЛИ ВСЕХ ИГРОКОВ??
368
-        if(empty($this->is_impersonating)) {
369
-          foreach($this->providers_authorised as $provider_id => $provider) {
370
-            if(empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
368
+        if (empty($this->is_impersonating)) {
369
+          foreach ($this->providers_authorised as $provider_id => $provider) {
370
+            if (empty($this->user_id_to_provider[self::$user['id']][$provider_id])) {
371 371
               // self::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
372 372
               PlayerToAccountTranslate::db_translate_register_user($provider_id, $provider->account->account_id, self::$user['id']);
373 373
               $this->user_id_to_provider[self::$user['id']][$provider_id][$provider->account->account_id] = true;
@@ -377,9 +377,9 @@  discard block
 block discarded – undo
377 377
       }
378 378
     }
379 379
 
380
-    if(empty(self::$user['id'])) {
380
+    if (empty(self::$user['id'])) {
381 381
       self::cookie_set(''); // OK 4.5
382
-    } elseif(self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
382
+    } elseif (self::$user['id'] != $_COOKIE[SN_COOKIE_U]) {
383 383
       self::cookie_set(self::$user['id']); // OK 4.5
384 384
     }
385 385
 
@@ -398,21 +398,21 @@  discard block
 block discarded – undo
398 398
    */
399 399
   // OK v4.7
400 400
   public function logout($redirect = true) {
401
-    if(!empty($_COOKIE[SN_COOKIE_U_I])) {
401
+    if (!empty($_COOKIE[SN_COOKIE_U_I])) {
402 402
       self::cookie_set($_COOKIE[SN_COOKIE_U_I]);
403 403
       self::cookie_set(0, true);
404 404
       self::$main_provider->logout();
405 405
     } else {
406
-      foreach($this->providers as $provider_name => $provider) {
406
+      foreach ($this->providers as $provider_name => $provider) {
407 407
         $provider->logout();
408 408
       }
409 409
 
410 410
       self::cookie_set(0);
411 411
     }
412 412
 
413
-    if($redirect === true) {
413
+    if ($redirect === true) {
414 414
       sys_redirect(SN_ROOT_RELATIVE . (empty($_COOKIE[SN_COOKIE_U]) ? 'login.php' : 'admin/overview.php'));
415
-    } elseif($redirect !== false) {
415
+    } elseif ($redirect !== false) {
416 416
       sys_redirect($redirect);
417 417
     }
418 418
   }
@@ -423,15 +423,15 @@  discard block
 block discarded – undo
423 423
    * @param $user_selected
424 424
    */
425 425
   public function impersonate($user_selected) {
426
-    if($_COOKIE[SN_COOKIE_U_I]) {
426
+    if ($_COOKIE[SN_COOKIE_U_I]) {
427 427
       die('You already impersonating someone. Go back to living other\'s life! Or clear your cookies and try again'); // TODO: Log it
428 428
     }
429 429
 
430
-    if($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
430
+    if ($this->auth_level_max_local < AUTH_LEVEL_ADMINISTRATOR) {
431 431
       die('You can\'t impersonate - too low level'); // TODO: Log it
432 432
     }
433 433
 
434
-    if($this->auth_level_max_local <= $user_selected['authlevel']) {
434
+    if ($this->auth_level_max_local <= $user_selected['authlevel']) {
435 435
       die('You can\'t impersonate this account - level is greater or equal to yours'); // TODO: Log it
436 436
     }
437 437
 
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
     $account_translate = reset($account_translate[$user_selected['id']][self::$main_provider->provider_id]);
440 440
     $account_to_impersonate = new Account(self::$main_provider->db);
441 441
     $account_to_impersonate->db_get_by_id($account_translate['provider_account_id']);
442
-    if(!$account_to_impersonate->is_exists) {
442
+    if (!$account_to_impersonate->is_exists) {
443 443
       die('Какая-то ошибка - не могу найти аккаунт для имперсонации'); // TODO: Log it
444 444
     }
445 445
     self::$main_provider->impersonate($account_to_impersonate);
@@ -465,12 +465,12 @@  discard block
 block discarded – undo
465 465
   public function password_check($password_unsafe) {
466 466
     $result = false;
467 467
 
468
-    if(empty($this->providers_authorised)) {
468
+    if (empty($this->providers_authorised)) {
469 469
       // TODO - такого быть не может!
470 470
       self::flog("password_check: Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
471 471
     } else {
472
-      foreach($this->providers_authorised as $provider_id => $provider) {
473
-        if($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
472
+      foreach ($this->providers_authorised as $provider_id => $provider) {
473
+        if ($provider->is_feature_supported(AUTH_FEATURE_HAS_PASSWORD)) {
474 474
           $result = $result || $provider->password_check($password_unsafe);
475 475
         }
476 476
       }
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
   public function password_change($old_password_unsafe, $new_password_unsafe) {
492 492
     global $lang;
493 493
 
494
-    if(empty($this->providers_authorised)) {
494
+    if (empty($this->providers_authorised)) {
495 495
       // TODO - такого быть не может!
496 496
       self::flog("Не найдено ни одного авторизированного провайдера в self::\$providers_authorised", true);
497 497
       return false;
@@ -504,8 +504,8 @@  discard block
 block discarded – undo
504 504
     $salt_unsafe = self::password_salt_generate();
505 505
 
506 506
     $providers_changed_password = array();
507
-    foreach($this->providers_authorised as $provider_id => $provider) {
508
-      if(
507
+    foreach ($this->providers_authorised as $provider_id => $provider) {
508
+      if (
509 509
         !$provider->is_feature_supported(AUTH_FEATURE_PASSWORD_CHANGE)
510 510
         || !$provider->password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe)
511 511
       ) {
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
       $account_translation = PlayerToAccountTranslate::db_translate_get_users_from_account_list($provider_id, $provider->account->account_id);
518 518
 
519 519
       // Рассылаем уведомления о смене пароля в ЛС
520
-      foreach($account_translation as $user_id => $provider_info) {
520
+      foreach ($account_translation as $user_id => $provider_info) {
521 521
         // TODO - УКазывать тип аккаунта, на котором сменён пароль
522 522
         msg_send_simple_message($user_id, 0, SN_TIME_NOW, MSG_TYPE_ADMIN,
523 523
           $lang['sys_administration'], $lang['sys_login_register_message_title'],
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
       sn_db_transaction_start();
565 565
       // Проверить наличие такого имени в истории имён
566 566
 
567
-      if(db_player_name_exists($player_name_unsafe)) {
567
+      if (db_player_name_exists($player_name_unsafe)) {
568 568
         throw new Exception(REGISTER_ERROR_PLAYER_NAME_EXISTS, ERR_ERROR);
569 569
       }
570 570
 
@@ -572,11 +572,11 @@  discard block
 block discarded – undo
572 572
       $player_language = '';
573 573
       $player_email = '';
574 574
       // TODO - порнография - работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
575
-      foreach($this->providers_authorised as $provider) {
576
-        if(!$player_language && $provider->account->account_language) {
575
+      foreach ($this->providers_authorised as $provider) {
576
+        if (!$player_language && $provider->account->account_language) {
577 577
           $player_language = $provider->account->account_language;
578 578
         }
579
-        if(!$player_email && $provider->account->account_email) {
579
+        if (!$player_email && $provider->account->account_email) {
580 580
           $player_email = $provider->account->account_email;
581 581
         }
582 582
       }
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
       ));
593 593
       // Зарегестрировать на него аккаунты из self::$accounts_authorised
594 594
       $a_user = self::$user;
595
-      foreach($this->providers_authorised as $provider) {
595
+      foreach ($this->providers_authorised as $provider) {
596 596
         // TODO - порнография. Должен быть отдельный класс трансляторов - в т.ч. и кэширующий транслятор
597 597
         // TODO - ну и работа должна происходить над списком аккаунтов, а не только на одном аккаунте...
598 598
         // self::db_translate_register_user($provider->provider_id, $provider->account->account_id, $a_user['id']);
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 
605 605
       sn_db_transaction_commit();
606 606
       $this->register_status = LOGIN_SUCCESS;
607
-    } catch(Exception $e) {
607
+    } catch (Exception $e) {
608 608
       sn_db_transaction_rollback();
609 609
 
610 610
       // Если старое имя занято
@@ -623,10 +623,10 @@  discard block
 block discarded – undo
623 623
     // Пробиваем все ИД игроков по базе - есть ли вообще такие записи
624 624
     // Вообще-то это не особо нужно - у нас по определению стоят констраинты
625 625
     // Зато так мы узнаем максимальный authlevel, проверим права имперсонейта и вытащим все записи юзеров
626
-    foreach($this->user_id_to_provider as $user_id => $cork) {
626
+    foreach ($this->user_id_to_provider as $user_id => $cork) {
627 627
       $user = db_user_by_id($user_id);
628 628
       // Если записи игрока в БД не существует?
629
-      if(empty($user['id'])) {
629
+      if (empty($user['id'])) {
630 630
         // Удаляем этого и переходим к следующему
631 631
         unset($this->user_id_to_provider[$user_id]);
632 632
         // Де-регистрируем игрока из таблицы трансляции игроков
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
   // OK v4.5
648 648
   protected function get_active_user() {
649 649
     // Проверяем куку "текущего игрока" из браузера
650
-    if(
650
+    if (
651 651
       // Кука не пустая
652 652
       ($_COOKIE[SN_COOKIE_U] = trim($_COOKIE[SN_COOKIE_U])) && !empty($_COOKIE[SN_COOKIE_U])
653 653
       // И в куке находится ID
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
     }
673 673
 
674 674
     // В куке нет валидного ИД записи игрока, доступной с текущих аккаунтов
675
-    if(empty(self::$user['id'])) {
675
+    if (empty(self::$user['id'])) {
676 676
       // Берем первого из доступных
677 677
       // TODO - default_user
678 678
       self::$user = reset($this->accessible_user_row_list);
@@ -696,7 +696,7 @@  discard block
 block discarded – undo
696 696
 
697 697
     $result = array();
698 698
 
699
-    if($user_id && empty($this->is_impersonating)) {
699
+    if ($user_id && empty($this->is_impersonating)) {
700 700
       // self::db_counter_insert();
701 701
       self::$device->db_counter_insert($user_id);
702 702
 
@@ -704,12 +704,12 @@  discard block
 block discarded – undo
704 704
 
705 705
       sys_user_options_unpack($user);
706 706
 
707
-      if($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
707
+      if ($user['banaday'] && $user['banaday'] <= SN_TIME_NOW) {
708 708
         $user['banaday'] = 0;
709 709
         $user['vacation'] = SN_TIME_NOW;
710 710
       }
711 711
 
712
-      $user['user_lastip'] = self::$device->ip_v4_string;// $ip['ip'];
712
+      $user['user_lastip'] = self::$device->ip_v4_string; // $ip['ip'];
713 713
       $user['user_proxy'] = self::$device->ip_v4_proxy_chain; //$ip['proxy_chain'];
714 714
 
715 715
       $result[F_BANNED_STATUS] = $user['banaday'];
@@ -723,13 +723,13 @@  discard block
 block discarded – undo
723 723
       );
724 724
     }
725 725
 
726
-    if($extra = $config->security_ban_extra) {
726
+    if ($extra = $config->security_ban_extra) {
727 727
       $extra = explode(',', $extra);
728
-      array_walk($extra,'trim');
728
+      array_walk($extra, 'trim');
729 729
       in_array(self::$device->device_id, $extra) and die();
730 730
     }
731 731
 
732
-    if(self::$login_message) {
732
+    if (self::$login_message) {
733 733
       $result[F_LOGIN_MESSAGE] = self::$login_message;
734 734
     }
735 735
 
@@ -765,21 +765,21 @@  discard block
 block discarded – undo
765 765
   protected function register_player_name_validate($player_name_unsafe) {
766 766
     // TODO - переделать под RAW-строки
767 767
     // Если имя игрока пустое - NO GO!
768
-    if(trim($player_name_unsafe) == '') {
768
+    if (trim($player_name_unsafe) == '') {
769 769
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_EMPTY, ERR_ERROR);
770 770
     }
771 771
     // Проверяем, что бы в начале и конце не было пустых символов
772
-    if($player_name_unsafe != trim($player_name_unsafe)) {
772
+    if ($player_name_unsafe != trim($player_name_unsafe)) {
773 773
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_TRIMMED, ERR_ERROR);
774 774
     }
775 775
     // Если логин имеет запрещенные символы - NO GO!
776
-    if(strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
776
+    if (strpbrk($player_name_unsafe, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
777 777
       // TODO - выдавать в сообщение об ошибке список запрещенных символов
778 778
       // TODO - заранее извещать игрока, какие символы являются запрещенными
779 779
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_RESTRICTED_CHARACTERS, ERR_ERROR);
780 780
     }
781 781
     // Если логин меньше минимальной длины - NO GO!
782
-    if(strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
782
+    if (strlen($player_name_unsafe) < LOGIN_LENGTH_MIN) {
783 783
       // TODO - выдавать в сообщение об ошибке минимальную длину имени игрока
784 784
       // TODO - заранее извещать игрока, какая минимальная и максимальная длина имени
785 785
       throw new Exception(REGISTER_ERROR_PLAYER_NAME_SHORT, ERR_ERROR);
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
   }
838 838
 
839 839
   protected static function flog($message, $die = false) {
840
-    if(!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
840
+    if (!defined('DEBUG_AUTH') || !DEBUG_AUTH) {
841 841
       return;
842 842
     }
843 843
     list($called, $caller) = debug_backtrace(false);
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
     $_SERVER['SERVER_NAME'] == 'localhost' ? print("<div class='debug'>$message - $caller_name\r\n</div>") : false;
851 851
 
852 852
     SN::log_file("$message - $caller_name");
853
-    if($die) {
853
+    if ($die) {
854 854
       $die && die("<div class='negative'>СТОП! Функция {$caller_name} при вызове в " . get_called_class() . " (располагается в " . get_class() . "). СООБЩИТЕ АДМИНИСТРАЦИИ!</div>");
855 855
     }
856 856
   }
Please login to merge, or discard this patch.