@@ -73,7 +73,7 @@ |
||
73 | 73 | } |
74 | 74 | else |
75 | 75 | { |
76 | - $message = $this->language->lang('INVALID_REQUEST', $action); |
|
76 | + $message = $this->language->lang('INVALID_REQUEST', $action); |
|
77 | 77 | trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>')); |
78 | 78 | } |
79 | 79 | } |
@@ -206,7 +206,7 @@ |
||
206 | 206 | */ |
207 | 207 | protected function init_ucp_mode(array $content_types, array &$sql_where_array) |
208 | 208 | { |
209 | - $sql_where_array[] = 't.topic_poster = ' . (int) $this->user->data['user_id']; |
|
209 | + $sql_where_array[] = 't.topic_poster = ' . (int) $this->user->data['user_id']; |
|
210 | 210 | |
211 | 211 | // list all content types that the user can post in |
212 | 212 | $postable_forums = array_intersect_key($this->content_forums, $this->auth->acl_getf('f_post', true)); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | * @param \phpbb\language\language $language Language Object |
29 | 29 | * @param \phpbb\template\template $template Template object |
30 | 30 | * @param \blitze\content\services\types $content_types Content types object |
31 | - */ |
|
31 | + */ |
|
32 | 32 | public function __construct(\phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types) |
33 | 33 | { |
34 | 34 | $this->language = $language; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param \blitze\content\services\types $content_types Content types object |
31 | 31 | * @param \blitze\content\model\mapper_factory $mapper_factory Mapper factory object |
32 | 32 | * @param boolean $redirect Used for testing |
33 | - */ |
|
33 | + */ |
|
34 | 34 | public function __construct(\phpbb\cache\driver\driver_interface $cache, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory, $redirect = true) |
35 | 35 | { |
36 | 36 | $this->cache = $cache; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
45 | 45 | * @param string $relative_admin_path Relative admin root path |
46 | 46 | * @param string $php_ext php file extension |
47 | - */ |
|
47 | + */ |
|
48 | 48 | public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types, $phpbb_root_path, $relative_admin_path, $php_ext) |
49 | 49 | { |
50 | 50 | $this->controller_helper = $controller_helper; |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @param \phpbb\user $user User object |
35 | 35 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
36 | 36 | * @param string $php_ext php file extension |
37 | - */ |
|
37 | + */ |
|
38 | 38 | public function __construct(\phpbb\auth\auth $auth, \phpbb\template\template $template, \phpbb\user $user, $phpbb_root_path, $php_ext) |
39 | 39 | { |
40 | 40 | $this->auth = $auth; |
@@ -124,7 +124,7 @@ |
||
124 | 124 | */ |
125 | 125 | protected function allow_topic_delete(array $topic_data) |
126 | 126 | { |
127 | - return ($this->auth->acl_get('m_delete', $topic_data['forum_id'])) || (($topic_data['topic_visibility'] != ITEM_DELETED) && $this->auth->acl_get('m_softdelete', $topic_data['forum_id'])); |
|
127 | + return ($this->auth->acl_get('m_delete', $topic_data['forum_id'])) || (($topic_data['topic_visibility'] != ITEM_DELETED) && $this->auth->acl_get('m_softdelete', $topic_data['forum_id'])); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -22,7 +22,7 @@ |
||
22 | 22 | * |
23 | 23 | * @param \blitze\sitemaker\services\poll $poll Poll Object |
24 | 24 | * @param \blitze\sitemaker\services\template $ptemplate Sitemaker Template Object |
25 | - */ |
|
25 | + */ |
|
26 | 26 | public function __construct(\blitze\sitemaker\services\poll $poll, \blitze\sitemaker\services\template $ptemplate) |
27 | 27 | { |
28 | 28 | $this->poll = $poll; |
@@ -42,7 +42,7 @@ |
||
42 | 42 | * @param \phpbb\user $user User object |
43 | 43 | * @param string $root_path Path to the phpbb includes directory. |
44 | 44 | * @param string $php_ext php file extension |
45 | - */ |
|
45 | + */ |
|
46 | 46 | public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, $root_path, $php_ext) |
47 | 47 | { |
48 | 48 | $this->auth = $auth; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * @param \blitze\content\services\topic $topic Topic object |
59 | 59 | * @param string $root_path Path to the phpbb directory. |
60 | 60 | * @param string $php_ext php file extension |
61 | - */ |
|
61 | + */ |
|
62 | 62 | public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\content_visibility $content_visibility, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \phpbb\template\context $template_context, \phpbb\user $user, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\topic $topic, $root_path, $php_ext) |
63 | 63 | { |
64 | 64 | parent::__construct($auth, $config, $language, $template, $user, $root_path, $php_ext); |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | { |
88 | 88 | if ($topic_data['total_comments']) |
89 | 89 | { |
90 | - $view = $this->request->variable('view', ''); |
|
91 | - $start = $this->request->variable('start', 0); |
|
92 | - $post_id = $this->request->variable('p', 0); |
|
90 | + $view = $this->request->variable('view', ''); |
|
91 | + $start = $this->request->variable('start', 0); |
|
92 | + $post_id = $this->request->variable('p', 0); |
|
93 | 93 | |
94 | 94 | $this->find_unread($view, $topic_data); |
95 | 95 | |
@@ -310,11 +310,11 @@ discard block |
||
310 | 310 | */ |
311 | 311 | protected function set_sorting_options(&$sort_days, &$sort_key, &$sort_dir, &$u_sort_param) |
312 | 312 | { |
313 | - $default_sort_days = (!empty($this->user->data['user_post_show_days'])) ? $this->user->data['user_post_show_days'] : 0; |
|
313 | + $default_sort_days = (!empty($this->user->data['user_post_show_days'])) ? $this->user->data['user_post_show_days'] : 0; |
|
314 | 314 | $default_sort_key = (!empty($this->user->data['user_post_sortby_type'])) ? $this->user->data['user_post_sortby_type'] : 't'; |
315 | 315 | $default_sort_dir = (!empty($this->user->data['user_post_sortby_dir'])) ? $this->user->data['user_post_sortby_dir'] : 'a'; |
316 | 316 | |
317 | - $sort_days = $this->request->variable('st', $default_sort_days); |
|
317 | + $sort_days = $this->request->variable('st', $default_sort_days); |
|
318 | 318 | $sort_key = $this->request->variable('sk', $default_sort_key); |
319 | 319 | $sort_dir = $this->request->variable('sd', $default_sort_dir); |
320 | 320 |