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/login.php

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 				'title'		=> 'LOGIN',
 				'content'	=> $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block')
 			);
-		}
-		else if ($settings['show_member_menu'])
+		} else if ($settings['show_member_menu'])
 		{
 			$block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu');
 			$block->set_template($this->ptemplate);

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;

services/blocks/action/save_blocks.php

Braces +2 added lines, -4 removed lines

@@ -50,8 +50,7 @@ 
 		if (!empty($collection))
 		{
 			return $collection->get_entities();
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -88,8 +87,7 @@ 
 		if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions))
 		{
 			$this->route_mapper->delete($route);
-		}
-		else
+		} else
 		{
 			$route->set_has_blocks($has_blocks);
 			$this->route_mapper->save($route);

services/blocks/display.php

Braces +3 added lines, -6 removed lines

@@ -135,8 +135,7 @@ 
 		if ($this->request->is_set('style'))
 		{
 			return $this->request->variable('style', 0);
-		}
-		else
+		} else
 		{
 			return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style'];
 		}
@@ -172,8 +171,7 @@ 
 				self::SHOW_BLOCK_LANDING	=> true,
 				self::SHOW_BLOCK_SUBPAGE	=> false,
 			);
-		}
-		else
+		} else
 		{
 			$modes = array(
 				self::SHOW_BLOCK_BOTH		=> true,
@@ -200,8 +198,7 @@ 
 			}
 
 			$u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1));
-		}
-		else
+		} else
 		{
 			$edit_mode = false;
 		}

model/blocks/entity/block.php

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 		if (!is_array($settings))
 		{
 			$this->settings = $settings;
-		}
-		else if (sizeof($settings))
+		} else if (sizeof($settings))
 		{
 			$this->settings = serialize($settings);
 			$this->hash = md5($this->settings);

model/base_collection.php

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
 			if (!isset($key))
 			{
 				$this->_entities[] = $entity;
-			}
-			else
+			} else
 			{
 				$this->_entities[$key] = $entity;
 			}

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;