@@ -80,10 +80,10 @@ |
||
80 | 80 | foreach ($message_portions as &$message) |
81 | 81 | { |
82 | 82 | // Attempt to translate each portion |
83 | - $translated_message = $translator->lang('EXCEPTION_' . $message); |
|
83 | + $translated_message = $translator->lang('EXCEPTION_'.$message); |
|
84 | 84 | |
85 | 85 | // Check if translating did anything |
86 | - if ($translated_message !== 'EXCEPTION_' . $message) |
|
86 | + if ($translated_message !== 'EXCEPTION_'.$message) |
|
87 | 87 | { |
88 | 88 | // It did, so replace message with the translated version |
89 | 89 | $message = $translated_message; |
@@ -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 = 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)) |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | foreach ($layouts as $name => $path) |
201 | 201 | { |
202 | 202 | $selected = ($path == $pref) ? ' selected="selected"' : ''; |
203 | - $options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>'; |
|
203 | + $options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>'; |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | return $options; |
@@ -214,11 +214,11 @@ discard block |
||
214 | 214 | { |
215 | 215 | $views = array('basic', 'boxed', 'simple'); |
216 | 216 | |
217 | - $options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>'; |
|
217 | + $options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>'; |
|
218 | 218 | foreach ($views as $view) |
219 | 219 | { |
220 | 220 | $selected = ($view == $pref) ? ' selected="selected"' : ''; |
221 | - $options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>'; |
|
221 | + $options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>'; |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | return $options; |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $path = dirname($path); |
261 | 261 | $name = basename($path); |
262 | 262 | |
263 | - $layouts[$name] = $this->phpbb_root_path . $path . '/'; |
|
263 | + $layouts[$name] = $this->phpbb_root_path.$path.'/'; |
|
264 | 264 | } |
265 | 265 | ksort($layouts); |
266 | 266 |
@@ -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 |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | // @codeCoverageIgnoreStart |
23 | 23 | if (!function_exists('make_forum_select')) |
24 | 24 | { |
25 | - include($phpbb_root_path . 'includes/functions_admin.' . $php_ext); |
|
25 | + include($phpbb_root_path.'includes/functions_admin.'.$php_ext); |
|
26 | 26 | } |
27 | 27 | // @codeCoverageIgnoreEnd |
28 | 28 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $forum_options = array('' => 'ALL'); |
44 | 44 | foreach ($forumlist as $row) |
45 | 45 | { |
46 | - $forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name']; |
|
46 | + $forum_options[$row['forum_id']] = $row['padding'].$row['forum_name']; |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | return $forum_options; |
@@ -202,12 +202,12 @@ discard block |
||
202 | 202 | $this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time'; |
203 | 203 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
204 | 204 | 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), |
205 | - 'ON' => 'tt.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id' |
|
205 | + 'ON' => 'tt.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tt.topic_id' |
|
206 | 206 | ); |
207 | 207 | |
208 | 208 | $this->store['sql_array']['LEFT_JOIN'][] = array( |
209 | 209 | 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), |
210 | - 'ON' => 'ft.user_id = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id' |
|
210 | + 'ON' => 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id' |
|
211 | 211 | ); |
212 | 212 | } |
213 | 213 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | { |
227 | 227 | if ($unix_start_time && $unix_stop_time) |
228 | 228 | { |
229 | - $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time"; |
|
229 | + $this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time"; |
|
230 | 230 | } |
231 | 231 | |
232 | 232 | return $this; |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | */ |
259 | 259 | public function set_sorting($sort_key, $sort_dir = 'DESC') |
260 | 260 | { |
261 | - $this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir; |
|
261 | + $this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir; |
|
262 | 262 | |
263 | 263 | return $this; |
264 | 264 | } |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | { |
320 | 320 | if (!empty($column_id)) |
321 | 321 | { |
322 | - $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id; |
|
322 | + $this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id; |
|
323 | 323 | } |
324 | 324 | } |
325 | 325 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | { |
331 | 331 | if ($check_visibility) |
332 | 332 | { |
333 | - $this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time(); |
|
333 | + $this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time(); |
|
334 | 334 | $this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.'); |
335 | 335 | } |
336 | 336 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | { |
142 | 142 | $this->set_display_fields(); |
143 | 143 | |
144 | - $view = 'S_' . strtoupper($this->settings['template']); |
|
144 | + $view = 'S_'.strtoupper($this->settings['template']); |
|
145 | 145 | $post_data = $this->get_post_data($topic_data); |
146 | 146 | $topic_data = array_values($topic_data); |
147 | 147 | |
@@ -189,10 +189,10 @@ discard block |
||
189 | 189 | 'VIEWS' => $row['topic_views'], |
190 | 190 | 'S_UNREAD_TOPIC' => $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']), |
191 | 191 | |
192 | - 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"), |
|
193 | - 'U_VIEWFORUM' => append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"), |
|
194 | - 'U_NEW_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread', |
|
195 | - 'U_LAST_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], |
|
192 | + 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"), |
|
193 | + 'U_VIEWFORUM' => append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"), |
|
194 | + 'U_NEW_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread', |
|
195 | + 'U_LAST_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'], |
|
196 | 196 | )); |
197 | 197 | unset($topic_data[$i], $post_data[$topic_id]); |
198 | 198 | } |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | 'USER_POSTS' => $this->user->data['user_posts'], |
69 | 69 | 'NEW_POSTS' => $this->get_new_posts_count(), |
70 | 70 | |
71 | - 'U_PROFILE' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']), |
|
72 | - 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'), |
|
73 | - 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'), |
|
74 | - 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'), |
|
75 | - 'U_LOGOUT' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
71 | + 'U_PROFILE' => append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']), |
|
72 | + 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'), |
|
73 | + 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'), |
|
74 | + 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'), |
|
75 | + 'U_LOGOUT' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
76 | 76 | 'U_MCP' => $this->get_mcp_url(), |
77 | 77 | 'U_ACP' => $this->get_acp_url(), |
78 | 78 | )); |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function get_mcp_url() |
101 | 101 | { |
102 | - return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : ''; |
|
102 | + return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : ''; |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | protected function get_acp_url() |
109 | 109 | { |
110 | - return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
110 | + return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | POSTS_TABLE => 'p', |
121 | 121 | ), |
122 | 122 | 'WHERE' => array( |
123 | - 't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'], |
|
123 | + 't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'], |
|
124 | 124 | ), |
125 | 125 | ); |
126 | 126 |
@@ -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 |