Completed
Push — master ( e581ca...436d2e )
by Daniel
08:58
created
controller/blocks_admin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,7 @@
 block discarded – undo
77 77
 			$return_data = $command->execute($style_id);
78 78
 
79 79
 			$this->action_handler->clear_cache();
80
-		}
81
-		catch (\blitze\sitemaker\exception\base $e)
80
+		} catch (\blitze\sitemaker\exception\base $e)
82 81
 		{
83 82
 			$json_data['message'] = $e->get_message($this->user);
84 83
 		}
Please login to merge, or discard this patch.
controller/menus_admin.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,12 +58,10 @@
 block discarded – undo
58 58
 			$return_data = $command->execute();
59 59
 
60 60
 			$this->action_handler->clear_cache();
61
-		}
62
-		catch (\blitze\sitemaker\exception\base $e)
61
+		} catch (\blitze\sitemaker\exception\base $e)
63 62
 		{
64 63
 			$return_data['message'] = $e->get_message($this->user);
65
-		}
66
-		catch (\Exception $e)
64
+		} catch (\Exception $e)
67 65
 		{
68 66
 			$return_data['message'] = $this->user->lang($e->getMessage());
69 67
 		}
Please login to merge, or discard this patch.
blocks/whois.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,7 @@
 block discarded – undo
69 69
 			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
70 70
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
71 71
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
72
-		}
73
-		else
72
+		} else
74 73
 		{
75 74
 			$item_id = 0;
76 75
 			$item = 'forum';
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
 		if (!empty($data['.'][0]['TOTAL_USERS_ONLINE']))
70 70
 		{
71
-			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
71
+			$l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE'];
72 72
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
73 73
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
74 74
 		}
@@ -105,6 +105,6 @@  discard block
 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.
services/tree/display.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -237,8 +237,7 @@
 block discarded – undo
237 237
 			{
238 238
 				$padding .= $pad_with;
239 239
 				$padding_store[$row['parent_id']] = $padding;
240
-			}
241
-			else if ($row['left_id'] > $right + 1)
240
+			} else if ($row['left_id'] > $right + 1)
242 241
 			{
243 242
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
244 243
 			}
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	{
79 79
 		$sql = "SELECT *
80 80
 			FROM $this->items_table
81
-			WHERE $this->pk = " . (int) $node_id ;
81
+			WHERE $this->pk = ".(int) $node_id;
82 82
 		$result = $this->db->sql_query($sql);
83 83
 		$row = $this->db->sql_fetchrow($result);
84 84
 		$this->db->sql_freeresult($result);
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 					$this->items_table => ' t'
108 108
 				),
109 109
 				'WHERE'		=> array(
110
-					't.depth ' . (($level) ? " BETWEEN $start AND " . ($start + $level) : ' >= ' . $start),
111
-					(($this->sql_where) ? 't.' . $this->sql_where : ''),
110
+					't.depth '.(($level) ? " BETWEEN $start AND ".($start + $level) : ' >= '.$start),
111
+					(($this->sql_where) ? 't.'.$this->sql_where : ''),
112 112
 				),
113 113
 				'ORDER_BY'	=> 't.left_id ASC',
114 114
 			),
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @param \phpbb\template\twig\twig $template
148 148
 	 * @param string $handle
149 149
 	 */
