@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | use Que\DBStaticQue; |
6 | 6 | use Universe\Universe; |
7 | 7 | |
8 | -function art_use(&$user, &$planetrow, $unit_id) |
|
9 | -{ |
|
8 | +function art_use(&$user, &$planetrow, $unit_id) { |
|
10 | 9 | global $lang; |
11 | 10 | |
12 | 11 | if(!in_array($unit_id, sn_get_groups('artifacts'))) |
@@ -53,14 +52,12 @@ discard block |
||
53 | 52 | { |
54 | 53 | $new_moon_row = uni_create_moon($planetrow['galaxy'], $planetrow['system'], $planetrow['planet'], $user['id'], $moonSize, $updateDebris); |
55 | 54 | $message = sprintf($lang['art_moon_create'][$unit_id], $new_moon_row['name'], uni_render_coordinates($planetrow), HelperString::numberFloorAndFormat($moonSize)); |
56 | - } |
|
57 | - else |
|
55 | + } else |
|
58 | 56 | { |
59 | 57 | $message = $lang['art_lhc_moon_fail']; |
60 | 58 | } |
61 | 59 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_ADMIN, $lang['art_lhc_from'], $lang['art_lhc_subj'], $message); |
62 | - } |
|
63 | - else |
|
60 | + } else |
|
64 | 61 | { |
65 | 62 | $message = $lang['art_moon_exists']; |
66 | 63 | } |
@@ -88,8 +85,9 @@ discard block |
||
88 | 85 | $sectors_used = 0; |
89 | 86 | foreach($artifact_deploy as $deploy_unit_id => $deploy_unit_level) |
90 | 87 | { |
91 | - if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) |
|
92 | - continue; |
|
88 | + if(!($levels_deployed = max(0, $deploy_unit_level - mrc_get_level($user, $planetrow, $deploy_unit_id, true, true)))) { |
|
89 | + continue; |
|
90 | + } |
|
93 | 91 | $sectors_used += $levels_deployed; |
94 | 92 | $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($deploy_unit_id, $levels_deployed, $user, $planetrow['id']); |
95 | 93 | } |
@@ -123,8 +121,7 @@ discard block |
||
123 | 121 | DBStaticQue::db_que_set_time_left_by_id($que_item['que_id'], $que_item['que_time_left']); |
124 | 122 | $message = sprintf($lang['art_heurestic_chip_ok'], $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], sys_time_human($old_time - $que_item['que_time_left'])); |
125 | 123 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_heurestic_chip_subj'], $lang['art_heurestic_chip_subj'], $message); |
126 | - } |
|
127 | - else |
|
124 | + } else |
|
128 | 125 | { |
129 | 126 | $message = $lang['art_heurestic_chip_no_research']; |
130 | 127 | } |
@@ -152,8 +149,7 @@ discard block |
||
152 | 149 | $lang['tech'][$que_item['que_unit_id']], $que_item['que_unit_level'], $planetrow['name'], uni_render_coordinates($planetrow), sys_time_human($old_time - $que_item['que_time_left']) |
153 | 150 | ); |
154 | 151 | msg_send_simple_message($user['id'], 0, 0, MSG_TYPE_QUE, $lang['art_nano_builder_subj'], $lang['art_nano_builder_subj'], $message); |
155 | - } |
|
156 | - else |
|
152 | + } else |
|
157 | 153 | { |
158 | 154 | $message = $lang['art_nano_builder_no_que']; |
159 | 155 | } |
@@ -165,8 +161,7 @@ discard block |
||
165 | 161 | $db_changeset['unit'][] = OldDbChangeSet::db_changeset_prepare_unit($unit_id, $unit_level - $artifact_level_old, $user); |
166 | 162 | OldDbChangeSet::db_changeset_apply($db_changeset); |
167 | 163 | } |
168 | - } |
|
169 | - else |
|
164 | + } else |
|
170 | 165 | { |
171 | 166 | $message = $lang['art_err_no_artifact']; |
172 | 167 | } |
@@ -32,8 +32,7 @@ |
||
32 | 32 | * @author Fabien Potencier |
33 | 33 | * @author Dominik Zogg |
34 | 34 | */ |
35 | -interface ServiceProviderInterface |
|
36 | -{ |
|
35 | +interface ServiceProviderInterface { |
|
37 | 36 | /** |
38 | 37 | * Registers services on the given container. |
39 | 38 | * |
@@ -31,8 +31,7 @@ discard block |
||
31 | 31 | * |
32 | 32 | * @author Fabien Potencier |
33 | 33 | */ |
34 | -class Container implements \ArrayAccess |
|
35 | -{ |
|
34 | +class Container implements \ArrayAccess { |
|
36 | 35 | private $values = array(); |
37 | 36 | private $factories; |
38 | 37 | private $protected; |
@@ -47,8 +46,7 @@ discard block |
||
47 | 46 | * |
48 | 47 | * @param array $values The parameters or objects. |
49 | 48 | */ |
50 | - public function __construct(array $values = array()) |
|
51 | - { |
|
49 | + public function __construct(array $values = array()) { |
|
52 | 50 | $this->factories = new \SplObjectStorage(); |
53 | 51 | $this->protected = new \SplObjectStorage(); |
54 | 52 | |
@@ -71,8 +69,7 @@ discard block |
||
71 | 69 | * |
72 | 70 | * @throws \RuntimeException Prevent override of a frozen service |
73 | 71 | */ |
74 | - public function offsetSet($id, $value) |
|
75 | - { |
|
72 | + public function offsetSet($id, $value) { |
|
76 | 73 | if (isset($this->frozen[$id])) { |
77 | 74 | throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id)); |
78 | 75 | } |
@@ -90,8 +87,7 @@ discard block |
||
90 | 87 | * |
91 | 88 | * @throws \InvalidArgumentException if the identifier is not defined |
92 | 89 | */ |
93 | - public function offsetGet($id) |
|
94 | - { |
|
90 | + public function offsetGet($id) { |
|
95 | 91 | if (!isset($this->keys[$id])) { |
96 | 92 | throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id)); |
97 | 93 | } |
@@ -125,8 +121,7 @@ discard block |
||
125 | 121 | * |
126 | 122 | * @return bool |
127 | 123 | */ |
128 | - public function offsetExists($id) |
|
129 | - { |
|
124 | + public function offsetExists($id) { |
|
130 | 125 | return isset($this->keys[$id]); |
131 | 126 | } |
132 | 127 | |
@@ -135,8 +130,7 @@ discard block |
||
135 | 130 | * |
136 | 131 | * @param string $id The unique identifier for the parameter or object |
137 | 132 | */ |
138 | - public function offsetUnset($id) |
|
139 | - { |
|
133 | + public function offsetUnset($id) { |
|
140 | 134 | if (isset($this->keys[$id])) { |
141 | 135 | if (is_object($this->values[$id])) { |
142 | 136 | unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]); |
@@ -155,8 +149,7 @@ discard block |
||
155 | 149 | * |
156 | 150 | * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object |
157 | 151 | */ |
158 | - public function factory($callable) |
|
159 | - { |
|
152 | + public function factory($callable) { |
|
160 | 153 | if (!method_exists($callable, '__invoke')) { |
161 | 154 | throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.'); |
162 | 155 | } |
@@ -177,8 +170,7 @@ discard block |
||
177 | 170 | * |
178 | 171 | * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object |
179 | 172 | */ |
180 | - public function protect($callable) |
|
181 | - { |
|
173 | + public function protect($callable) { |
|
182 | 174 | if (!method_exists($callable, '__invoke')) { |
183 | 175 | throw new \InvalidArgumentException('Callable is not a Closure or invokable object.'); |
184 | 176 | } |
@@ -197,8 +189,7 @@ discard block |
||
197 | 189 | * |
198 | 190 | * @throws \InvalidArgumentException if the identifier is not defined |
199 | 191 | */ |
200 | - public function raw($id) |
|
201 | - { |
|
192 | + public function raw($id) { |
|
202 | 193 | if (!isset($this->keys[$id])) { |
203 | 194 | throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id)); |
204 | 195 | } |
@@ -223,8 +214,7 @@ discard block |
||
223 | 214 | * |
224 | 215 | * @throws \InvalidArgumentException if the identifier is not defined or not a service definition |
225 | 216 | */ |
226 | - public function extend($id, $callable) |
|
227 | - { |
|
217 | + public function extend($id, $callable) { |
|
228 | 218 | if (!isset($this->keys[$id])) { |
229 | 219 | throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id)); |
230 | 220 | } |
@@ -256,8 +246,7 @@ discard block |
||
256 | 246 | * |
257 | 247 | * @return array An array of value names |
258 | 248 | */ |
259 | - public function keys() |
|
260 | - { |
|
249 | + public function keys() { |
|
261 | 250 | return array_keys($this->values); |
262 | 251 | } |
263 | 252 | |
@@ -269,8 +258,7 @@ discard block |
||
269 | 258 | * |
270 | 259 | * @return static |
271 | 260 | */ |
272 | - public function register(ServiceProviderInterface $provider, array $values = array()) |
|
273 | - { |
|
261 | + public function register(ServiceProviderInterface $provider, array $values = array()) { |
|
274 | 262 | $provider->register($this); |
275 | 263 | |
276 | 264 | foreach ($values as $key => $value) { |
@@ -37,8 +37,7 @@ discard block |
||
37 | 37 | * |
38 | 38 | * @package phpBB3 |
39 | 39 | */ |
40 | -class template_compile |
|
41 | -{ |
|
40 | +class template_compile { |
|
42 | 41 | var $template; |
43 | 42 | |
44 | 43 | // Various storage arrays |
@@ -58,8 +57,7 @@ discard block |
||
58 | 57 | * Load template source from file |
59 | 58 | * @access private |
60 | 59 | */ |
61 | - function _tpl_load_file($handle, $store_in_db = false) |
|
62 | - { |
|
60 | + function _tpl_load_file($handle, $store_in_db = false) { |
|
63 | 61 | // Try and open template for read |
64 | 62 | if (!file_exists($this->template->files[$handle])) |
65 | 63 | { |
@@ -67,8 +65,7 @@ discard block |
||
67 | 65 | { |
68 | 66 | return; |
69 | 67 | trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR); |
70 | - } |
|
71 | - else |
|
68 | + } else |
|
72 | 69 | { |
73 | 70 | $this->template->files[$handle] = $this->template->files_inherit[$handle]; |
74 | 71 | } |
@@ -104,8 +101,7 @@ discard block |
||
104 | 101 | * the ones that exist in zend_language_scanner.l |
105 | 102 | * @access private |
106 | 103 | */ |
107 | - function remove_php_tags(&$code) |
|
108 | - { |
|
104 | + function remove_php_tags(&$code) { |
|
109 | 105 | // This matches the information gathered from the internal PHP lexer |
110 | 106 | $match = array( |
111 | 107 | '#<([\?%])=?.*?\1>#s', |
@@ -120,8 +116,7 @@ discard block |
||
120 | 116 | * The all seeing all doing compile method. Parts are inspired by or directly from Smarty |
121 | 117 | * @access private |
122 | 118 | */ |
123 | - function compile($code, $no_echo = false, $echo_var = '') |
|
124 | - { |
|
119 | + function compile($code, $no_echo = false, $echo_var = '') { |
|
125 | 120 | if ($echo_var) |
126 | 121 | { |
127 | 122 | global $$echo_var; |
@@ -224,15 +219,13 @@ discard block |
||
224 | 219 | $var = substr($temp, 2, -1); |
225 | 220 | //$file = $this->template->_tpldata['DEFINE']['.'][$var]; |
226 | 221 | $temp = "\$this->_tpldata['DEFINE']['.']['$var']"; |
227 | - } |
|
228 | - else |
|
222 | + } else |
|
229 | 223 | { |
230 | 224 | $var = substr($temp, 1, -1); |
231 | 225 | //$file = $this->template->_rootref[$var]; |
232 | 226 | $temp = "\$this->_rootref['$var']"; |
233 | 227 | } |
234 | - } |
|
235 | - else |
|
228 | + } else |
|
236 | 229 | { |
237 | 230 | $file = $temp; |
238 | 231 | } |
@@ -291,8 +284,7 @@ discard block |
||
291 | 284 | * Compile variables |
292 | 285 | * @access private |
293 | 286 | */ |
294 | - function compile_var_tags(&$text_blocks) |
|
295 | - { |
|
287 | + function compile_var_tags(&$text_blocks) { |
|
296 | 288 | // including $lang variable |
297 | 289 | // global $lang, $config; // NOT NEDEED - $lang now is global! |
298 | 290 | |
@@ -366,8 +358,7 @@ discard block |
||
366 | 358 | * Compile blocks |
367 | 359 | * @access private |
368 | 360 | */ |
369 | - function compile_tag_block($tag_args) |
|
370 | - { |
|
361 | + function compile_tag_block($tag_args) { |
|
371 | 362 | $no_nesting = false; |
372 | 363 | |
373 | 364 | // Is the designer wanting to call another loop in a loop? |
@@ -390,8 +381,7 @@ discard block |
||
390 | 381 | if ($match[2] < 0) |
391 | 382 | { |
392 | 383 | $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')'; |
393 | - } |
|
394 | - else |
|
384 | + } else |
|
395 | 385 | { |
396 | 386 | $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')'; |
397 | 387 | } |
@@ -399,17 +389,14 @@ discard block |
||
399 | 389 | if (strlen($match[3]) < 1 || $match[3] == -1) |
400 | 390 | { |
401 | 391 | $loop_end = '$_' . $tag_args . '_count'; |
402 | - } |
|
403 | - else if ($match[3] >= 0) |
|
392 | + } else if ($match[3] >= 0) |
|
404 | 393 | { |
405 | 394 | $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')'; |
406 | - } |
|
407 | - else //if ($match[3] < -1) |
|
395 | + } else //if ($match[3] < -1) |
|
408 | 396 | { |
409 | 397 | $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1); |
410 | 398 | } |
411 | - } |
|
412 | - else |
|
399 | + } else |
|
413 | 400 | { |
414 | 401 | $loop_start = 0; |
415 | 402 | $loop_end = '$_' . $tag_args . '_count'; |
@@ -422,8 +409,7 @@ discard block |
||
422 | 409 | { |
423 | 410 | // We need to implode $no_nesting times from the end... |
424 | 411 | $block = array_slice($this->block_names, -$no_nesting); |
425 | - } |
|
426 | - else |
|
412 | + } else |
|
427 | 413 | { |
428 | 414 | $block = $this->block_names; |
429 | 415 | } |
@@ -433,8 +419,7 @@ discard block |
||
433 | 419 | // Block is not nested. |
434 | 420 | $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;"; |
435 | 421 | $varref = "\$this->_tpldata['$tag_args']"; |
436 | - } |
|
437 | - else |
|
422 | + } else |
|
438 | 423 | { |
439 | 424 | // This block is nested. |
440 | 425 | // Generate a namespace string for this block. |
@@ -473,8 +458,7 @@ discard block |
||
473 | 458 | * some adaptions for our block level methods |
474 | 459 | * @access private |
475 | 460 | */ |
476 | - function compile_tag_if($tag_args, $elseif) |
|
477 | - { |
|
461 | + function compile_tag_if($tag_args, $elseif) { |
|
478 | 462 | // Tokenize args for 'if' tag. |
479 | 463 | preg_match_all('/(?: |
480 | 464 | "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | |
@@ -582,8 +566,7 @@ discard block |
||
582 | 566 | if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs)) |
583 | 567 | { |
584 | 568 | $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']'); |
585 | - } |
|
586 | - else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs)) |
|
569 | + } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs)) |
|
587 | 570 | { |
588 | 571 | // Allow checking if loops are set with .loopname |
589 | 572 | // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example |
@@ -599,8 +582,7 @@ discard block |
||
599 | 582 | |
600 | 583 | // Add the block reference for the last child. |
601 | 584 | $varref .= "['" . $block . "']"; |
602 | - } |
|
603 | - else |
|
585 | + } else |
|
604 | 586 | { |
605 | 587 | $varref = '$this->_tpldata'; |
606 | 588 | |
@@ -608,8 +590,7 @@ discard block |
||
608 | 590 | $varref .= "['" . $blocks[0] . "']"; |
609 | 591 | } |
610 | 592 | $token = "sizeof($varref)"; |
611 | - } |
|
612 | - else if (!empty($token)) |
|
593 | + } else if (!empty($token)) |
|
613 | 594 | { |
614 | 595 | $token = '(' . $token . ')'; |
615 | 596 | } |
@@ -630,8 +611,7 @@ discard block |
||
630 | 611 | * Compile DEFINE tags |
631 | 612 | * @access private |
632 | 613 | */ |
633 | - function compile_tag_define($tag_args, $op) |
|
634 | - { |
|
614 | + function compile_tag_define($tag_args, $op) { |
|
635 | 615 | preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match); |
636 | 616 | |
637 | 617 | if (empty($match[2]) || (!isset($match[4]) && $op)) |
@@ -654,8 +634,7 @@ discard block |
||
654 | 634 | |
655 | 635 | // Now replace the php code |
656 | 636 | $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'"; |
657 | - } |
|
658 | - else |
|
637 | + } else |
|
659 | 638 | { |
660 | 639 | preg_match('#true|false|\.#i', $match[4], $type); |
661 | 640 | |
@@ -683,8 +662,7 @@ discard block |
||
683 | 662 | * Compile INCLUDE tag |
684 | 663 | * @access private |
685 | 664 | */ |
686 | - function compile_tag_include($tag_args) |
|
687 | - { |
|
665 | + function compile_tag_include($tag_args) { |
|
688 | 666 | // Process dynamic includes |
689 | 667 | if ($tag_args[0] == '$') |
690 | 668 | { |
@@ -698,8 +676,7 @@ discard block |
||
698 | 676 | * Compile INCLUDE_PHP tag |
699 | 677 | * @access private |
700 | 678 | */ |
701 | - function compile_tag_include_php($tag_args) |
|
702 | - { |
|
679 | + function compile_tag_include_php($tag_args) { |
|
703 | 680 | return "\$this->_php_include('$tag_args');"; |
704 | 681 | } |
705 | 682 | |
@@ -708,8 +685,7 @@ discard block |
||
708 | 685 | * This is from Smarty |
709 | 686 | * @access private |
710 | 687 | */ |
711 | - function _parse_is_expr($is_arg, $tokens) |
|
712 | - { |
|
688 | + function _parse_is_expr($is_arg, $tokens) { |
|
713 | 689 | $expr_end = 0; |
714 | 690 | $negate_expr = false; |
715 | 691 | |
@@ -717,8 +693,7 @@ discard block |
||
717 | 693 | { |
718 | 694 | $negate_expr = true; |
719 | 695 | $expr_type = array_shift($tokens); |
720 | - } |
|
721 | - else |
|
696 | + } else |
|
722 | 697 | { |
723 | 698 | $expr_type = $first_token; |
724 | 699 | } |
@@ -731,8 +706,7 @@ discard block |
||
731 | 706 | $expr_end++; |
732 | 707 | $expr_arg = $tokens[$expr_end++]; |
733 | 708 | $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; |
734 | - } |
|
735 | - else |
|
709 | + } else |
|
736 | 710 | { |
737 | 711 | $expr = "!($is_arg & 1)"; |
738 | 712 | } |
@@ -744,8 +718,7 @@ discard block |
||
744 | 718 | $expr_end++; |
745 | 719 | $expr_arg = $tokens[$expr_end++]; |
746 | 720 | $expr = "(($is_arg / $expr_arg) % $expr_arg)"; |
747 | - } |
|
748 | - else |
|
721 | + } else |
|
749 | 722 | { |
750 | 723 | $expr = "($is_arg & 1)"; |
751 | 724 | } |
@@ -784,8 +757,7 @@ discard block |
||
784 | 757 | * |
785 | 758 | * @return string |
786 | 759 | */ |
787 | - private function generate_block_varref($namespace, $varname, $defop = false) |
|
788 | - { |
|
760 | + private function generate_block_varref($namespace, $varname, $defop = false) { |
|
789 | 761 | // Strip the trailing period. |
790 | 762 | $namespace = substr($namespace, 0, -1); |
791 | 763 | |
@@ -808,8 +780,7 @@ discard block |
||
808 | 780 | * NOTE: does not expect a trailing "." on the blockname. |
809 | 781 | * @access private |
810 | 782 | */ |
811 | - function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) |
|
812 | - { |
|
783 | + function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) { |
|
813 | 784 | // Get an array of the blocks involved. |
814 | 785 | $blocks = explode('.', $blockname); |
815 | 786 | $blockcount = sizeof($blocks) - 1; |
@@ -831,12 +802,10 @@ discard block |
||
831 | 802 | $varref .= '[$_' . $blocks[$blockcount] . '_i]'; |
832 | 803 | } |
833 | 804 | return $varref; |
834 | - } |
|
835 | - else if ($include_last_iterator) |
|
805 | + } else if ($include_last_iterator) |
|
836 | 806 | { |
837 | 807 | return '$_'. $blocks[$blockcount] . '_val'; |
838 | - } |
|
839 | - else |
|
808 | + } else |
|
840 | 809 | { |
841 | 810 | return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']'; |
842 | 811 | } |
@@ -846,8 +815,7 @@ discard block |
||
846 | 815 | * Write compiled file to cache directory |
847 | 816 | * @access private |
848 | 817 | */ |
849 | - function compile_write($handle, $data) |
|
850 | - { |
|
818 | + function compile_write($handle, $data) { |
|
851 | 819 | $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX; |
852 | 820 | |
853 | 821 | $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data); |
@@ -871,8 +839,7 @@ discard block |
||
871 | 839 | * Minifies template w/i PHP code by removing extra spaces |
872 | 840 | * @access private |
873 | 841 | */ |
874 | - function minify($html) |
|
875 | - { |
|
842 | + function minify($html) { |
|
876 | 843 | if(!SN::$config->tpl_minifier) |
877 | 844 | { |
878 | 845 | return $html; |
@@ -22,8 +22,7 @@ discard block |
||
22 | 22 | * Base Template class. |
23 | 23 | * @package phpBB3 |
24 | 24 | */ |
25 | -class template |
|
26 | -{ |
|
25 | +class template { |
|
27 | 26 | /** variable that holds all the data we'll be substituting into |
28 | 27 | * the compiled templates. Takes form: |
29 | 28 | * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value |
@@ -82,8 +81,7 @@ discard block |
||
82 | 81 | * Set template location |
83 | 82 | * @access public |
84 | 83 | */ |
85 | - function set_template() |
|
86 | - { |
|
84 | + function set_template() { |
|
87 | 85 | global $user; |
88 | 86 | |
89 | 87 | if (file_exists($this->rootPhysical. 'styles/' . $user->theme['template_path'] . '/template')) |
@@ -108,8 +106,7 @@ discard block |
||
108 | 106 | { |
109 | 107 | $this->inherit_root = $this->rootPhysical . 'styles/' . $user->theme['template_inherit_path'] . '/template'; |
110 | 108 | } |
111 | - } |
|
112 | - else |
|
109 | + } else |
|
113 | 110 | { |
114 | 111 | trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR); |
115 | 112 | } |
@@ -123,8 +120,7 @@ discard block |
||
123 | 120 | * Set custom template location (able to use directory outside of phpBB) |
124 | 121 | * @access public |
125 | 122 | */ |
126 | - function set_custom_template($template_path, $template_name, $fallback_template_path = false) |
|
127 | - { |
|
123 | + function set_custom_template($template_path, $template_name, $fallback_template_path = false) { |
|
128 | 124 | global $user; |
129 | 125 | |
130 | 126 | // Make sure $template_path has no ending slash |
@@ -145,8 +141,7 @@ discard block |
||
145 | 141 | |
146 | 142 | $this->inherit_root = $fallback_template_path; |
147 | 143 | $this->orig_tpl_inherits_id = true; |
148 | - } |
|
149 | - else |
|
144 | + } else |
|
150 | 145 | { |
151 | 146 | $this->orig_tpl_inherits_id = false; |
152 | 147 | } |
@@ -165,8 +160,7 @@ discard block |
||
165 | 160 | * should be a hash of handle => filename pairs. |
166 | 161 | * @access public |
167 | 162 | */ |
168 | - function set_filenames($filename_array) |
|
169 | - { |
|
163 | + function set_filenames($filename_array) { |
|
170 | 164 | if (!is_array($filename_array)) |
171 | 165 | { |
172 | 166 | return false; |
@@ -194,8 +188,7 @@ discard block |
||
194 | 188 | * Destroy template data set |
195 | 189 | * @access public |
196 | 190 | */ |
197 | - function destroy() |
|
198 | - { |
|
191 | + function destroy() { |
|
199 | 192 | $this->_tpldata = array('.' => array(0 => array())); |
200 | 193 | $this->_rootref = &$this->_tpldata['.'][0]; |
201 | 194 | } |
@@ -204,8 +197,7 @@ discard block |
||
204 | 197 | * Reset/empty complete block |
205 | 198 | * @access public |
206 | 199 | */ |
207 | - function destroy_block_vars($blockname) |
|
208 | - { |
|
200 | + function destroy_block_vars($blockname) { |
|
209 | 201 | if (strpos($blockname, '.') !== false) |
210 | 202 | { |
211 | 203 | // Nested block. |
@@ -220,8 +212,7 @@ discard block |
||
220 | 212 | } |
221 | 213 | |
222 | 214 | unset($str[$blocks[$blockcount]]); |
223 | - } |
|
224 | - else |
|
215 | + } else |
|
225 | 216 | { |
226 | 217 | // Top-level block. |
227 | 218 | unset($this->_tpldata[$blockname]); |
@@ -234,8 +225,7 @@ discard block |
||
234 | 225 | * Display handle |
235 | 226 | * @access public |
236 | 227 | */ |
237 | - function display($handle, $include_once = true) |
|
238 | - { |
|
228 | + function display($handle, $include_once = true) { |
|
239 | 229 | if (defined('IN_ERROR_HANDLER')) |
240 | 230 | { |
241 | 231 | $is_enotice = error_reporting(); |
@@ -248,8 +238,7 @@ discard block |
||
248 | 238 | if ($filename = $this->_tpl_load($handle)) |
249 | 239 | { |
250 | 240 | ($include_once) ? include_once($filename) : include($filename); |
251 | - } |
|
252 | - else |
|
241 | + } else |
|
253 | 242 | { |
254 | 243 | $this->evaluate($this->compiled_code[$handle]); |
255 | 244 | } |
@@ -261,8 +250,7 @@ discard block |
||
261 | 250 | * Display the handle and assign the output to a template variable or return the compiled result. |
262 | 251 | * @access public |
263 | 252 | */ |
264 | - function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) |
|
265 | - { |
|
253 | + function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) { |
|
266 | 254 | ob_start(); |
267 | 255 | $this->display($handle, $include_once); |
268 | 256 | $contents = ob_get_clean(); |
@@ -281,8 +269,7 @@ discard block |
||
281 | 269 | * Load a compiled template if possible, if not, recompile it |
282 | 270 | * @access private |
283 | 271 | */ |
284 | - function _tpl_load(&$handle) |
|
285 | - { |
|
272 | + function _tpl_load(&$handle) { |
|
286 | 273 | global $user, $config; |
287 | 274 | |
288 | 275 | if (!isset($this->filename[$handle])) |
@@ -303,8 +290,7 @@ discard block |
||
303 | 290 | if (!file_exists($filename) || @filesize($filename) === 0) |
304 | 291 | { |
305 | 292 | $recompile = true; |
306 | - } |
|
307 | - else if ($config->load_tplcompile) |
|
293 | + } else if ($config->load_tplcompile) |
|
308 | 294 | { |
309 | 295 | // No way around it: we need to check inheritance here |
310 | 296 | if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle])) |
@@ -387,15 +373,13 @@ discard block |
||
387 | 373 | $this->files[$row['template_filename']] = $file; |
388 | 374 | $this->files_inherit[$row['template_filename']] = $file; |
389 | 375 | $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id']; |
390 | - } |
|
391 | - else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) |
|
376 | + } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) |
|
392 | 377 | { |
393 | 378 | // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that. |
394 | 379 | $force_reload = true; |
395 | 380 | $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id']; |
396 | 381 | } |
397 | - } |
|
398 | - else |
|
382 | + } else |
|
399 | 383 | { |
400 | 384 | $this->files_template[$row['template_filename']] = $user->theme['template_id']; |
401 | 385 | } |
@@ -405,8 +389,7 @@ discard block |
||
405 | 389 | if ($row['template_filename'] == $this->filename[$handle]) |
406 | 390 | { |
407 | 391 | $compile->_tpl_load_file($handle, true); |
408 | - } |
|
409 | - else |
|
392 | + } else |
|
410 | 393 | { |
411 | 394 | $this->files[$row['template_filename']] = $file; |
412 | 395 | $this->filename[$row['template_filename']] = $row['template_filename']; |
@@ -421,8 +404,7 @@ discard block |
||
421 | 404 | { |
422 | 405 | $this->compiled_code[$handle] = $compile->compile(trim($row['template_data'])); |
423 | 406 | $compile->compile_write($handle, $this->compiled_code[$handle]); |
424 | - } |
|
425 | - else |
|
407 | + } else |
|
426 | 408 | { |
427 | 409 | // Only bother compiling if it doesn't already exist |
428 | 410 | if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX)) |
@@ -433,8 +415,7 @@ discard block |
||
433 | 415 | } |
434 | 416 | } |
435 | 417 | } |
436 | - } |
|
437 | - else |
|
418 | + } else |
|
438 | 419 | { |
439 | 420 | $file = $this->root . '/' . $row['template_filename']; |
440 | 421 | |
@@ -461,8 +442,7 @@ discard block |
||
461 | 442 | * Assign key variable pairs from an array |
462 | 443 | * @access public |
463 | 444 | */ |
464 | - function assign_vars($vararray) |
|
465 | - { |
|
445 | + function assign_vars($vararray) { |
|
466 | 446 | foreach ($vararray as $key => $val) |
467 | 447 | { |
468 | 448 | $this->_rootref[$key] = $val; |
@@ -475,8 +455,7 @@ discard block |
||
475 | 455 | * Assign a single variable to a single key |
476 | 456 | * @access public |
477 | 457 | */ |
478 | - function assign_var($varname, $varval) |
|
479 | - { |
|
458 | + function assign_var($varname, $varval) { |
|
480 | 459 | $this->_rootref[$varname] = $varval; |
481 | 460 | |
482 | 461 | return true; |
@@ -486,8 +465,7 @@ discard block |
||
486 | 465 | * Assign key variable pairs from an array to a specified block |
487 | 466 | * @access public |
488 | 467 | */ |
489 | - function assign_block_vars($blockname, $vararray) |
|
490 | - { |
|
468 | + function assign_block_vars($blockname, $vararray) { |
|
491 | 469 | if (strpos($blockname, '.') !== false) |
492 | 470 | { |
493 | 471 | // Nested block. |
@@ -522,8 +500,7 @@ discard block |
||
522 | 500 | // We're adding a new iteration to this block with the given |
523 | 501 | // variable assignments. |
524 | 502 | $str[$blocks[$blockcount]][] = $vararray; |
525 | - } |
|
526 | - else |
|
503 | + } else |
|
527 | 504 | { |
528 | 505 | // Top-level block. |
529 | 506 | $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0; |
@@ -577,8 +554,7 @@ discard block |
||
577 | 554 | * @return bool false on error, true on success |
578 | 555 | * @access public |
579 | 556 | */ |
580 | - function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') |
|
581 | - { |
|
557 | + function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') { |
|
582 | 558 | if (strpos($blockname, '.') !== false) |
583 | 559 | { |
584 | 560 | // Nested blocks are not supported |
@@ -623,8 +599,7 @@ discard block |
||
623 | 599 | $key = sizeof($this->_tpldata[$blockname]); |
624 | 600 | unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']); |
625 | 601 | $vararray['S_LAST_ROW'] = true; |
626 | - } |
|
627 | - else if ($key === 0) |
|
602 | + } else if ($key === 0) |
|
628 | 603 | { |
629 | 604 | unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']); |
630 | 605 | $vararray['S_FIRST_ROW'] = true; |
@@ -663,8 +638,7 @@ discard block |
||
663 | 638 | * Include a separate template |
664 | 639 | * @access private |
665 | 640 | */ |
666 | - function _tpl_include($filename, $include = true) |
|
667 | - { |
|
641 | + function _tpl_include($filename, $include = true) { |
|
668 | 642 | // This is used to access global vars |
669 | 643 | // global $lang, $config, $user; // Not needed! |
670 | 644 | |
@@ -694,8 +668,7 @@ discard block |
||
694 | 668 | * Include a php-file |
695 | 669 | * @access private |
696 | 670 | */ |
697 | - function _php_include($filename) |
|
698 | - { |
|
671 | + function _php_include($filename) { |
|
699 | 672 | $file = $this->rootPhysical . $filename; |
700 | 673 | |
701 | 674 | if (!file_exists($file)) |
@@ -711,8 +684,7 @@ discard block |
||
711 | 684 | * Assign key variable pairs from an array with block support |
712 | 685 | * @access public |
713 | 686 | */ |
714 | - function assign_recursive($values, $name = '') |
|
715 | - { |
|
687 | + function assign_recursive($values, $name = '') { |
|
716 | 688 | if(isset($values['.'])) |
717 | 689 | { |
718 | 690 | $values_extra = $values['.']; |
@@ -722,8 +694,7 @@ discard block |
||
722 | 694 | if(!$name) |
723 | 695 | { |
724 | 696 | $this->assign_vars($values); |
725 | - } |
|
726 | - else |
|
697 | + } else |
|
727 | 698 | { |
728 | 699 | $this->assign_block_vars($name, $values); |
729 | 700 | } |