Completed
Pull Request — master (#26)
by Daniel
17:09 queued 05:15
created
cron/blocks_cleanup.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,8 +91,8 @@
 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)
Please login to merge, or discard this patch.
services/tree/builder.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -214,23 +214,23 @@
 block discarded – undo
214 214
 		foreach ($branch as $i => $row)
215 215
 		{
216 216
 			$left_id	= $right_id + 1;
217
-			$right_id   = $right_id + 2;
217
+			$right_id = $right_id + 2;
218 218
 
219 219
 			$sql_data[$i] = $row;
220
-			$sql_data[$i]['parent_id']	= $parent_id;
221
-			$sql_data[$i]['left_id']	= $left_id;
222
-			$sql_data[$i]['right_id']	= $right_id;
223
-			$sql_data[$i]['depth']		= $depth;
220
+			$sql_data[$i]['parent_id'] = $parent_id;
221
+			$sql_data[$i]['left_id'] = $left_id;
222
+			$sql_data[$i]['right_id'] = $right_id;
223
+			$sql_data[$i]['depth'] = $depth;
224 224
 
225 225
 			if ($row['parent_id'])
226 226
 			{
227
-				$left_id	= $sql_data[$row['parent_id']]['right_id'];
228
-				$right_id   = $left_id + 1;
227
+				$left_id = $sql_data[$row['parent_id']]['right_id'];
228
+				$right_id = $left_id + 1;
229 229
 
230
-				$sql_data[$i]['parent_id']	= $row['parent_id'];
231
-				$sql_data[$i]['depth']		= $sql_data[$row['parent_id']]['depth'] + 1;
232
-				$sql_data[$i]['left_id']	= $left_id;
233
-				$sql_data[$i]['right_id']	= $right_id;
230
+				$sql_data[$i]['parent_id'] = $row['parent_id'];
231
+				$sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1;
232
+				$sql_data[$i]['left_id'] = $left_id;
233
+				$sql_data[$i]['right_id'] = $right_id;
234 234
 
235 235
 				$this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch);
236 236
 			}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	 */
78 78
 	public function update_item($item_id, array $sql_data)
79 79
 	{
80
-		$sql = "UPDATE {$this->table_name}
80
+		$sql = "update {$this->table_name}
81 81
 			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . "
82 82
 			WHERE $this->column_item_id = " . (int) $item_id;
83 83
 		$this->db->sql_query($sql);
Please login to merge, or discard this patch.
services/tree/display.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@
 block discarded – undo
33 33
 	protected $data = array();
34 34
 
35 35
 	/**
36
-	* Construct
37
-	*
38
-	* @param \phpbb\db\driver\driver_interface		$db             Database connection
39
-	* @param string									$items_table	Table name
40
-	* @param string									$pk				Primary key
41
-	* @param string									$sql_where		Column restriction
42
-	*/
36
+	 * Construct
37
+	 *
38
+	 * @param \phpbb\db\driver\driver_interface		$db             Database connection
39
+	 * @param string									$items_table	Table name
40
+	 * @param string									$pk				Primary key
41
+	 * @param string									$sql_where		Column restriction
42
+	 */
43 43
 	public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '')
44 44
 	{
45 45
 		$this->db = $db;
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 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);
@@ -174,10 +174,10 @@  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),
Please login to merge, or discard this patch.
model/base_entity.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	/**
59
-	* {@inheritdoc}
60
-	*/
59
+	 * {@inheritdoc}
60
+	 */
61 61
 	public function to_array()
62 62
 	{
63 63
 		$attributes = $this->get_attributes();
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 	}
75 75
 
76 76
 	/**
77
-	* {@inheritdoc}
78
-	*/
77
+	 * {@inheritdoc}
78
+	 */
79 79
 	public function to_db()
80 80
 	{
81 81
 		$this->check_required();
Please login to merge, or discard this patch.
services/menus/nestedset.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,12 +14,12 @@
 block discarded – undo
14 14
 class nestedset extends builder
15 15
 {
16 16
 	/**
17
-	* Construct
18
-	*
19
-	* @param \phpbb\db\driver\driver_interface	$db				Database connection
20
-	* @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
21
-	* @param string								$table_name		Table name
22
-	*/
17
+	 * Construct
18
+	 *
19
+	 * @param \phpbb\db\driver\driver_interface	$db				Database connection
20
+	 * @param \phpbb\lock\db						$lock			Lock class used to lock the table when moving forums around
21
+	 * @param string								$table_name		Table name
22
+	 */
23 23
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name)
24 24
 	{
25 25
 		parent::__construct(
Please login to merge, or discard this patch.
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/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.
services/forum/data.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
 			$this->store['topic'][$row['topic_id']] = $row;
90 90
 
91 91
 			$this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id'];
92
-			$this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time'];
92
+			$this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time'];
93 93
 			$this->store['post_ids']['first'][] = $row['topic_first_post_id'];
94 94
 			$this->store['post_ids']['last'][] = $row['topic_last_post_id'];
95 95
 			$this->store['poster_ids'][] = $row['topic_poster'];
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@
 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;
Please login to merge, or discard this patch.