Completed
Pull Request — master (#26)
by Daniel
11:55 queued 09:03
created
blocks/whats_new.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
 			$this->ptemplate->assign_block_vars('topicrow', array(
101 101
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
102
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
102
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
103 103
 			));
104 104
 			unset($topic_data[$i]);
105 105
 		}
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	{
141 141
 		return array(
142 142
 			'WHERE'		=> array(
143
-				't.topic_last_post_time > ' . (int) $this->user->data['user_lastvisit'],
143
+				't.topic_last_post_time > '.(int) $this->user->data['user_lastvisit'],
144 144
 				't.topic_moved_id = 0',
145 145
 			),
146 146
 		);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				POSTS_TABLE		=> 'p',
157 157
 			),
158 158
 			'WHERE'		=> array(
159
-				't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'],
159
+				't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'],
160 160
 			),
161 161
 		);
162 162
 	}
Please login to merge, or discard this patch.
services/blocks/admin_bar.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 		if ($this->config['sitemaker_default_layout'])
116 116
 		{
117 117
 			$is_default_route = ($this->config['sitemaker_default_layout'] === $route) ? true : false;
118
-			$u_default_route .= $board_url . '/' . $this->config['sitemaker_default_layout'];
118
+			$u_default_route .= $board_url.'/'.$this->config['sitemaker_default_layout'];
119 119
 			$u_default_route = reapply_sid($u_default_route);
120 120
 		}
121 121
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 			list($controller_service, $controller_method) = explode(':', $controller);
196 196
 			$controller_params	= $symfony_request->attributes->get('_route_params');
197 197
 			$controller_object	= $this->phpbb_container->get($controller_service);
198
-			$controller_class	= get_class($controller_object);
198
+			$controller_class = get_class($controller_object);
199 199
 
200 200
 			$r = new \ReflectionMethod($controller_class, $controller_method);
201 201
 			$class_params = $r->getParameters();
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 				'CONTROLLER_METHOD'	=> $controller_method,
209 209
 				'CONTROLLER_PARAMS'	=> $controller_arguments,
210 210
 				'S_IS_STARTPAGE'	=> $this->is_startpage($controller_service, $controller_arguments),
211
-				'UA_EXTENSION'		=> $namespace . '/' . $extension,
211
+				'UA_EXTENSION'		=> $namespace.'/'.$extension,
212 212
 			));
213 213
 		}
214 214
 	}
@@ -243,11 +243,11 @@  discard block
 block discarded – undo
