Completed
Pull Request — master (#26)
by Daniel
14:36 queued 12:14
created
services/groups.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	public function get_users_groups()
41 41
 	{
42 42
 		$sql = 'SELECT group_id
43
-			FROM ' . USER_GROUP_TABLE . '
43
+			FROM ' . USER_GROUP_TABLE.'
44 44
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
45 45
 		$result = $this->db->sql_query($sql);
46 46
 
@@ -83,13 +83,13 @@  discard block
 block discarded – undo
83 83
 		$sql = $this->_get_group_sql($mode);
84 84
 		$result = $this->db->sql_query($sql);
85 85
 
86
-		$options = '<option value="0">' . $this->translator->lang('ALL_GROUPS') . '</option>';
86
+		$options = '<option value="0">'.$this->translator->lang('ALL_GROUPS').'</option>';
87 87
 		while ($row = $this->db->sql_fetchrow($result))
88 88
 		{
89 89
 			$group_name = $this->_get_group_name($row);
90 90
 			$group_class = $this->_get_group_class($row['group_type']);
91 91
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
92
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
92
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
93 93
 		}
94 94
 		$this->db->sql_freeresult($result);
95 95
 
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	private function _get_group_sql($mode)
104 104
 	{
105 105
 		return 'SELECT group_id, group_name, group_type
106
-			FROM ' . GROUPS_TABLE .
107
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
106
+			FROM ' . GROUPS_TABLE.
107
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
108 108
 			ORDER BY group_type DESC, group_name ASC';
109 109
 	}
110 110
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	private function _get_group_name(array $row)
116 116
 	{
117
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
117
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
118 118
 	}
119 119
 
120 120
 	/**
Please login to merge, or discard this patch.
services/members.php 1 patch
Spacing   +9 added lines, -9 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('phpbb_get_user_avatar'))
65 65
 		{
66
-			include($phpbb_root_path . 'includes/functions_display.' . $php_ext);
66
+			include($phpbb_root_path.'includes/functions_display.'.$php_ext);
67 67
 		}
68 68
 		// @codeCoverageIgnoreEnd
69 69
 	}
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	protected function member_posts(array $row)
103 103
 	{
104
-		$u_posts = append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&amp;sr=posts" . $this->explain_range);
105
-		$user_posts = '<a href="' . $u_posts . '">' . $row['user_posts'] . '</a>';
104
+		$u_posts = append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&amp;sr=posts".$this->explain_range);
105
+		$user_posts = '<a href="'.$u_posts.'">'.$row['user_posts'].'</a>';
106 106
 
107 107
 		return array(
108 108
 			'USERNAME'		=> get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			'WHERE'			=> $this->db->sql_in_set('u.user_type', array(USER_NORMAL, USER_FOUNDER)),
171 171
 		);
172 172
 
173
-		$sql_method = 'set_' . $this->settings['query_type'] . '_sql';
173
+		$sql_method = 'set_'.$this->settings['query_type'].'_sql';
174 174
 		call_user_func_array(array($this, $sql_method), array(&$sql_ary));
175 175
 
176 176
 		$this->set_range_sql($sql_ary);
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	protected function set_visits_sql(array &$sql_ary)
185 185
 	{
186 186
 		$sql_ary['SELECT'] .= ', u.user_lastvisit as member_date';
187
-		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> ' . (int) $this->user->data['user_id'];
187
+		$sql_ary['WHERE'] .= ' AND u.user_lastvisit <> 0 AND u.user_id <> '.(int) $this->user->data['user_id'];
188 188
 		$sql_ary['ORDER_BY'] = 'u.user_lastvisit DESC';
189 189
 
190 190
 		$this->sql_date_field = 'user_lastvisit';
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 		$this->info_header = '';
201 201
 		$this->view_mode = 'member_bots';
202 202
 
203
-		$sql_ary['WHERE'] = 'u.user_type = ' . USER_IGNORE;
203
+		$sql_ary['WHERE'] = 'u.user_type = '.USER_IGNORE;
204 204
 	}
205 205
 
206 206
 	/**
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 	protected function set_tenured_sql(array &$sql_ary)
210 210
 	{
211 211
 		$sql_ary['SELECT'] .= ', u.user_regdate as member_date';
212
-		$sql_ary['ORDER_BY'] = 'u.user_regdate ' . (($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
212
+		$sql_ary['ORDER_BY'] = 'u.user_regdate '.(($this->settings['query_type'] == 'tenured') ? 'ASC' : 'DESC');
213 213
 
214 214
 		$this->sql_date_field = 'u.user_regdate';
215 215
 		$this->settings['date_range'] = '';
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 		$sql_ary['SELECT'] .= ', COUNT(p.post_id) as user_posts';
233 233
 		$sql_ary['FROM'] += array(TOPICS_TABLE => 't');
234 234
 		$sql_ary['FROM'] += array(POSTS_TABLE => 'p');
235
-		$sql_ary['WHERE'] .= ' AND ' . time() . ' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = ' . ITEM_APPROVED . ' AND p.poster_id = u.user_id';
235
+		$sql_ary['WHERE'] .= ' AND '.time().' > t.topic_time AND t.topic_id = p.topic_id AND p.post_visibility = '.ITEM_APPROVED.' AND p.poster_id = u.user_id';
236 236
 		$sql_ary['GROUP_BY'] = 'u.user_id';
237 237
 		$sql_ary['ORDER_BY'] = 'user_posts DESC, u.username ASC';
238 238
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 		if ($this->settings['date_range'] && $this->sql_date_field)
250 250
 		{
251 251
 			$range = $this->date_range->get($this->settings['date_range']);
252
-			$this->explain_range = '&amp;date=' . $range['date'];
252
+			$this->explain_range = '&amp;date='.$range['date'];
253 253
 
254 254
 			$sql_ary['WHERE'] .= " AND {$this->sql_date_field} BETWEEN {$range['start']} AND {$range['stop']}";
255 255
 		}
Please login to merge, or discard this patch.
services/blocks/action/add_block.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@
 block discarded – undo
17 17
 	 */
18 18
 	public function execute($style_id)
19 19
 	{
20
-		$name	= $this->request->variable('block', '');
21
-		$route	= $this->request->variable('route', '');
20
+		$name = $this->request->variable('block', '');
21
+		$route = $this->request->variable('route', '');
22 22
 
23 23
 		if (($block_instance = $this->block_factory->get_block($name)) === null)
24 24
 		{
Please login to merge, or discard this patch.
services/blocks/display.php 1 patch
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.
services/url_checker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 		$status = array();
27 27
 		$headers = $this->get_headers($url, $curl);
28 28
 
29
-		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers , $status);
29
+		preg_match('/HTTP\/.* ([0-9]+) .*/', $headers, $status);
30 30
 
31 31
 		return ($status[1] == 200) ? true : false;
32 32
 	}
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/data.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 			$this->store['topic'][$row['topic_id']] = $row;
90 90
 
91 91
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
92
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
92
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
93 93
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
94 94
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
95 95
 			$this->store['poster_ids'][] = $row['topic_poster'];
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.