Completed
Push — develop ( cc7114...ef0a0d )
by Daniel
08:51
created
services/blocks/admin_bar.php 1 patch
Spacing   +7 added lines, -7 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
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 			list($controller_service, $controller_method) = explode(':', $controller);
151 151
 			$controller_params	= $symfony_request->attributes->get('_route_params');
152 152
 			$controller_object	= $this->phpbb_container->get($controller_service);
153
-			$controller_class	= get_class($controller_object);
153
+			$controller_class = get_class($controller_object);
154 154
 
155 155
 			$r = new \ReflectionMethod($controller_class, $controller_method);
156 156
 			$class_params = $r->getParameters();
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 				'CONTROLLER_METHOD'	=> $controller_method,
164 164
 				'CONTROLLER_PARAMS'	=> $controller_arguments,
165 165
 				'S_IS_STARTPAGE'	=> $this->is_startpage($controller_service, $controller_arguments),
166
-				'UA_EXTENSION'		=> $namespace . '/' . $extension,
166
+				'UA_EXTENSION'		=> $namespace.'/'.$extension,
167 167
 			));
168 168
 		}
169 169
 	}
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 	{
199 199
 		$routes_ary = $this->get_routes();
200 200
 
201
-		$options = '<option value="">' . $this->translator->lang('SELECT') . '</option>';
201
+		$options = '<option value="">'.$this->translator->lang('SELECT').'</option>';
202 202
 		foreach ($routes_ary as $route)
203 203
 		{
204 204
 			$selected = ($route == $current_route) ? ' selected="selected"' : '';
205
-			$options .= '<option value="' . $route . '"' . $selected . '>' . $route . '</option>';
205
+			$options .= '<option value="'.$route.'"'.$selected.'>'.$route.'</option>';
206 206
 		}
207 207
 
208 208
 		return $options;
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 		$options = '';
220 220
 		foreach ($ex_positions as $position)
221 221
 		{
222
-			$options .= '<option value="' . $position . '" selected="selected">' . $position . '</option>';
222
+			$options .= '<option value="'.$position.'" selected="selected">'.$position.'</option>';
223 223
 		}
224 224
 
225 225
 		return $options;
Please login to merge, or discard this patch.
services/filemanager/setup.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	/**
49
-	 * @return void
49
+	 * @return string
50 50
 	 */
51 51
 	public function get_access_key()
52 52
 	{
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 */
51 51
 	public function get_access_key()
52 52
 	{
53
-		return sha1($this->user->data['user_form_salt'] . 'filemanager');
53
+		return sha1($this->user->data['user_form_salt'].'filemanager');
54 54
 	}
55 55
 
56 56
 	/**
Please login to merge, or discard this patch.
blocks/whois.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,6 +105,6 @@
 block discarded – undo
105 105
 	 */
106 106
 	private function get_viewonline_url()
107 107
 	{
108
-		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline." . $this->php_ext) : '';
108
+		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline.".$this->php_ext) : '';
109 109
 	}
110 110
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@
 block discarded – undo
69 69
 		if ($data['TOTAL_USERS_ONLINE'])
70 70
 		{
71 71
 			list($l_online_users, $online_userlist, $l_online_record) = array_values($data);
72
-		}
73
-		else
72
+		} else
74 73
 		{
75 74
 			$item_id = 0;
76 75
 			$item = 'forum';
Please login to merge, or discard this patch.
services/tree/display.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	{
80 80
 		$sql = "SELECT *
81 81
 			FROM $this->items_table
82
-			WHERE $this->pk = " . (int) $node_id ;
82
+			WHERE $this->pk = ".(int) $node_id;
83 83
 		$result = $this->db->sql_query($sql);
84 84
 		$row = $this->db->sql_fetchrow($result);
85 85
 		$this->db->sql_freeresult($result);
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 					$this->items_table => 'i'
109 109
 				),
110 110
 				'WHERE'		=> array(
111
-					'i.depth ' . (($max_depth) ? " BETWEEN $start AND " . ($start + $max_depth) : ' >= ' . $start),
112
-					(($this->sql_where) ? 'i.' . $this->sql_where : ''),
111
+					'i.depth '.(($max_depth) ? " BETWEEN $start AND ".($start + $max_depth) : ' >= '.$start),
112
+					(($this->sql_where) ? 'i.'.$this->sql_where : ''),
113 113
 				),
114 114
 				'ORDER_BY'	=> 'i.left_id ASC',
115 115
 			),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	 * @param \phpbb\template\twig\twig $template
156 156
 	 * @param string $handle
157 157
 	 */
158
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
158
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
159 159
 	{
160 160
 		$prev_depth = 0;
161 161
 		$parental_depth = array(0 => -1);
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
165 165
 		{
166 166
 			$row 		= $data[$i];
167
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
168
-			$repeat		= abs($prev_depth - $this_depth);
167
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
168
+			$repeat = abs($prev_depth - $this_depth);
169 169
 
170
-			$tpl_data	= array(
170
+			$tpl_data = array(
171 171
 				'PREV_DEPTH'	=> $prev_depth,
172 172
 				'THIS_DEPTH'	=> $this_depth,
173 173
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 			for ($j = 0; $j < $repeat; $j++)
179 179
 			{
180
-				$template->assign_block_vars($handle . '.close', array());
180
+				$template->assign_block_vars($handle.'.close', array());
181 181
 			}
182 182
 
183 183
 			$prev_depth = $this_depth;
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
 		for ($i = 0; $i < $prev_depth; $i++)
188 188
 		{
189
-			$template->assign_block_vars('close_' . $handle, array());
189
+			$template->assign_block_vars('close_'.$handle, array());
190 190
 		}
191 191
 	}
192 192
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 	 */
255 255
 	protected function get_padded_title($padding, $title)
256 256
 	{
257
-		return (($padding) ? $padding . '&#x2937; ' : '') . $title;
257
+		return (($padding) ? $padding.'&#x2937; ' : '').$title;
258 258
 	}
259 259
 
260 260
 	/**
@@ -266,6 +266,6 @@  discard block
 block discarded – undo
266 266
 	protected function get_html_option(array $row, array $selected_ids, $title)
267 267
 	{
268 268
 		$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
269
-		return '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
269
+		return '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
270 270
 	}
271 271
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -240,8 +240,7 @@
 block discarded – undo
240 240
 		{
241 241
 			$padding .= $pad_with;
242 242
 			$padding_store[$row['parent_id']] = $padding;
243
-		}
244
-		else if ($row['left_id'] > $right + 1)
243
+		} else if ($row['left_id'] > $right + 1)
245 244
 		{
246 245
 			$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
247 246
 		}
Please login to merge, or discard this patch.