Completed
Pull Request — master (#26)
by Daniel
13:06 queued 10:06
created
services/util.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 */
106 106
 	public function get_theme_path()
107 107
 	{
108
-		return "{$this->web_path}styles/" . rawurlencode($this->user->style['style_path']) . '/theme';
108
+		return "{$this->web_path}styles/".rawurlencode($this->user->style['style_path']).'/theme';
109 109
 	}
110 110
 
111 111
 	/**
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	protected function set_corrected_paths()
141 141
 	{
142 142
 		// Determine board url - we may need it later
143
-		$board_url = generate_board_url() . '/';
143
+		$board_url = generate_board_url().'/';
144 144
 
145 145
 		$corrected_path = $this->path_helper->get_web_root_path();
146 146
 		$this->web_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? $board_url : $corrected_path;
Please login to merge, or discard this patch.
services/forum/options.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
services/forum/query_builder.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
services/users/data.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
 		if (sizeof($query_ids))
82 82
 		{
83
-			$sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids);
83
+			$sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids);
84 84
 			$this->query($sql_where);
85 85
 		}
86 86
 
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	public function get_profile_fields()
156 156
 	{
157 157
 		$sql = 'SELECT l.lang_name, f.field_ident
158
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
159
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
158
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
159
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
160 160
 				AND f.field_active = 1
161 161
 				AND f.field_no_view = 0
162 162
 				AND f.field_hide = 0
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 		if ($this->user->optionget('viewavatars'))
185 185
 		{
186 186
 			$theme_path = $this->util->get_theme_path();
187
-			$avatar = ($row['avatar']) ? phpbb_get_user_avatar($row, '', true) : '<img src="' . $theme_path . '/images/no_avatar.gif" alt="" />';
187
+			$avatar = ($row['avatar']) ? phpbb_get_user_avatar($row, '', true) : '<img src="'.$theme_path.'/images/no_avatar.gif" alt="" />';
188 188
 		}
189 189
 
190 190
 		return $avatar;
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	protected function get_search_url($user_id)
217 217
 	{
218
-		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&amp;sr=posts") : '';
218
+		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&amp;sr=posts") : '';
219 219
 	}
220 220
 
221 221
 	/**
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	{
227 227
 		if (!function_exists('phpbb_get_user_rank'))
228 228
 		{
229
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
229
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
230 230
 		}
231 231
 
232 232
 		$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
 	protected function get_sql_statement($sql_where = '', $order_by = '')
301 301
 	{
302 302
 		return 'SELECT user_id, username, user_type, user_colour, user_avatar, user_avatar_type, user_avatar_height, user_avatar_width, user_regdate, user_lastvisit, user_birthday, user_posts, user_rank, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason
303
-			FROM ' . USERS_TABLE .
304
-			(($sql_where) ? ' WHERE ' . $sql_where : '') .
305
-			(($order_by) ? ' ORDER BY ' . $order_by : '');
303
+			FROM ' . USERS_TABLE.
304
+			(($sql_where) ? ' WHERE '.$sql_where : '').
305
+			(($order_by) ? ' ORDER BY '.$order_by : '');
306 306
 	}
307 307
 }
Please login to merge, or discard this patch.
services/blocks/cfg_handler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		// @codeCoverageIgnoreStart
64 64
 		if (!function_exists('validate_config_vars'))
65 65
 		{
66
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
66
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
67 67
 		}
68 68
 		// @codeCoverageIgnoreEnd
69 69
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		// @codeCoverageIgnoreStart
86 86
 		if (!function_exists('validate_config_vars'))
87 87
 		{
88
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
88
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
89 89
 		}
90 90
 		// @codeCoverageIgnoreEnd
91 91
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		$vars['append'] = $this->append_field($vars);
174 174
 
175 175
 		$type = explode(':', $vars['type']);
176
-		$method = 'prep_' . $type[0] . '_field_for_display';
176
+		$method = 'prep_'.$type[0].'_field_for_display';
177 177
 
178 178
 		if (is_callable(array($this, $method)))
179 179
 		{
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$l_explain = '';
218 218
 		if (!empty($vars['explain']))
219 219
 		{
220
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
220
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
221 221
 		}
222 222
 
223 223
 		return $l_explain;
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 	{
318 318
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
319 319
 
320
-		$vars['method'] ='build_multi_select';
320
+		$vars['method'] = 'build_multi_select';
321 321
 	}
322 322
 
323 323
 	/**
Please login to merge, or discard this patch.
blocks/forum_topics.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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&amp;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&amp;t=$topic_id&amp;view=unread") . '#unread',
195
-				'U_LAST_POST'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;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&amp;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&amp;t=$topic_id&amp;view=unread").'#unread',
195
+				'U_LAST_POST'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id&amp;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
 		}
Please login to merge, or discard this patch.