Completed
Push — develop ( e1201f...9e183f )
by Daniel
10:47
created
services/tree/display.php 2 patches
Spacing   +12 added lines, -12 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',
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * @param \phpbb\template\twig\twig $template
166 166
 	 * @param string $handle
167 167
 	 */
168
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
168
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
169 169
 	{
170 170
 		$prev_depth = 0;
171 171
 		$parental_depth = array(0 => -1);
@@ -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
 	/**
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
 	 * @param \phpbb\template\twig\twig $template
199 199
 	 * @return void
200 200
 	 */
201
-	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig &$template)
201
+	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig & $template)
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -254,8 +254,7 @@
 block discarded – undo
254 254
 		{
255 255
 			$padding .= $pad_with;
256 256
 			$padding_store[$row[$this->column_parent_id]] = $padding;
257
-		}
258
-		else if ($row[$this->column_left_id] > $right + 1)
257
+		} else if ($row[$this->column_left_id] > $right + 1)
259 258
 		{
260 259
 			$padding = (isset($padding_store[$row[$this->column_parent_id]])) ? $padding_store[$row[$this->column_parent_id]] : '';
261 260
 		}
Please login to merge, or discard this patch.
services/menus/display.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 * @param string $handle
61 61
 	 * @return void
62 62
 	 */
63
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
63
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
64 64
 	{
65 65
 		$this->set_current_item($data);
66 66
 		$this->prepare_items($data['items']);
@@ -75,10 +75,10 @@  discard block
 block discarded – undo
75 75
 				$row['num_kids'] = $this->count_descendants($row);
76 76
 
77 77
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
78
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
78
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
79 79
 			}
80 80
 
81
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
81
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
82 82
 		}
83 83
 	}
84 84
 
@@ -115,12 +115,12 @@  discard block
 block discarded – undo
115 115
 	 */
116 116
 	protected function get_current_path()
117 117
 	{
118
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
118
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
119 119
 		$curr_parts = explode('&', $this->user->page['query_string']);
120 120
 
121 121
 		sort($curr_parts);
122 122
 
123
-		return $curr_page . '?' . join('&', $curr_parts);
123
+		return $curr_page.'?'.join('&', $curr_parts);
124 124
 	}
125 125
 
126 126
 	/**
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 
163 163
 			$is_current_item = $this->is_current_item($row);
164 164
 			$is_parent = $this->is_parent_of_current_item($row);
165
-			$this_depth	= $this->parental_depth[$row[$this->column_parent_id]] + 1;
165
+			$this_depth = $this->parental_depth[$row[$this->column_parent_id]] + 1;
166 166
 			$leaf = $this->get_leaf_node($row, $is_current_item, $is_parent);
167 167
 
168 168
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 	 * @param int $repeat
244 244
 	 * @return void
245 245
 	 */
246
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
246
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
247 247
 	{
248 248
 		for ($i = 0; $i < $repeat; $i++)
249 249
 		{
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.