Completed
Pull Request — master (#26)
by Daniel
16:40 queued 13:36
created
services/blocks/display.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	protected function toggle_edit_mode()
143 143
 	{
144
-		$edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
144
+		$edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
145 145
 
146 146
 		if ($this->request->is_set('edit_mode'))
147 147
 		{
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 				);
199 199
 			}
200 200
 
201
-			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
201
+			$u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode);
202 202
 		}
203 203
 		else
204 204
 		{
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
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		if (!function_exists('build_cfg_template'))
64 64
 		{
65
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); // @codeCoverageIgnore
65
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); // @codeCoverageIgnore
66 66
 		}
67 67
 
68 68
 		// We fake this class as it is needed by the build_cfg_template function
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 		// @codeCoverageIgnoreStart
84 84
 		if (!function_exists('validate_config_vars'))
85 85
 		{
86
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
86
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
87 87
 		}
88 88
 		// @codeCoverageIgnoreEnd
89 89
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		$vars['append'] = $this->append_field($vars);
172 172
 
173 173
 		$type = explode(':', $vars['type']);
174
-		$method = 'prep_' . $type[0] . '_field_for_display';
174
+		$method = 'prep_'.$type[0].'_field_for_display';
175 175
 
176 176
 		if (is_callable(array($this, $method)))
177 177
 		{
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		$l_explain = '';
216 216
 		if (!empty($vars['explain']))
217 217
 		{
218
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
218
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
219 219
 		}
220 220
 
221 221
 		return $l_explain;
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 	{
316 316
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
317 317
 
318
-		$vars['method'] ='build_multi_select';
318
+		$vars['method'] = 'build_multi_select';
319 319
 	}
320 320
 
321 321
 	/**
Please login to merge, or discard this patch.
services/auto_lang.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 			$default_lang_files = $finder
65 65
 				->prefix($lang_file)
66 66
 				->suffix(".$this->php_ext")
67
-				->extension_directory('/language/' . basename($this->config['default_lang']))
68
-				->core_path('language/' . basename($this->config['default_lang']) . '/')
67
+				->extension_directory('/language/'.basename($this->config['default_lang']))
68
+				->core_path('language/'.basename($this->config['default_lang']).'/')
69 69
 				->find();
70 70
 		}
71 71
 
@@ -84,8 +84,8 @@  discard block
 block discarded – undo
84 84
 		$user_lang_files = $finder
85 85
 			->prefix($lang_file)
86 86
 			->suffix(".$this->php_ext")
87
-			->extension_directory('/language/' . $this->user->lang_name)
88
-			->core_path('language/' . $this->user->lang_name . '/')
87
+			->extension_directory('/language/'.$this->user->lang_name)
88
+			->core_path('language/'.$this->user->lang_name.'/')
89 89
 			->find();
90 90
 
91 91
 		$lang_files = array_unique(array_merge($user_lang_files, $english_lang_files, $default_lang_files));
Please login to merge, or discard this patch.
services/menus/action/add_menu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 
21 21
 		/** @type \blitze\sitemaker\model\menus\entity\menu $entity */
22 22
 		$entity = $menu_mapper->create_entity(array(
23
-			'menu_name' => $this->translator->lang('MENU') . '-' . mt_rand(1000, 9999),
23
+			'menu_name' => $this->translator->lang('MENU').'-'.mt_rand(1000, 9999),
24 24
 		));
25 25
 
26 26
 		$entity = $menu_mapper->save($entity);
Please login to merge, or discard this patch.
services/menus/action_handler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 */
47 47
 	public function create($action)
48 48
 	{
49
-		$action_class = 'blitze\\sitemaker\\services\\menus\\action\\' . $action;
49
+		$action_class = 'blitze\\sitemaker\\services\\menus\\action\\'.$action;
50 50
 
51 51
 		if (!class_exists($action_class))
52 52
 		{
Please login to merge, or discard this patch.
services/forum/attachments.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -77,10 +77,10 @@
 block discarded – undo
77 77
 	protected function get_attachment_sql(array $attach_ids, array $allowed_extensions, $exclude_in_message, $order_by)
78 78
 	{
79 79
 		return 'SELECT *
80
-			FROM ' . ATTACHMENTS_TABLE . '
81
-			WHERE ' . $this->db->sql_in_set('post_msg_id', $attach_ids) .
82
-				(($exclude_in_message) ? ' AND in_message = 0' : '') .
83
-				(sizeof($allowed_extensions) ? ' AND ' . $this->db->sql_in_set('extension', $allowed_extensions) : '') . '
80
+			FROM ' . ATTACHMENTS_TABLE.'
81
+			WHERE ' . $this->db->sql_in_set('post_msg_id', $attach_ids).
82
+				(($exclude_in_message) ? ' AND in_message = 0' : '').
83
+				(sizeof($allowed_extensions) ? ' AND '.$this->db->sql_in_set('extension', $allowed_extensions) : '').'
84 84
 			ORDER BY ' . $order_by;
85 85
 	}
86 86
 }
Please login to merge, or discard this patch.
services/forum/manager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 
55 55
 		if (!class_exists('acp_forums'))
56 56
 		{
57
-			include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext);
57
+			include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext);
58 58
 		}
59 59
 
60 60
 		$translator->add_lang('acp/forums');
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); // @codeCoverageIgnore
25
+			include($phpbb_root_path.'includes/functions_admin.'.$php_ext); // @codeCoverageIgnore
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 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -191,7 +191,7 @@
 block discarded – undo
191 191
 
192 192
 		return $this;
193 193
 	}
194
-	*/
194
+	 */
195 195
 
196 196
 	/**
197 197
 	 * Fetch Topic Tracking Info
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 		if (in_array($topic_type, array(POST_STICKY, POST_ANNOUNCE)))
144 144
 		{
145
-			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < ' . time() . ')';
145
+			$this->store['sql_array']['WHERE'][] = '(t.topic_time_limit > 0 AND (t.topic_time + t.topic_time_limit) < '.time().')';
146 146
 		}
147 147
 
148 148
 		return $this;
@@ -207,12 +207,12 @@  discard block
 block discarded – undo
207 207
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
208 208
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
209 209
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
210
-				'ON'	=> 'tt.user_id = ' . $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
210
+				'ON'	=> 'tt.user_id = '.$this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
211 211
 			);
212 212
 
213 213
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
214 214
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
215
-				'ON'	=> 'ft.user_id = ' . $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
215
+				'ON'	=> 'ft.user_id = '.$this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
216 216
 			);
217 217
 		}
218 218
 
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	{
232 232
 		if ($unix_start_time && $unix_stop_time)
233 233
 		{
234
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
234
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
235 235
 		}
236 236
 
237 237
 		return $this;
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
 	 */
264 264
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
265 265
 	{
266
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
266
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
267 267
 
268 268
 		return $this;
269 269
 	}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	{
325 325
 		if (!empty($column_id))
326 326
 		{
327
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
327
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
328 328
 		}
329 329
 	}
330 330
 
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 	{
336 336
 		if ($check_visibility)
337 337
 		{
338
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
338
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
339 339
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
340 340
 		}
341 341
 	}
Please login to merge, or discard this patch.