blitze / phpBB-ext-sitemaker

controller/blocks_admin.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 			$return_data = $command->execute($style_id);
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$json_data['message'] = $e->get_message($this->user);
 		}

controller/menus_admin.php

Braces +2 added lines, -4 removed lines

@@ -58,12 +58,10 @@
 			$return_data = $command->execute();
 
 			$this->action_handler->clear_cache();
-		}
-		catch (\blitze\sitemaker\exception\base $e)
+		} catch (\blitze\sitemaker\exception\base $e)
 		{
 			$return_data['message'] = $e->get_message($this->user);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$return_data['message'] = $this->user->lang($e->getMessage());
 		}

blocks/whois.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
-		}
-		else
+		} else
 		{
 			$item_id = 0;
 			$item = 'forum';

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 
 		if (!empty($data['.'][0]['TOTAL_USERS_ONLINE']))
 		{
-			$l_online_users	= $data['.'][0]['TOTAL_USERS_ONLINE'];
+			$l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE'];
 			$online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST'];
 			$l_online_record = $data['.'][0]['RECORD_USERS'];
 		}
@@ -105,6 +105,6 @@ 
 	 */
 	private function get_viewonline_url()
 	{
-		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline." . $this->php_ext) : '';
+		return ($this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$this->phpbb_root_path}viewonline.".$this->php_ext) : '';
 	}
 }

services/tree/display.php

Braces +1 added lines, -2 removed lines

@@ -237,8 +237,7 @@
 			{
 				$padding .= $pad_with;
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}

Indentation +7 added lines, -7 removed lines

@@ -33,13 +33,13 @@
 	protected $data = array();
 
 	/**
-	* Construct
-	*
-	* @param \phpbb\db\driver\driver_interface		$db             Database connection
-	* @param string									$items_table	Table name
-	* @param string									$pk				Primary key
-	* @param string									$sql_where		Column restriction
-	*/
+	 * Construct
+	 *
+	 * @param \phpbb\db\driver\driver_interface		$db             Database connection
+	 * @param string									$items_table	Table name
+	 * @param string									$pk				Primary key
+	 * @param string									$sql_where		Column restriction
+	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '')
 	{
 		$this->db = $db;

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
 	{
 		$sql = "SELECT *
 			FROM $this->items_table
-			WHERE $this->pk = " . (int) $node_id ;
+			WHERE $this->pk = ".(int) $node_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);
@@ -107,8 +107,8 @@ 
 					$this->items_table => ' t'
 				),
 				'WHERE'		=> array(
-					't.depth ' . (($level) ? " BETWEEN $start AND " . ($start + $level) : ' >= ' . $start),
-					(($this->sql_where) ? 't.' . $this->sql_where : ''),
+					't.depth '.(($level) ? " BETWEEN $start AND ".($start + $level) : ' >= '.$start),
+					(($this->sql_where) ? 't.'.$this->sql_where : ''),
 				),
 				'ORDER_BY'	=> 't.left_id ASC',
 			),
@@ -147,7 +147,7 @@ 
 	 * @param \phpbb\template\twig\twig $template
 	 * @param string $handle
 	 */
