@@ -50,7 +50,7 @@ |
||
50 | 50 | '@blitze_sitemaker/assets/icons/picker.min.js', |
51 | 51 | ), |
52 | 52 | 'css' => array( |
53 | - defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '', |
|
53 | + defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '', |
|
54 | 54 | '@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css', |
55 | 55 | '@blitze_sitemaker/assets/icons/picker.min.css', |
56 | 56 | ) |
@@ -59,12 +59,12 @@ |
||
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 | // @codeCoverageIgnoreStart |
65 | 65 | if (!function_exists('display_forums')) |
66 | 66 | { |
67 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); |
|
67 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); |
|
68 | 68 | } |
69 | 69 | // @codeCoverageIgnoreEnd |
70 | 70 |
@@ -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 | /** |
@@ -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 | /** |
@@ -225,8 +225,7 @@ |
||
225 | 225 | $this->set_params($field, $vars, $db_settings); |
226 | 226 | $this->$method($vars, $type, $field, $db_settings); |
227 | 227 | } |
228 | - } |
|
229 | - else |
|
228 | + } else |
|
230 | 229 | { |
231 | 230 | $object = $vars['object']; |
232 | 231 | $this->set_params($field, $vars, $db_settings); |
@@ -70,8 +70,8 @@ |
||
70 | 70 | */ |
71 | 71 | protected function find_sql(array $sql_where) |
72 | 72 | { |
73 | - return 'SELECT * FROM ' . $this->entity_table . |
|
74 | - ((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . ' |
|
73 | + return 'SELECT * FROM '.$this->entity_table. |
|
74 | + ((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').' |
|
75 | 75 | ORDER BY route ASC'; |
76 | 76 | } |
77 | 77 | } |
@@ -172,6 +172,6 @@ |
||
172 | 172 | */ |
173 | 173 | protected function get_sql_where($menu_id) |
174 | 174 | { |
175 | - return '%smenu_id = ' . (int) $menu_id; |
|
175 | + return '%smenu_id = '.(int) $menu_id; |
|
176 | 176 | } |
177 | 177 | } |
@@ -96,8 +96,7 @@ |
||
96 | 96 | if ($entity->get_item_id()) |
97 | 97 | { |
98 | 98 | $item = $this->tree->update_item($entity->get_item_id(), $sql_data); |
99 | - } |
|
100 | - else |
|
99 | + } else |
|
101 | 100 | { |
102 | 101 | $item = $this->tree->insert($sql_data); |
103 | 102 | } |