Completed
Pull Request — master (#26)
by Daniel
16:46 queued 14:37
created
acp/settings_module.php 1 patch
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();
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
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 			$id = $entity->get_menu_id();
302 302
 			$name = $entity->get_menu_name();
303 303
 			$selected = ($id == $this->config['sm_navbar_menu']) ? ' selected="selected"' : '';
304
-			$options .= '<option value="' . $id . '"' . $selected . '>' . $name . '</option>';
304
+			$options .= '<option value="'.$id.'"'.$selected.'>'.$name.'</option>';
305 305
 		}
306 306
 
307 307
 		return $options;
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
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			'MENU_ID'		=> $menu_id,
97 97
 			'ICON_PICKER'	=> $this->icon->picker(),
98 98
 			'T_PATH'		=> $this->phpbb_root_path,
99
-			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '') . '/',
99
+			'UA_AJAX_URL'   => $this->controller_helper->route('blitze_sitemaker_menus_admin', array(), true, '').'/',
100 100
 		));
101 101
 
102 102
 		$this->tpl_name = 'acp_menu';
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 		$vars = array('bulk_options', 'forumslist');
151 151
 		extract($this->phpbb_dispatcher->trigger_event('blitze.sitemaker.acp_add_bulk_menu_options', compact($vars)));
152 152
 
153
-		$bulk_options['FORUMS']	= $this->get_forums_string($forumslist);
153
+		$bulk_options['FORUMS'] = $this->get_forums_string($forumslist);
154 154
 
155 155
 		$this->template->assign_var('bulk_options', $bulk_options);
156 156
 	}
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	protected function get_forums_string(array $forumslist)
163 163
 	{
164
-		$text = $this->language->lang('FORUM') . "|app.{$this->php_ext}/forum\n";
164
+		$text = $this->language->lang('FORUM')."|app.{$this->php_ext}/forum\n";
165 165
 		foreach ($forumslist as $forum_id => $row)
166 166
 		{
167
-			$text .= "\t" . str_replace('&nbsp; &nbsp;', "\t", $row['padding']);
168
-			$text .= $row['forum_name'] . '|';
167
+			$text .= "\t".str_replace('&nbsp; &nbsp;', "\t", $row['padding']);
168
+			$text .= $row['forum_name'].'|';
169 169
 			$text .= "viewforum.{$this->php_ext}?f=$forum_id\n";
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
controller/upload.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$this->set_filename($file);
93 93
 
94 94
 		$user_dir = $this->get_user_dir();
95
-		$destination = rtrim($this->upload_dir . $user_dir, '/');
95
+		$destination = rtrim($this->upload_dir.$user_dir, '/');
96 96
 		$file->move_file($destination, true);
97 97
 
98 98
 		if (sizeof($file->error))
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		}
103 103
 		else
104 104
 		{
105
-			$json_data['location'] = $user_dir . $file->get('realname');
105
+			$json_data['location'] = $user_dir.$file->get('realname');
106 106
 		}
107 107
 	}
108 108
 
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 		// if user does not have root access, they must have a directory
117 117
 		if (!$this->auth->acl_get('a_sm_filemanager'))
118 118
 		{
119
-			$user_dir = 'users/' . $this->user->data['username'] . '/';
119
+			$user_dir = 'users/'.$this->user->data['username'].'/';
120 120
 
121
-			$destination = $this->phpbb_root_path . $this->upload_dir . $user_dir;
121
+			$destination = $this->phpbb_root_path.$this->upload_dir.$user_dir;
122 122
 
123 123
 			if (!is_dir($destination))
124 124
 			{
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @param \phpbb\files\filespec $file
134 134
 	 * @return void
135 135
 	 */
136
-	protected function set_filename(\phpbb\files\filespec &$file)
136
+	protected function set_filename(\phpbb\files\filespec & $file)
137 137
 	{
138 138
 		$mode = 'real';
139 139
 		$prefix = '';
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.