@@ -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 | |
@@ -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 | /** |
@@ -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 | |
@@ -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 | } |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | protected function find_sql(array $sql_where) |
| 27 | 27 | { |
| 28 | - return 'SELECT * FROM ' . $this->entity_table . |
|
| 29 | - ((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . ' |
|
| 28 | + return 'SELECT * FROM '.$this->entity_table. |
|
| 29 | + ((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').' |
|
| 30 | 30 | ORDER BY position, weight ASC'; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -40,12 +40,12 @@ discard block |
||
| 40 | 40 | // move blocks up for position |
| 41 | 41 | if ($condition instanceof $this->entity_class) |
| 42 | 42 | { |
| 43 | - $this->db->sql_query('UPDATE ' . $this->entity_table . ' |
|
| 43 | + $this->db->sql_query('UPDATE '.$this->entity_table.' |
|
| 44 | 44 | SET weight = weight - 1 |
| 45 | - WHERE weight > ' . (int) $condition->get_weight() . ' |
|
| 46 | - AND style = ' . (int) $condition->get_style() . ' |
|
| 47 | - AND route_id = ' . (int) $condition->get_route_id() . " |
|
| 48 | - AND position = '" . $this->db->sql_escape($condition->get_position()) . "'"); |
|
| 45 | + WHERE weight > ' . (int) $condition->get_weight().' |
|
| 46 | + AND style = ' . (int) $condition->get_style().' |
|
| 47 | + AND route_id = ' . (int) $condition->get_route_id()." |
|
| 48 | + AND position = '" . $this->db->sql_escape($condition->get_position())."'"); |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
@@ -65,10 +65,10 @@ discard block |
||
| 65 | 65 | protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity) |
| 66 | 66 | { |
| 67 | 67 | /** @type \blitze\sitemaker\model\entity\block $entity */ |
| 68 | - $sql = 'UPDATE ' . $this->entity_table . ' |
|
| 68 | + $sql = 'UPDATE '.$this->entity_table.' |
|
| 69 | 69 | SET weight = weight + 1 |
| 70 | - WHERE weight >= ' . (int) $entity->get_weight() . ' |
|
| 71 | - AND route_id = ' . (int) $entity->get_route_id() . ' |
|
| 70 | + WHERE weight >= ' . (int) $entity->get_weight().' |
|
| 71 | + AND route_id = ' . (int) $entity->get_route_id().' |
|
| 72 | 72 | AND style = ' . (int) $entity->get_style(); |
| 73 | 73 | $this->db->sql_query($sql); |
| 74 | 74 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0)); |
| 136 | 136 | $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', '')); |
| 137 | 137 | |
| 138 | - $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action)); |
|
| 138 | + $this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action)); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | { |
| 148 | 148 | $style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true); |
| 149 | 149 | |
| 150 | - $result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE); |
|
| 150 | + $result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE); |
|
| 151 | 151 | |
| 152 | 152 | $styles = array(); |
| 153 | 153 | while ($row = $this->db->sql_fetchrow($result)) |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | foreach ($layouts as $name => $path) |
| 202 | 202 | { |
| 203 | 203 | $selected = ($path == $pref) ? ' selected="selected"' : ''; |
| 204 | - $options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>'; |
|
| 204 | + $options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>'; |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | return $options; |
@@ -215,11 +215,11 @@ discard block |
||
| 215 | 215 | { |
| 216 | 216 | $views = array('basic', 'boxed', 'simple'); |
| 217 | 217 | |
| 218 | - $options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>'; |
|
| 218 | + $options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>'; |
|
| 219 | 219 | foreach ($views as $view) |
| 220 | 220 | { |
| 221 | 221 | $selected = ($view == $pref) ? ' selected="selected"' : ''; |
| 222 | - $options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>'; |
|
| 222 | + $options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>'; |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | return $options; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | $path = dirname($path); |
| 262 | 262 | $name = basename($path); |
| 263 | 263 | |
| 264 | - $layouts[$name] = $this->phpbb_root_path . $path . '/'; |
|
| 264 | + $layouts[$name] = $this->phpbb_root_path.$path.'/'; |
|
| 265 | 265 | } |
| 266 | 266 | ksort($layouts); |
| 267 | 267 | |