@@ -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 | } |
@@ -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 || !empty($host) || substr($item_url, 0, 2) === '//') ? false: true; |
|
188 | + return (!$item_url || !empty($host) || substr($item_url, 0, 2) === '//') ? false : true; |
|
189 | 189 | } |
190 | 190 | } |
@@ -141,7 +141,7 @@ |
||
141 | 141 | */ |
142 | 142 | public function set_class($class) |
143 | 143 | { |
144 | - $this->class = ($class) ? ' ' . trim($class) : ''; |
|
144 | + $this->class = ($class) ? ' '.trim($class) : ''; |
|
145 | 145 | return $this; |
146 | 146 | } |
147 | 147 |
@@ -175,8 +175,7 @@ |
||
175 | 175 | if (!is_array($settings)) |
176 | 176 | { |
177 | 177 | $this->settings = $settings; |
178 | - } |
|
179 | - else if (sizeof($settings)) |
|
178 | + } else if (sizeof($settings)) |
|
180 | 179 | { |
181 | 180 | $this->settings = json_encode($settings); |
182 | 181 | $this->hash = md5($this->settings); |
@@ -39,8 +39,8 @@ |
||
39 | 39 | */ |
40 | 40 | public function create($type) |
41 | 41 | { |
42 | - $mapper_class = 'blitze\\sitemaker\\model\\mapper\\' . $type; |
|
43 | - $collection = 'blitze\\sitemaker\\model\\collections\\' . $type; |
|
42 | + $mapper_class = 'blitze\\sitemaker\\model\\mapper\\'.$type; |
|
43 | + $collection = 'blitze\\sitemaker\\model\\collections\\'.$type; |
|
44 | 44 | |
45 | 45 | return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type], $this->config); |
46 | 46 | } |