@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | |
46 | 46 | if (!function_exists('phpbb_show_profile')) |
47 | 47 | { |
48 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); |
|
48 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | public function get_all_fields() |
56 | 56 | { |
57 | 57 | $sql = 'SELECT l.lang_name, f.field_ident |
58 | - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f |
|
59 | - WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . ' |
|
58 | + FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f |
|
59 | + WHERE l.lang_id = ' . $this->user->get_iso_lang_id().' |
|
60 | 60 | AND f.field_active = 1 |
61 | 61 | AND f.field_no_view = 0 |
62 | 62 | AND f.field_hide = 0 |
@@ -45,11 +45,11 @@ |
||
45 | 45 | $curr_key = (int) array_search($settings['current_user'], $userlist); |
46 | 46 | |
47 | 47 | // Remove the invalid user from the list |
48 | - $new_list = str_replace($settings['current_user'] . ',', '', $settings['userlist'] . ','); |
|
48 | + $new_list = str_replace($settings['current_user'].',', '', $settings['userlist'].','); |
|
49 | 49 | $new_list = trim($new_list, ','); |
50 | 50 | |
51 | 51 | $new_userlist = self::_get_userlist($new_list); |
52 | - $current_user =& $new_userlist[$curr_key - 1]; |
|
52 | + $current_user = & $new_userlist[$curr_key - 1]; |
|
53 | 53 | $settings['current_user'] = (int) $current_user; |
54 | 54 | $settings['userlist'] = trim($new_list); |
55 | 55 | $settings['last_changed'] = 0; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | public function get_users_groups() |
36 | 36 | { |
37 | 37 | $sql = 'SELECT group_id |
38 | - FROM ' . USER_GROUP_TABLE . ' |
|
38 | + FROM ' . USER_GROUP_TABLE.' |
|
39 | 39 | WHERE user_id = ' . (int) $this->user->data['user_id']; |
40 | 40 | $result = $this->db->sql_query($sql); |
41 | 41 | |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | $sql = $this->_get_group_sql($mode); |
79 | 79 | $result = $this->db->sql_query($sql); |
80 | 80 | |
81 | - $options = '<option value="0">' . $this->user->lang('ALL') . '</option>'; |
|
81 | + $options = '<option value="0">'.$this->user->lang('ALL').'</option>'; |
|
82 | 82 | while ($row = $this->db->sql_fetchrow($result)) |
83 | 83 | { |
84 | 84 | $group_name = $this->_get_group_name($row); |
85 | 85 | $group_class = $this->_get_group_class($row['group_type']); |
86 | 86 | $selected_option = $this->_get_selected_option($row['group_id'], $selected); |
87 | - $options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>'; |
|
87 | + $options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>'; |
|
88 | 88 | } |
89 | 89 | $this->db->sql_freeresult($result); |
90 | 90 | |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | private function _get_group_sql($mode) |
99 | 99 | { |
100 | 100 | return 'SELECT group_id, group_name, group_type |
101 | - FROM ' . GROUPS_TABLE . |
|
102 | - (($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . ' |
|
101 | + FROM ' . GROUPS_TABLE. |
|
102 | + (($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').' |
|
103 | 103 | ORDER BY group_type DESC, group_name ASC'; |
104 | 104 | } |
105 | 105 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | private function _get_group_name(array $row) |
111 | 111 | { |
112 | - return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_' . $row['group_name']) : ucfirst($row['group_name']); |
|
112 | + return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_'.$row['group_name']) : ucfirst($row['group_name']); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | /** |
@@ -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 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | list($controller_service, $controller_method) = explode(':', $controller); |
150 | 150 | $controller_params = $symfony_request->attributes->get('_route_params'); |
151 | 151 | $controller_object = $this->phpbb_container->get($controller_service); |
152 | - $controller_class = get_class($controller_object); |
|
152 | + $controller_class = get_class($controller_object); |
|
153 | 153 | |
154 | 154 | $r = new \ReflectionMethod($controller_class, $controller_method); |
155 | 155 | $class_params = $r->getParameters(); |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | 'CONTROLLER_METHOD' => $controller_method, |
163 | 163 | 'CONTROLLER_PARAMS' => $controller_arguments, |
164 | 164 | 'S_IS_STARTPAGE' => $this->is_startpage($controller_service, $controller_arguments), |
165 | - 'UA_EXTENSION' => $namespace . '/' . $extension, |
|
165 | + 'UA_EXTENSION' => $namespace.'/'.$extension, |
|
166 | 166 | )); |
167 | 167 | } |
168 | 168 | } |
@@ -197,11 +197,11 @@ discard block |
||
197 | 197 | { |
198 | 198 | $routes_ary = $this->get_routes(); |
199 | 199 | |
200 | - $options = '<option value="">' . $this->user->lang('SELECT') . '</option>'; |
|
200 | + $options = '<option value="">'.$this->user->lang('SELECT').'</option>'; |
|
201 | 201 | foreach ($routes_ary as $route) |
202 | 202 | { |
203 | 203 | $selected = ($route == $current_route) ? ' selected="selected"' : ''; |
204 | - $options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>'; |
|
204 | + $options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>'; |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | return $options; |
@@ -215,10 +215,10 @@ discard block |
||
215 | 215 | */ |
216 | 216 | public function get_excluded_position_options(array $ex_positions) |
217 | 217 | { |
218 | - $options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->user->lang('NONE') . '</option>'; |
|
218 | + $options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->user->lang('NONE').'</option>'; |
|
219 | 219 | foreach ($ex_positions as $position) |
220 | 220 | { |
221 | - $options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>'; |
|
221 | + $options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>'; |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | return $options; |
@@ -46,9 +46,9 @@ |
||
46 | 46 | public function display(array $settings, $edit_mode = false) |
47 | 47 | { |
48 | 48 | $content = ''; |
49 | - $content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />'; |
|
50 | - $content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />'; |
|
51 | - $content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />'; |
|
49 | + $content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />'; |
|
50 | + $content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />'; |
|
51 | + $content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />'; |
|
52 | 52 | $content .= $this->user->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])); |
53 | 53 | |
54 | 54 | return array( |
@@ -59,11 +59,11 @@ |
||
59 | 59 | * to fix relative paths for forum images |
60 | 60 | */ |
61 | 61 | global $phpbb_root_path; |
62 | - $phpbb_root_path = generate_board_url() . '/'; |
|
62 | + $phpbb_root_path = generate_board_url().'/'; |
|
63 | 63 | |
64 | 64 | if (!function_exists('display_forums')) |
65 | 65 | { |
66 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); // @codeCoverageIgnore |
|
66 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); // @codeCoverageIgnore |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | display_forums('', $this->config['load_moderators']); |
@@ -185,7 +185,7 @@ |
||
185 | 185 | * Checks if a url is an extension route |
186 | 186 | * |
187 | 187 | * @param string $item_url |
188 | - * @return true|false |
|
188 | + * @return boolean |
|
189 | 189 | */ |
190 | 190 | private function is_extension_route($item_url) |
191 | 191 | { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | */ |
137 | 137 | public function set_item_icon($icon) |
138 | 138 | { |
139 | - $this->item_icon = ($icon) ? trim($icon) . ' ' : ''; |
|
139 | + $this->item_icon = ($icon) ? trim($icon).' ' : ''; |
|
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | // add leading / for local paths, except leading hashtags |
154 | 154 | if ($this->is_local($this->item_url) && $this->item_url[0] !== '#') |
155 | 155 | { |
156 | - $this->item_url = '/' . ltrim($this->item_url, './'); |
|
156 | + $this->item_url = '/'.ltrim($this->item_url, './'); |
|
157 | 157 | } |
158 | 158 | |
159 | 159 | return $this; |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | |
169 | 169 | if ($this->is_local($item_url) && $item_url[0] === '/') |
170 | 170 | { |
171 | - $item_url = $this->board_url . $item_url; |
|
171 | + $item_url = $this->board_url.$item_url; |
|
172 | 172 | if ($this->mod_rewrite_enabled) |
173 | 173 | { |
174 | 174 | $item_url = str_replace('app.php/', '', $item_url); |
@@ -185,6 +185,6 @@ discard block |
||
185 | 185 | private function is_local($item_url) |
186 | 186 | { |
187 | 187 | $host = parse_url($item_url, PHP_URL_HOST); |
188 | - return (!$item_url || $host || substr($item_url, 0, 2) === '//') ? false: true; |
|
188 | + return (!$item_url || $host || substr($item_url, 0, 2) === '//') ? false : true; |
|
189 | 189 | } |
190 | 190 | } |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @param string $handle |
71 | 71 | * @return void |
72 | 72 | */ |
73 | - public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree') |
|
73 | + public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree') |
|
74 | 74 | { |
75 | 75 | $this->prepare_items($data); |
76 | 76 | |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | $row['num_kids'] = $this->count_descendants($row); |
85 | 85 | |
86 | 86 | $template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER)); |
87 | - $this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth)); |
|
87 | + $this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth)); |
|
88 | 88 | } |
89 | 89 | |
90 | - $this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth)); |
|
90 | + $this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth)); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | $is_current_item = $this->is_current_item($row); |
129 | - $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
129 | + $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
130 | 130 | $leaf = $this->get_leaf_node($row, $is_current_item); |
131 | 131 | |
132 | 132 | $this->parental_depth[$row[$this->pk]] = $this_depth; |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function set_current_item(array $data) |
157 | 157 | { |
158 | - $curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './'); |
|
159 | - $curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page); |
|
158 | + $curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './'); |
|
159 | + $curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page); |
|
160 | 160 | $curr_parts = explode('&', $this->user->page['query_string']); |
161 | 161 | |
162 | 162 | $data = array_values($data); |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | * @param int $repeat |
240 | 240 | * @return void |
241 | 241 | */ |
242 | - protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat) |
|
242 | + protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat) |
|
243 | 243 | { |
244 | 244 | for ($i = 0; $i < $repeat; $i++) |
245 | 245 | { |
@@ -124,7 +124,7 @@ |
||
124 | 124 | { |
125 | 125 | $row['is_navigable'] = $this->is_navigable($row); |
126 | 126 | $row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false; |
127 | - $row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']); |
|
127 | + $row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |