Completed
Push — trunk ( 0e7a2e...6a6c5e )
by SuperNova.WS
07:28
created
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.
classes/Core/Repository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
    */
30 30
   protected $_repository;
31 31
 
32
- /**
32
+  /**
33 33
    * @var ContainerPlus $_oldRepo
34 34
    */
35 35
   protected $_oldRepo;
Please login to merge, or discard this patch.
resources.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
 
97 97
 for ($Option = 10; $Option >= 0; $Option--)
98 98
 {
99
- $template->assign_block_vars('option', array(
100
-   'VALUE' => $Option * 10,
101
- ));
99
+  $template->assign_block_vars('option', array(
100
+    'VALUE' => $Option * 10,
101
+  ));
102 102
 }
103 103
 
104 104
 $capsObj = new ResourceCalculations();
@@ -165,12 +165,12 @@  discard block
 block discarded – undo
165 165
 int_calc_storage_bar(RES_DEUTERIUM, $capsObj);
166 166
 
167 167
 $template->assign_vars(array(
168
- 'PLANET_NAME'          => $planetrow['name'],
169
- 'PLANET_TYPE'          => $planetrow['planet_type'],
168
+  'PLANET_NAME'          => $planetrow['name'],
169
+  'PLANET_TYPE'          => $planetrow['planet_type'],
170 170
 
171
- 'PRODUCTION_LEVEL'     => floor($capsObj->efficiency * 100),
171
+  'PRODUCTION_LEVEL'     => floor($capsObj->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.
classes/template_compile.php 1 patch
Indentation   +55 added lines, -55 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
@@ -365,9 +365,9 @@  discard block
 block discarded – undo
365 365
   }
366 366
 
367 367
   /**
368
-  * Compile blocks
369
-  * @access private
370
-  */
368
+   * Compile blocks
369
+   * @access private
370
+   */
371 371
   function compile_tag_block($tag_args)
372 372
   {
373 373
     $no_nesting = false;
@@ -453,14 +453,14 @@  discard block
 block discarded – undo
453 453
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
454 454
 
455 455
     /**
456
-    * 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
457
-    * <code>
458
-    * if (!$offset)
459
-    * {
460
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
461
-    * }
462
-    * </code>
463
-    */
456
+     * 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
457
+     * <code>
458
+     * if (!$offset)
459
+     * {
460
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
461
+     * }
462
+     * </code>
463
+     */
464 464
 
465 465
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
466 466
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -471,10 +471,10 @@  discard block
 block discarded – undo
471 471
   }
472 472
 
473 473
   /**
474
-  * Compile IF tags - much of this is from Smarty with
475
-  * some adaptions for our block level methods
476
-  * @access private
477
-  */
474
+   * Compile IF tags - much of this is from Smarty with
475
+   * some adaptions for our block level methods
476
+   * @access private
477
+   */
478 478
   function compile_tag_if($tag_args, $elseif)
479 479
   {
480 480
     // Tokenize args for 'if' tag.
@@ -629,9 +629,9 @@  discard block
 block discarded – undo
629 629
   }
630 630
 
631 631
   /**
632
-  * Compile DEFINE tags
633
-  * @access private
634
-  */
632
+   * Compile DEFINE tags
633
+   * @access private
634
+   */
635 635
   function compile_tag_define($tag_args, $op)
636 636
   {
637 637
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -682,9 +682,9 @@  discard block
 block discarded – undo
682 682
   }
683 683
 
684 684
   /**
685
-  * Compile INCLUDE tag
686
-  * @access private
687
-  */
685
+   * Compile INCLUDE tag
686
+   * @access private
687
+   */
688 688
   function compile_tag_include($tag_args)
689 689
   {
690 690
     // Process dynamic includes
@@ -697,19 +697,19 @@  discard block
 block discarded – undo
697 697
   }
698 698
 
699 699
   /**
700
-  * Compile INCLUDE_PHP tag
701
-  * @access private
702
-  */
700
+   * Compile INCLUDE_PHP tag
701
+   * @access private
702
+   */
703 703
   function compile_tag_include_php($tag_args)
704 704
   {
705 705
     return "\$this->_php_include('$tag_args');";
706 706
   }
707 707
 
708 708
   /**
709
-  * parse expression
710
-  * This is from Smarty
711
-  * @access private
712
-  */
709
+   * parse expression
710
+   * This is from Smarty
711
+   * @access private
712
+   */
713 713
   function _parse_is_expr($is_arg, $tokens)
714 714
   {
715 715
     $expr_end = 0;
@@ -802,14 +802,14 @@  discard block
 block discarded – undo
802 802
   }
803 803
 
804 804
   /**
805
-  * Generates a reference to the array of data values for the given
806
-  * (possibly nested) block namespace. This is a string of the form:
807
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
808
-  *
809
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
810
-  * NOTE: does not expect a trailing "." on the blockname.
811
-  * @access private
812
-  */
805
+   * Generates a reference to the array of data values for the given
806
+   * (possibly nested) block namespace. This is a string of the form:
807
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
808
+   *
809
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
810
+   * NOTE: does not expect a trailing "." on the blockname.
811
+   * @access private
812
+   */
813 813
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
814 814
   {
815 815
     // Get an array of the blocks involved.
@@ -845,9 +845,9 @@  discard block
 block discarded – undo
845 845
   }
846 846
 
847 847
   /**
848
-  * Write compiled file to cache directory
849
-  * @access private
850
-  */
848
+   * Write compiled file to cache directory
849
+   * @access private
850
+   */
851 851
   function compile_write($handle, $data)
852 852
   {
853 853
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -870,9 +870,9 @@  discard block
 block discarded – undo
870 870
 
871 871
   // Gorlum's minifier BOF
872 872
   /**
873
-  * Minifies template w/i PHP code by removing extra spaces
874
-  * @access private
875
-  */
873
+   * Minifies template w/i PHP code by removing extra spaces
874
+   * @access private
875
+   */
876 876
   function minify($html)
877 877
   {
878 878
     global $config;
Please login to merge, or discard this patch.
language/ru/system.mo.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -705,15 +705,15 @@
 block discarded – undo
705 705
   ],
706 706
 
707 707
   'months' => [
708
-     1 =>'января',
709
-     2 =>'февраля',
710
-     3 =>'марта',
711
-     4 =>'апреля',
712
-     5 =>'мая',
713
-     6 =>'июня',
714
-     7 =>'июля',
715
-     8 =>'августа',
716
-     9 =>'сентября',
708
+      1 =>'января',
709
+      2 =>'февраля',
710
+      3 =>'марта',
711
+      4 =>'апреля',
712
+      5 =>'мая',
713
+      6 =>'июня',
714
+      7 =>'июля',
715
+      8 =>'августа',
716
+      9 =>'сентября',
717 717
     10 =>'октября',
718 718
     11 =>'ноября',
719 719
     12 =>'декабря'
Please login to merge, or discard this patch.
classes/template.php 1 patch
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
 class template
26 26
 {
27 27
   /** variable that holds all the data we'll be substituting into
28
-  * the compiled templates. Takes form:
29
-  * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
30
-  * if it's a root-level variable, it'll be like this:
31
-  * --> $this->_tpldata[.][0][varname] == value
32
-  */
28
+   * the compiled templates. Takes form:
29
+   * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
30
+   * if it's a root-level variable, it'll be like this:
31
+   * --> $this->_tpldata[.][0][varname] == value
32
+   */
33 33
   var $_tpldata = array('.' => array(0 => array()));
34 34
   var $_rootref;
35 35
 //  var $_block_counter = array();
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
   }
80 80
 
81 81
   /**
82
-  * Set template location
83
-  * @access public
84
-  */
82
+   * Set template location
83
+   * @access public
84
+   */
85 85
   function set_template()
86 86
   {
87 87
     global $user;
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
   }
121 121
 
122 122
   /**
123
-  * Set custom template location (able to use directory outside of phpBB)
124
-  * @access public
125
-  */
123
+   * Set custom template location (able to use directory outside of phpBB)
124
+   * @access public
125
+   */
126 126
   function set_custom_template($template_path, $template_name, $fallback_template_path = false)
127 127
   {
128 128
     global $user;
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
161 161
   }
162 162
 
163 163
   /**
164
-  * Sets the template filenames for handles. $filename_array
165
-  * should be a hash of handle => filename pairs.
166
-  * @access public
167
-  */
164
+   * Sets the template filenames for handles. $filename_array
165
+   * should be a hash of handle => filename pairs.
166
+   * @access public
167
+   */
168 168
   function set_filenames($filename_array)
169 169
   {
170 170
     if (!is_array($filename_array))
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
   }
192 192
 
193 193
   /**
194
-  * Destroy template data set
195
-  * @access public
196
-  */
194
+   * Destroy template data set
195
+   * @access public
196
+   */
197 197
   function destroy()
198 198
   {
199 199
     $this->_tpldata = array('.' => array(0 => array()));
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
   }
202 202
 
203 203
   /**
204
-  * Reset/empty complete block
205
-  * @access public
206
-  */
204
+   * Reset/empty complete block
205
+   * @access public
206
+   */
207 207
   function destroy_block_vars($blockname)
208 208
   {
209 209
     if (strpos($blockname, '.') !== false)
@@ -231,9 +231,9 @@  discard block
 block discarded – undo
231 231
   }
232 232
 
233 233
   /**
234
-  * Display handle
235
-  * @access public
236
-  */
234
+   * Display handle
235
+   * @access public
236
+   */
237 237
   function display($handle, $include_once = true)
238 238
   {
239 239
     if (defined('IN_ERROR_HANDLER'))
@@ -258,9 +258,9 @@  discard block
 block discarded – undo
258 258
   }
259 259
 
260 260
   /**
261
-  * Display the handle and assign the output to a template variable or return the compiled result.
262
-  * @access public
263
-  */
261
+   * Display the handle and assign the output to a template variable or return the compiled result.
262
+   * @access public
263
+   */
264 264
   function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
265 265
   {
266 266
     ob_start();
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
   }
279 279
 
280 280
   /**
281
-  * Load a compiled template if possible, if not, recompile it
282
-  * @access private
283
-  */
281
+   * Load a compiled template if possible, if not, recompile it
282
+   * @access private
283
+   */
284 284
   function _tpl_load(&$handle)
285 285
   {
286 286
     global $user, $config;
@@ -458,9 +458,9 @@  discard block
 block discarded – undo
458 458
   }
459 459
 
460 460
   /**
461
-  * Assign key variable pairs from an array
462
-  * @access public
463
-  */
461
+   * Assign key variable pairs from an array
462
+   * @access public
463
+   */
464 464
   function assign_vars($vararray)
465 465
   {
466 466
     foreach ($vararray as $key => $val)
@@ -472,9 +472,9 @@  discard block
 block discarded – undo
472 472
   }
473 473
 
474 474
   /**
475
-  * Assign a single variable to a single key
476
-  * @access public
477
-  */
475
+   * Assign a single variable to a single key
476
+   * @access public
477
+   */
478 478
   function assign_var($varname, $varval)
479 479
   {
480 480
     $this->_rootref[$varname] = $varval;
@@ -483,9 +483,9 @@  discard block
 block discarded – undo
483 483
   }
484 484
 
485 485
   /**
486
-  * Assign key variable pairs from an array to a specified block
487
-  * @access public
488
-  */
486
+   * Assign key variable pairs from an array to a specified block
487
+   * @access public
488
+   */
489 489
   function assign_block_vars($blockname, $vararray)
490 490
   {
491 491
     if (strpos($blockname, '.') !== false)
@@ -550,33 +550,33 @@  discard block
 block discarded – undo
550 550
   }
551 551
 
552 552
   /**
553
-  * Change already assigned key variable pair (one-dimensional - single loop entry)
554
-  *
555
-  * An example of how to use this function:
556
-  * {@example alter_block_array.php}
557
-  *
558
-  * @param  string  $blockname  the blockname, for example 'loop'
559
-  * @param  array $vararray the var array to insert/add or merge
560
-  * @param  mixed $key    Key to search for
561
-  *
562
-  * array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
563
-  *
564
-  * int: Position [the position to change or insert at directly given]
565
-  *
566
-  * If key is false the position is set to 0
567
-  * If key is true the position is set to the last entry
568
-  *
569
-  * @param  string  $mode   Mode to execute (valid modes are 'insert' and 'change')
570
-  *
571
-  * If insert, the vararray is inserted at the given position (position counting from zero).
572
-  * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
573
-  *
574
-  * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
575
-  * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
576
-  *
577
-  * @return bool false on error, true on success
578
-  * @access public
579
-  */
553
+   * Change already assigned key variable pair (one-dimensional - single loop entry)
554
+   *
555
+   * An example of how to use this function:
556
+   * {@example alter_block_array.php}
557
+   *
558
+   * @param  string  $blockname  the blockname, for example 'loop'
559
+   * @param  array $vararray the var array to insert/add or merge
560
+   * @param  mixed $key    Key to search for
561
+   *
562
+   * array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
563
+   *
564
+   * int: Position [the position to change or insert at directly given]
565
+   *
566
+   * If key is false the position is set to 0
567
+   * If key is true the position is set to the last entry
568
+   *
569
+   * @param  string  $mode   Mode to execute (valid modes are 'insert' and 'change')
570
+   *
571
+   * If insert, the vararray is inserted at the given position (position counting from zero).
572
+   * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
573
+   *
574
+   * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
575
+   * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
576
+   *
577
+   * @return bool false on error, true on success
578
+   * @access public
579
+   */
580 580
   function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
581 581
   {
582 582
     if (strpos($blockname, '.') !== false)
@@ -660,9 +660,9 @@  discard block
 block discarded – undo
660 660
   }
661 661
 
662 662
   /**
663
-  * Include a separate template
664
-  * @access private
665
-  */
663
+   * Include a separate template
664
+   * @access private
665
+   */
666 666
   function _tpl_include($filename, $include = true)
667 667
   {
668 668
     // This is used to access global vars
@@ -691,9 +691,9 @@  discard block
 block discarded – undo
691 691
   }
692 692
 
693 693
   /**
694
-  * Include a php-file
695
-  * @access private
696
-  */
694
+   * Include a php-file
695
+   * @access private
696
+   */
697 697
   function _php_include($filename)
698 698
   {
699 699
     $file = $this->rootPhysical . $filename;
@@ -708,9 +708,9 @@  discard block
 block discarded – undo
708 708
   }
709 709
 
710 710
   /**
711
-  * Assign key variable pairs from an array with block support
712
-  * @access public
713
-  */
711
+   * Assign key variable pairs from an array with block support
712
+   * @access public
713
+   */
714 714
   function assign_recursive($values, $name = '')
715 715
   {
716 716
     if(isset($values['.']))
Please login to merge, or discard this patch.