Completed
Branch trunk (78000f)
by SuperNova.WS
25:55 queued 09:00
created
resources.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 
93 93
 for ($Option = 10; $Option >= 0; $Option--)
94 94
 {
95
- $template->assign_block_vars('option', array(
96
-   'VALUE' => $Option * 10,
97
- ));
95
+  $template->assign_block_vars('option', array(
96
+    'VALUE' => $Option * 10,
97
+  ));
98 98
 }
99 99
 
100 100
 $caps_real = eco_get_planet_caps($user, $planetrow, 3600);
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
 int_calc_storage_bar(RES_DEUTERIUM);
164 164
 
165 165
 $template->assign_vars(array(
166
- 'PLANET_NAME'          => $planetrow['name'],
167
- 'PLANET_TYPE'          => $planetrow['planet_type'],
168
- 'PLANET_DENSITY_INDEX' => $planet_density_index,
169
- 'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
166
+  'PLANET_NAME'          => $planetrow['name'],
167
+  'PLANET_TYPE'          => $planetrow['planet_type'],
168
+  'PLANET_DENSITY_INDEX' => $planet_density_index,
169
+  'PLANET_CORE_TEXT'     => $lang['uni_planet_density_types'][$planet_density_index],
170 170
 
171
- 'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
171
+  'PRODUCTION_LEVEL'     => floor($caps_real['efficiency'] * 100),
172 172
 
173
- 'PAGE_HINT'            => $lang['res_hint'],
173
+  'PAGE_HINT'            => $lang['res_hint'],
174 174
 ));
175 175
 
176 176
 display($template, $lang['res_planet_production']);
Please login to merge, or discard this patch.
admin/adm_user_analyze.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
     0 => $row['visit_time'], // start
40 40
     1 => $row['visit_time'], // end
41 41
   )
42
-   //: false
43
-   ;
42
+    //: false
43
+    ;
44 44
 }
45 45
 
46 46
 $session_list = array();
Please login to merge, or discard this patch.
stat.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -50,52 +50,52 @@
 block discarded – undo
50 50
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
51 51
 
52 52
 $stat_types = array(
53
-   STAT_TOTAL => array(
54
-     'type' => 'total',
55
-   ),
53
+    STAT_TOTAL => array(
54
+      'type' => 'total',
55
+    ),
56 56
 
57
-   STAT_FLEET => array(
58
-     'type' => 'fleet',
59
-   ),
57
+    STAT_FLEET => array(
58
+      'type' => 'fleet',
59
+    ),
60 60
 
61
-   STAT_TECH => array(
62
-     'type' => 'tech',
63
-   ),
61
+    STAT_TECH => array(
62
+      'type' => 'tech',
63
+    ),
64 64
 
65
-   STAT_BUILDING => array(
66
-     'type' => 'build',
67
-   ),
65
+    STAT_BUILDING => array(
66
+      'type' => 'build',
67
+    ),
68 68
 
69
-   STAT_DEFENSE => array(
70
-     'type' => 'defs',
71
-   ),
69
+    STAT_DEFENSE => array(
70
+      'type' => 'defs',
71
+    ),
72 72
 
73
-   STAT_RESOURCE => array(
74
-     'type' => 'res',
75
-   ),
73
+    STAT_RESOURCE => array(
74
+      'type' => 'res',
75
+    ),
76 76
 
77
-   STAT_RAID_TOTAL => array(
78
-     'type' => 'raids',
79
-   ),
77
+    STAT_RAID_TOTAL => array(
78
+      'type' => 'raids',
79
+    ),
80 80
 
81
-   STAT_RAID_WON => array(
82
-     'type' => 'raidswin',
83
-   ),
81
+    STAT_RAID_WON => array(
82
+      'type' => 'raidswin',
83
+    ),
84 84
 
85
-   STAT_RAID_LOST => array(
86
-     'type' => 'raidsloose',
87
-   ),
85
+    STAT_RAID_LOST => array(
86
+      'type' => 'raidsloose',
87
+    ),
88 88
 
89 89
   STAT_LVL_BUILDING => array(
90
-     'type' => 'lvl_minier',
90
+      'type' => 'lvl_minier',
91 91
   ),
92 92
 
93 93
   STAT_LVL_TECH => array(
94
-     'type' => 'player_rpg_tech_level',
94
+      'type' => 'player_rpg_tech_level',
95 95
   ),
96 96
 
97 97
   STAT_LVL_RAID => array(
98
-     'type' => 'lvl_raid',
98
+      'type' => 'lvl_raid',
99 99
   ),
100 100
 );
101 101
 stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common);
Please login to merge, or discard this patch.
language/en/system.mo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 */
28 28
 
29 29
 if (!defined('INSIDE')) {
30
-	die('Hack attempt!');
30
+  die('Hack attempt!');
31 31
 }
32 32
 
33 33
 global $config;
Please login to merge, or discard this patch.
language/en/language.mo.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 */
29 29
 if (!defined('INSIDE')) 
