@@ -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 | /** |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $edit_mode = $this->toggle_edit_mode(); |
| 70 | 70 | $style_id = $this->get_style_id(); |
| 71 | - $current_route = ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './'); |
|
| 71 | + $current_route = ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './'); |
|
| 72 | 72 | $route_info = $blocks->get_route_info($current_route, $this->user->page['page_dir'], $style_id, $edit_mode); |
| 73 | 73 | |
| 74 | 74 | $display_modes = $this->get_display_modes($route_info['is_sub_route']); |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | protected function toggle_edit_mode() |
| 116 | 116 | { |
| 117 | - $edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE); |
|
| 117 | + $edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE); |
|
| 118 | 118 | |
| 119 | 119 | if ($this->request->is_set('edit_mode')) |
| 120 | 120 | { |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | ); |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - $u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode); |
|
| 173 | + $u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode); |
|
| 174 | 174 | } |
| 175 | 175 | else |
| 176 | 176 | { |
@@ -175,12 +175,12 @@ |
||
| 175 | 175 | { |
| 176 | 176 | if ($page_dir) |
| 177 | 177 | { |
| 178 | - $route = ltrim(dirname($page_dir) . '/index.php', './'); |
|
| 178 | + $route = ltrim(dirname($page_dir).'/index.php', './'); |
|
| 179 | 179 | $parent_route = $this->get_parent_route_info($routes, $route); |
| 180 | 180 | } |
| 181 | - else if ($current_route === 'viewtopic.' . $this->php_ext) |
|
| 181 | + else if ($current_route === 'viewtopic.'.$this->php_ext) |
|
| 182 | 182 | { |
| 183 | - $route = 'viewforum.' . $this->php_ext; |
|
| 183 | + $route = 'viewforum.'.$this->php_ext; |
|
| 184 | 184 | $parent_route = $this->get_parent_route_info($routes, $route); |
| 185 | 185 | } |
| 186 | 186 | else |
@@ -177,13 +177,11 @@ |
||
| 177 | 177 | { |
| 178 | 178 | $route = ltrim(dirname($page_dir) . '/index.php', './'); |
| 179 | 179 | $parent_route = $this->get_parent_route_info($routes, $route); |
| 180 | - } |
|
| 181 | - else if ($current_route === 'viewtopic.' . $this->php_ext) |
|
| 180 | + } else if ($current_route === 'viewtopic.' . $this->php_ext) |
|
| 182 | 181 | { |
| 183 | 182 | $route = 'viewforum.' . $this->php_ext; |
| 184 | 183 | $parent_route = $this->get_parent_route_info($routes, $route); |
| 185 | - } |
|
| 186 | - else |
|
| 184 | + } else |
|
| 187 | 185 | { |
| 188 | 186 | $parent_route = $this->get_virtual_parent($routes, $current_route); |
| 189 | 187 | } |
@@ -34,11 +34,11 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function build_select($option_ary, $selected_item, $key) |
| 36 | 36 | { |
| 37 | - $html = '<select id="' . $key . '" name="config[' . $key . ']">'; |
|
| 37 | + $html = '<select id="'.$key.'" name="config['.$key.']">'; |
|
| 38 | 38 | foreach ($option_ary as $value => $title) |
| 39 | 39 | { |
| 40 | 40 | $selected = ($value == $selected_item) ? ' selected="selected"' : ''; |
| 41 | - $html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>'; |
|
| 41 | + $html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>'; |
|
| 42 | 42 | } |
| 43 | 43 | $html .= '</select>'; |
| 44 | 44 | |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | $selected_items = $this->ensure_array($selected_items); |
| 59 | 59 | |
| 60 | - $html = '<select id="' . $field . '" name="config[' . $field . '][]" multiple="multiple">'; |
|
| 60 | + $html = '<select id="'.$field.'" name="config['.$field.'][]" multiple="multiple">'; |
|
| 61 | 61 | foreach ($option_ary as $value => $title) |
| 62 | 62 | { |
| 63 | 63 | $selected = $this->get_selected_option($value, $selected_items); |
| 64 | - $html .= '<option value="' . $value . '"' . $selected . '>' . $this->translator->lang($title) . '</option>'; |
|
| 64 | + $html .= '<option value="'.$value.'"'.$selected.'>'.$this->translator->lang($title).'</option>'; |
|
| 65 | 65 | } |
| 66 | 66 | $html .= '</select>'; |
| 67 | 67 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | foreach ($option_ary as $value => $title) |
| 121 | 121 | { |
| 122 | 122 | $selected = $this->get_selected_option($value, $selected_item, 'checked'); |
| 123 | - $html .= '<label><input type="radio" name="config[' . $key . ']" value="' . $value . '"' . $selected . ' class="radio" /> ' . $this->translator->lang($title) . '</label><br />'; |
|
| 123 | + $html .= '<label><input type="radio" name="config['.$key.']" value="'.$value.'"'.$selected.' class="radio" /> '.$this->translator->lang($title).'</label><br />'; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $html; |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function build_hidden($value, $field) |
| 137 | 137 | { |
| 138 | - return '<input type="hidden" name="config[' . $field . ']" value="' . $value . '" />'; |
|
| 138 | + return '<input type="hidden" name="config['.$field.']" value="'.$value.'" />'; |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | protected function get_selected_option($needle, array $haystack, $type = 'selected') |
| 177 | 177 | { |
| 178 | - return (in_array($needle, $haystack)) ? ' ' . $type . '="' . $type . '"' : ''; |
|
| 178 | + return (in_array($needle, $haystack)) ? ' '.$type.'="'.$type.'"' : ''; |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | /** |
@@ -189,12 +189,12 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function get_checkbox_column(array $row, array $selected_items, $field, $column_class, $column_count, &$index) |
| 191 | 191 | { |
| 192 | - $column = '<div class="' . $column_class . $field . '-checkbox" id="' . $field . '-col-' . $column_count . '">'; |
|
| 192 | + $column = '<div class="'.$column_class.$field.'-checkbox" id="'.$field.'-col-'.$column_count.'">'; |
|
| 193 | 193 | foreach ($row as $value => $title) |
| 194 | 194 | { |
| 195 | 195 | $title = $this->translator->lang($title); |
| 196 | 196 | $selected = $this->get_selected_option($value, $selected_items, 'checked'); |
| 197 | - $column .= '<label><input type="checkbox" name="config[' . $field . '][' . $index . ']" value="' . $value . '"' . $selected . ' class="checkbox" /> ' . $title . '</label><br />'; |
|
| 197 | + $column .= '<label><input type="checkbox" name="config['.$field.']['.$index.']" value="'.$value.'"'.$selected.' class="checkbox" /> '.$title.'</label><br />'; |
|
| 198 | 198 | $index++; |
| 199 | 199 | } |
| 200 | 200 | $column .= '</div>'; |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | // @codeCoverageIgnoreStart |
| 62 | 62 | if (!function_exists('build_cfg_template')) |
| 63 | 63 | { |
| 64 | - include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); |
|
| 64 | + include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); |
|
| 65 | 65 | } |
| 66 | 66 | // @codeCoverageIgnoreEnd |
| 67 | 67 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | // @codeCoverageIgnoreStart |
| 101 | 101 | if (!function_exists('validate_config_vars')) |
| 102 | 102 | { |
| 103 | - include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); |
|
| 103 | + include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); |
|
| 104 | 104 | } |
| 105 | 105 | // @codeCoverageIgnoreEnd |
| 106 | 106 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | if (empty($vars['object'])) |
| 204 | 204 | { |
| 205 | 205 | $object = $this; |
| 206 | - $method = 'prep_' . $type[0] . '_field_for_display'; |
|
| 206 | + $method = 'prep_'.$type[0].'_field_for_display'; |
|
| 207 | 207 | |
| 208 | 208 | if (is_callable(array($this, $method))) |
| 209 | 209 | { |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | $l_explain = ''; |
| 258 | 258 | if (!empty($vars['explain'])) |
| 259 | 259 | { |
| 260 | - $l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN'); |
|
| 260 | + $l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN'); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | return $l_explain; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | { |
| 358 | 358 | $this->prep_checkbox_field_for_display($vars, $type, $field); |
| 359 | 359 | |
| 360 | - $vars['method'] ='build_multi_select'; |
|
| 360 | + $vars['method'] = 'build_multi_select'; |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |