Test Failed
Push — trunk ( e02d87...314b8c )
by SuperNova.WS
07:20
created
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/SnTemplate.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         $insert_position = $is_positioned == '-' ? 0 : count($menu);
129 129
       }
130 130
 
131
-      $insert_position     += $is_positioned == '+' ? 1 : 0;
131
+      $insert_position += $is_positioned == '+' ? 1 : 0;
132 132
       $spliced             = array_splice($menu, $insert_position, count($menu) - $insert_position);
133 133
       $menu[$menu_item_id] = $menu_item;
134 134
 
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
       'LANG'     => $language ? $language : '',
647 647
       'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
648 648
 
649
-      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
649
+      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
650 650
       'FILENAME'       => basename($_SERVER['PHP_SELF']),
651 651
     ));
652 652
 
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
873 873
       'QUE_ID'   => QUE_RESEARCH,
874 874
       'QUE_HTML' => 'topnav',
875 875
 
876
-      'RESEARCH_ONGOING' => (boolean)$user['que'],
876
+      'RESEARCH_ONGOING' => (boolean) $user['que'],
877 877
 
878 878
       'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
879 879
         $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -1161,7 +1161,7 @@  discard block
 block discarded – undo
1161 1161
       SnTemplate::renderFooter($page, $template_result);
1162 1162
     }
1163 1163
 
1164
-    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
1164
+    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
1165 1165
 
1166 1166
     sn_db_disconnect();
1167 1167
 
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.
classes/classConfig.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
202 202
 
203 203
     // Alliance bonus calculations
204
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
204
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
205 205
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
206
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
206
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
207 207
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
208 208
     'ali_bonus_members'            => 10, // Minimum alliance size to start using bonus
209 209
 
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 
246 246
     'eco_scale_storage'            => 1,
247 247
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
248
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
248
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
249 249
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
250 250
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
251 251
 
@@ -256,21 +256,21 @@  discard block
 block discarded – undo
256 256
     'energy_basic_income'          => 0,
257 257
 
258 258
     // Bashing protection settings
259
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
260
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
261
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
262
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
263
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
259
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
260
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
261
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
262
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
263
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
264 264
 
265 265
     'Fleet_Cdr'   => 30,
266 266
     'fleet_speed' => 1,
267 267
 
268
-    self::FLEET_UPDATE_MAX_RUN_TIME => 30,     // Maximum length in seconds for single fleet dispatch run
268
+    self::FLEET_UPDATE_MAX_RUN_TIME => 30, // Maximum length in seconds for single fleet dispatch run
269 269
     'fleet_update_interval'         => 4,
270 270
     'fleet_update_lock'             => '', // SQL time when lock was acquired
271 271
 
272
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
273
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
272
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
273
+    'game_counter'          => 0, // Does built-in page hit counter is on?
274 274
     // Defaults
275 275
     'game_default_language' => 'ru',
276 276
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -284,14 +284,14 @@  discard block
 block discarded – undo
284 284
     'game_maxSystem'      => 199,
285 285
     'game_maxPlanet'      => 15,
286 286
     // Game global settings
287
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
287
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
288 288
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
289 289
 
290 290
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
291
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
292
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
291
+    'game_news_overview'      => 3, // How much last news to show in Overview page
292
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
293 293
     // Noob protection
294
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
294
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
295 295
     'game_noob_points'        => 5000, // Below this point user treated as noob. 0 to disable
296 296
 
297 297
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -346,12 +346,12 @@  discard block
 block discarded – undo
346 346
     'payment_currency_exchange_wmz' => 1,
347 347
     'payment_currency_exchange_pln' => 3.86,
348 348
 
349
-    'payment_lot_price' => 1,     // Lot price in default currency
350
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
349
+    'payment_lot_price' => 1, // Lot price in default currency
350
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
351 351
 
352 352
     'planet_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
353
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
354
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
353
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
354
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
355 355
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
356 356
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
357 357
 
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
     'resource_multiplier'     => 1,
374 374
 
375 375
     //Roleplay system
376
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
376
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
377 377
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
378 378
 
379 379
     // Black Market - General
@@ -438,12 +438,12 @@  discard block
 block discarded – undo
438 438
     'url_purchase_metamatter' => '',
439 439
     'url_rules'               => '',
440 440
 
441
-    'users_amount'              => 1,                // Total users count
441
+    'users_amount'              => 1, // Total users count
442 442
     'game_users_online_timeout' => PERIOD_MINUTE_15, // Seconds, How long user should considered ONLINE for online counter
443
-    'game_users_update_online'  => 30,               // How often user online should be refreshed (seconds)
444
-    'var_online_user_time'      => 0,                // When last time user online was refreshed
445
-    'var_online_user_count'     => 0,                // Last calculated online user count
446
-    'server_log_online'         => 0,                // Log online user count
443
+    'game_users_update_online'  => 30, // How often user online should be refreshed (seconds)
444
+    'var_online_user_time'      => 0, // When last time user online was refreshed
445
+    'var_online_user_count'     => 0, // Last calculated online user count
446
+    'server_log_online'         => 0, // Log online user count
447 447
 
448 448
     'user_birthday_celebrate' => 0, // When last time celebrations (i.e. giftgiving) was made
449 449
     'user_birthday_gift'      => 0, // User birthday gift
Please login to merge, or discard this patch.
classes/Core/Scheduler/TaskConditional.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     }
86 86
 
87 87
     // Checking task lock
88
-    if (is_object($this->lock) && !$this->lock->attemptLock(function () {
88
+    if (is_object($this->lock) && !$this->lock->attemptLock(function() {
89 89
         return $this->proceedLockExpiration();
90 90
       }, SN_TIME_NOW)) {
91 91
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
    */
153 153
   protected function updateTaskLastRunTime($time) {
154 154
     $this->db->transactionWrap(
155
-      function () use ($time) {
155
+      function() use ($time) {
156 156
         $this->config->dateWrite($this->configName, $time, classConfig::DATE_TYPE_SQL_STRING);
157 157
       }
158 158
     );
Please login to merge, or discard this patch.