blitze / phpBB-ext-sitemaker

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;

blocks/custom.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;
 		}

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>';
 		}
 	}
 

blocks/whats_new.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);

Spacing +3 added lines, -3 removed lines

@@ -99,7 +99,7 @@ 
 
 			$this->ptemplate->assign_block_vars('topicrow', array(
 				'TOPIC_TITLE'    => censor_text($row['topic_title']),
-				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"),
+				'U_VIEWTOPIC'    => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"),
 			));
 			unset($topic_data[$i]);
 		}
@@ -140,7 +140,7 @@ 
 	{
 		return array(
 			'WHERE'		=> array(
-				't.topic_last_post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_last_post_time > '.$this->user->data['user_lastvisit'],
 				't.topic_moved_id = 0',
 			),
 		);
@@ -156,7 +156,7 @@ 
 				POSTS_TABLE		=> 'p',
 			),
 			'WHERE'		=> array(
-				't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'],
+				't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'],
 			),
 		);
 	}

blocks/whois.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;
 		}

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) : '';
 	}
 }

model/menus/mapper/items.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;
 		}

Spacing +1 added lines, -1 removed lines

@@ -172,6 +172,6 @@
 	 */
 	protected function get_sql_where($menu_id)
 	{
-		return '%smenu_id = ' . (int) $menu_id;
+		return '%smenu_id = '.(int) $menu_id;
 	}
 }

services/tree/builder.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;
 		}

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/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');

blocks/forum_topics.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);

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
 	{
 		$this->set_display_fields();
 
-		$view = 'S_' . strtoupper($this->settings['template']);
+		$view = 'S_'.strtoupper($this->settings['template']);
 		$post_data = $this->get_post_data($topic_data);
 		$topic_data = array_values($topic_data);
 
@@ -164,7 +164,7 @@ 
 	{
 		for ($i = 0, $size = sizeof($topic_data); $i < $size; $i++)
 		{
-			$row =& $topic_data[$i];
+			$row = & $topic_data[$i];
 			$forum_id = $row['forum_id'];
 			$topic_id = $row['topic_id'];
 
@@ -179,8 +179,8 @@ 
 				'VIEWS'				=> $row['topic_views'],
 				'S_UNREAD_TOPIC'	=> $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']),
 
-				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&amp;t=$topic_id"),
-				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"),
+				'U_VIEWTOPIC'		=> append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&amp;t=$topic_id"),
+				'U_VIEWFORUM'		=> append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"),
 			);
 
 			$this->ptemplate->assign_block_vars('topicrow', $tpl_ary);

services/blocks/blocks.php

Braces +1 added lines, -2 removed lines

@@ -178,8 +178,7 @@
 		if (!empty($block['content']))
 		{
 			$content = $block['content'];
-		}
-		else if ($edit_mode)
+		} else if ($edit_mode)
 		{
 			$content = $this->user->lang('BLOCK_NO_DATA');
 		}