@@ -112,7 +112,7 @@ |
||
| 112 | 112 | 'ICON_PICKER' => $this->icon->picker(), |
| 113 | 113 | 'T_PATH' => $this->phpbb_root_path, |
| 114 | 114 | 'UA_MENU_ID' => $menu_id, |
| 115 | - 'UA_AJAX_URL' => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/', |
|
| 115 | + 'UA_AJAX_URL' => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/', |
|
| 116 | 116 | )); |
| 117 | 117 | |
| 118 | 118 | $this->tpl_name = 'acp_menu'; |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | public function load_permission_language(\phpbb\event\data $event) |
| 118 | 118 | { |
| 119 | 119 | $permissions = $event['permissions']; |
| 120 | - $permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc'); |
|
| 121 | - $permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc'); |
|
| 122 | - $permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc'); |
|
| 120 | + $permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc'); |
|
| 121 | + $permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc'); |
|
| 122 | + $permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc'); |
|
| 123 | 123 | $event['permissions'] = $permissions; |
| 124 | 124 | } |
| 125 | 125 | |
@@ -193,13 +193,13 @@ discard block |
||
| 193 | 193 | */ |
| 194 | 194 | public function set_startpage(\phpbb\event\data $event) |
| 195 | 195 | { |
| 196 | - if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false) |
|
| 196 | + if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false) |
|
| 197 | 197 | { |
| 198 | 198 | $method = $this->config['sitemaker_startpage_method']; |
| 199 | 199 | $this->is_startpage = true; |
| 200 | 200 | |
| 201 | 201 | $controller_dir = explode('\\', get_class($controller_object)); |
| 202 | - $controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles'; |
|
| 202 | + $controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles'; |
|
| 203 | 203 | $this->template->set_style(array($controller_style_dir, 'styles')); |
| 204 | 204 | |
| 205 | 205 | $arguments = explode('/', $this->config['sitemaker_startpage_params']); |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | public function add_viewonline_location(\phpbb\event\data $event) |
| 222 | 222 | { |
| 223 | - if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0) |
|
| 223 | + if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0) |
|
| 224 | 224 | { |
| 225 | 225 | $event['location'] = $this->translator->lang('FORUM_INDEX'); |
| 226 | 226 | $event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum'); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | public function get_default_avatar() |
| 105 | 105 | { |
| 106 | - return '<img src="' . $this->get_theme_path() . '/images/no_avatar.gif" alt="" />'; |
|
| 106 | + return '<img src="'.$this->get_theme_path().'/images/no_avatar.gif" alt="" />'; |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | public function get_theme_path() |
| 114 | 114 | { |
| 115 | 115 | $web_path = $this->get_web_path(); |
| 116 | - return "{$web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme'; |
|
| 116 | + return "{$web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme'; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | public function get_web_path() |
| 124 | 124 | { |
| 125 | 125 | // Determine board url - we may need it later |
| 126 | - $board_url = generate_board_url() . '/'; |
|
| 126 | + $board_url = generate_board_url().'/'; |
|
| 127 | 127 | |
| 128 | 128 | $corrected_path = $this->path_helper->get_web_root_path(); |
| 129 | 129 | return (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path; |
@@ -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 | } |
@@ -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); |