@@ -77,8 +77,7 @@ |
||
77 | 77 | $return_data = $command->execute($style_id); |
78 | 78 | |
79 | 79 | $this->action_handler->clear_cache(); |
80 | - } |
|
81 | - catch (\blitze\sitemaker\exception\base $e) |
|
80 | + } catch (\blitze\sitemaker\exception\base $e) |
|
82 | 81 | { |
83 | 82 | $json_data['message'] = $e->get_message($this->user); |
84 | 83 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\event; |
11 | 11 |
@@ -58,12 +58,10 @@ |
||
58 | 58 | $return_data = $command->execute(); |
59 | 59 | |
60 | 60 | $this->action_handler->clear_cache(); |
61 | - } |
|
62 | - catch (\blitze\sitemaker\exception\base $e) |
|
61 | + } catch (\blitze\sitemaker\exception\base $e) |
|
63 | 62 | { |
64 | 63 | $return_data['message'] = $e->get_message($this->user); |
65 | - } |
|
66 | - catch (\Exception $e) |
|
64 | + } catch (\Exception $e) |
|
67 | 65 | { |
68 | 66 | $return_data['message'] = $this->user->lang($e->getMessage()); |
69 | 67 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\event; |
11 | 11 |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\blocks; |
11 | 11 | |
@@ -15,15 +15,15 @@ discard block |
||
15 | 15 | class stats extends \blitze\sitemaker\services\blocks\driver\block |
16 | 16 | { |
17 | 17 | /** |
18 | - * phpBB configuration |
|
19 | - * @var \phpbb\config\config |
|
20 | - */ |
|
18 | + * phpBB configuration |
|
19 | + * @var \phpbb\config\config |
|
20 | + */ |
|
21 | 21 | protected $config; |
22 | 22 | |
23 | 23 | /** |
24 | - * User object |
|
25 | - * @var \phpbb\user |
|
26 | - */ |
|
24 | + * User object |
|
25 | + * @var \phpbb\user |
|
26 | + */ |
|
27 | 27 | protected $user; |
28 | 28 | |
29 | 29 | /** |
@@ -79,8 +79,7 @@ |
||
79 | 79 | 'title' => 'LOGIN', |
80 | 80 | 'content' => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block') |
81 | 81 | ); |
82 | - } |
|
83 | - else if ($settings['show_member_menu']) |
|
82 | + } else if ($settings['show_member_menu']) |
|
84 | 83 | { |
85 | 84 | $block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu'); |
86 | 85 | $block->set_template($this->ptemplate); |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\event; |
11 | 11 |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package phpBB Sitemaker [English] |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package phpBB Sitemaker [English] |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * @ignore |
@@ -237,8 +237,7 @@ |
||
237 | 237 | { |
238 | 238 | $padding .= $pad_with; |
239 | 239 | $padding_store[$row['parent_id']] = $padding; |
240 | - } |
|
241 | - else if ($row['left_id'] > $right + 1) |
|
240 | + } else if ($row['left_id'] > $right + 1) |
|
242 | 241 | { |
243 | 242 | $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; |
244 | 243 | } |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\services\tree; |
11 | 11 | |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | protected $data = array(); |
34 | 34 | |
35 | 35 | /** |
36 | - * Construct |
|
37 | - * |
|
38 | - * @param \phpbb\db\driver\driver_interface $db Database connection |
|
39 | - * @param string $items_table Table name |
|
40 | - * @param string $pk Primary key |
|
41 | - * @param string $sql_where Column restriction |
|
42 | - */ |
|
36 | + * Construct |
|
37 | + * |
|
38 | + * @param \phpbb\db\driver\driver_interface $db Database connection |
|
39 | + * @param string $items_table Table name |
|
40 | + * @param string $pk Primary key |
|
41 | + * @param string $sql_where Column restriction |
|
42 | + */ |
|
43 | 43 | public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '') |
44 | 44 | { |
45 | 45 | $this->db = $db; |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\services\tree; |
11 | 11 | |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
38 | - * Set additional sql where restrictions |
|
39 | - */ |
|
38 | + * Set additional sql where restrictions |
|
39 | + */ |
|
40 | 40 | public function set_sql_where($sql_where) |
41 | 41 | { |
42 | 42 | $this->sql_where = $sql_where; |
@@ -283,8 +283,8 @@ discard block |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | /** |
286 | - * Update right side of tree |
|
287 | - */ |
|
286 | + * Update right side of tree |
|
287 | + */ |
|
288 | 288 | protected function update_right_side(&$data, &$right_id, $index, $branch) |
289 | 289 | { |
290 | 290 | $right_id++; |
@@ -41,8 +41,7 @@ |
||
41 | 41 | if (is_array($message)) |
42 | 42 | { |
43 | 43 | $this->message = (string) $message[0]; |
44 | - } |
|
45 | - else |
|
44 | + } else |
|
46 | 45 | { |
47 | 46 | $this->message = $message; |
48 | 47 | } |
@@ -50,8 +50,7 @@ discard block |
||
50 | 50 | if (!empty($collection)) |
51 | 51 | { |
52 | 52 | return $collection->get_entities(); |
53 | - } |
|
54 | - else |
|
53 | + } else |
|
55 | 54 | { |
56 | 55 | return array(); |
57 | 56 | } |
@@ -88,8 +87,7 @@ discard block |
||
88 | 87 | if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions)) |
89 | 88 | { |
90 | 89 | $this->route_mapper->delete($route); |
91 | - } |
|
92 | - else |
|
90 | + } else |
|
93 | 91 | { |
94 | 92 | $route->set_has_blocks($has_blocks); |
95 | 93 | $this->route_mapper->save($route); |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\event; |
11 | 11 |
@@ -135,8 +135,7 @@ discard block |
||
135 | 135 | if ($this->request->is_set('style')) |
136 | 136 | { |
137 | 137 | return $this->request->variable('style', 0); |
138 | - } |
|
139 | - else |
|
138 | + } else |
|
140 | 139 | { |
141 | 140 | return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style']; |
142 | 141 | } |
@@ -172,8 +171,7 @@ discard block |
||
172 | 171 | self::SHOW_BLOCK_LANDING => true, |
173 | 172 | self::SHOW_BLOCK_SUBPAGE => false, |
174 | 173 | ); |
175 | - } |
|
176 | - else |
|
174 | + } else |
|
177 | 175 | { |
178 | 176 | $modes = array( |
179 | 177 | self::SHOW_BLOCK_BOTH => true, |
@@ -200,8 +198,7 @@ discard block |
||
200 | 198 | } |
201 | 199 | |
202 | 200 | $u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1)); |
203 | - } |
|
204 | - else |
|
201 | + } else |
|
205 | 202 | { |
206 | 203 | $edit_mode = false; |
207 | 204 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * |
|
4 | - * @package sitemaker |
|
5 | - * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | - * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | - * |
|
8 | - */ |
|
3 | + * |
|
4 | + * @package sitemaker |
|
5 | + * @copyright (c) 2013 Daniel A. (blitze) |
|
6 | + * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 |
|
7 | + * |
|
8 | + */ |
|
9 | 9 | |
10 | 10 | namespace blitze\sitemaker\event; |
11 | 11 |