Completed
Push — trunk ( d79498...d7aafa )
by SuperNova.WS
04:22
created
includes/vars.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -582,9 +582,9 @@  discard block
 block discarded – undo
582 582
           2 => 0.01,
583 583
         ),
584 584
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
585
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
586
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
587
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
585
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
586
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
587
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
588 588
         ],
589 589
       ),
590 590
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => array(
@@ -596,9 +596,9 @@  discard block
 block discarded – undo
596 596
           2 => 0.025,
597 597
         ),
598 598
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
599
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
600
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
601
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
599
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
600
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
601
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
602 602
         ],
603 603
       ),
604 604
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => array(
@@ -1265,7 +1265,7 @@  discard block
 block discarded – undo
1265 1265
       UNIT_PLANS        => 'plans',
1266 1266
     ],
1267 1267
 
1268
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
1268
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
1269 1269
 
1270 1270
   ),
1271 1271
 );
Please login to merge, or discard this patch.
includes/template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
     renderFooter();
318 318
   }
319 319
 
320
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
320
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
321 321
 
322 322
   sn_db_disconnect();
323 323
 
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
   }
630 630
 }
631 631
 
632
-SN::$afterInit[] = function () {
632
+SN::$afterInit[] = function() {
633 633
   SN::$gc->pimp->add()->tpl_render_topnav($t = 'sn_tpl_render_topnav', [], null);
634 634
 };
635 635
 
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
     'QUE_ID'   => QUE_RESEARCH,
701 701
     'QUE_HTML' => 'topnav',
702 702
 
703
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
703
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
704 704
 
705 705
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
706 706
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
     'LANG'     => $language ? $language : '',
995 995
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
996 996
 
997
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
997
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
998 998
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
999 999
   ));
1000 1000
 
Please login to merge, or discard this patch.
classes/template_compile.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
 
142 142
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
143 143
     $include_blocks = $matches[1];
144
-    if($include_blocks)
144
+    if ($include_blocks)
145 145
     {
146
-      foreach($include_blocks as &$included_file)
146
+      foreach ($include_blocks as &$included_file)
147 147
       {
148 148
         $included_file .= '.tpl.html';
149 149
       }
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
       $varname = $var_val[3];
309 309
       $new = $this->generate_block_varref($namespace, $varname, $var_val[2]);
310 310
 
311
-      if(!empty($var_val[4])) {
311
+      if (!empty($var_val[4])) {
312 312
         $new = \Ptl\PtlVariableDecorator::decorate($var_val[0], $new, $this->template);
313 313
       }
314 314
 
@@ -462,8 +462,8 @@  discard block
 block discarded – undo
462 462
 
463 463
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
464 464
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
465
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
466
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
465
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
466
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
467 467
 
468 468
     return $tag_template_php;
469 469
   }
@@ -567,10 +567,10 @@  discard block
 block discarded – undo
567 567
         break;
568 568
 
569 569
         case 'is':
570
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
570
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
571 571
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
572 572
 
573
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
573
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
574 574
 
575 575
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
576 576
 
@@ -834,11 +834,11 @@  discard block
 block discarded – undo
834 834
     }
835 835
     else if ($include_last_iterator)
836 836
     {
837
-      return '$_'. $blocks[$blockcount] . '_val';
837
+      return '$_' . $blocks[$blockcount] . '_val';
838 838
     }
839 839
     else
840 840
     {
841
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
841
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
842 842
     }
843 843
   }
844 844
 
@@ -855,7 +855,7 @@  discard block
 block discarded – undo
855 855
     if ($fp = @fopen($filename, 'wb'))
856 856
     {
857 857
       @flock($fp, LOCK_EX);
858
-      @fwrite ($fp, $data);
858
+      @fwrite($fp, $data);
859 859
       @flock($fp, LOCK_UN);
860 860
       @fclose($fp);
861 861
 
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
873 873
   */
874 874
   function minify($html)
875 875
   {
876
-    if(!SN::$config->tpl_minifier)
876
+    if (!SN::$config->tpl_minifier)
877 877
     {
878 878
       return $html;
879 879
     }
@@ -885,14 +885,14 @@  discard block
 block discarded – undo
885 885
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
886 886
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
887 887
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
888
-    if(!empty($pre[0]))
888
+    if (!empty($pre[0]))
889 889
     {
890
-      foreach($pre[0] as $tag)
890
+      foreach ($pre[0] as $tag)
891 891
       {
892 892
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
893 893
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
894 894
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
895
-        $html = preg_replace('/#pre#/', $tag, $html,1);
895
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
896 896
       }
897 897
     }
898 898
 
Please login to merge, or discard this patch.
classes/Pages/Deprecated/PageAdminMining.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,19 +29,19 @@
 block discarded – undo
29 29
         'ID'        => self::PAGE_SORT_BY_RANK,
30 30
         'HTML_ID'   => 'byTotalRank',
31 31
         'HTML_NAME' => '{ byTotalRank }',
32
-        'SQL_SORT'  => ['u.total_rank',],
32
+        'SQL_SORT'  => ['u.total_rank', ],
33 33
       ],
34 34
       self::PAGE_SORT_BY_ID => [
35 35
         'ID'        => self::PAGE_SORT_BY_ID,
36 36
         'HTML_ID'   => 'byId',
37 37
         'HTML_NAME' => '{ byId }',
38
-        'SQL_SORT'  => ['u.id',],
38
+        'SQL_SORT'  => ['u.id', ],
39 39
       ],
40 40
       self::PAGE_SORT_BY_NAME => [
41 41
         'ID'        => self::PAGE_SORT_BY_NAME,
42 42
         'HTML_ID'   => 'byName',
43 43
         'HTML_NAME' => '{ byName }',
44
-        'SQL_SORT'  => ['u.username',],
44
+        'SQL_SORT'  => ['u.username', ],
45 45
       ],
46 46
 
47 47
       self::PAGE_SORT_BY_POINTS => [
Please login to merge, or discard this patch.
classes/Pages/Deprecated/PageAdminModules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
   const SORT_BY_ACTIVITY = 1;
14 14
 
15 15
   private static $sorting = [
16
-    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED',],
17
-    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME',],
16
+    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED', ],
17
+    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME', ],
18 18
   ];
19 19
 
20 20
   private static $sortFields = [];
Please login to merge, or discard this patch.