@@ -118,8 +118,7 @@ |
||
118 | 118 | if (!$has_blocks && !$this->route_is_customized($entity->to_array())) |
119 | 119 | { |
120 | 120 | $this->route_mapper->delete($entity); |
121 | - } |
|
122 | - else |
|
121 | + } else |
|
123 | 122 | { |
124 | 123 | $entity->set_has_blocks($has_blocks); |
125 | 124 | $this->route_mapper->save($entity); |
@@ -154,8 +154,7 @@ |
||
154 | 154 | if (!empty($returned_data['content'])) |
155 | 155 | { |
156 | 156 | $content = $returned_data['content']; |
157 | - } |
|
158 | - else if ($edit_mode) |
|
157 | + } else if ($edit_mode) |
|
159 | 158 | { |
160 | 159 | $returned_data['status'] = 0; |
161 | 160 | $content = $this->translator->lang('BLOCK_NO_DATA'); |
@@ -144,7 +144,7 @@ |
||
144 | 144 | * @param string $position |
145 | 145 | * @param array $blocks |
146 | 146 | * @param array $ex_positions |
147 | - * @param array $users_groups |
|
147 | + * @param integer[] $users_groups |
|
148 | 148 | * @param array $display_modes |
149 | 149 | * @param bool $edit_mode |
150 | 150 | * @return array[] |
@@ -96,13 +96,13 @@ discard block |
||
96 | 96 | public function set_javascript_data($route, $style_id) |
97 | 97 | { |
98 | 98 | $board_url = generate_board_url(); |
99 | - $ajax_url = $board_url . ((!$this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : ''); |
|
99 | + $ajax_url = $board_url.((!$this->config['enable_mod_rewrite']) ? '/app.'.$this->php_ext : ''); |
|
100 | 100 | |
101 | 101 | $is_default_route = $u_default_route = false; |
102 | 102 | if ($this->config['sitemaker_default_layout']) |
103 | 103 | { |
104 | 104 | $is_default_route = ($this->config['sitemaker_default_layout'] === $route) ? true : false; |
105 | - $u_default_route .= $board_url . '/' . $this->config['sitemaker_default_layout']; |
|
105 | + $u_default_route .= $board_url.'/'.$this->config['sitemaker_default_layout']; |
|
106 | 106 | $u_default_route = reapply_sid($u_default_route); |
107 | 107 | } |
108 | 108 | |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | list($controller_service, $controller_method) = explode(':', $controller); |
151 | 151 | $controller_params = $symfony_request->attributes->get('_route_params'); |
152 | 152 | $controller_object = $this->phpbb_container->get($controller_service); |
153 | - $controller_class = get_class($controller_object); |
|
153 | + $controller_class = get_class($controller_object); |
|
154 | 154 | |
155 | 155 | $r = new \ReflectionMethod($controller_class, $controller_method); |
156 | 156 | $class_params = $r->getParameters(); |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | 'CONTROLLER_METHOD' => $controller_method, |
164 | 164 | 'CONTROLLER_PARAMS' => $controller_arguments, |
165 | 165 | 'S_IS_STARTPAGE' => $this->is_startpage($controller_service, $controller_arguments), |
166 | - 'UA_EXTENSION' => $namespace . '/' . $extension, |
|
166 | + 'UA_EXTENSION' => $namespace.'/'.$extension, |
|
167 | 167 | )); |
168 | 168 | } |
169 | 169 | } |
@@ -198,11 +198,11 @@ discard block |
||
198 | 198 | { |
199 | 199 | $routes_ary = $this->get_routes(); |
200 | 200 | |
201 | - $options = '<option value="">' . $this->translator->lang('SELECT') . '</option>'; |
|
201 | + $options = '<option value="">'.$this->translator->lang('SELECT').'</option>'; |
|
202 | 202 | foreach ($routes_ary as $route) |
203 | 203 | { |
204 | 204 | $selected = ($route == $current_route) ? ' selected="selected"' : ''; |
205 | - $options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>'; |
|
205 | + $options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>'; |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | return $options; |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $options = ''; |
220 | 220 | foreach ($ex_positions as $position) |
221 | 221 | { |
222 | - $options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>'; |
|
222 | + $options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>'; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | return $options; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | |
84 | 84 | if (sizeof($query_ids)) |
85 | 85 | { |
86 | - $sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids); |
|
86 | + $sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids); |
|
87 | 87 | $this->query($sql_where); |
88 | 88 | } |
89 | 89 | |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | public function get_profile_fields() |
161 | 161 | { |
162 | 162 | $sql = 'SELECT l.lang_name, f.field_ident |
163 | - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f |
|
164 | - WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . ' |
|
163 | + FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f |
|
164 | + WHERE l.lang_id = ' . $this->user->get_iso_lang_id().' |
|
165 | 165 | AND f.field_active = 1 |
166 | 166 | AND f.field_no_view = 0 |
167 | 167 | AND f.field_hide = 0 |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function get_search_url($user_id) |
221 | 221 | { |
222 | - return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : ''; |
|
222 | + return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : ''; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | /** |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | { |
231 | 231 | if (!function_exists('phpbb_get_user_rank')) |
232 | 232 | { |
233 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); |
|
233 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | $user_rank_data = phpbb_get_user_rank($row, $row['user_posts']); |
@@ -304,8 +304,8 @@ discard block |
||
304 | 304 | protected function get_sql_statement($sql_where = '', $order_by = '') |
305 | 305 | { |
306 | 306 | return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_email, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason |
307 | - FROM ' . USERS_TABLE . |
|
308 | - (($sql_where) ? ' WHERE ' . $sql_where : '') . |
|
309 | - (($order_by) ? ' ORDER BY ' . $order_by : ''); |
|
307 | + FROM ' . USERS_TABLE. |
|
308 | + (($sql_where) ? ' WHERE '.$sql_where : ''). |
|
309 | + (($order_by) ? ' ORDER BY '.$order_by : ''); |
|
310 | 310 | } |
311 | 311 | } |
@@ -288,8 +288,7 @@ |
||
288 | 288 | 'NAME' => $field_data['PROFILE_FIELD_NAME'], |
289 | 289 | 'U_CONTACT' => $field_data['PROFILE_FIELD_CONTACT'], |
290 | 290 | ); |
291 | - } |
|
292 | - else |
|
291 | + } else |
|
293 | 292 | { |
294 | 293 | $this->user_cache[$user_id]['profile_fields'][$field] = $field_data; |
295 | 294 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | // @codeCoverageIgnoreStart |
23 | 23 | if (!function_exists('make_forum_select')) |
24 | 24 | { |
25 | - include($phpbb_root_path . 'includes/functions_admin.' . $php_ext); |
|
25 | + include($phpbb_root_path.'includes/functions_admin.'.$php_ext); |
|
26 | 26 | } |
27 | 27 | // @codeCoverageIgnoreEnd |
28 | 28 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $forum_options = array('' => 'ALL_FORUMS'); |
44 | 44 | foreach ($forumlist as $row) |
45 | 45 | { |
46 | - $forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name']; |
|
46 | + $forum_options[$row['forum_id']] = $row['padding'].$row['forum_name']; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | return $forum_options; |
@@ -89,7 +89,7 @@ |
||
89 | 89 | $this->store['topic'][$row['topic_id']] = $row; |
90 | 90 | |
91 | 91 | $this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id']; |
92 | - $this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time']; |
|
92 | + $this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time']; |
|
93 | 93 | $this->store['post_ids']['first'][] = $row['topic_first_post_id']; |
94 | 94 | $this->store['post_ids']['last'][] = $row['topic_last_post_id']; |
95 | 95 | $this->store['poster_ids'][] = $row['topic_poster']; |
@@ -242,8 +242,7 @@ |
||
242 | 242 | { |
243 | 243 | $sql_where[] = $this->db->sql_in_set('p.post_id', array_map('intval', $post_ids)); |
244 | 244 | return $sql_where; |
245 | - } |
|
246 | - else if (sizeof($this->store['topic'])) |
|
245 | + } else if (sizeof($this->store['topic'])) |
|
247 | 246 | { |
248 | 247 | $this->_limit_posts_by_topic($sql_where, $topic_first_or_last_post); |
249 | 248 | } |
@@ -64,7 +64,7 @@ |
||
64 | 64 | { |
65 | 65 | if (!class_exists('acp_forums')) |
66 | 66 | { |
67 | - include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext); |
|
67 | + include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | $this->translator->add_lang('acp/forums'); |
@@ -20,7 +20,7 @@ |
||
20 | 20 | |
21 | 21 | /** @type \blitze\sitemaker\model\entity\menu $entity */ |
22 | 22 | $entity = $menu_mapper->create_entity(array( |
23 | - 'menu_name' => $this->translator->lang('MENU') . '-' . mt_rand(1000, 9999), |
|
23 | + 'menu_name' => $this->translator->lang('MENU').'-'.mt_rand(1000, 9999), |
|
24 | 24 | )); |
25 | 25 | |
26 | 26 | $entity = $menu_mapper->save($entity); |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | 'USER_POSTS' => $this->user->data['user_posts'], |
69 | 69 | 'NEW_POSTS' => $this->get_new_posts_count(), |
70 | 70 | |
71 | - 'U_PROFILE' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']), |
|
72 | - 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'), |
|
73 | - 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'), |
|
74 | - 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'), |
|
75 | - 'U_LOGOUT' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
71 | + 'U_PROFILE' => append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']), |
|
72 | + 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'), |
|
73 | + 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'), |
|
74 | + 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'), |
|
75 | + 'U_LOGOUT' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
76 | 76 | 'U_MCP' => $this->get_mcp_url(), |
77 | 77 | 'U_ACP' => $this->get_acp_url(), |
78 | 78 | )); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function get_mcp_url() |
101 | 101 | { |
102 | - return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : ''; |
|
102 | + return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : ''; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | protected function get_acp_url() |
109 | 109 | { |
110 | - return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
110 | + return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | POSTS_TABLE => 'p', |
121 | 121 | ), |
122 | 122 | 'WHERE' => array( |
123 | - 't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'], |
|
123 | + 't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'], |
|
124 | 124 | ), |
125 | 125 | ); |
126 | 126 |