@@ -40,8 +40,7 @@ |
||
40 | 40 | if ($this->can_track_by_lastread()) |
41 | 41 | { |
42 | 42 | $info = $this->build_tracking_info('get_topic_tracking', $forums, $topics); |
43 | - } |
|
44 | - else if ($this->can_track_anonymous()) |
|
43 | + } else if ($this->can_track_anonymous()) |
|
45 | 44 | { |
46 | 45 | $info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics); |
47 | 46 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | protected function get_email_url(array $row) |
98 | 98 | { |
99 | - return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u=' . $row['user_id']) : (($this->mailto_allowed) ? 'mailto:' . $row['user_email'] : ''); |
|
99 | + return ($this->email_form_allowed) ? append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=email&u='.$row['user_id']) : (($this->mailto_allowed) ? 'mailto:'.$row['user_email'] : ''); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $jabber = array( |
128 | 128 | 'ID' => 'jabber', |
129 | 129 | 'NAME' => $this->translator->lang('JABBER'), |
130 | - 'U_CONTACT' => append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u=' . $row['user_id']), |
|
130 | + 'U_CONTACT' => append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=contact&action=jabber&u='.$row['user_id']), |
|
131 | 131 | ); |
132 | 132 | } |
133 | 133 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $pm = array( |
157 | 157 | 'ID' => 'pm', |
158 | 158 | 'NAME' => $this->translator->lang('SEND_PRIVATE_MESSAGE'), |
159 | - 'U_CONTACT' => append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u=' . $row['user_id']), |
|
159 | + 'U_CONTACT' => append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u='.$row['user_id']), |
|
160 | 160 | ); |
161 | 161 | } |
162 | 162 | |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | { |
220 | 220 | if (!function_exists('phpbb_get_banned_user_ids')) |
221 | 221 | { |
222 | - include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); |
|
222 | + include($this->phpbb_root_path.'includes/functions_user.'.$this->php_ext); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | return phpbb_get_banned_user_ids($user_ids, false); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | private function change_user() |
148 | 148 | { |
149 | 149 | $change = false; |
150 | - if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']])) |
|
150 | + if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']])) |
|
151 | 151 | { |
152 | 152 | $this->settings['last_changed'] = time(); |
153 | 153 | $change = true; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | private function get_settings(array $bdata) |
164 | 164 | { |
165 | - $cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']); |
|
165 | + $cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']); |
|
166 | 166 | $settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings']; |
167 | 167 | $settings['hash'] = $bdata['hash']; |
168 | 168 | |
@@ -182,8 +182,8 @@ discard block |
||
182 | 182 | $sql_data = array( |
183 | 183 | 'settings' => json_encode($settings) |
184 | 184 | ); |
185 | - $this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid); |
|
186 | - $this->cache->put('pt_block_data_' . $bid, $this->settings); |
|
185 | + $this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid); |
|
186 | + $this->cache->put('pt_block_data_'.$bid, $this->settings); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
@@ -235,8 +235,8 @@ discard block |
||
235 | 235 | $rotation = $this->settings['rotation']; |
236 | 236 | |
237 | 237 | $this->ptemplate->assign_vars(array( |
238 | - 'QTYPE_EXPLAIN' => ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_' . strtoupper($query_type)) : '', |
|
239 | - 'TITLE_EXPLAIN' => ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation) . '_MEMBER') : '', |
|
238 | + 'QTYPE_EXPLAIN' => ($query_type == 'posts' || $query_type == 'recent') ? $this->translator->lang('QTYPE_'.strtoupper($query_type)) : '', |
|
239 | + 'TITLE_EXPLAIN' => ($rotation != 'pageload') ? $this->translator->lang(strtoupper($rotation).'_MEMBER') : '', |
|
240 | 240 | )); |
241 | 241 | } |
242 | 242 |
@@ -130,8 +130,7 @@ |
||
130 | 130 | if (isset($sort_keys[$this->settings['qtype']])) |
131 | 131 | { |
132 | 132 | return $this->user_data->query($sql_where, $sort_keys[$this->settings['qtype']], 1); |
133 | - } |
|
134 | - else |
|
133 | + } else |
|
135 | 134 | { |
136 | 135 | $user_id = (int) userlist::get_user_id($this->settings, $change_user); |
137 | 136 | $data = $this->user_data->get_users(array($user_id), $sql_where); |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | $this->ptemplate->assign_block_vars('wordgraph', array( |
110 | 110 | 'WORD' => $this->show_word($word, $words_array[$word], $settings['show_word_count']), |
111 | 111 | 'WORD_SIZE' => $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']), |
112 | - 'WORD_COLOR' => $r . $g . $b, |
|
113 | - 'WORD_URL' => append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word)), |
|
112 | + 'WORD_COLOR' => $r.$g.$b, |
|
113 | + 'WORD_URL' => append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word)), |
|
114 | 114 | )); |
115 | 115 | } |
116 | 116 | } |
@@ -187,8 +187,8 @@ discard block |
||
187 | 187 | AND m.word_id = l.word_id |
188 | 188 | AND m.post_id = p.post_id |
189 | 189 | AND t.topic_id = p.topic_id |
190 | - AND t.topic_time <= ' . time() . ' |
|
191 | - AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.') . |
|
190 | + AND t.topic_time <= ' . time().' |
|
191 | + AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.'). |
|
192 | 192 | $sql_where, |
193 | 193 | 'GROUP_BY' => 'l.word_text, l.word_count', |
194 | 194 | 'ORDER_BY' => 'l.word_count DESC' |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | if ($exclude_words) |
206 | 206 | { |
207 | 207 | $exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words)))); |
208 | - $sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : ''; |
|
208 | + $sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : ''; |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | return $sql_where; |
@@ -219,6 +219,6 @@ discard block |
||
219 | 219 | */ |
220 | 220 | private function show_word($word, $count, $show_count) |
221 | 221 | { |
222 | - return censor_text(($show_count) ? $word . '(' . $count . ')' : $word); |
|
222 | + return censor_text(($show_count) ? $word.'('.$count.')' : $word); |
|
223 | 223 | } |
224 | 224 | } |
@@ -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; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | { |
80 | 80 | $sql = "SELECT * |
81 | 81 | FROM $this->items_table |
82 | - WHERE $this->pk = " . (int) $node_id ; |
|
82 | + WHERE $this->pk = ".(int) $node_id; |
|
83 | 83 | $result = $this->db->sql_query($sql); |
84 | 84 | $row = $this->db->sql_fetchrow($result); |
85 | 85 | $this->db->sql_freeresult($result); |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | $this->items_table => 'i' |
109 | 109 | ), |
110 | 110 | 'WHERE' => array( |
111 | - 'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start), |
|
112 | - (($this->sql_where) ? 'i.' . $this->sql_where : ''), |
|
111 | + 'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start), |
|
112 | + (($this->sql_where) ? 'i.'.$this->sql_where : ''), |
|
113 | 113 | ), |
114 | 114 | 'ORDER_BY' => 'i.left_id ASC', |
115 | 115 | ), |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | * @param \phpbb\template\twig\twig $template |
156 | 156 | * @param string $handle |
157 | 157 | */ |
158 | - public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree') |
|
158 | + public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree') |
|
159 | 159 | { |
160 | 160 | $prev_depth = 0; |
161 | 161 | $parental_depth = array(0 => -1); |
@@ -164,10 +164,10 @@ discard block |
||
164 | 164 | for ($i = 0, $size = sizeof($data); $i < $size; $i++) |
165 | 165 | { |
166 | 166 | $row = $data[$i]; |
167 | - $this_depth = $parental_depth[$row['parent_id']] + 1; |
|
168 | - $repeat = abs($prev_depth - $this_depth); |
|
167 | + $this_depth = $parental_depth[$row['parent_id']] + 1; |
|
168 | + $repeat = abs($prev_depth - $this_depth); |
|
169 | 169 | |
170 | - $tpl_data = array( |
|
170 | + $tpl_data = array( |
|
171 | 171 | 'PREV_DEPTH' => $prev_depth, |
172 | 172 | 'THIS_DEPTH' => $this_depth, |
173 | 173 | 'NUM_KIDS' => $this->count_descendants($row), |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | for ($j = 0; $j < $repeat; $j++) |
179 | 179 | { |
180 | - $template->assign_block_vars($handle . '.close', array()); |
|
180 | + $template->assign_block_vars($handle.'.close', array()); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | $prev_depth = $this_depth; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | for ($i = 0; $i < $prev_depth; $i++) |
188 | 188 | { |
189 | - $template->assign_block_vars('close_' . $handle, array()); |
|
189 | + $template->assign_block_vars('close_'.$handle, array()); |
|
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
@@ -225,10 +225,10 @@ discard block |
||
225 | 225 | } |
226 | 226 | |
227 | 227 | $right = $row['right_id']; |
228 | - $title = $padding . '├─ ' . $row[$title_column]; |
|
228 | + $title = $padding.'├─ '.$row[$title_column]; |
|
229 | 229 | $selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : ''; |
230 | 230 | |
231 | - $return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>'; |
|
231 | + $return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>'; |
|
232 | 232 | $return_data[$row[$this->pk]] = $title; |
233 | 233 | } |
234 | 234 |
@@ -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 |
@@ -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 | /** |