Completed
Pull Request — master (#26)
by Daniel
13:06 queued 10:06
created
exception/base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,10 +80,10 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
acp/settings_module.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
model/blocks/entity/block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
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/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.