Completed
Pull Request — master (#26)
by Daniel
11:49 queued 09:28
created
services/blocks/display.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		{
72 72
 			$edit_mode = $this->toggle_edit_mode();
73 73
 			$style_id = $this->get_style_id();
74
-			$current_route = ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
74
+			$current_route = ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
75 75
 
76 76
 			$this->show_sitemaker($current_route, $this->user->page['page_dir'], $style_id, $edit_mode);
77 77
 		}
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	protected function toggle_edit_mode()
109 109
 	{
110
-		$edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
110
+		$edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
111 111
 
112 112
 		if ($this->request->is_set('edit_mode'))
113 113
 		{
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 				);
164 164
 			}
165 165
 
166
-			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
166
+			$u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode);
167 167
 		}
168 168
 		else
169 169
 		{
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -86,8 +86,7 @@  discard block
 block discarded – undo
86 86
 		if ($this->request->is_set('style'))
87 87
 		{
88 88
 			return $this->request->variable('style', 0);
89
-		}
90
-		else
89
+		} else
91 90
 		{
92 91
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
93 92
 		}
@@ -131,8 +130,7 @@  discard block
 block discarded – undo
131 130
 				self::SHOW_ON_PARENT_ROUTE_ONLY	=> true,
132 131
 				self::SHOW_ON_CHILD_ROUTE_ONLY	=> false,
133 132
 			);
134
-		}
135
-		else
133
+		} else
136 134
 		{
137 135
 			$modes = array(
138 136
 				self::SHOW_ON_ALL_ROUTES		=> true,
@@ -164,8 +162,7 @@  discard block
 block discarded – undo
164 162
 			}
165 163
 
166 164
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
167
-		}
168
-		else
165
+		} else
169 166
 		{
170 167
 			$edit_mode = false;
171 168
 		}
Please login to merge, or discard this patch.
services/users/data.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 
84 84
 		if (sizeof($query_ids))
85 85
 		{
86
-			$sql_where .= (($sql_where) ? ' AND ' : '') . $this->db->sql_in_set('user_id', $query_ids);
86
+			$sql_where .= (($sql_where) ? ' AND ' : '').$this->db->sql_in_set('user_id', $query_ids);
87 87
 			$this->query($sql_where);
88 88
 		}
89 89
 
@@ -160,8 +160,8 @@  discard block
 block discarded – undo
160 160
 	public function get_profile_fields()
161 161
 	{
162 162
 		$sql = 'SELECT l.lang_name, f.field_ident
163
-			FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f
164
-			WHERE l.lang_id = ' . $this->user->get_iso_lang_id() . '
163
+			FROM ' . PROFILE_LANG_TABLE.' l, '.PROFILE_FIELDS_TABLE.' f
164
+			WHERE l.lang_id = ' . $this->user->get_iso_lang_id().'
165 165
 				AND f.field_active = 1
166 166
 				AND f.field_no_view = 0
167 167
 				AND f.field_hide = 0
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 	 */
220 220
 	protected function get_search_url($user_id)
221 221
 	{
222
-		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id=$user_id&sr=posts") : '';
222
+		return ($this->auth->acl_get('u_search')) ? append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id=$user_id&sr=posts") : '';
223 223
 	}
224 224
 
225 225
 	/**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	{
231 231
 		if (!function_exists('phpbb_get_user_rank'))
232 232
 		{
233
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
233
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
234 234
 		}
235 235
 
236 236
 		$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
 	protected function get_sql_statement($sql_where = '', $order_by = '')
305 305
 	{
306 306
 		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_email, user_allow_viewemail, user_allow_pm, user_jabber, user_inactive_reason
307
-			FROM ' . USERS_TABLE .
308
-			(($sql_where) ? ' WHERE ' . $sql_where : '') .
309
-			(($order_by) ? ' ORDER BY ' . $order_by : '');
307
+			FROM ' . USERS_TABLE.
308
+			(($sql_where) ? ' WHERE '.$sql_where : '').
309
+			(($order_by) ? ' ORDER BY '.$order_by : '');
310 310
 	}
311 311
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -288,8 +288,7 @@
 block discarded – undo
288 288
 					'NAME'		=> $field_data['PROFILE_FIELD_NAME'],
289 289
 					'U_CONTACT'	=> $field_data['PROFILE_FIELD_CONTACT'],
290 290
 				);
291
-			}
292
-			else
291
+			} else
293 292
 			{
294 293
 				$this->user_cache[$user_id]['profile_fields'][$field] = $field_data;
295 294
 			}
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_FORUMS');
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/manager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
 	{
65 65
 		if (!class_exists('acp_forums'))
66 66
 		{
67
-			include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext);
67
+			include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext);
68 68
 		}
69 69
 
70 70
 		$this->translator->add_lang('acp/forums');
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\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.