150
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
150
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
151 151
 	{
152 152
 		$prev_depth = 0;
153 153
 		$parental_depth = array(0 => -1);
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
156 156
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
157 157
 		{
158 158
 			$row 		= $data[$i];
159
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
160
-			$repeat		= abs($prev_depth - $this_depth);
159
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
160
+			$repeat = abs($prev_depth - $this_depth);
161 161
 
162
-			$tpl_data	= array(
162
+			$tpl_data = array(
163 163
 				'PREV_DEPTH'	=> $prev_depth,
164 164
 				'THIS_DEPTH'	=> $this_depth,
165 165
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 
170 170
 			for ($j = 0; $j < $repeat; $j++)
171 171
 			{
172
-				$template->assign_block_vars($handle . '.close', array());
172
+				$template->assign_block_vars($handle.'.close', array());
173 173
 			}
174 174
 
175 175
 			$prev_depth = $this_depth;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
 		for ($i = 0; $i < $prev_depth; $i++)
180 180
 		{
181
-			$template->assign_block_vars('close_' . $handle, array());
181
+			$template->assign_block_vars('close_'.$handle, array());
182 182
 		}
183 183
 	}
184 184
 
@@ -217,10 +217,10 @@  discard block
 block discarded – undo
217 217
 			}
218 218
 
219 219
 			$right = $row['right_id'];
220
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
220
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
221 221
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
222 222
 
223
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
223
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
224 224
 			$return_data[$row[$this->pk]] = $title;
225 225
 		}
226 226
 
Please login to merge, or discard this patch.
services/tree/builder.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -260,8 +260,7 @@
 block discarded – undo
260 260
 				'depth'		=> $new_parent['depth'] + 1,
261 261
 				'right_id'	=> --$new_parent['right_id'],
262 262
 			);
