blitze / phpBB-ext-sitemaker

model/blocks/entity/block.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 	 */
 	public function set_class($class)
 	{
-		$this->class = ($class) ? ' ' . $class : '';
+		$this->class = ($class) ? ' '.$class : '';
 		return $this;
 	}
 

services/blocks/display.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
 	 */
 	protected function toggle_edit_mode()
 	{
-		$edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
+		$edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE);
 
 		if ($this->request->is_set('edit_mode'))
 		{
@@ -198,7 +198,7 @@ 
 				);
 			}
 
-			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode);
+			$u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode);
 		}
 		else
 		{

services/blocks/cfg_handler.php

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
 
 		if (!function_exists('build_cfg_template'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext); // @codeCoverageIgnore
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext); // @codeCoverageIgnore
 		}
 
 		// We fake this class as it is needed by the build_cfg_template function
@@ -83,7 +83,7 @@ 
 		// @codeCoverageIgnoreStart
 		if (!function_exists('validate_config_vars'))
 		{
-			include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
+			include($this->phpbb_root_path.'includes/functions_acp.'.$this->php_ext);
 		}
 		// @codeCoverageIgnoreEnd
 
@@ -171,7 +171,7 @@ 
 		$vars['append'] = $this->append_field($vars);
 
 		$type = explode(':', $vars['type']);
