Completed
Push — master ( e581ca...436d2e )
by Daniel
08:58
created
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.
model/mapper_factory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@
 block discarded – undo
39 39
 	 */
40 40
 	public function create($type, $mapper = '')
41 41
 	{
42
-		$mapper_class = 'blitze\\sitemaker\\model\\' . $type . '\\mapper\\' . $mapper;
43
-		$collection = 'blitze\\sitemaker\\model\\' . $type . '\\collections\\' . $mapper;
42
+		$mapper_class = 'blitze\\sitemaker\\model\\'.$type.'\\mapper\\'.$mapper;
43
+		$collection = 'blitze\\sitemaker\\model\\'.$type.'\\collections\\'.$mapper;
44 44
 
45 45
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$mapper], $this->config);
46 46
 	}
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
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	{
22 22
 		if (!function_exists('make_forum_select'))
23 23
 		{
24
-			include($phpbb_root_path . 'includes/functions_admin.' . $php_ext); // @codeCoverageIgnore
24
+			include($phpbb_root_path.'includes/functions_admin.'.$php_ext); // @codeCoverageIgnore
25 25
 		}
26 26
 	}
27 27
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 		$forum_options = array('' => 'ALL');
42 42
 		foreach ($forumlist as $row)
43 43
 		{
44
-			$forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name'];
44
+			$forum_options[$row['forum_id']] = $row['padding'].$row['forum_name'];
45 45
 		}
46 46
 
47 47
 		return $forum_options;
Please login to merge, or discard this patch.
services/forum/query_builder.php 1 patch
Spacing   +10 added lines, -10 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;
@@ -160,13 +160,13 @@  discard block
 block discarded – undo
160 160
 			$this->store['sql_array']['SELECT'][] = 'tw.notify_status';
161 161
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
162 162
 				'FROM'	=> array(TOPICS_WATCH_TABLE => 'tw'),
163
-				'ON'	=> 'tw.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tw.topic_id'
163
+				'ON'	=> 'tw.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tw.topic_id'
164 164
 			);
165 165
 
166 166
 			$this->store['sql_array']['SELECT'][] = 'fw.notify_status';
167 167
 			$this->store['sql_array']['LEFT JOIN'][] = array(
168 168
 				'FROM'	=> array(FORUMS_WATCH_TABLE => 'fw'),
169
-				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = ' . (int) $this->user->data['user_id'] . ')',
169
+				'ON'	=> '(fw.forum_id = f.forum_id AND fw.user_id = '.(int) $this->user->data['user_id'].')',
170 170
 			);
171 171
 		}
172 172
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 			$this->store['sql_array']['SELECT'][] = 'bm.topic_id as bookmarked';
186 186
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
187 187
 				'FROM'	=> array(BOOKMARKS_TABLE => 'bm'),
188
-				'ON'	=> 'bm.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = bm.topic_id'
188
+				'ON'	=> 'bm.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = bm.topic_id'
189 189
 			);
190 190
 		}
191 191
 
@@ -206,12 +206,12 @@  discard block
 block discarded – undo
206 206
 			$this->store['sql_array']['SELECT'][] = 'tt.mark_time, ft.mark_time as forum_mark_time';
207 207
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
208 208
 				'FROM'	=> array(TOPICS_TRACK_TABLE => 'tt'),
209
-				'ON'	=> 'tt.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.topic_id = tt.topic_id'
209
+				'ON'	=> 'tt.user_id = '.(int) $this->user->data['user_id'].' AND t.topic_id = tt.topic_id'
210 210
 			);
211 211
 
212 212
 			$this->store['sql_array']['LEFT_JOIN'][] = array(
213 213
 				'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
214
-				'ON'	=> 'ft.user_id = ' . (int) $this->user->data['user_id'] . ' AND t.forum_id = ft.forum_id'
214
+				'ON'	=> 'ft.user_id = '.(int) $this->user->data['user_id'].' AND t.forum_id = ft.forum_id'
215 215
 			);
216 216
 		}
