Completed
Push — trunk ( f48ee3...dfa631 )
by SuperNova.WS
10:02
created
classes/classConfig.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -185,9 +185,9 @@  discard block
 block discarded – undo
185 185
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
186 186
 
187 187
     // Alliance bonus calculations
188
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
188
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
189 189
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
190
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
190
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
191 191
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
192 192
     'ali_bonus_members'            => 10, // Minimum alliance size to start using bonus
193 193
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 
230 230
     'eco_scale_storage'            => 1,
231 231
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
232
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
232
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
233 233
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
234 234
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
235 235
 
@@ -240,11 +240,11 @@  discard block
 block discarded – undo
240 240
     'energy_basic_income'          => 0,
241 241
 
242 242
     // Bashing protection settings
243
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
244
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
245
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
246
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
247
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
243
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
244
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
245
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
246
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
247
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
248 248
 
249 249
     'Fleet_Cdr'   => 30,
250 250
     'fleet_speed' => 1,
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
252 252
     'fleet_update_interval' => 4,
253 253
     'fleet_update_lock'     => '', // SQL time when lock was acquired
254 254
 
255
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
256
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
255
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
256
+    'game_counter'          => 0, // Does built-in page hit counter is on?
257 257
     // Defaults
258 258
     'game_default_language' => 'ru',
259 259
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -267,14 +267,14 @@  discard block
 block discarded – undo
267 267
     'game_maxSystem'      => 199,
268 268
     'game_maxPlanet'      => 15,
269 269
     // Game global settings
270
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
270
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
271 271
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
272 272
 
273 273
     'game_news_actual'        => PERIOD_DAY_3, // How long announcement would be marked as "New". In seconds. Default - 3 days
274
-    'game_news_overview'      => 3,    // How much last news to show in Overview page
275
-    'game_news_overview_show' => PERIOD_WEEK_2,    // How long news will be shown in Overview page in seconds. Default - 2 weeks
274
+    'game_news_overview'      => 3, // How much last news to show in Overview page
275
+    'game_news_overview_show' => PERIOD_WEEK_2, // How long news will be shown in Overview page in seconds. Default - 2 weeks
276 276
     // Noob protection
277
-    'game_noob_factor'        => 5,    // Multiplier to divide "stronger" and "weaker" users
277
+    'game_noob_factor'        => 5, // Multiplier to divide "stronger" and "weaker" users
278 278
     'game_noob_points'        => 5000, // Below this point user threated as noob. 0 to disable
279 279
 
280 280
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
     'payment_currency_exchange_wmz' => 1,
330 330
     'payment_currency_exchange_pln' => 3.86,
331 331
 
332
-    'payment_lot_price' => 1,     // Lot price in default currency
333
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
332
+    'payment_lot_price' => 1, // Lot price in default currency
333
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
334 334
 
335 335
     'planet_capital_cost'          => 25000, // Cost in DM to move Capital to current planet
336
-    'planet_capital_mining_rate'   => 2.0,   // Capital Mining rates
337
-    'planet_capital_building_rate' => 2.0,   // Capital Building rates
336
+    'planet_capital_mining_rate'   => 2.0, // Capital Mining rates
337
+    'planet_capital_building_rate' => 2.0, // Capital Building rates
338 338
     'planet_teleport_cost'         => 50000, // Cost of planet teleportation
339 339
     'planet_teleport_timeout'      => 86400, // Timeout for next teleportation
340 340
 
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
     'resource_multiplier'     => 1,
357 357
 
358 358
     //Roleplay system
359
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
359
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
360 360
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
361 361
 
362 362
     // Black Market - General
@@ -421,12 +421,12 @@  discard block
 block discarded – undo
421 421
     'url_purchase_metamatter' => '',
422 422
     'url_rules'               => '',
423 423
 
424
-    'users_amount'              => 1,                // Total users count
424
+    'users_amount'              => 1, // Total users count
425 425
     'game_users_online_timeout' => PERIOD_MINUTE_15, // Seconds, How long user should considered ONLINE for online counter