243 243
 	{
244 244
 		$routes_ary = $this->get_routes();
245 245
 
246
-		$options = '<option value="">' . $this->translator->lang('SELECT') . '</option>';
246
+		$options = '<option value="">'.$this->translator->lang('SELECT').'</option>';
247 247
 		foreach ($routes_ary as $route)
248 248
 		{
249 249
 			$selected = ($route == $current_route) ? ' selected="selected"' : '';
250
-			$options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>';
250
+			$options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>';
251 251
 		}
252 252
 
253 253
 		return $options;
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 		$options = '';
265 265
 		foreach ($ex_positions as $position)
266 266
 		{
267
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
267
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
268 268
 		}
269 269
 
270 270
 		return $options;
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 	public function load_permission_language(\phpbb\event\data $event)
69 69
 	{
70 70
 		$permissions = $event['permissions'];
71
-		$permissions['a_sm_settings']		= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
71
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
72
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
73
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
74 74
 		$permissions['a_sm_filemanager']	= array('lang' => 'ACL_A_SM_FILEMANAGER', 'cat' => 'misc');
75 75
 		$permissions['u_sm_filemanager']	= array('lang' => 'ACL_U_SM_FILEMANAGER', 'cat' => 'misc');
76 76
 		$event['permissions'] = $permissions;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function add_viewonline_location(\phpbb\event\data $event)
83 83
 	{
84
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
84
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
85 85
 		{
86 86
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
87 87
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
services/filemanager/setup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	public function get_access_key()
76 76
 	{
77
-		return sha1($this->user->data['user_form_salt'] . 'filemanager');
77
+		return sha1($this->user->data['user_form_salt'].'filemanager');
78 78
 	}
79 79
 
80 80
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 */
99 99
 	public function get_upload_destination()
100 100
 	{
101
-		return $this->upload_dir . $this->get_user_dir();
101
+		return $this->upload_dir.$this->get_user_dir();
102 102
 	}
103 103
 
104 104
 	/**
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 	protected function set_user_dir()
121 121
 	{
122 122
 		// if user does not have root access, they must have a directory
123
-		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/' . $this->user->data['username'] . '/' : '';
123
+		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/'.$this->user->data['username'].'/' : '';
124 124
 
125
-		$destination = $this->phpbb_root_path . $this->upload_dir . $this->user_dir;
125
+		$destination = $this->phpbb_root_path.$this->upload_dir.$this->user_dir;
126 126
 
127 127
 		if (!is_dir($destination))
128 128
 		{
Please login to merge, or discard this patch.
services/icon_picker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 				'@blitze_sitemaker/assets/icons/picker.min.js',
51 51
 			),
52 52
 			'css'	=> array_filter(array(
53
-				defined('IN_ADMIN') ? $this->util->get_web_path() . 'assets/css/font-awesome.min.css' : '',
53
+				defined('IN_ADMIN') ? $this->util->get_web_path().'assets/css/font-awesome.min.css' : '',
54 54
 				'@blitze_sitemaker/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css',
55 55
 				'@blitze_sitemaker/assets/icons/picker.min.css',
56 56
 			))
Please login to merge, or discard this patch.
cron/blocks_cleanup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	private function clean_styles()
93 93
 	{
94
-		$routes_ary	= $this->manager->get_routes_per_style();
95
-		$style_ids	= $this->get_style_ids();
94
+		$routes_ary = $this->manager->get_routes_per_style();
95
+		$style_ids = $this->get_style_ids();
96 96
 
97 97
 		$routes = array();
98 98
 		foreach ($routes_ary as $style_id => $style_routes)
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 		foreach ($routes as $route => $row)
124 124
 		{
125
-			$url = $board_url . '/' . $row['route'];
125
+			$url = $board_url.'/'.$row['route'];
126 126
 
127 127
 			// Route no longer exists => remove all blocks for route
128 128
 			if ($this->url_checker->exists($url) !== true)
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 
186 186
 		if (sizeof($block_ids))
187 187
 		{
188
-			$this->db->sql_query('DELETE FROM ' . $this->cblocks_table . ' WHERE ' . $this->db->sql_in_set('block_id', $block_ids));
188
+			$this->db->sql_query('DELETE FROM '.$this->cblocks_table.' WHERE '.$this->db->sql_in_set('block_id', $block_ids));
189 189
 		}
190 190
 	}
191 191
 
Please login to merge, or discard this patch.
controller/upload.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
 		}
90 90
 		else
91 91
 		{
92
-			$json_data['location'] = $user_dir . $file->get('realname');
92
+			$json_data['location'] = $user_dir.$file->get('realname');
93 93
 		}
94 94
 	}
95 95
 
Please login to merge, or discard this patch.
services/tree/display.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	{
90 90
 		$sql = "SELECT *
91 91
 			FROM $this->items_table
92
-			WHERE $this->pk = " . (int) $node_id ;
92
+			WHERE $this->pk = ".(int) $node_id;
93 93
 		$result = $this->db->sql_query($sql);
94 94
 		$row = $this->db->sql_fetchrow($result);
95 95
 		$this->db->sql_freeresult($result);
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 					$this->items_table => 'i'
119 119
 				),
120 120
 				'WHERE'		=> array(
121
-					'i.depth ' . (($max_depth) ? ' BETWEEN ' . (int) $start . ' AND ' . (int) ($start + $max_depth) : ' >= ' . (int) $start),
121
+					'i.depth '.(($max_depth) ? ' BETWEEN '.(int) $start.' AND '.(int) ($start + $max_depth) : ' >= '.(int) $start),
122 122
 					$this->sql_where,
123 123
 				),
124 124
 				'ORDER_BY'	=> 'i.left_id ASC',
@@ -174,22 +174,22 @@  discard block
 block discarded – undo
174 174
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
175 175
 		{
176 176
 			$row 		= $data[$i];
177
-			$this_depth	= $parental_depth[$row[$this->column_parent_id]] + 1;
178
-			$repeat		= abs($prev_depth - $this_depth);
177
+			$this_depth = $parental_depth[$row[$this->column_parent_id]] + 1;
178
+			$repeat = abs($prev_depth - $this_depth);
179 179
 
180
-			$tpl_data	= array(
180
+			$tpl_data = array(
181 181
 				'PREV_DEPTH'	=> $prev_depth,
182 182
 				'THIS_DEPTH'	=> $this_depth,
183 183
 				'NUM_KIDS'		=> $this->count_descendants($row),
184 184
 			);
185 185
 
186 186
 			$template->assign_block_vars($handle, array_merge($tpl_data, array_change_key_case($row, CASE_UPPER)));
187
-			$this->recursively_close_tags($repeat, $handle . '.close', $template);
187
+			$this->recursively_close_tags($repeat, $handle.'.close', $template);
188 188
 
189 189
 			$prev_depth = $this_depth;
190 190
 			$parental_depth[$row[$this->pk]] = $this_depth;
191 191
 		}
192
-		$this->recursively_close_tags($prev_depth, 'close_' . $handle, $template);
192
+		$this->recursively_close_tags($prev_depth, 'close_'.$handle, $template);
193 193
 	}
194 194
 
195 195
 	/**
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	{
203 203
 		for ($i = 0; $i < $repeat; $i++)
204 204
 		{
205
-			$template->assign_block_vars('close_' . $handle, array());
205
+			$template->assign_block_vars('close_'.$handle, array());
206 206
 		}
207 207
 	}
208 208
 
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	protected function get_padded_title($padding, $title)
270 270
 	{
271
-		return (($padding) ? $padding . '&#x2937; ' : '') . $title;
271
+		return (($padding) ? $padding.'&#x2937; ' : '').$title;
272 272
 	}
273 273
 
274 274
 	/**
@@ -280,6 +280,6 @@  discard block
 block discarded – undo
280 280
 	protected function get_html_option(array $row, array $selected_ids, $title)
281 281
 	{
282 282
 		$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
283
-		return '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
283
+		return '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
284 284
 	}
285 285
 }
Please login to merge, or discard this patch.
services/poll.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 			'S_POLL_ACTION'		=> $viewtopic_url,
101 101
 			'S_FORM_TOKEN'		=> $this->sitemaker->get_form_key('posting'),
102 102
 
103
-			'U_VIEW_RESULTS'	=> $viewtopic_url . '&amp;view=viewpoll',
103
+			'U_VIEW_RESULTS'	=> $viewtopic_url.'&amp;view=viewpoll',
104 104
 		));
105 105
 	}
106 106
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		$post_id = (int) $topic_data['topic_first_post_id'];
172 172
 
173 173
 		$sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid
174
-			FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p
174
+			FROM ' . POLL_OPTIONS_TABLE.' o, '.POSTS_TABLE." p
175 175
 			WHERE o.topic_id = $topic_id
176 176
 				AND p.post_id = $post_id
177 177
 				AND p.topic_id = o.topic_id
@@ -247,8 +247,8 @@  discard block
 block discarded – undo
247 247
 		if ($this->user->data['is_registered'])
248 248
 		{
249 249
 			$sql = 'SELECT poll_option_id
250
-			FROM ' . POLL_VOTES_TABLE . '
251
-			WHERE topic_id = ' . (int) $topic_id . '
250
+			FROM ' . POLL_VOTES_TABLE.'
251
+			WHERE topic_id = ' . (int) $topic_id.'
252 252
 				AND vote_user_id = ' . (int) $this->user->data['user_id'];
253 253
 			$result = $this->db->sql_query($sql);
254 254
 
@@ -263,9 +263,9 @@  discard block
 block discarded – undo
263 263
 			// Cookie based guest tracking ... I don't like this but hum ho
264 264
 			// it's oft requested. This relies on "nice" users who don't feel
265 265
 			// the need to delete cookies to mess with results.
266
-			if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE))
266
+			if ($this->request->is_set($this->config['cookie_name'].'_poll_'.$topic_id, \phpbb\request\request_interface::COOKIE))
267 267
 			{
268
-				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE));
268
+				$cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'].'_poll_'.$topic_id, '', true, \phpbb\request\request_interface::COOKIE));
269 269
 				$cur_voted_id = array_map('intval', $cur_voted_id);
270 270
 			}
271 271
 		}
Please login to merge, or discard this patch.