@@ -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 | } |
@@ -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 | } |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | $this->ptemplate->assign_vars(array( |
| 78 | 78 | 'S_SHOW_HIDE_ME' => ($settings['show_hide_me']) ? true : false, |
| 79 | 79 | 'S_AUTOLOGIN_ENABLED' => ($settings['allow_autologin']) ? true : false, |
| 80 | - 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=login'), |
|
| 81 | - 'U_REGISTER' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=register'), |
|
| 82 | - 'U_SEND_PASSWORD' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, 'mode=sendpassword'), |
|
| 80 | + 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=login'), |
|
| 81 | + 'U_REGISTER' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=register'), |
|
| 82 | + 'U_SEND_PASSWORD' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, 'mode=sendpassword'), |
|
| 83 | 83 | 'U_REDIRECT' => reapply_sid(ltrim(rtrim(build_url(array('edit_mode')), '?'), './../')) |
| 84 | 84 | )); |
| 85 | 85 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | private function hide_quicklogin() |
| 105 | 105 | { |
| 106 | 106 | $current_page = $this->user->page['page_name']; |
| 107 | - if ($current_page === 'index.' . $this->php_ext) |
|
| 107 | + if ($current_page === 'index.'.$this->php_ext) |
|
| 108 | 108 | { |
| 109 | 109 | $this->template->assign_var('S_USER_LOGGED_IN', true); |
| 110 | 110 | } |
@@ -84,8 +84,7 @@ |
||
| 84 | 84 | )); |
| 85 | 85 | |
| 86 | 86 | $content = $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block'); |
| 87 | - } |
|
| 88 | - else if ($settings['show_member_menu']) |
|
| 87 | + } else if ($settings['show_member_menu']) |
|
| 89 | 88 | { |
| 90 | 89 | $block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu'); |
| 91 | 90 | $block->set_template($this->ptemplate); |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | { |
| 128 | 128 | $this->entities = array_filter( |
| 129 | 129 | $this->entities, |
| 130 | - function ($v) use ($key) |
|
| 130 | + function($v) use ($key) |
|
| 131 | 131 | { |
| 132 | 132 | return $v !== $key; |
| 133 | 133 | } |
@@ -104,8 +104,7 @@ |
||
| 104 | 104 | if (!isset($key)) |
| 105 | 105 | { |
| 106 | 106 | $this->entities[] = $entity; |
| 107 | - } |
|
| 108 | - else |
|
| 107 | + } else |
|
| 109 | 108 | { |
| 110 | 109 | $this->entities[$key] = $entity; |
| 111 | 110 | } |