426
-    'game_users_update_online'  => 30,               // How often user online should be refreshed (seconds)
427
-    'var_online_user_time'      => 0,                // When last time user online was refreshed
428
-    'var_online_user_count'     => 0,                // Last calculated online user count
429
-    'server_log_online'         => 0,                // Log online user count
426
+    'game_users_update_online'  => 30, // How often user online should be refreshed (seconds)
427
+    'var_online_user_time'      => 0, // When last time user online was refreshed
428
+    'var_online_user_count'     => 0, // Last calculated online user count
429
+    'server_log_online'         => 0, // Log online user count
430 430
 
431 431
     'user_birthday_celebrate' => 0, // When last time celebrations (i.e. giftgiving) was made
432 432
     'user_birthday_gift'      => 0, // User birthday gift
Please login to merge, or discard this patch.
classes/SnTemplate.php 1 patch
Spacing   +12 added lines, -12 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
 
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
       'LANG'     => $language ? $language : '',
644 644
       'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
645 645
 
646
-      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
646
+      'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
647 647
       'FILENAME'       => basename($_SERVER['PHP_SELF']),
648 648
     ));
649 649
 
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
       'QUE_ID'   => QUE_RESEARCH,
871 871
       'QUE_HTML' => 'topnav',
872 872
 
873
-      'RESEARCH_ONGOING' => (boolean)$user['que'],
873
+      'RESEARCH_ONGOING' => (boolean) $user['que'],
874 874
 
875 875
       'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
876 876
         $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
 
1041 1041
     $isRenderGlobal = is_object($page) && isset($template_result['GLOBAL_DISPLAY_HEADER']) ? $template_result['GLOBAL_DISPLAY_HEADER'] : true;
1042 1042
 
1043
-    if(self::getCurrentTemplate()->isRenderWhole()) {
1043
+    if (self::getCurrentTemplate()->isRenderWhole()) {
1044 1044
       ob_start();
1045 1045
     } else {
1046 1046
       // Global header
@@ -1071,18 +1071,18 @@  discard block
 block discarded – undo
1071 1071
 
1072 1072
         // Checking that no duplicates would be merged from template_result to template itself
1073 1073
         $filtered = [];
1074
-        if(!empty($template_result['.']['result']) && is_array($template_result['.']['result'])) {
1075
-          foreach($template_result['.']['result'] as $message) {
1076
-            if(empty($message['MESSAGE'])) {
1074
+        if (!empty($template_result['.']['result']) && is_array($template_result['.']['result'])) {
1075
+          foreach ($template_result['.']['result'] as $message) {
1076
+            if (empty($message['MESSAGE'])) {
1077 1077
               continue;
1078 1078
             }
1079 1079
 
1080
-            foreach($resultTemplate->_tpldata['result'] as $tplData) {
1081
-              if(empty($tplData['MESSAGE'])) {
1080
+            foreach ($resultTemplate->_tpldata['result'] as $tplData) {
1081
+              if (empty($tplData['MESSAGE'])) {
1082 1082
                 continue;
1083 1083
               }
1084 1084
 
1085
-              if($tplData['MESSAGE'] == $message['MESSAGE']) {
1085
+              if ($tplData['MESSAGE'] == $message['MESSAGE']) {
1086 1086
                 continue 2;
1087 1087
               }
1088 1088
             }
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
       SnTemplate::displayP($resultTemplate);
1138 1138
     }
1139 1139
 
1140
-    if(self::getCurrentTemplate()->isRenderWhole()) {
1140
+    if (self::getCurrentTemplate()->isRenderWhole()) {
1141 1141
       $renderedContent = ob_get_clean();
1142 1142
       // Global header
1143 1143
       if ($isRenderGlobal) {
@@ -1156,7 +1156,7 @@  discard block
 block discarded – undo
1156 1156
       SnTemplate::renderFooter($page, $template_result);
1157 1157
     }
1158 1158
 
1159
-    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
1159
+    $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
1160 1160
 
1161 1161
     sn_db_disconnect();
1162 1162
 
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.