Test Failed
Push — master ( 247090...f61425 )
by SuperNova.WS
18:56 queued 11:23
created
blitz_register.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -4,12 +4,12 @@  discard block
 block discarded – undo
4 4
 
5 5
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
6 6
 
7
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
7
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
8 8
   $error_message = SN::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
9 9
     !SN::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
10 10
   );
11 11
 
12
-  if($error_message) {
12
+  if ($error_message) {
13 13
     SnTemplate::messageBox($lang[$error_message], $lang['sys_error'], 'overview.php', 10);
14 14
     die();
15 15
   }
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
 $current_round = intval(SN::$config->db_loadItem('game_blitz_register_round'));
20 20
 $current_price = intval(SN::$config->db_loadItem('game_blitz_register_price'));
21 21
 
22
-if(SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
22
+if (SN::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
23 23
   sn_db_transaction_start();
24 24
   $user = db_user_by_id($user['id'], true);
25 25
   $is_registered = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `user_id` = {$user['id']} AND `round_number` = {$current_round} FOR UPDATE;", true);
26
-  if(sys_get_param_str('register_me')) {
27
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
26
+  if (sys_get_param_str('register_me')) {
27
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
28 28
       doquery("INSERT IGNORE INTO {{blitz_registrations}} SET `user_id` = {$user['id']}, `round_number` = {$current_round};");
29 29
       //mm_points_change($user['id'], RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
30 30
       SN::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
45 45
 $blitz_players = 0;
46 46
 $blitz_prize_dark_matter = 0;
47 47
 $blitz_prize_places = 0;
48
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
49
-  if(sys_get_param_str('generate')) {
48
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
49
+  if (sys_get_param_str('generate')) {
50 50
     $next_id = 0;
51 51
     $query = doquery("SELECT `id` FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY RAND();");
52
-    while($row = db_fetch($query)) {
52
+    while ($row = db_fetch($query)) {
53 53
       $next_id++;
54 54
       $blitz_name = 'Игрок' . $next_id;
55 55
       $blitz_password = sys_random_string(8);
56 56
       doquery("UPDATE {{blitz_registrations}} SET blitz_name = '{$blitz_name}', blitz_password = '{$blitz_password}' WHERE `id` = {$row['id']} AND `round_number` = {$current_round};");
57 57
     }
58
-  } elseif(sys_get_param_str('import_generated')) {
58
+  } elseif (sys_get_param_str('import_generated')) {
59 59
     // ЭТО НА БЛИЦЕ!!!
60 60
     doquery("DELETE FROM {{users}} WHERE username like 'Игрок%';");
61 61
     doquery("DELETE FROM {{planets}} WHERE id_owner not in (SELECT `id` FROM {{users}});");
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     $system = $system_step;
78 78
     $planet = round(SN::$config->game_maxPlanet / 2);
79 79
 
80
-    foreach($imported_string as &$string_data) {
80
+    foreach ($imported_string as &$string_data) {
81 81
       $string_data = explode(',', $string_data);
82 82
       $username_safe = $string_data[0];
83 83
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 
92 92
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], Universe::MOON_MAX_SIZE, false);
93 93
 
94
-      if(($system += $system_step) >= SN::$config->game_maxSystem) {
94
+      if (($system += $system_step) >= SN::$config->game_maxSystem) {
95 95
         $galaxy++;
96 96
         $system = $system_step;
97 97
       }
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
 
101 101
     SN::$config->db_saveItem('users_amount', SN::$config->users_amount + $new_players);
102 102
     // generated_string
103
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
103
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
104 104
     $blitz_result = explode(';', $blitz_result_string);
105 105
     $blitz_last_update = $blitz_result[0]; // Пока не используется
106 106
     unset($blitz_result[0]);
107
-    foreach($blitz_result as $blitz_result_data) {
107
+    foreach ($blitz_result as $blitz_result_data) {
108 108
       $blitz_result_data = explode(',', $blitz_result_data);
109
-      if(count($blitz_result_data) == 5) {
109
+      if (count($blitz_result_data) == 5) {
110 110
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
111 111
         doquery(
112 112
           "UPDATE `{{blitz_registrations}}` SET
@@ -120,15 +120,15 @@  discard block
 block discarded – undo
120 120
     $blitz_result = array();
121 121
   }
122 122
 
123
-  if(SN::$config->game_mode == GAME_BLITZ) {
123
+  if (SN::$config->game_mode == GAME_BLITZ) {
124 124
     $blitz_result = array(SN::$config->db_loadItem('var_stat_update'));
125 125
     $query = doquery("SELECT id, username, total_rank, total_points, onlinetime FROM {{users}} ORDER BY `id`;");
126
-    while($row = db_fetch($query)) {
126
+    while ($row = db_fetch($query)) {
127 127
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
128 128
     }
129 129
   } else {
130 130
     $query = doquery("SELECT blitz_name, blitz_password, blitz_online FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `id`;");
131
-    while($row = db_fetch($query)) {
131
+    while ($row = db_fetch($query)) {
132 132
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
133 133
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
134 134
       $blitz_players++;
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
     'Игрок40'
144 144
     */
145 145
 
146
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
146
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
147 147
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
148 148
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
149 149
       sn_db_transaction_start();
150 150
       $query = doquery("SELECT * FROM {{blitz_registrations}} WHERE `round_number` = {$current_round} ORDER BY `blitz_place` FOR UPDATE;");
151
-      while($row = db_fetch($query)) {
152
-        if(!$row['blitz_place']) {
151
+      while ($row = db_fetch($query)) {
152
+        if (!$row['blitz_place']) {
153 153
           continue;
154 154
         }
155 155
 
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
         $blitz_prize_places_actual--;
158 158
 
159 159
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
160
-pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}",$row['id']);
161
-        if($reward) {
160
+pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
161
+        if ($reward) {
162 162
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
163 163
             $lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
164 164
           ));
165 165
           doquery("UPDATE {{blitz_registrations}} SET blitz_reward_dark_matter = blitz_reward_dark_matter + ($reward) WHERE id = {$row['id']} AND `round_number` = {$current_round};");
166 166
         }
167 167
 
168
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
168
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
169 169
           break;
170 170
         }
171 171
       }
@@ -185,12 +185,12 @@  discard block
 block discarded – undo
185 185
     JOIN {{users}} AS u ON u.id = br.user_id
186 186
   WHERE br.`round_number` = {$current_round}
187 187
   order by `blitz_place`, `timestamp`;");
188
-while($row = db_fetch($query)) {
188
+while ($row = db_fetch($query)) {
189 189
   $tpl_player_data = array(
190 190
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
191 191
   );
192 192
 
193
-  if(SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
193
+  if (SN::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
194 194
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
195 195
     $tpl_player_data = array_merge($tpl_player_data, array(
196 196
       'ID' => $row['id'],
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
   }
204 204
 
205 205
   $template->assign_block_vars('registrations', $tpl_player_data);
206
-  if($row['id'] == $user['id']) {
206
+  if ($row['id'] == $user['id']) {
207 207
     $player_registered = $row;
208 208
   }
209 209
 }
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 $template = SnTemplate::gettemplate('banned_body', true);
20 20
 
21 21
 $query = doquery("SELECT * FROM {{banned}} ORDER BY `ban_id` DESC;");
22
-$i=0;
23
-while($ban_row = db_fetch($query))
22
+$i = 0;
23
+while ($ban_row = db_fetch($query))
24 24
 {
25 25
   $template->assign_block_vars('banlist', array(
26 26
     'USER_NAME'   => $ban_row['ban_user_name'],
Please login to merge, or discard this patch.
common.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,24 +12,24 @@  discard block
 block discarded – undo
12 12
 global $debug, $template_result, $user, $lang, $planetrow;
13 13
 
14 14
 // Напоминание для Администрации, что игра отключена
15
-if($template_result[F_GAME_DISABLE]) {
15
+if ($template_result[F_GAME_DISABLE]) {
16 16
   echo '<div class="global_admin_warning">', $template_result[F_GAME_DISABLE_REASON], '</div>';
17 17
 }
18 18
 unset($disable_reason);
19 19
 
20 20
 
21
-if(defined('IN_ADMIN') && IN_ADMIN === true) {
21
+if (defined('IN_ADMIN') && IN_ADMIN === true) {
22 22
   lng_include('admin');
23
-} elseif($sys_user_logged_in) {
23
+} elseif ($sys_user_logged_in) {
24 24
   sys_user_vacation($user);
25 25
 
26 26
   $planet_id = SetSelectedPlanet($user);
27 27
 
28 28
   // TODO НЕ НУЖНО АЛЬЯНС КАЖДЫЙ РАЗ ОБНОВЛЯТЬ!!!
29
-  if($user['ally_id']) {
29
+  if ($user['ally_id']) {
30 30
     sn_db_transaction_start();
31 31
     \Alliance\Alliance::sn_ali_fill_user_ally($user);
32
-    if(!$user['ally']['player']['id']) {
32
+    if (!$user['ally']['player']['id']) {
33 33
       // sn_sys_logout(false, true);
34 34
       // core_auth::logout(false);
35 35
       SN::$auth->logout(false);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
   sn_db_transaction_commit();
49 49
 
50 50
   $planetrow = $global_data['planet'];
51
-  if(!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
51
+  if (!($planetrow && isset($planetrow['id']) && $planetrow['id'])) {
52 52
     // sn_sys_logout(false, true);
53 53
     // core_auth::logout(false);
54 54
     SN::$auth->logout(false);
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 sys_user_options_unpack($user);
64 64
 
65 65
 global $sn_page_name, $sn_mvc;
66
-if(!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
66
+if (!empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_EARLY_HEADER])) {
67 67
   $title = !empty($sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE]) ? $sn_mvc['pages'][INITIAL_PAGE][PAGE_OPTION_TITLE] : '';
68 68
   SnTemplate::renderHeader($page, $title, $template_result, false, $user, SN::$config, $lang, $planetrow);
69 69
 }
Please login to merge, or discard this patch.
language/ru/alliance.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 = [
Please login to merge, or discard this patch.
metamatter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     }
161 161
 
162 162
     if (is_array($pay_link) && in_array($pay_link['PAY_LINK_METHOD'], array('POST', 'GET', 'LINK', 'STEP', 'REDIRECT'))) {
163
-      if($pay_link['PAY_LINK_METHOD'] == 'REDIRECT') {
163
+      if ($pay_link['PAY_LINK_METHOD'] == 'REDIRECT') {
164 164
         sys_redirect($pay_link['PAY_LINK_URL']);
165 165
       }
166 166
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
   'PLAYER_CURRENCY'              => $player_currency,
235 235
   'PLAYER_CURRENCY_PRICE_PER_MM' => sn_module_payment::currency_convert(1, $player_currency, 'MM_', 10),
236 236
 
237
-  'UNIT_AMOUNT'                 => (float)$request['metamatter'],
237
+  'UNIT_AMOUNT'                 => (float) $request['metamatter'],
238 238
   'UNIT_AMOUNT_TEXT'            => HelperString::numberFloorAndFormat($request['metamatter']),
239 239
   'UNIT_AMOUNT_BONUS_PERCENT'   => $bonus_percent,
240 240
   'UNIT_AMOUNT_TEXT_DISCOUNTED' => $income_metamatter_text,
Please login to merge, or discard this patch.
classes/Payment/PaymentsMethodsActive.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -160,10 +160,10 @@
 block discarded – undo
160 160
         $paymentMethodId = 0;
161 161
       }
162 162
 
163
-      if(!$paymentMethodId) {
163
+      if (!$paymentMethodId) {
164 164
         $module = $this->modulesInstalled[$moduleName];
165 165
         $methodsOnModule = $module->getMethodList();
166
-        if(count($methodsOnModule) == 1) {
166
+        if (count($methodsOnModule) == 1) {
167 167
           $paymentMethodId = HelperArray::array_key_first($methodsOnModule);
168 168
         }
169 169
       }
Please login to merge, or discard this patch.
classes/Fleet/FleetDispatcher.php 1 patch
Spacing   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 //      $this->log_file('Dispatch stopped: lock ' . $runLock->isLocked() .'s' );
171 171
       return self::TASK_ALREADY_LOCKED;
172 172
     }
173
-    register_shutdown_function(function () use ($runLock) {
173
+    register_shutdown_function(function() use ($runLock) {
174 174
 //      $this->log_file('Shutting down');
175 175
       $timeLock = $runLock->isLocked();
176 176
       if ($timeLock > 0 || $timeLock === 0) {
@@ -552,15 +552,11 @@  discard block
 block discarded – undo
552 552
   protected function flt_flyingFleetsSort($a, $b) {
553 553
     return
554 554
       // Сравниваем время флотов - кто раньше, тот и первый обрабатывается
555
-      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 :
556
-        // Если время - одинаковое, сравниваем события флотов
555
+      $a['fleet_time'] > $b['fleet_time'] ? 1 : ($a['fleet_time'] < $b['fleet_time'] ? -1 : // Если время - одинаковое, сравниваем события флотов
557 556
         // Если события - одинаковые, то флоты равны
558
-        ($a['fleet_event'] == $b['fleet_event'] ? 0 :
559
-          // Если события разные - первыми считаем прибывающие флоты
560
-          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 :
561
-            // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
562
-            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 :
563
-              // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
557
+        ($a['fleet_event'] == $b['fleet_event'] ? 0 : // Если события разные - первыми считаем прибывающие флоты
558
+          ($a['fleet_event'] == EVENT_FLT_ARRIVE ? 1 : ($b['fleet_event'] == EVENT_FLT_ARRIVE ? -1 : // Если нет прибывающих флотов - дальше считаем флоты, которые закончили миссию
559
+            ($a['fleet_event'] == EVENT_FLT_ACOMPLISH ? 1 : ($b['fleet_event'] == EVENT_FLT_ACOMPLISH ? -1 : // Если нет флотов, закончивших задание - остались возвращающиеся флоты, которые равны между собой
564 560
               // TODO: Добавить еще проверку по ID флота и/или времени запуска - что бы обсчитывать их в порядке запуска
565 561
               (
566 562
               0 // Вообще сюда доходить не должно - будет отсекаться на равенстве событий
Please login to merge, or discard this patch.
classes/Fleet/TaskDispatchFleets.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
     $url = HttpUrl::spawn($this->gc)
64 64
       ->parseUrl(SN_ROOT_VIRTUAL)
65 65
       ->addPath('index.php')
66
-      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets',]);
66
+      ->addParams(['page' => 'worker', 'mode' => 'dispatchFleets', ]);
67 67
 
68 68
     sn_get_url_contents($url->urlSigned());
69 69
 
Please login to merge, or discard this patch.
classes/AjaxController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 
24 24
     define('IN_AJAX', true);
25 25
 
26
-    if(!is_object($template)) {
26
+    if (!is_object($template)) {
27 27
       $template = SnTemplate::gettemplate('_ajax', true);
28 28
     }
29 29
 
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
        * @var IPage $page
52 52
        */
53 53
       $page = new $className();
54
-      if(method_exists($page, 'loadParams')) {
54
+      if (method_exists($page, 'loadParams')) {
55 55
         $page->loadParams();
56 56
       }
57 57
 
58
-      if(method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
58
+      if (method_exists($page, $action = sys_get_param_str('action')) && $page->checkAction($action)) {
59 59
         $result = $page->$action();
60 60
         is_array($result) ? HelperArray::merge($template_result['AJAX'], $result) : false;
61 61
       }
Please login to merge, or discard this patch.