Completed
Pull Request — master (#26)
by Daniel
10:32 queued 08:32
created
services/tree/display.php 1 patch
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
 
@@ -225,10 +225,10 @@  discard block
 block discarded – undo
225 225
 			}
226 226
 
227 227
 			$right = $row['right_id'];
228
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
228
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
229 229
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
230 230
 
231
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
231
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
232 232
 			$return_data[$row[$this->pk]] = $title;
233 233
 		}
234 234
 
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(
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.
controller/forum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@
 block discarded – undo
59 59
 		 * to fix relative paths for forum images
60 60
 		 */
61 61
 		global $phpbb_root_path;
62
-		$phpbb_root_path = generate_board_url() . '/';
62
+		$phpbb_root_path = generate_board_url().'/';
63 63
 
64 64
 		// @codeCoverageIgnoreStart
65 65
 		if (!function_exists('display_forums'))
66 66
 		{
67
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
67
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
68 68
 		}
69 69
 		// @codeCoverageIgnoreEnd
70 70
 
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
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @param string $handle
71 71
 	 * @return void
72 72
 	 */
73
-	public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
73
+	public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
74 74
 	{
75 75
 		$this->prepare_items($data);
76 76
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
 				$row['num_kids'] = $this->count_descendants($row);
85 85
 
86 86
 				$template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER));
87
-				$this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth));
87
+				$this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth));
88 88
 			}
89 89
 
90
-			$this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth));
90
+			$this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth));
91 91
 		}
92 92
 	}
93 93
 
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			}
127 127
 
128 128
 			$is_current_item = $this->is_current_item($row);
129
-			$this_depth	= $this->parental_depth[$row['parent_id']] + 1;
129
+			$this_depth = $this->parental_depth[$row['parent_id']] + 1;
130 130
 			$leaf = $this->get_leaf_node($row, $is_current_item);
131 131
 
132 132
 			$this->parental_depth[$row[$this->pk]] = $this_depth;
@@ -155,8 +155,8 @@  discard block
 block discarded – undo
155 155
 	 */
156 156
 	protected function set_current_item(array $data)
157 157
 	{
158
-		$curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './');
159
-		$curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page);
158
+		$curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './');
159
+		$curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page);
160 160
 		$curr_parts = explode('&', $this->user->page['query_string']);
161 161
 
162 162
 		$data = array_values($data);
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @param int $repeat
240 240
 	 * @return void
241 241
 	 */
242
-	protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat)
242
+	protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat)
243 243
 	{
244 244
 		for ($i = 0; $i < $repeat; $i++)
245 245
 		{
Please login to merge, or discard this patch.
services/menus/menu_block.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@
 block discarded – undo
124 124
 	{
125 125
 		$row['is_navigable'] = $this->is_navigable($row);
126 126
 		$row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false;
127
-		$row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']);
127
+		$row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']);
128 128
 	}
129 129
 
130 130
 	/**
Please login to merge, or discard this patch.
services/blocks/routes.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -175,12 +175,12 @@
 block discarded – undo
175 175
 	{
176 176
 		if ($page_dir)
177 177
 		{
178
-			$route = ltrim(dirname($page_dir) . '/index.php', './');
178
+			$route = ltrim(dirname($page_dir).'/index.php', './');
179 179
 			$parent_route = $this->get_parent_route_info($routes, $route);
180 180
 		}
181
-		else if ($current_route === 'viewtopic.' . $this->php_ext)
181
+		else if ($current_route === 'viewtopic.'.$this->php_ext)
182 182
 		{
183
-			$route = 'viewforum.' . $this->php_ext;
183
+			$route = 'viewforum.'.$this->php_ext;
184 184
 			$parent_route = $this->get_parent_route_info($routes, $route);
185 185
 		}
186 186
 		else
Please login to merge, or discard this patch.
services/blocks/cfg_handler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		// @codeCoverageIgnoreStart
62 62
 		if (!function_exists('build_cfg_template'))
63 63
 		{
64
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
64
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
65 65
 		}
66 66
 		// @codeCoverageIgnoreEnd
67 67
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		// @codeCoverageIgnoreStart
101 101
 		if (!function_exists('validate_config_vars'))
102 102
 		{
103
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
103
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
104 104
 		}
105 105
 		// @codeCoverageIgnoreEnd
106 106
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		if (empty($vars['object']))
204 204
 		{
205 205
 			$object = $this;
206
-			$method = 'prep_' . $type[0] . '_field_for_display';
206
+			$method = 'prep_'.$type[0].'_field_for_display';
207 207
 
208 208
 			if (is_callable(array($this, $method)))
209 209
 			{
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 		$l_explain = '';
258 258
 		if (!empty($vars['explain']))
259 259
 		{
260
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
260
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
261 261
 		}
262 262
 
263 263
 		return $l_explain;
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	{
358 358
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
359 359
 
360
-		$vars['method'] ='build_multi_select';
360
+		$vars['method'] = 'build_multi_select';
361 361
 	}
362 362
 
363 363
 	/**
Please login to merge, or discard this patch.
model/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.
model/mapper/items.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -172,6 +172,6 @@
 block discarded – undo
172 172
 	 */
173 173
 	protected function get_sql_where($menu_id)
174 174
 	{
175
-		return '%smenu_id = ' . (int) $menu_id;
175
+		return '%smenu_id = '.(int) $menu_id;
176 176
 	}
177 177
 }
Please login to merge, or discard this patch.