Completed
Pull Request — master (#26)
by Daniel
16:39 queued 14:52
created
services/filemanager/setup.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
 	 */
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.
services/tree/display.php 1 patch
Spacing   +13 added lines, -13 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,22 +164,22 @@  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),
174 174
 			);
175 175
 
176 176
 			$template->assign_block_vars($handle, array_merge($tpl_data, array_change_key_case($row, CASE_UPPER)));
177
-			$this->recursively_close_tags($repeat, $handle . '.close', $template);
177
+			$this->recursively_close_tags($repeat, $handle.'.close', $template);
178 178
 
179 179
 			$prev_depth = $this_depth;
180 180
 			$parental_depth[$row[$this->pk]] = $this_depth;
181 181
 		}
182
-		$this->recursively_close_tags($prev_depth, 'close_' . $handle, $template);
182
+		$this->recursively_close_tags($prev_depth, 'close_'.$handle, $template);
183 183
 	}
184 184
 
185 185
 	/**
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
 	 * @param \phpbb\template\twig\twig $template
189 189
 	 * @return void
190 190
 	 */
191
-	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig &$template)
191
+	protected function recursively_close_tags($repeat, $handle, \phpbb\template\twig\twig & $template)
192 192
 	{
193 193
 		for ($i = 0; $i < $repeat; $i++)
194 194
 		{
195
-			$template->assign_block_vars('close_' . $handle, array());
195
+			$template->assign_block_vars('close_'.$handle, array());
196 196
 		}
197 197
 	}
198 198
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 	 */
259 259
 	protected function get_padded_title($padding, $title)
260 260
 	{
261
-		return (($padding) ? $padding . '&#x2937; ' : '') . $title;
261
+		return (($padding) ? $padding.'&#x2937; ' : '').$title;
262 262
 	}
263 263
 
264 264
 	/**
@@ -270,6 +270,6 @@  discard block
 block discarded – undo
270 270
 	protected function get_html_option(array $row, array $selected_ids, $title)
271 271
 	{
272 272
 		$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
273
-		return '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
273
+		return '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
274 274
 	}
275 275
 }
Please login to merge, or discard this patch.
acp/settings_module.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 			 */
150 150
 			$this->phpbb_dispatcher->trigger_event('blitze_sitemaker.acp_save_settings');
151 151
 
152
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
152
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
153 153
 		}
154 154
 	}
155 155
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	{
173 173
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
174 174
 
175
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
175
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
176 176
 
177 177
 		$styles = array();
178 178
 		while ($row = $this->db->sql_fetchrow($result))
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 			$path = dirname($path);
240 240
 			$name = basename($path);
241 241
 
242
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
242
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
243 243
 		}
244 244
 		ksort($layouts);
245 245
 
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			$id = $entity->get_menu_id();
293 293
 			$name = $entity->get_menu_name();
294 294
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
295
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
295
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
296 296
 		}
297 297
 
298 298
 		return $options;
Please login to merge, or discard this patch.
acp/menu_module.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			'MENU_ID'		=> $menu_id,
94 94
 			'ICON_PICKER'	=> $this->icon->picker(),
95 95
 			'T_PATH'		=> $this->phpbb_root_path,
96
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
96
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
97 97
 		));
98 98
 
99 99
 		$this->tpl_name = 'acp_menu';
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 		$vars = array('bulk_options', 'forumslist');
147 147
 		extract($this->phpbb_dispatcher->trigger_event('blitze_sitemaker.acp_add_bulk_menu_options', compact($vars)));
148 148
 
149
-		$bulk_options['FORUMS']	= $this->get_forums_string($forumslist);
149
+		$bulk_options['FORUMS'] = $this->get_forums_string($forumslist);
150 150
 
151 151
 		$this->template->assign_var('bulk_options', $bulk_options);
152 152
 	}
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 		foreach ($forumslist as $forum_id => $row)
162 162
 		{
163 163
 			$text .= str_replace('&nbsp; &nbsp;', "\t", $row['padding']);
164
-			$text .= $row['forum_name'] . '|';
164
+			$text .= $row['forum_name'].'|';
165 165
 			$text .= "viewforum.{$this->php_ext}?f=$forum_id\n";
166 166
 		}
167 167
 
Please login to merge, or discard this patch.