-	public function display_list(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree')
+	public function display_list(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree')
 	{
 		$prev_depth = 0;
 		$parental_depth = array(0 => -1);
@@ -156,10 +156,10 @@ 
 		for ($i = 0, $size = sizeof($data); $i < $size; $i++)
 		{
 			$row 		= $data[$i];
-			$this_depth	= $parental_depth[$row['parent_id']] + 1;
-			$repeat		= abs($prev_depth - $this_depth);
+			$this_depth = $parental_depth[$row['parent_id']] + 1;
+			$repeat = abs($prev_depth - $this_depth);
 
-			$tpl_data	= array(
+			$tpl_data = array(
 				'PREV_DEPTH'	=> $prev_depth,
 				'THIS_DEPTH'	=> $this_depth,
 				'NUM_KIDS'		=> $this->count_descendants($row),
@@ -169,7 +169,7 @@ 
 
 			for ($j = 0; $j < $repeat; $j++)
 			{
-				$template->assign_block_vars($handle . '.close', array());
+				$template->assign_block_vars($handle.'.close', array());
 			}
 
 			$prev_depth = $this_depth;
@@ -178,7 +178,7 @@ 
 
 		for ($i = 0; $i < $prev_depth; $i++)
 		{
-			$template->assign_block_vars('close_' . $handle, array());
+			$template->assign_block_vars('close_'.$handle, array());
 		}
 	}
 
@@ -217,10 +217,10 @@ 
 			}
 
 			$right = $row['right_id'];
-			$title = $padding . '&#x251c;&#x2500; ' . $row[$title_column];
+			$title = $padding.'&#x251c;&#x2500; '.$row[$title_column];
 			$selected = (in_array($row[$this->pk], $selected_ids)) ? ' selected="selected' : '';
 
-			$return_options .= '<option value="' . $row[$this->pk] . '"' . $selected . '>' . $title . '</option>';
+			$return_options .= '<option value="'.$row[$this->pk].'"'.$selected.'>'.$title.'</option>';
 			$return_data[$row[$this->pk]] = $title;
 		}
 

services/tree/builder.php

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
 				'depth'		=> $new_parent['depth'] + 1,
 				'right_id'	=> --$new_parent['right_id'],
 			);
-		}
-		else
+		} else
 		{
 			return array(
 				'depth'		=> 0,

Spacing +19 added lines, -19 removed lines

@@ -55,8 +55,8 @@ 
 	 */
 	public function get_item_info($item_id = 0)
 	{
-		$sql = 'SELECT * FROM ' . $this->table_name . ' ' . $this->get_sql_where('WHERE') .
-			(($item_id) ? " AND {$this->column_item_id} = " . (int) $item_id : '');
+		$sql = 'SELECT * FROM '.$this->table_name.' '.$this->get_sql_where('WHERE').
+			(($item_id) ? " AND {$this->column_item_id} = ".(int) $item_id : '');
 
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -75,8 +75,8 @@ 
 	public function update_item($item_id, array $sql_data)
 	{
 		$sql = "UPDATE {$this->table_name}
-			SET " . $this->db->sql_build_array('UPDATE', $sql_data) . "
-			WHERE $this->column_item_id = " . (int) $item_id;
+			SET ".$this->db->sql_build_array('UPDATE', $sql_data)."
+			WHERE $this->column_item_id = ".(int) $item_id;
 		$this->db->sql_query($sql);
 
 		return $sql_data;
@@ -109,7 +109,7 @@ 
 
 		// Rather than updating each item individually, we will just delete all items
 		// then add them all over again with new parent_id|left_id|right_id
-		$this->db->sql_query("DELETE FROM {$this->table_name} " . $this->get_sql_where('WHERE'));
+		$this->db->sql_query("DELETE FROM {$this->table_name} ".$this->get_sql_where('WHERE'));
 
 		// Now we add it back
 		$sql_data = $this->add_sub_tree($tree, 0);
@@ -158,7 +158,7 @@ 
 
 			if ($depth && !$parent_id)
 			{
-				throw new \RuntimeException($this->message_prefix . 'MALFORMED_TREE');
+				throw new \RuntimeException($this->message_prefix.'MALFORMED_TREE');
 			}
 
 			$key = $i + $max_id + 1;
@@ -230,23 +230,23 @@ 
 		foreach ($branch as $i => $row)
 		{
 			$left_id	= $right_id + 1;
-			$right_id   = $right_id + 2;
+			$right_id = $right_id + 2;
 
 			$sql_data[$i] = $row;
-			$sql_data[$i]['parent_id']	= $parent_id;
-			$sql_data[$i]['left_id']	= $left_id;
-			$sql_data[$i]['right_id']	= $right_id;
-			$sql_data[$i]['depth']		= $depth;
+			$sql_data[$i]['parent_id'] = $parent_id;
+			$sql_data[$i]['left_id'] = $left_id;
+			$sql_data[$i]['right_id'] = $right_id;
+			$sql_data[$i]['depth'] = $depth;
 
 			if ($row['parent_id'])
 			{
-				$left_id	= $sql_data[$row['parent_id']]['right_id'];
-				$right_id   = $left_id + 1;
+				$left_id = $sql_data[$row['parent_id']]['right_id'];
+				$right_id = $left_id + 1;
 
-				$sql_data[$i]['parent_id']	= $row['parent_id'];
-				$sql_data[$i]['depth']		= $sql_data[$row['parent_id']]['depth'] + 1;
-				$sql_data[$i]['left_id']	= $left_id;
-				$sql_data[$i]['right_id']	= $right_id;
+				$sql_data[$i]['parent_id'] = $row['parent_id'];
+				$sql_data[$i]['depth'] = $sql_data[$row['parent_id']]['depth'] + 1;
+				$sql_data[$i]['left_id'] = $left_id;
+				$sql_data[$i]['right_id'] = $right_id;
 
 				$this->update_right_side($sql_data, $right_id, $row['parent_id'], $branch);
 			}
@@ -272,7 +272,7 @@ 
 				$this->db->sql_transaction('rollback');
 				$this->lock->release();
 
-				throw new \RuntimeException($this->message_prefix . 'INVALID_PARENT');
+				throw new \RuntimeException($this->message_prefix.'INVALID_PARENT');
 			}
 
 			// adjust items in affected branch
@@ -300,7 +300,7 @@ 
 	protected function get_max_id($column, $use_sql_where = true)
 	{
 		$sql = "SELECT MAX($column) AS $column
-			FROM {$this->table_name} " .
+			FROM {$this->table_name} ".
 			(($use_sql_where) ? $this->get_sql_where('WHERE') : '');
 		$result = $this->db->sql_query($sql);
 		$max_id = $this->db->sql_fetchfield($column);

exception/base.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 		if (is_array($message))
 		{
 			$this->message = (string) $message[0];
-		}
-		else
+		} else
 		{
 			$this->message = $message;
 		}

Indentation +45 added lines, -45 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,12 +53,12 @@ 
 	}
 
 	/**
-	* Basic message translation for our exceptions
-	*
-	* @param \phpbb\user $user
-	* @return string|array
-	* @access public
-	*/
+	 * Basic message translation for our exceptions
+	 *
+	 * @param \phpbb\user $user
+	 * @return string|array
+	 * @access public
+	 */
 	public function get_message(\phpbb\user $user)
 	{
 		// Make sure our language file has been loaded
@@ -73,18 +73,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\user $user
-	* @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\user $user
+	 * @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\user $user, $message_portions, $parent_message = null)
 	{
 		// Make sure our language file has been loaded
@@ -126,12 +126,12 @@ 
 	}
 
 	/**
-	* Add our language file
-	*
-	* @param \phpbb\user $user
-	* @return null
-	* @access public
-	*/
+	 * Add our language file
+	 *
+	 * @param \phpbb\user $user
+	 * @return null
+	 * @access public
+	 */
 	public function add_lang(\phpbb\user $user)
 	{
 		static $is_loaded = false;
@@ -150,15 +150,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

@@ -100,10 +100,10 @@
 		foreach ($message_portions as &$message)
 		{
 			// Attempt to translate each portion
-			$translated_message = $user->lang('EXCEPTION_' . $message);
+			$translated_message = $user->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;

exception/unexpected_value.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 class unexpected_value extends base
 {
 	/**
-	* Translate this exception
-	*
-	* @param \phpbb\user $user
-	* @return array|string
-	* @access public
-	*/
+	 * Translate this exception
+	 *
+	 * @param \phpbb\user $user
+	 * @return array|string
+	 * @access public
+	 */
 	public function get_message(\phpbb\user $user)
 	{
 		return $this->translate_portions($user, $this->message_full, 'EXCEPTION_UNEXPECTED_VALUE');

cron/blocks_cleanup.php

Spacing +4 added lines, -4 removed lines

@@ -91,8 +91,8 @@ 
 	 */
 	private function clean_styles()
 	{
-		$routes_ary	= $this->manager->get_routes_per_style();
-		$style_ids	= $this->get_style_ids();
+		$routes_ary = $this->manager->get_routes_per_style();
+		$style_ids = $this->get_style_ids();
 
 		$routes = array();
 		foreach ($routes_ary as $style_id => $style_routes)
@@ -122,7 +122,7 @@ 
 
 		foreach ($routes as $route => $row)
 		{
-			$url = $board_url . '/' . (($row['ext_name']) ? 'app.php' : '') . $row['route'];
+			$url = $board_url.'/'.(($row['ext_name']) ? 'app.php' : '').$row['route'];
 
 			// Route no longer exists => remove all blocks for route
 			if ($this->url_checker->exists($url) !== true)
@@ -185,7 +185,7 @@ 
 
 		if (sizeof($block_ids))
 		{
-			$this->db->sql_query('DELETE FROM ' . $this->cblocks_table . ' WHERE ' . $this->db->sql_in_set('block_id', $block_ids));
+			$this->db->sql_query('DELETE FROM '.$this->cblocks_table.' WHERE '.$this->db->sql_in_set('block_id', $block_ids));
 		}
 	}
 

model/base_entity.php

Indentation +4 added lines, -4 removed lines

@@ -56,8 +56,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_array()
 	{
 		$attributes = $this->get_attributes();
@@ -74,8 +74,8 @@ 
 	}
 
 	/**
-	* {@inheritdoc}
-	*/
+	 * {@inheritdoc}
+	 */
 	public function to_db()
 	{
 		$this->check_required();

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	{
 		foreach ($data as $name => $value)
 		{
-			$mutator = 'set_' . $name;
+			$mutator = 'set_'.$name;
 			$this->$mutator($value);
 		}
 	}
@@ -65,7 +65,7 @@ 
 		$data = array();
 		foreach ($attributes as $attribute)
 		{
-			$accessor = 'get_' . $attribute;
+			$accessor = 'get_'.$attribute;
 			$data[$attribute] = $this->$accessor();
 		}
 		unset($data['db_fields'], $data['required_fields']);

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 			if ('get' == $match[1])
 			{
 				return $this->$attribute;
-			}
-			else
+			} else
 			{
 				$this->$attribute = $this->validate_attribute($match[2], $args[0]);
 				return $this;