30 30
 {
31
-	die('Hack attempt!');
31
+  die('Hack attempt!');
32 32
 }
33 33
 
34 34
 $lang_info = array(
Please login to merge, or discard this patch.
language/ru/system.mo.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -689,15 +689,15 @@  discard block
 block discarded – undo
689 689
   ),
690 690
 
691 691
   'months' => array(
692
-     1 =>'января',
693
-     2 =>'февраля',
694
-     3 =>'марта',
695
-     4 =>'апреля',
696
-     5 =>'мая',
697
-     6 =>'июня',
698
-     7 =>'июля',
699
-     8 =>'августа',
700
-     9 =>'сентября',
692
+      1 =>'января',
693
+      2 =>'февраля',
694
+      3 =>'марта',
695
+      4 =>'апреля',
696
+      5 =>'мая',
697
+      6 =>'июня',
698
+      7 =>'июля',
699
+      8 =>'августа',
700
+      9 =>'сентября',
701 701
     10 =>'октября',
702 702
     11 =>'ноября',
703 703
     12 =>'декабря'
@@ -993,7 +993,7 @@  discard block
 block discarded – undo
993 993
     PASSWORD_RESTORE_ERROR_ACCOUNT_NOT_EXISTS => 'Внутренняя ошибка - при смене пароля аккаунт не найден! Сообщите об этой ошибке Администрации!',
994 994
     AUTH_PASSWORD_RESET_INSIDE_ERROR_NO_ACCOUNT_FOR_CONFIRMATION => 'ВНУТРЕННЯЯ ОШИБКА! Нет аккаунтов для сброса пароля при корректном коде подтверждения! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
995 995
     LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET => 'ВНУТРЕННЯЯ ОШИБКА! СООБЩИТЕ АДМИНИСТРАЦИИ! Не установлен аккаунт при cookie_set()! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
996
- ),
996
+  ),
997 997
 
998 998
   'log_reg_email_title' => "Ваша регистрация на сервере %1\$s игры СуперНова",
999 999
   'log_reg_email_text' => "Подтверждение регистрации для %3\$s\r\n\r\n
Please login to merge, or discard this patch.
includes/general.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -815,7 +815,7 @@
 block discarded – undo
815 815
       '%H' => '(?P<H>[0-9]{2})',
816 816
       '%M' => '(?P<M>[0-9]{2})',
817 817
       '%S' => '(?P<S>[0-9]{2})',
818
-     // usw..
818
+      // usw..
819 819
     );
820 820
 
821 821
     $rexep = "#".strtr(preg_quote($format), $masks)."#";
Please login to merge, or discard this patch.
includes/includes/mrc_mercenary.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,8 +62,8 @@
 block discarded – undo
62 62
     if($mercenary_level) {
63 63
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
64 64
       if(!$config->empire_mercenary_temporary && $mercenary_level_old) {
65
-       $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
66
-       $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
65
+        $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
66
+        $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
67 67
       }
68 68
       $darkmater_cost = ceil($darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] * $mercenary_period * $sn_powerup_buy_discounts[$mercenary_period] / $config->empire_mercenary_base_period);
69 69
     } else {
Please login to merge, or discard this patch.
classes/template_compile.php 1 patch
Indentation   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
   }
56 56
 
57 57
   /**
58
-  * Load template source from file
59
-  * @access private
60
-  */
58
+   * Load template source from file
59
+   * @access private
60
+   */
61 61
   function _tpl_load_file($handle, $store_in_db = false)
62 62
   {
63 63
     // Try and open template for read
@@ -100,10 +100,10 @@  discard block
 block discarded – undo
100 100
   }
101 101
 
102 102
   /**
103
-  * Remove any PHP tags that do not belong, these regular expressions are derived from
104
-  * the ones that exist in zend_language_scanner.l
105
-  * @access private
106
-  */
103
+   * Remove any PHP tags that do not belong, these regular expressions are derived from
104
+   * the ones that exist in zend_language_scanner.l
105
+   * @access private
106
+   */
107 107
   function remove_php_tags(&$code)
108 108
   {
109 109
     // This matches the information gathered from the internal PHP lexer
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
   }
118 118
 
119 119
   /**
120
-  * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
121
-  * @access private
122
-  */
120
+   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
121
+   * @access private
122
+   */
123 123
   function compile($code, $no_echo = false, $echo_var = '')
124 124
   {
125 125
     global $config;
@@ -290,9 +290,9 @@  discard block
 block discarded – undo
290 290
   }
291 291
 
292 292
   /**
293
-  * Compile variables
294
-  * @access private
295
-  */
293
+   * Compile variables
294
+   * @access private
295
+   */
296 296
   function compile_var_tags(&$text_blocks)
297 297
   {
298 298
     // including $lang variable
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
359 359
   }
360 360
 
361 361
   /**
362
-  * Compile blocks
363
-  * @access private
364
-  */
362
+   * Compile blocks
363
+   * @access private
364
+   */
365 365
   function compile_tag_block($tag_args)