217 217
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	{
231 231
 		if ($unix_start_time && $unix_stop_time)
232 232
 		{
233
-			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time') . " BETWEEN $unix_start_time AND $unix_stop_time";
233
+			$this->store['sql_array']['WHERE'][] = (($mode == 'topic') ? 't.topic_time' : 'p.post_time')." BETWEEN $unix_start_time AND $unix_stop_time";
234 234
 		}
235 235
 
236 236
 		return $this;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public function set_sorting($sort_key, $sort_dir = 'DESC')
264 264
 	{
265
-		$this->store['sql_array']['ORDER_BY'] = $sort_key . ' ' . $sort_dir;
265
+		$this->store['sql_array']['ORDER_BY'] = $sort_key.' '.$sort_dir;
266 266
 
267 267
 		return $this;
268 268
 	}
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 	{
324 324
 		if (!empty($column_id))
325 325
 		{
326
-			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column . ' = ' . (int) $column_id;
326
+			$this->store['sql_array']['WHERE'][] = (is_array($column_id)) ? $this->db->sql_in_set($column, $column_id) : $column.' = '.(int) $column_id;
327 327
 		}
328 328
 	}
329 329
 
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 	{
335 335
 		if ($check_visibility)
336 336
 		{
337
-			$this->store['sql_array']['WHERE'][] = 't.topic_time <= ' . time();
337
+			$this->store['sql_array']['WHERE'][] = 't.topic_time <= '.time();
338 338
 			$this->store['sql_array']['WHERE'][] = $this->content_visibility->get_global_visibility_sql('topic', $this->ex_fid_ary, 't.');
339 339
 		}
340 340
 	}
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->user->add_lang('acp/forums');
Please login to merge, or discard this patch.
services/poll.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 * @param array $topic_data
64 64
 	 * @param \phpbb\template\twig\twig $template
65 65
 	 */
66
-	public function build(array $topic_data, \phpbb\template\twig\twig &$template)
66
+	public function build(array $topic_data, \phpbb\template\twig\twig & $template)
67 67
 	{
68 68
 		$this->user->add_lang('viewtopic');
69 69
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 			'S_POLL_ACTION'		=> $viewtopic_url,
96 96
 			'S_FORM_TOKEN'		=> $this->sitemaker->get_form_key('posting'),
97 97
 
98
-			'U_VIEW_RESULTS'	=> $viewtopic_url . '&amp;view=viewpoll',
98
+			'U_VIEW_RESULTS'	=> $viewtopic_url.'&amp;view=viewpoll',
99 99
 		));
100 100
 	}
101 101
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		$post_id = (int) $topic_data['topic_first_post_id'];
128 128
 
129 129
 		$sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid
130
-			FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p
130
+			FROM ' . POLL_OPTIONS_TABLE.' o, '.POSTS_TABLE." p
131 131
 			WHERE o.topic_id = $topic_id
132 132
 				AND p.post_id = $post_id
133 133
 				AND p.topic_id = o.topic_id
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	 * @param int $poll_most
173 173
 	 * @param \phpbb\template\twig\twig $template
174 174
 	 */
175
-	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig &$template)
175
+	private function _build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig & $template)
176 176
 	{
177 177
 		foreach ($poll_info as $poll_option)
178 178
 		{
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 		if ($this->user->data['is_registered'])
204 204
 		{
205 205
 			$sql = 'SELECT poll_option_id
206
-			FROM ' . POLL_VOTES_TABLE . '
207
-			WHERE topic_id = ' . (int) $topic_id . '
206
+			FROM ' . POLL_VOTES_TABLE.'
207
+			WHERE topic_id = ' . (int) $topic_id.'
208 208
 				AND vote_user_id = ' . (int) $this->user->data['user_id'];
209 209
 			$result = $this->db->sql_query($sql);
210 210
 
@@ -219,9 +219,9 @@  discard block
 block discarded – undo
219 219
 			// Cookie based guest tracking ... I don't like this but hum ho
220 220
 			// it's oft requested. This relies on "nice" users who don't feel
221 221
 			// the need to delete cookies to mess with results.
222
-			if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE))
222
+			if ($this->request->is_set($this->config['cookie_name'].'_poll_'.$topic_id, \phpbb\request\request_interface::COOKIE))
223 223
 			{
224
-				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE));
224
+				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'].'_poll_'.$topic_id, '', true, \phpbb\request\request_interface::COOKIE));
225 225
 				$cur_voted_id = array_map('intval', $cur_voted_id);
226 226
 			}
227 227
 		}
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
@@ -45,9 +45,9 @@
 block discarded – undo
45 45
 	public function display(array $settings, $edit_mode = false)
46 46
 	{
47 47
 		$content = '';
48
-		$content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />';
49
-		$content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />';
50
-		$content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />';
48
+		$content .= $this->user->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />';
49
+		$content .= $this->user->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />';
50
+		$content .= $this->user->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />';
51 51
 		$content .= $this->user->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour']));
52 52
 
53 53
 		$this->template->assign_var('NEWEST_USER', false);
Please login to merge, or discard this patch.