263
-		}
264
-		else
263
+		} else
265 264
 		{
266 265
 			return array(
267 266
 				'depth'		=> 0,
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 */
56 56
 	public function get_item_info($item_id = 0)
57 57
 	{
58
-		$sql = 'SELECT * FROM ' . $this->table_name . ' ' . $this->get_sql_where('WHERE') .
59
-			(($item_id) ? " AND {$this->column_item_id} = " . (int) $item_id : '');
58
+		$sql = 'SELECT * FROM '.$this->table_name.' '.$this->get_sql_where('WHERE').
59
+			(($item_id) ? " AND {$this->column_item_id} = ".(int) $item_id : '');
60 60
 
61 61
 		$result = $this->db->sql_query($sql);
62 62
 		$row = $this->db->sql_fetchrow($result);
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	public function update_item($item_id, array $sql_data)
76 76
 	{
77 77
 		$sql = "UPDATE {$this->table_name}
78
-			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . "
79
-			WHERE $this->column_item_id = " . (int) $item_id;
78
+			SET ".$this->db->sql_build_array('UPDATE', $sql_data)."
79
+			WHERE $this->column_item_id = ".(int) $item_id;
80 80
 		$this->db->sql_query($sql);
81 81
 
82 82
 		return $sql_data;
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 
110 110
 		// Rather than updating each item individually, we will just delete all items
111 111
 		// then add them all over again with new parent_id|left_id|right_id
112
-		$this->db->sql_query("DELETE FROM {$this->table_name} " . $this->get_sql_where('WHERE'));
112
+		$this->db->sql_query("DELETE FROM {$this->table_name} ".$this->get_sql_where('WHERE'));
113 113
 
114 114
 		// Now we add it back
115 115
 		$sql_data = $this->add_sub_tree($tree, 0);
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 
159 159
 			if ($depth && !$parent_id)
160 160
 			{
161
-				throw new \RuntimeException($this->message_prefix . 'MALFORMED_TREE');
161
+				throw new \RuntimeException($this->message_prefix.'MALFORMED_TREE');
162 162
 			}
163 163
 
164 164
 			$key = $i + $max_id + 1;
@@ -230,23 +230,23 @@  discard block
 block discarded – undo
230 230
 		foreach ($branch as $i => $row)
231 231
 		{
232 232
 			$left_id	= $right_id + 1;
233
-			$right_id   = $right_id + 2;
233
+			$right_id = $right_id + 2;
234 234
 
235 235
 			$sql_data[$i] = $row;
236
-			$sql_data[$i]['parent_id']	= $parent_id;
237
-			$sql_data[$i]['left_id']	= $left_id;
238
-			$sql_data[$i]['right_id']	= $right_id;
239
-			$sql_data[$i]['depth']		= $depth;
236
+			$sql_data[$i]['parent_id'] = $parent_id;
237
+			$sql_data[$i]['left_id'] = $left_id;
238
+			$sql_data[$i]['right_id'] = $right_id;
239
+			$sql_data[$i]['depth'] = $depth;
240 240
 
241 241
 			if ($row['parent_id'])
242 242
 			{
243
-				$left_id	= $sql_data[$row['parent_id']]['right_id'];
244
-				$right_id   = $left_id + 1;
243
+				$left_id = $sql_data[$row['parent_id']]['right_id'];
244
+				$right_id = $left_id + 1;
245 245
 
246
-				$sql_data[$i]['parent_id']	= $row['parent_id'];
247
-				$sql_data[$i]['depth']		= $sql_data[$row['parent_id']]['depth'] + 1;
248
-				$sql_data[$i]['left_id']	= $left_id;
249
-				$sql_data[$i]['right_id']	= $right_id;
246
+				$sql_data[$i]['parent_id'] = $row['parent_id'];
247
+				$sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1;
248
+				$sql_data[$i]['left_id'] = $left_id;
249
+				$sql_data[$i]['right_id'] = $right_id;
250 250
 
251 251
 				$this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch);
252 252
 			}
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 				$this->db->sql_transaction('rollback');
273 273
 				$this->lock->release();
274 274
 
275
-				throw new \RuntimeException($this->message_prefix . 'INVALID_PARENT');
275
+				throw new \RuntimeException($this->message_prefix.'INVALID_PARENT');
276 276
 			}
277 277
 
278 278
 			// adjust items in affected branch
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 	protected function get_max_id($column, $use_sql_where = true)
301 301
 	{
302 302
 		$sql = "SELECT MAX($column) AS $column
303
-			FROM {$this->table_name} " .
303
+			FROM {$this->table_name} ".
304 304
 			(($use_sql_where) ? $this->get_sql_where('WHERE') : '');
305 305
 		$result = $this->db->sql_query($sql);
306 306
 		$max_id = $this->db->sql_fetchfield($column);
Please login to merge, or discard this patch.
exception/base.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
41 41
 		if (is_array($message))
42 42
 		{
43 43
 			$this->message = (string) $message[0];
44
-		}
45
-		else
44
+		} else
46 45
 		{
47 46
 			$this->message = $message;
48 47
 		}
Please login to merge, or discard this 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.
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['ext_name']) ? 'app.php' : '') . $row['route'];
125
+			$url = $board_url.'/'.(($row['ext_name']) ? 'app.php' : '').$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.
model/base_entity.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	{
26 26
 		foreach ($data as $name => $value)
27 27
 		{
28
-			$mutator = 'set_' . $name;
28
+			$mutator = 'set_'.$name;
29 29
 			$this->$mutator($value);
30 30
 		}
31 31
 	}
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		$data = array();
66 66
 		foreach ($attributes as $attribute)
67 67
 		{
68
-			$accessor = 'get_' . $attribute;
68
+			$accessor = 'get_'.$attribute;
69 69
 			$data[$attribute] = $this->$accessor();
70 70
 		}
71 71
 		unset($data['db_fields'], $data['required_fields']);
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,7 @@
 block discarded – undo
43 43
 			if ('get' == $match[1])
44 44
 			{
45 45
 				return $this->$attribute;
46
-			}
47
-			else
46
+			} else
48 47
 			{
49 48
 				$this->$attribute = $this->validate_attribute($match[2], $args[0]);
50 49
 				return $this;
Please login to merge, or discard this patch.
model/blocks/mapper/routes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@
 block discarded – undo
70 70
 	 */
71 71
 	protected function find_sql(array $sql_where)
72 72
 	{
73
-		return 'SELECT * FROM ' . $this->entity_table .
74
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
73
+		return 'SELECT * FROM '.$this->entity_table.
74
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
75 75
 			ORDER BY route ASC';
76 76
 	}
77 77
 }
Please login to merge, or discard this patch.