Completed
Push — master ( 7c0139...9a411c )
by Daniel
11:04
created
services/groups.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	public function get_users_groups()
36 36
 	{
37 37
 		$sql = 'SELECT group_id
38
-			FROM ' . USER_GROUP_TABLE . '
38
+			FROM ' . USER_GROUP_TABLE.'
39 39
 			WHERE user_id = ' . (int) $this->user->data['user_id'];
40 40
 		$result = $this->db->sql_query($sql);
41 41
 
@@ -78,13 +78,13 @@  discard block
 block discarded – undo
78 78
 		$sql = $this->_get_group_sql($mode);
79 79
 		$result = $this->db->sql_query($sql);
80 80
 
81
-		$options = '<option value="0">' . $this->user->lang('ALL') . '</option>';
81
+		$options = '<option value="0">'.$this->user->lang('ALL').'</option>';
82 82
 		while ($row = $this->db->sql_fetchrow($result))
83 83
 		{
84 84
 			$group_name = $this->_get_group_name($row);
85 85
 			$group_class = $this->_get_group_class($row['group_type']);
86 86
 			$selected_option = $this->_get_selected_option($row['group_id'], $selected);
87
-			$options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>';
87
+			$options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>';
88 88
 		}
89 89
 		$this->db->sql_freeresult($result);
90 90
 
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
98 98
 	private function _get_group_sql($mode)
99 99
 	{
100 100
 		return 'SELECT group_id, group_name, group_type 
101
-			FROM ' . GROUPS_TABLE .
102
-			(($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . '
101
+			FROM ' . GROUPS_TABLE.
102
+			(($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').'
103 103
 			ORDER BY group_type DESC, group_name ASC';
104 104
 	}
105 105
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 */
110 110
 	private function _get_group_name(array $row)
111 111
 	{
112
-		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_' . $row['group_name']) : ucfirst($row['group_name']);
112
+		return ($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang('G_'.$row['group_name']) : ucfirst($row['group_name']);
113 113
 	}
114 114
 
115 115
 	/**
Please login to merge, or discard this patch.
services/blocks/admin_bar.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function set_javascript_data($route, $style_id)
97 97
 	{
98 98
 		$board_url = generate_board_url();
99
-		$ajax_url = $board_url . ((!$this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '');
99
+		$ajax_url = $board_url.((!$this->config['enable_mod_rewrite']) ? '/app.'.$this->php_ext : '');
100 100
 
101 101
 		$is_default_route = $u_default_route = false;
102 102
 		if ($this->config['sitemaker_default_layout'])
103 103
 		{
104 104
 			$is_default_route = ($this->config['sitemaker_default_layout'] === $route) ? true : false;
105
-			$u_default_route .= $board_url . '/' . $this->config['sitemaker_default_layout'];
105
+			$u_default_route .= $board_url.'/'.$this->config['sitemaker_default_layout'];
106 106
 			$u_default_route = reapply_sid($u_default_route);
107 107
 		}
108 108
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			list($controller_service, $controller_method) = explode(':', $controller);
150 150
 			$controller_params	= $symfony_request->attributes->get('_route_params');
151 151
 			$controller_object	= $this->phpbb_container->get($controller_service);
152
-			$controller_class	= get_class($controller_object);
152
+			$controller_class = get_class($controller_object);
153 153
 
154 154
 			$r = new \ReflectionMethod($controller_class, $controller_method);
155 155
 			$class_params = $r->getParameters();
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 				'CONTROLLER_METHOD'	=> $controller_method,
163 163
 				'CONTROLLER_PARAMS'	=> $controller_arguments,
164 164
 				'S_IS_STARTPAGE'	=> $this->is_startpage($controller_service, $controller_arguments),
165
-				'UA_EXTENSION'		=> $namespace . '/' . $extension,
165
+				'UA_EXTENSION'		=> $namespace.'/'.$extension,
166 166
 			));
167 167
 		}
168 168
 	}
@@ -197,11 +197,11 @@  discard block
 block discarded – undo
197 197
 	{
198 198
 		$routes_ary = $this->get_routes();
199 199
 
200
-		$options = '<option value="">' . $this->user->lang('SELECT') . '</option>';
200
+		$options = '<option value="">'.$this->user->lang('SELECT').'</option>';
201 201
 		foreach ($routes_ary as $route)
202 202
 		{
203 203
 			$selected = ($route == $current_route) ? ' selected="selected"' : '';
204
-			$options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>';
204
+			$options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>';
205 205
 		}
206 206
 
207 207
 		return $options;
@@ -215,10 +215,10 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function get_excluded_position_options(array $ex_positions)
217 217
 	{
218
-		$options = '<option value=""' . ((!sizeof($ex_positions)) ? ' selected="selected"' : '') . '>' . $this->user->lang('NONE') . '</option>';
218
+		$options = '<option value=""'.((!sizeof($ex_positions)) ? ' selected="selected"' : '').'>'.$this->user->lang('NONE').'</option>';
219 219
 		foreach ($ex_positions as $position)
220 220
 		{
221
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
221
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
222 222
 		}
223 223
 
224 224
 		return $options;
Please login to merge, or discard this patch.
exception/base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,10 +100,10 @@
 block discarded – undo
100 100
 		foreach ($message_portions as &$message)
101 101
 		{
102 102
 			// Attempt to translate each portion
103
-			$translated_message = $user->lang('EXCEPTION_' . $message);
103
+			$translated_message = $user->lang('EXCEPTION_'.$message);
104 104
 
105 105
 			// Check if translating did anything
106
-			if ($translated_message !== 'EXCEPTION_' . $message)
106
+			if ($translated_message !== 'EXCEPTION_'.$message)
107 107
 			{
108 108
 				// It did, so replace message with the translated version
109 109
 				$message = $translated_message;
Please login to merge, or discard this patch.
blocks/forum_topics.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	{
140 140
 		$this->set_display_fields();
141 141
 
142
-		$view = 'S_' . strtoupper($this->settings['template']);
142
+		$view = 'S_'.strtoupper($this->settings['template']);
143 143
 		$post_data = $this->get_post_data($topic_data);
144 144
 		$topic_data = array_values($topic_data);
145 145
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	{
165 165
 		for ($i = 0, $size = sizeof($topic_data); $i < $size; $i++)
166 166
 		{
167
-			$row =& $topic_data[$i];
167
+			$row = & $topic_data[$i];
168 168
 			$forum_id = $row['forum_id'];
169 169
 			$topic_id = $row['topic_id'];
170 170
 
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 				'VIEWS'				=> $row['topic_views'],
180 180
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
181 181
 
182
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
183
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
182
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
183
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
184 184
 			);
185 185
 
186 186
 			$this->ptemplate->assign_block_vars('topicrow', $tpl_ary);
Please login to merge, or discard this patch.
blocks/stats.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@
 block discarded – undo
46 46
 	public function display(array $settings, $edit_mode = false)
47 47
 	{
48 48
 		$content = '';
49
-		$content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />';
50
-		$content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />';
51
-		$content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />';
49
+		$content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />';
50
+		$content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />';
51
+		$content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />';
52 52
 		$content .= $this->user->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour']));
53 53
 
54 54
 		return array(
Please login to merge, or discard this patch.
controller/forum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,11 +59,11 @@
 block discarded – undo
59 59
 		 * to fix relative paths for forum images
60 60
 		 */
61 61
 		global $phpbb_root_path;
62
-		$phpbb_root_path = generate_board_url() . '/';
62
+		$phpbb_root_path = generate_board_url().'/';
63 63
 
64 64
 		if (!function_exists('display_forums'))
65 65
 		{
66
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); // @codeCoverageIgnore
66
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); // @codeCoverageIgnore
67 67
 		}
68 68
 
69 69
 		display_forums('', $this->config['load_moderators']);
Please login to merge, or discard this patch.
blocks/featured_member.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 			'WHERE'		=> $this->db->sql_in_set('u.user_type', array(USER_NORMAL, USER_FOUNDER)),
147 147
 		);
148 148
 
149
-		$method = 'query_' . $this->settings['qtype'];
149
+		$method = 'query_'.$this->settings['qtype'];
150 150
 
151 151
 		if (is_callable(array($this, $method)))
152 152
 		{
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 */
172 172
 	private function query_featured(array &$sql_array, $change_user)
173 173
 	{
174
-		$sql_array['WHERE'] .= ' AND user_id = ' . userlist::get_user_id($this->settings, $change_user);
174
+		$sql_array['WHERE'] .= ' AND user_id = '.userlist::get_user_id($this->settings, $change_user);
175 175
 	}
176 176
 
177 177
 	/**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	 */
180 180
 	private function query_recent(array &$sql_array)
181 181
 	{
182
-		$sql_array['WHERE'] = 'user_id = ' . (int) $this->config['newest_user_id'];
182
+		$sql_array['WHERE'] = 'user_id = '.(int) $this->config['newest_user_id'];
183 183
 	}
184 184
 
185 185
 	/**
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	private function change_user()
207 207
 	{
208 208
 		$change = false;
209
-		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 ' . self::$rotations[$this->settings['rotation']]))
209
+		if ($this->settings['rotation'] == 'pageload' || $this->settings['last_changed'] < strtotime('-1 '.self::$rotations[$this->settings['rotation']]))
210 210
 		{
211 211
 			$this->settings['last_changed'] = time();
212 212
 			$change = true;
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 		$rotation = $this->settings['rotation'];
224 224
 
225 225
 		$this->ptemplate->assign_vars(array(
226
-			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_' . strtoupper($query_type)) : '',
227
-			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation) . '_MEMBER') : '',
226
+			'QTYPE_EXPLAIN'		=> ($query_type == 'posts' || $query_type == 'recent') ? $this->user->lang('QTYPE_'.strtoupper($query_type)) : '',
227
+			'TITLE_EXPLAIN'		=> ($rotation != 'pageload') ? $this->user->lang(strtoupper($rotation).'_MEMBER') : '',
228 228
 		));
229 229
 	}
230 230
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 */
235 235
 	private function get_settings(array $bdata)
236 236
 	{
237
-		$cached_settings = $this->cache->get('pt_block_data_' . $bdata['bid']);
237
+		$cached_settings = $this->cache->get('pt_block_data_'.$bdata['bid']);
238 238
 		$settings = ($cached_settings && $cached_settings['hash'] === $bdata['hash']) ? $cached_settings : $bdata['settings'];
239 239
 		$settings['hash'] = $bdata['hash'];
240 240
 
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 			$sql_data = array(
255 255
 				'settings'	=> json_encode($settings)
256 256
 			);
257
-			$this->db->sql_query('UPDATE ' . $this->blocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE bid = ' . (int) $bid);
258
-			$this->cache->put('pt_block_data_' . $bid, $this->settings);
257
+			$this->db->sql_query('UPDATE '.$this->blocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE bid = '.(int) $bid);
258
+			$this->cache->put('pt_block_data_'.$bid, $this->settings);
259 259
 		}
260 260
 	}
261 261
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 			'RANK_TITLE'		=> $rank['title'],
309 309
 			'RANK_IMG'			=> $rank['img'],
310 310
 			'U_PROFILE'			=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
311
-			'U_SEARCH_USER'		=> append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, "author_id={$row['user_id']}&amp;sr=posts"),
311
+			'U_SEARCH_USER'		=> append_sid($this->phpbb_root_path.'search.'.$this->php_ext, "author_id={$row['user_id']}&amp;sr=posts"),
312 312
 		));
313 313
 
314 314
 		return $tpl_data;
Please login to merge, or discard this patch.
services/menus/display.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @param string $handle
71 71
 	 * @return void
72 72
 	 */
73
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
73
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
74 74
 	{
75 75
 		$this->prepare_items($data);
76 76
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
 				$row['num_kids'] = $this->count_descendants($row);
85 85
 
86 86
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
87
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
87
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
88 88
 			}
89 89
 
90
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
90
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
91 91
 		}
92 92
 	}
93 93
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			}
127 127
 
128 128
 			$is_current_item = $this->is_current_item($row);
129
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
129
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
130 130
 			$leaf = $this->get_leaf_node($row, $is_current_item);
131 131
 
132 132
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	 */
156 156
 	protected function set_current_item(array $data)
157 157
 	{
158
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
159
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
158
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
159
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
160 160
 		$curr_parts = explode('&', $this->user->page['query_string']);
161 161
 
162 162
 		$data = array_values($data);
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @param int $repeat
240 240
 	 * @return void
241 241
 	 */
242
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
242
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
243 243
 	{
244 244
 		for ($i = 0; $i < $repeat; $i++)
245 245
 		{
Please login to merge, or discard this patch.
services/menus/menu_block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@
 block discarded – undo
124 124
 	{
125 125
 		$row['is_navigable'] = $this->is_navigable($row);
126 126
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
127
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
127
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
128 128
 	}
129 129
 
130 130
 	/**
Please login to merge, or discard this patch.