-		$method = 'prep_' . $type[0] . '_field_for_display';
+		$method = 'prep_'.$type[0].'_field_for_display';
 
 		if (is_callable(array($this, $method)))
 		{
@@ -215,7 +215,7 @@ 
 		$l_explain = '';
 		if (!empty($vars['explain']))
 		{
-			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'] . '_EXPLAIN');
+			$l_explain = (isset($vars['lang_explain'])) ? $this->translator->lang($vars['lang_explain']) : $this->translator->lang($vars['lang'].'_EXPLAIN');
 		}
 
 		return $l_explain;
@@ -315,7 +315,7 @@ 
 	{
 		$this->prep_checkbox_field_for_display($vars, $type, $field);
 
-		$vars['method'] ='build_multi_select';
+		$vars['method'] = 'build_multi_select';
 	}
 
 	/**

blocks/custom.php

Spacing +4 added lines, -4 removed lines

@@ -69,7 +69,7 @@ 
 		$content = $this->request->variable('content', '', true);
 		$cblocks = $this->get_custom_blocks();
 
-		$sql_data =	$this->get_default_fields($block_id);
+		$sql_data = $this->get_default_fields($block_id);
 		$sql_data['block_content'] = $content;
 
 		generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, true, true);
@@ -130,11 +130,11 @@ 
 	{
 		if (!$block_exists)
 		{
-			$sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data);
+			$sql = 'INSERT INTO '.$this->cblocks_table.' '.$this->db->sql_build_array('INSERT', $sql_data);
 		}
 		else
 		{
-			$sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id'];
+			$sql = 'UPDATE '.$this->cblocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE block_id = '.(int) $sql_data['block_id'];
 		}
 		$this->db->sql_query($sql);
 		$this->cache->destroy('pt_cblocks');
@@ -151,7 +151,7 @@ 
 		if ($edit_mode !== false)
 		{
 			decode_message($cblock['block_content'], $cblock['bbcode_uid']);
-			$content = '<div id="block-editor-' . $cblock['block_id'] . '" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="' . $cblock['block_content'] . '">' . $content . '</div>';
+			$content = '<div id="block-editor-'.$cblock['block_id'].'" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="'.$cblock['block_content'].'">'.$content.'</div>';
 		}
 	}
 

acp/settings_module.php

Indentation +20 added lines, -20 removed lines

@@ -93,16 +93,16 @@ 
 
 		$layouts = $this->get_layouts();
 
-        $this->template->assign_vars(array(
-            'u_action'			=> $this->u_action,
+		$this->template->assign_vars(array(
+			'u_action'			=> $this->u_action,
 			'icon_picker'		=> $this->icon->picker(),
-            'forum_icon'		=> $this->config['sm_forum_icon'],
-            'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
+			'forum_icon'		=> $this->config['sm_forum_icon'],
+			'show_forum_nav'	=> (bool) $this->config['sm_show_forum_nav'],
 			'hide_login'		=> (bool) $this->config['sm_hide_login'],
 			'hide_online'		=> (bool) $this->config['sm_hide_online'],
 			'hide_birthday'		=> (bool) $this->config['sm_hide_birthday'],
-            'styles'			=> $this->get_styles_data($layouts),
-            'layouts'			=> $layouts,
+			'styles'			=> $this->get_styles_data($layouts),
+			'layouts'			=> $layouts,
 		));
 
 		$this->util->add_assets(array(
@@ -119,21 +119,21 @@ 
 	 */
 	protected function save_settings($form_key)
 	{
-        if ($this->request->is_set_post('submit'))
-        {
-            $this->check_form_key($form_key);
+		if ($this->request->is_set_post('submit'))
+		{
+			$this->check_form_key($form_key);
 
 			$layout_prefs = $this->request->variable('layouts', array(0 => array('' => '')));
-            $this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
+			$this->config_text->set('sm_layout_prefs', json_encode($layout_prefs));
 
-            $this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
-            $this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
-            $this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
-            $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
-            $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
+			$this->config->set('sm_hide_login', $this->request->variable('hide_login', 0));
+			$this->config->set('sm_hide_online', $this->request->variable('hide_online', 0));
+			$this->config->set('sm_hide_birthday', $this->request->variable('hide_birthday', 0));
+			$this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
+			$this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
 
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
-        }
+			$this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
+		}
 	}
 
 	/**
@@ -227,9 +227,9 @@ 
 	protected function check_form_key($form_key)
 	{
 		if (!check_form_key($form_key))
-        {
-            $this->trigger_error('FORM_INVALID');
-        }
+		{
+			$this->trigger_error('FORM_INVALID');
+		}
 	}
 
 	/**

Spacing +6 added lines, -6 removed lines

@@ -132,7 +132,7 @@ 
             $this->config->set('sm_show_forum_nav', $this->request->variable('show_forum_nav', 0));
             $this->config->set('sm_forum_icon', $this->request->variable('forum_icon', ''));
 
-            $this->trigger_error($this->translator->lang('SETTINGS_SAVED') . adm_back_link($this->u_action));
+            $this->trigger_error($this->translator->lang('SETTINGS_SAVED').adm_back_link($this->u_action));
         }
 	}
 
@@ -144,7 +144,7 @@ 
 	{
 		$style_prefs = json_decode($this->config_text->get('sm_layout_prefs'), true);
 
-		$result = $this->db->sql_query('SELECT style_id, style_name FROM ' . STYLES_TABLE);
+		$result = $this->db->sql_query('SELECT style_id, style_name FROM '.STYLES_TABLE);
 
 		$styles = array();
 		while ($row = $this->db->sql_fetchrow($result))
@@ -197,7 +197,7 @@ 
 		foreach ($layouts as $name => $path)
 		{
 			$selected = ($path == $pref) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $path . '"' . $selected . '>' . $this->translator->lang('LAYOUT_' . strtoupper($name)) . '</option>';
+			$options .= '<option value="'.$path.'"'.$selected.'>'.$this->translator->lang('LAYOUT_'.strtoupper($name)).'</option>';
 		}
 
 		return $options;
@@ -211,11 +211,11 @@ 
 	{
 		$views = array('basic', 'boxed', 'simple');
 
-		$options = '<option value="">' . $this->translator->lang('BLOCK_VIEW_DEFAULT') . '</option>';
+		$options = '<option value="">'.$this->translator->lang('BLOCK_VIEW_DEFAULT').'</option>';
 		foreach ($views as $view)
 		{
 			$selected = ($view == $pref) ? ' selected="selected"' : '';
-			$options .= '<option value="' . $view . '"' . $selected . '>' . $this->translator->lang('BLOCK_VIEW_' . strtoupper($view)) . '</option>';
+			$options .= '<option value="'.$view.'"'.$selected.'>'.$this->translator->lang('BLOCK_VIEW_'.strtoupper($view)).'</option>';
 		}
 
 		return $options;
@@ -257,7 +257,7 @@ 
 			$path = dirname($path);
 			$name = basename($path);
 
-			$layouts[$name] = $this->phpbb_root_path . $path . '/';
+			$layouts[$name] = $this->phpbb_root_path.$path.'/';
 		}
 
 		return $layouts;

event/listener.php

Spacing +6 added lines, -6 removed lines

@@ -117,9 +117,9 @@ 
 	public function load_permission_language(\phpbb\event\data $event)
 	{
 		$permissions = $event['permissions'];
-		$permissions['a_sm_settings']	= array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
-		$permissions['a_sm_manage_blocks']	= array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
-		$permissions['a_sm_manage_menus']	= array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
+		$permissions['a_sm_settings'] = array('lang' => 'ACL_A_SM_SETTINGS', 'cat' => 'misc');
+		$permissions['a_sm_manage_blocks'] = array('lang' => 'ACL_A_SM_MANAGE_BLOCKS', 'cat' => 'misc');
+		$permissions['a_sm_manage_menus'] = array('lang' => 'ACL_A_SM_MANAGE_MENUS', 'cat' => 'misc');
 		$event['permissions'] = $permissions;
 	}
 
@@ -193,13 +193,13 @@ 
 	 */
 	public function set_startpage(\phpbb\event\data $event)
 	{
-		if ($this->user->page['page_name'] == 'index.' . $this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
+		if ($this->user->page['page_name'] == 'index.'.$this->php_ext && !$this->is_startpage && ($controller_object = $this->get_startpage_controller()) !== false)
 		{
 			$method = $this->config['sitemaker_startpage_method'];
 			$this->is_startpage = true;
 
 			$controller_dir = explode('\\', get_class($controller_object));
-			$controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles';
+			$controller_style_dir = 'ext/'.$controller_dir[0].'/'.$controller_dir[1].'/styles';
 			$this->template->set_style(array($controller_style_dir, 'styles'));
 
 			$arguments = explode('/', $this->config['sitemaker_startpage_params']);
@@ -220,7 +220,7 @@ 
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/forum') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/forum') === 0)
 		{
 			$event['location'] = $this->translator->lang('FORUM_INDEX');
 			$event['location_url'] = $this->phpbb_container->get('controller.helper')->route('blitze_sitemaker_forum');

exception/base.php

Indentation +39 added lines, -39 removed lines

@@ -16,23 +16,23 @@ 
 class base extends \Exception
 {
 	/**
-	* Null if the message is a string, array if the message was submitted as an array
-	* @var string|array
-	*/
+	 * Null if the message is a string, array if the message was submitted as an array
+	 * @var string|array
+	 */
 	protected $message_full;
 
 	protected $previous;
 
 	/**
-	* Constructor
-	*
-	* Different from normal exceptions in that we do not enforce $message to be a string.
-	*
-	* @param string|array $message
-	* @param int $code
-	* @param \Exception $previous
-	* @access public
-	*/
+	 * Constructor
+	 *
+	 * Different from normal exceptions in that we do not enforce $message to be a string.
+	 *
+	 * @param string|array $message
+	 * @param int $code
+	 * @param \Exception $previous
+	 * @access public
+	 */
 	public function __construct($message = null, $code = 0, \Exception $previous = null)
 	{
 		// We're slightly changing the way exceptions work
@@ -53,18 +53,18 @@ 
 	}
 
 	/**
-	* Translate all portions of the message sent to the exception
-	*
-	* Goes through each element of the array and tries to translate them
-	*
-	* @param \phpbb\language\language $translator
-	* @param string|array $message_portions The message portions to translate
-	* @param string|null $parent_message Send a string to translate all of the
-	*     portions with the parent message (typically used to format a string
-	*     with the given message portions). Null to ignore. Default: Null
-	* @return array|string Array if $parent_message === null else a string
-	* @access protected
-	*/
+	 * Translate all portions of the message sent to the exception
+	 *
+	 * Goes through each element of the array and tries to translate them
+	 *
+	 * @param \phpbb\language\language $translator
+	 * @param string|array $message_portions The message portions to translate
+	 * @param string|null $parent_message Send a string to translate all of the
+	 *     portions with the parent message (typically used to format a string
+	 *     with the given message portions). Null to ignore. Default: Null
+	 * @return array|string Array if $parent_message === null else a string
+	 * @access protected
+	 */
 	protected function translate_portions(\phpbb\language\language $translator, $message_portions, $parent_message = null)
 	{
 		// Make sure our language file has been loaded
@@ -106,12 +106,12 @@ 
 	}
 
 	/**
-	* Add our language file
-	*
-	* @param \phpbb\language\language $translator
-	* @return null
-	* @access public
-	*/
+	 * Add our language file
+	 *
+	 * @param \phpbb\language\language $translator
+	 * @return null
+	 * @access public
+	 */
 	public function add_lang(\phpbb\language\language $translator)
 	{
 		static $is_loaded = false;
@@ -130,15 +130,15 @@ 
 	}
 
 	/**
-	* Output a string of this error message
-	*
-	* This will hopefully be never called, always catch the expected exceptions
-	* and call get_message to translate them into an error that a user can
-	* understand
-	*
-	* @return string
-	* @access public
-	*/
+	 * Output a string of this error message
+	 *
+	 * This will hopefully be never called, always catch the expected exceptions
+	 * and call get_message to translate them into an error that a user can
+	 * understand
+	 *
+	 * @return string
+	 * @access public
+	 */
 	public function __toString()
 	{
 		return (is_array($this->message_full)) ? var_export($this->message_full, true) : (string) $this->message_full;

Spacing +2 added lines, -2 removed lines

@@ -80,10 +80,10 @@
 		foreach ($message_portions as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $translator->lang('EXCEPTION_' . $message);
+			$translated_message = $translator->lang('EXCEPTION_'.$message);
 
 			// Check if translating did anything
-			if ($translated_message !== 'EXCEPTION_' . $message)
+			if ($translated_message !== 'EXCEPTION_'.$message)
 			{
 				// It did, so replace message with the translated version
 				$message = $translated_message;