Completed
Push — develop ( a3ab64...524863 )
by Daniel
13:34
created
acp/settings_module.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -93,16 +93,16 @@  discard block
 block discarded – undo
93 93
 
94 94
 		$layouts = $this->get_layouts();
95 95
 
96
-        $this->template->assign_vars(array(
97
-            'u_action'			=> $this->u_action,
96
+		$this->template->assign_vars(array(
97
+			'u_action'			=> $this->u_action,
98 98
 			'icon_picker'		=> $this->icon->picker(),
99
-            'forum_icon'		=> $this->config['sm_forum_icon'],
100
-            'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
99
+			'forum_icon'		=> $this->config['sm_forum_icon'],
100
+			'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
101 101
 			'hide_login'		=> (bool) $this->config['sm_hide_login'],
102 102
 			'hide_online'		=> (bool) $this->config['sm_hide_online'],
103 103
 			'hide_birthday'		=> (bool) $this->config['sm_hide_birthday'],
104
-            'styles'			=> $this->get_styles_data($layouts),
105
-            'layouts'			=> $layouts,
104
+			'styles'			=> $this->get_styles_data($layouts),
105
+			'layouts'			=> $layouts,
106 106
 		));
107 107
 
108 108
 		$this->util->add_assets(array(
@@ -119,21 +119,21 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	protected function save_settings($form_key)
121 121
 	{
122
-        if ($this->request->is_set_post('submit'))
123
-        {
124
-            $this->check_form_key($form_key);
122
+		if ($this->request->is_set_post('submit'))
123
+		{
124
+			$this->check_form_key($form_key);
125 125
 
126 126
 			$layout_prefs = $this->request->variable('layouts', array(0 => array('' => '')));
127
-            $this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
127
+			$this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
128 128
 
129
-            $this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
130
-            $this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
131
-            $this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
132
-            $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133
-            $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
129
+			$this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
130
+			$this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
131
+			$this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
132
+			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133
+			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
134 134
 
135
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
136
-        }
135
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
136
+		}
137 137
 	}
138 138
 
139 139
 	/**
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 	protected function check_form_key($form_key)
228 228
 	{
229 229
 		if (!check_form_key($form_key))
230
-        {
231
-            $this->trigger_error('FORM_INVALID');
232
-        }
230
+		{
231
+			$this->trigger_error('FORM_INVALID');
232
+		}
233 233
 	}
234 234
 
235 235
 	/**
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
             $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
133 133
             $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
134 134
 
135
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
135
+            $this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
136 136
         }
137 137
 	}
138 138
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	{
145 145
 		$style_prefs = json_decode($this->config_text->get('sm_layout_prefs'), true);
146 146
 
147
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
147
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
148 148
 
149 149
 		$styles = array();
150 150
 		while ($row = $this->db->sql_fetchrow($result))
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 		foreach ($layouts as $name => $path)
198 198
 		{
199 199
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
200
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
200
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
201 201
 		}
202 202
 
203 203
 		return $options;
@@ -211,11 +211,11 @@  discard block
 block discarded – undo
211 211
 	{
212 212
 		$views = array('basic', 'boxed', 'simple');
213 213
 
214
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
214
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
215 215
 		foreach ($views as $view)
216 216
 		{
217 217
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
218
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
218
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
219 219
 		}
220 220
 
221 221
 		return $options;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			$path = dirname($path);
258 258
 			$name = basename($path);
259 259
 
260
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
260
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
261 261
 		}
262 262
 
263 263
 		return $layouts;
Please login to merge, or discard this patch.
event/listener.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
 	public function load_permission_language(\phpbb\event\data $event)
118 118
 	{
119 119
 		$permissions = $event['permissions'];
120
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
121
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
122
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
120
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
121
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
122
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
123 123
 		$event['permissions'] = $permissions;
124 124
 	}
125 125
 
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 	 */
194 194
 	public function set_startpage(\phpbb\event\data $event)
195 195
 	{
196
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
196
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
197 197
 		{
198 198
 			$method = $this->config['sitemaker_startpage_method'];
199 199
 			$this->is_startpage = true;
200 200
 
201 201
 			$controller_dir = explode('\\', get_class($controller_object));
202
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
202
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
203 203
 			$this->template->set_style(array($controller_style_dir, 'styles'));
204 204
 
205 205
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 */
221 221
 	public function add_viewonline_location(\phpbb\event\data $event)
222 222
 	{
223
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
223
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
224 224
 		{
225 225
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
226 226
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');
Please login to merge, or discard this patch.
controller/forum.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 		// @codeCoverageIgnoreStart
58 58
 		if (!function_exists('display_forums'))
59 59
 		{
60
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
60
+			include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
61 61
 		}
62 62
 		// @codeCoverageIgnoreEnd
63 63
 
Please login to merge, or discard this patch.
exception/out_of_bounds.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 class invalid_argument extends base
16 16
 {
17 17
 	/**
18
-	* Translate this exception
19
-	*
20
-	* @param \phpbb\language\language $translator
21
-	* @return array|string
22
-	* @access public
23
-	*/
18
+	 * Translate this exception
19
+	 *
20
+	 * @param \phpbb\language\language $translator
21
+	 * @return array|string
22
+	 * @access public
23
+	 */
24 24
 	public function get_message(\phpbb\language\language $translator)
25 25
 	{
26 26
 		return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_INVALID_ARGUMENT');
Please login to merge, or discard this patch.
exception/unexpected_value.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 class invalid_argument extends base
16 16
 {
17 17
 	/**
18
-	* Translate this exception
19
-	*
20
-	* @param \phpbb\language\language $translator
21
-	* @return array|string
22
-	* @access public
23
-	*/
18
+	 * Translate this exception
19
+	 *
20
+	 * @param \phpbb\language\language $translator
21
+	 * @return array|string
22
+	 * @access public
23
+	 */
24 24
 	public function get_message(\phpbb\language\language $translator)
25 25
 	{
26 26
 		return $this->translate_portions($translator, $this->message_full, 'EXCEPTION_INVALID_ARGUMENT');
Please login to merge, or discard this patch.