Passed
Branch develop (786e4f)
by Daniel
07:32
created
controller/upload.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,7 @@
 block discarded – undo
99 99
 		{
100 100
 			$file->remove();
101 101
 			$json_data['message'] = implode('<br />', $file->error);
102
-		}
103
-		else
102
+		} else
104 103
 		{
105 104
 			$json_data['location'] = $user_dir . $file->get('realname');
106 105
 		}
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@
 block discarded – undo
89 89
 		}
90 90
 		else
91 91
 		{
92
-			$json_data['location'] = $user_dir . $file->get('realname');
92
+			$json_data['location'] = $user_dir.$file->get('realname');
93 93
 		}
94 94
 	}
95 95
 
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@  discard block
 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;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function add_viewonline_location(\phpbb\event\data $event)
83 83
 	{
84
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
84
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
85 85
 		{
86 86
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
87 87
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
services/filemanager/setup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	public function get_access_key()
76 76
 	{
77
-		return sha1($this->user->data['user_form_salt'] . 'filemanager');
77
+		return sha1($this->user->data['user_form_salt'].'filemanager');
78 78
 	}
79 79
 
80 80
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 */
99 99
 	public function get_upload_destination()
100 100
 	{
101
-		return $this->upload_dir . $this->get_user_dir();
101
+		return $this->upload_dir.$this->get_user_dir();
102 102
 	}
103 103
 
104 104
 	/**
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 	protected function set_user_dir()
121 121
 	{
122 122
 		// if user does not have root access, they must have a directory
123
-		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/' . $this->user->data['username'] . '/' : '';
123
+		$this->user_dir = (!$this->auth->acl_get('a_sm_filemanager')) ? 'users/'.$this->user->data['username'].'/' : '';
124 124
 
125
-		$destination = $this->phpbb_root_path . $this->upload_dir . $this->user_dir;
125
+		$destination = $this->phpbb_root_path.$this->upload_dir.$this->user_dir;
126 126
 
127 127
 		if (!is_dir($destination))
128 128
 		{
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_filter(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.
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.
services/menus/display.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -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;
Please login to merge, or discard this patch.
acp/menu_module.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 			'MENU_ID'		=> $menu_id,
98 98
 			'ICON_PICKER'	=> $this->icon->picker(),
99 99
 			'T_PATH'		=> $this->phpbb_root_path,
100
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
100
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
101 101
 		));
102 102
 
103 103
 		$this->tpl_name = 'acp_menu';
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		$vars = array('bulk_options', 'forumslist');
152 152
 		extract($this->phpbb_dispatcher->trigger_event('blitze.sitemaker.acp_add_bulk_menu_options', compact($vars)));
153 153
 
154
-		$bulk_options['FORUMS']	= $this->get_forums_string($forumslist);
154
+		$bulk_options['FORUMS'] = $this->get_forums_string($forumslist);
155 155
 
156 156
 		$this->template->assign_var('bulk_options', $bulk_options);
157 157
 	}
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
 	protected function get_forums_string(array $forumslist)
164 164
 	{
165 165
 		$forum_url = $this->controller_helper->route('blitze_sitemaker_forum', array(), true, '', UrlGeneratorInterface::RELATIVE_PATH);
166
-		$text = $this->language->lang('FORUM') . '|' . $forum_url . "\n";
166
+		$text = $this->language->lang('FORUM').'|'.$forum_url."\n";
167 167
 		foreach ($forumslist as $forum_id => $row)
168 168
 		{
169
-			$text .= "\t" . str_replace('&nbsp; &nbsp;', "\t", $row['padding']);
170
-			$text .= $row['forum_name'] . '|';
169
+			$text .= "\t".str_replace('&nbsp; &nbsp;', "\t", $row['padding']);
170
+			$text .= $row['forum_name'].'|';
171 171
 			$text .= "viewforum.{$this->php_ext}?f=$forum_id\n";
172 172
 		}
173 173
 
Please login to merge, or discard this patch.
acp/settings_module.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 			$this->save_filemanager_settings($settings);
155 155
 			$this->save_config_settings($settings);
156
-			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
156
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
157 157
 		}
158 158
 	}
159 159
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	{
177 177
 		$style_prefs = (array) json_decode($this->config_text->get('sm_layout_prefs'), true);
178 178
 
179
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
179
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
180 180
 
181 181
 		$styles = array();
182 182
 		while ($row = $this->db->sql_fetchrow($result))
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 			$path = dirname($path);
246 246
 			$name = basename($path);
247 247
 
248
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
248
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
249 249
 		}
250 250
 		ksort($layouts);
251 251
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 			$id = $entity->get_menu_id();
307 307
 			$name = $entity->get_menu_name();
308 308
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
309
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
309
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
310 310
 		}
311 311
 
312 312
 		return $options;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -283,8 +283,7 @@
 block discarded – undo
283 283
 			unset($settings['image_watermark_coordinates']);
284 284
 
285 285
 			$this->filemanager->save($settings);
286
-		}
287
-		else
286
+		} else
288 287
 		{
289 288
 			$config['sm_filemanager'] = 0;
290 289
 		}
Please login to merge, or discard this patch.
blocks/wordgraph.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			$this->ptemplate->assign_block_vars('wordgraph', array(
106 106
 				'WORD'			=> $this->show_word($word, $words_array[$word], $settings['show_word_count']),
107 107
 				'WORD_SIZE'		=> $settings['min_word_size'] + (($words_array[$word] - $params['min_count']) * $params['size_step']),
108
-				'WORD_COLOR'	=> $r . $g . $b,
108
+				'WORD_COLOR'	=> $r.$g.$b,
109 109
 				'WORD_URL'		=> $this->get_url($word),
110 110
 			));
111 111
 		}
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 		if ($exclude_words)
201 201
 		{
202 202
 			$exclude_words = array_filter(explode(',', str_replace(' ', '', strtolower($exclude_words))));
203
-			$sql_where = (sizeof($exclude_words)) ? ' AND ' . $this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
203
+			$sql_where = (sizeof($exclude_words)) ? ' AND '.$this->db->sql_in_set('l.word_text', $exclude_words, true) : '';
204 204
 		}
205 205
 
206 206
 		return $sql_where;
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 */
215 215
 	protected function show_word($word, $count, $show_count)
216 216
 	{
217
-		return censor_text(($show_count) ? $word . '(' . $count . ')' : $word);
217
+		return censor_text(($show_count) ? $word.'('.$count.')' : $word);
218 218
 	}
219 219
 
220 220
 	/**
@@ -223,6 +223,6 @@  discard block
 block discarded – undo
223 223
 	 */
224 224
 	protected function get_url($word)
225 225
 	{
226
-		return append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords=' . urlencode($word));
226
+		return append_sid("{$this->phpbb_root_path}search.$this->php_ext", 'keywords='.urlencode($word));
227 227
 	}
228 228
 }
Please login to merge, or discard this patch.