366 366
   {
367 367
     $no_nesting = false;
@@ -447,14 +447,14 @@  discard block
 block discarded – undo
447 447
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
448 448
 
449 449
     /**
450
-    * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
451
-    * <code>
452
-    * if (!$offset)
453
-    * {
454
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
455
-    * }
456
-    * </code>
457
-    */
450
+     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
451
+     * <code>
452
+     * if (!$offset)
453
+     * {
454
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
455
+     * }
456
+     * </code>
457
+     */
458 458
 
459 459
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
460 460
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -465,10 +465,10 @@  discard block
 block discarded – undo
465 465
   }
466 466
 
467 467
   /**
468
-  * Compile IF tags - much of this is from Smarty with
469
-  * some adaptions for our block level methods
470
-  * @access private
471
-  */
468
+   * Compile IF tags - much of this is from Smarty with
469
+   * some adaptions for our block level methods
470
+   * @access private
471
+   */
472 472
   function compile_tag_if($tag_args, $elseif)
473 473
   {
474 474
     // Tokenize args for 'if' tag.
@@ -623,9 +623,9 @@  discard block
 block discarded – undo
623 623
   }
624 624
 
625 625
   /**
626
-  * Compile DEFINE tags
627
-  * @access private
628
-  */
626
+   * Compile DEFINE tags
627
+   * @access private
628
+   */
629 629
   function compile_tag_define($tag_args, $op)
630 630
   {
631 631
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -676,9 +676,9 @@  discard block
 block discarded – undo
676 676
   }
677 677
 
678 678
   /**
679
-  * Compile INCLUDE tag
680
-  * @access private
681
-  */
679
+   * Compile INCLUDE tag
680
+   * @access private
681
+   */
682 682
   function compile_tag_include($tag_args)
683 683
   {
684 684
     // Process dynamic includes
@@ -691,19 +691,19 @@  discard block
 block discarded – undo
691 691
   }
692 692
 
693 693
   /**
694
-  * Compile INCLUDE_PHP tag
695
-  * @access private
696
-  */
694
+   * Compile INCLUDE_PHP tag
695
+   * @access private
696
+   */
697 697
   function compile_tag_include_php($tag_args)
698 698
   {
699 699
     return "\$this->_php_include('$tag_args');";
700 700
   }
701 701
 
702 702
   /**
703
-  * parse expression
704
-  * This is from Smarty
705
-  * @access private
706
-  */
703
+   * parse expression
704
+   * This is from Smarty
705
+   * @access private
706
+   */
707 707
   function _parse_is_expr($is_arg, $tokens)
708 708
   {
709 709
     $expr_end = 0;
@@ -768,13 +768,13 @@  discard block
 block discarded – undo
768 768
   }
769 769
 
770 770
   /**
771
-  * Generates a reference to the given variable inside the given (possibly nested)
772
-  * block namespace. This is a string of the form:
773
-  * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
774
-  * It's ready to be inserted into an "echo" line in one of the templates.
775
-  * NOTE: expects a trailing "." on the namespace.
776
-  * @access private
777
-  */
771
+   * Generates a reference to the given variable inside the given (possibly nested)
772
+   * block namespace. This is a string of the form:
773
+   * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
774
+   * It's ready to be inserted into an "echo" line in one of the templates.
775
+   * NOTE: expects a trailing "." on the namespace.
776
+   * @access private
777
+   */
778 778
   function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
779 779
   {
780 780
     // Strip the trailing period.
@@ -792,14 +792,14 @@  discard block
 block discarded – undo
792 792
   }
793 793
 
794 794
   /**
795
-  * Generates a reference to the array of data values for the given
796
-  * (possibly nested) block namespace. This is a string of the form:
797
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
798
-  *
799
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
800
-  * NOTE: does not expect a trailing "." on the blockname.
801
-  * @access private
802
-  */
795
+   * Generates a reference to the array of data values for the given
796
+   * (possibly nested) block namespace. This is a string of the form:
797
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
798
+   *
799
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
800
+   * NOTE: does not expect a trailing "." on the blockname.
801
+   * @access private
802
+   */
803 803
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
804 804
   {
805 805
     // Get an array of the blocks involved.
@@ -835,9 +835,9 @@  discard block
 block discarded – undo
835 835
   }
836 836
 
837 837
   /**
838
-  * Write compiled file to cache directory
839
-  * @access private
840
-  */
838
+   * Write compiled file to cache directory
839
+   * @access private
840
+   */
841 841
   function compile_write($handle, $data)
842 842
   {
843 843
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -860,9 +860,9 @@  discard block
 block discarded – undo
860 860
 
861 861
   // Gorlum's minifier BOF
862 862
   /**
863
-  * Minifies template w/i PHP code by removing extra spaces
864
-  * @access private
865
-  */
863
+   * Minifies template w/i PHP code by removing extra spaces
864
+   * @access private
865
+   */
866 866
   function minify($html)
867 867
   {
868 868
     global $config;
Please login to merge, or discard this patch.