ErnadoO / qte

qte.php

Indentation +108 added lines, -108 removed lines

@@ -54,19 +54,19 @@ 
 	private $_name = array();
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\request\request					$request			Request object
-	* @param \phpbb\cache\driver\driver_interface	$cache				Cache object
-	* @param \phpbb\db\driver\driver_interface 		$db					Database object
-	* @param \phpbb\template\template				$template			Template object
-	* @param \phpbb\user							$user				User object
-	* @param \phpbb\log\log							$log				Log object
-	* @param \phpbb\auth\auth						$auth				Auth object
-	* @param string									$root_path			phpBB root path
-	* @param string									$php_ext   			phpEx
-	* @param string									$table_prefix   	Prefix tables
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\request\request					$request			Request object
+	 * @param \phpbb\cache\driver\driver_interface	$cache				Cache object
+	 * @param \phpbb\db\driver\driver_interface 		$db					Database object
+	 * @param \phpbb\template\template				$template			Template object
+	 * @param \phpbb\user							$user				User object
+	 * @param \phpbb\log\log							$log				Log object
+	 * @param \phpbb\auth\auth						$auth				Auth object
+	 * @param string									$root_path			phpBB root path
+	 * @param string									$php_ext   			phpEx
+	 * @param string									$table_prefix   	Prefix tables
+	 */
 	public function __construct(\phpbb\request\request $request, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, \phpbb\auth\auth $auth, $root_path, $php_ext, $table_prefix)
 	{
 		$this->request		= $request;
@@ -86,12 +86,12 @@ 
 	}
 
 	/**
-	* Get topic attributes username
-	*
-	* @param	array	$topic_list	Topic ids
-	*
-	* @return	null
-	*/
+	 * Get topic attributes username
+	 *
+	 * @param	array	$topic_list	Topic ids
+	 *
+	 * @return	null
+	 */
 	public function get_users_by_topic_id($topic_list)
 	{
 		if (!empty($topic_list))
@@ -116,24 +116,24 @@ 
 	}
 
 	/**
-	* Get attribute name
-	*
-	* @param	int		$attr_id	The attribute id
-	*
-	* @return	string
-	*/
+	 * Get attribute name
+	 *
+	 * @param	int		$attr_id	The attribute id
+	 *
+	 * @return	string
+	 */
 	public function get_attr_name_by_id($attr_id)
 	{
 		return $this->_attr[$attr_id]['attr_name'];
 	}
 
 	/**
-	* Get attribute author
-	*
-	* @param	int		$user_id	User id
-	*
-	* @return	string
-	*/
+	 * Get attribute author
+	 *
+	 * @param	int		$user_id	User id
+	 *
+	 * @return	string
+	 */
 	public function get_users_by_user_id($user_id)
 	{
 		if (!isset($this->_name[$user_id]))
@@ -156,16 +156,16 @@ 
 	}
 
 	/**
-	* Generate a list of attributes based on permissions
-	*
-	* @param	int		$forum_id		Forum id
-	* @param	int		$author_id		Topic author id
-	* @param	int		$attribute_id	Current attribute id
-	* @param	string	$viewtopic_url	Topic's url
-	* @param	string	$mode			Post mode
-	*
-	* @return	null
-	*/
+	 * Generate a list of attributes based on permissions
+	 *
+	 * @param	int		$forum_id		Forum id
+	 * @param	int		$author_id		Topic author id
+	 * @param	int		$attribute_id	Current attribute id
+	 * @param	string	$viewtopic_url	Topic's url
+	 * @param	string	$mode			Post mode
+	 *
+	 * @return	null
+	 */
 	public function attr_select($forum_id, $author_id = 0, $attribute_id = 0, $viewtopic_url = '', $mode = '')
 	{
 		$show_select	= false;
@@ -215,10 +215,10 @@ 
 	}
 
 	/**
-	* Generate a list of all attributes for search page
-	*
-	* @return	null
-	*/
+	 * Generate a list of all attributes for search page
+	 *
+	 * @return	null
+	 */
 	public function attr_search()
 	{
 		foreach ($this->_attr as $attr)
@@ -238,13 +238,13 @@ 
 	}
 
 	/**
-	* Generate a list of attributes for viewforum page
-	*
-	* @param	int		$forum_id		Forum id
-	* @param	int		$attribute_id	Current attribute id
-	*
-	* @return	null
-	*/
+	 * Generate a list of attributes for viewforum page
+	 *
+	 * @param	int		$forum_id		Forum id
+	 * @param	int		$attribute_id	Current attribute id
+	 *
+	 * @return	null
+	 */
 	public function attr_sort($forum_id = 0, $attribute_id = 0)
 	{
 		foreach ($this->_attr as $attr)
@@ -271,13 +271,13 @@ 
 	}
 
 	/**
-	* Generate a default attribute list for a forum
-	*
-	* @param	int		$forum_id		Forum id
-	* @param	int		$attribute_id	Current attribute id
-	*
-	* @return	null
-	*/
+	 * Generate a default attribute list for a forum
+	 *
+	 * @param	int		$forum_id		Forum id
+	 * @param	int		$attribute_id	Current attribute id
+	 *
+	 * @return	null
+	 */
 	public function attr_default($forum_id = 0, $attribute_id = 0)
 	{
 		foreach ($this->_attr as $attr)
@@ -304,14 +304,14 @@ 
 	}
 
 	/**
-	* Generate attribute for topic title
-	*
-	* @param	int		$attribute_id	Current attribute id
-	* @param	int		$user_id		Current attribute user id
-	* @param	int		$timestamp		Attribute timestamp
-	*
-	* @return	string					Attribute html code
-	*/
+	 * Generate attribute for topic title
+	 *
+	 * @param	int		$attribute_id	Current attribute id
+	 * @param	int		$user_id		Current attribute user id
+	 * @param	int		$timestamp		Attribute timestamp
+	 *
+	 * @return	string					Attribute html code
+	 */
 	public function attr_display($attribute_id = 0, $user_id = 0, $timestamp = 0)
 	{
 		if (empty($attribute_id) || empty($user_id) || empty($timestamp))
@@ -341,14 +341,14 @@ 
 	}
 
 	/**
-	* Generate attribute for page title
-	*
-	* @param	int		$attribute_id	Current attribute id
-	* @param	int		$user_id		Current attribute user id
-	* @param	int		$timestamp		Attribute timestamp
-	*
-	* @return	string					attribute html code
-	*/
+	 * Generate attribute for page title
+	 *
+	 * @param	int		$attribute_id	Current attribute id
+	 * @param	int		$user_id		Current attribute user id
+	 * @param	int		$timestamp		Attribute timestamp
+	 *
+	 * @return	string					attribute html code
+	 */
 	public function attr_title($attribute_id = 0, $user_id = 0, $timestamp = 0)
 	{
 		if (empty($attribute_id) || empty($user_id) || empty($timestamp))
@@ -375,17 +375,17 @@ 
 
 
 	/**
-	* Change topic attribute
-	*
-	* @param	int		$attribute_id		New attribute id
-	* @param	int		$topic_id			The id of the topic
-	* @param	int		$forum_id			The id of the forum
-	* @param	int		$topic_attribute	Current attribute id
-	* @param	int		$author_id			Topic author id
-	* @param	string	$viewtopic_url		URL to the topic page
-	*
-	* @return	null
-	*/
+	 * Change topic attribute
+	 *
+	 * @param	int		$attribute_id		New attribute id
+	 * @param	int		$topic_id			The id of the topic
+	 * @param	int		$forum_id			The id of the forum
+	 * @param	int		$topic_attribute	Current attribute id
+	 * @param	int		$author_id			Topic author id
+	 * @param	string	$viewtopic_url		URL to the topic page
+	 *
+	 * @return	null
+	 */
 	public function attr_apply($attribute_id = 0, $topic_id = 0, $forum_id = 0, $topic_attribute = 0, $author_id = 0, $viewtopic_url = '')
 	{
 		if (empty($topic_id) || empty($forum_id) || empty($attribute_id))
@@ -458,14 +458,14 @@ 
 	}
 
 	/**
-	* Change topic attribute in mcp
-	*
-	* @param	int		$attribute_id		New attribute id
-	* @param	int		$forum_id			The id of the forum
-	* @param	array	$topic_ids			Topics ids
-	*
-	* @return	null
-	*/
+	 * Change topic attribute in mcp
+	 *
+	 * @param	int		$attribute_id		New attribute id
+	 * @param	int		$forum_id			The id of the forum
+	 * @param	array	$topic_ids			Topics ids
+	 *
+	 * @return	null
+	 */
 	public function mcp_attr_apply($attribute_id = 0, $forum_id = 0, $topic_ids = array())
 	{
 		$can_edit		= $this->auth->acl_get('m_qte_attr_edit', $forum_id);
@@ -551,10 +551,10 @@ 
 	}
 
 	/**
-	* Getter...
-	*
-	* @return	array
-	*/
+	 * Getter...
+	 *
+	 * @return	array
+	 */
 	public function getAttr()
 	{
 		return $this->_attr;
@@ -567,12 +567,12 @@ 
 	}
 
 	/**
-	* Build class and style attribute
-	*
-	* @param	string	$a_name			Attribute name
-	* @param	string	$a_colour		Attribute color
-	* @return	string					html code
-	*/
+	 * Build class and style attribute
+	 *
+	 * @param	string	$a_name			Attribute name
+	 * @param	string	$a_colour		Attribute color
+	 * @return	string					html code
+	 */
 	public function attr_colour($a_name, $a_colour)
 	{
 		if ($a_name != $this->user->lang($a_name))
@@ -584,10 +584,10 @@ 
 	}
 
 	/**
-	* Get attributes from database
-	*
-	* @return	null
-	*/
+	 * Get attributes from database
+	 *
+	 * @return	null
+	 */
 	private function _get_attributes()
 	{
 		if (($this->_attr = $this->cache->get('_attr')) === false)

Spacing +17 added lines, -17 removed lines

@@ -69,16 +69,16 @@ 
 	*/
 	public function __construct(\phpbb\request\request $request, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, \phpbb\auth\auth $auth, $root_path, $php_ext, $table_prefix)
 	{
-		$this->request		= $request;
+		$this->request = $request;
 		$this->cache		= $cache;
-		$this->db			= $db;
-		$this->template		= $template;
+		$this->db = $db;
+		$this->template = $template;
 		$this->user			= $user;
-		$this->log			= $log;
+		$this->log = $log;
 		$this->auth			= $auth;
 
-		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 		$this->table_prefix = $table_prefix;
 
 		$this->_get_attributes();
@@ -169,16 +169,16 @@ 
 	public function attr_select($forum_id, $author_id = 0, $attribute_id = 0, $viewtopic_url = '', $mode = '')
 	{
 		$show_select	= false;
-		$current_time	= time();
-		$can_edit		= (bool) $this->auth->acl_get('m_qte_attr_edit', $forum_id);
+		$current_time = time();
+		$can_edit = (bool) $this->auth->acl_get('m_qte_attr_edit', $forum_id);
 		$can_remove		= (bool) $this->auth->acl_get('m_qte_attr_del', $forum_id);
-		$is_author		= (bool) ($this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id);
+		$is_author = (bool) ($this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id);
 
 		if ($can_edit || $is_author || $mode == 'post')
 		{
 			foreach ($this->_attr as $attr)
 			{
-				if (!$this->auth->acl_get('f_qte_attr_'.$attr['attr_id'], $forum_id))
+				if (!$this->auth->acl_get('f_qte_attr_' . $attr['attr_id'], $forum_id))
 				{
 					continue;
 				}
@@ -249,7 +249,7 @@ 
 	{
 		foreach ($this->_attr as $attr)
 		{
-			$forum_allowed = $this->auth->acl_getf('f_qte_attr_'.$attr['attr_id'], true);
+			$forum_allowed = $this->auth->acl_getf('f_qte_attr_' . $attr['attr_id'], true);
 
 			if (isset($forum_allowed[$forum_id]))
 			{
@@ -282,7 +282,7 @@ 
 	{
 		foreach ($this->_attr as $attr)
 		{
-			$forum_allowed = $this->auth->acl_getf('f_qte_attr_'.$attr['attr_id'], true);
+			$forum_allowed = $this->auth->acl_getf('f_qte_attr_' . $attr['attr_id'], true);
 
 			if (isset($forum_allowed[$forum_id]))
 			{
@@ -393,8 +393,8 @@ 
 			return;
 		}
 
-		$can_edit		= $this->auth->acl_get('m_qte_attr_edit', $forum_id) || $this->auth->acl_get('f_qte_attr_'.$attribute_id, $forum_id) && $this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id;
-		$can_remove		= $this->auth->acl_get('m_qte_attr_del', $forum_id);
+		$can_edit = $this->auth->acl_get('m_qte_attr_edit', $forum_id) || $this->auth->acl_get('f_qte_attr_' . $attribute_id, $forum_id) && $this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id;
+		$can_remove = $this->auth->acl_get('m_qte_attr_del', $forum_id);
 
 		if (!$can_edit && $attribute_id != self::REMOVE || !$can_remove && $attribute_id == self::REMOVE)
 		{
@@ -468,8 +468,8 @@ 
 	*/
 	public function mcp_attr_apply($attribute_id = 0, $forum_id = 0, $topic_ids = array())
 	{
-		$can_edit		= $this->auth->acl_get('m_qte_attr_edit', $forum_id);
-		$can_remove		= $this->auth->acl_get('m_qte_attr_del', $forum_id);
+		$can_edit = $this->auth->acl_get('m_qte_attr_edit', $forum_id);
+		$can_remove = $this->auth->acl_get('m_qte_attr_del', $forum_id);
 
 		if (!$can_edit && $attribute_id != self::REMOVE || !$can_remove && $attribute_id == self::REMOVE)
 		{
@@ -580,7 +580,7 @@ 
 			$a_class_name = preg_replace('#[^a-z0-9 _-]#', '', strtolower($a_name));
 		}
 
-		return ' class="qte-attr ' . (isset($a_class_name) ?  $a_class_name : '') . '"' . (!empty($a_colour) ? ' style="color:#' . $a_colour . '; font-weight:bold;"' : '');
+		return ' class="qte-attr ' . (isset($a_class_name) ? $a_class_name : '') . '"' . (!empty($a_colour) ? ' style="color:#' . $a_colour . '; font-weight:bold;"' : '');
 	}
 
 	/**

event/main_listener.php

Spacing +6 added lines, -6 removed lines

@@ -33,9 +33,9 @@ 
 
 	public function __construct(\phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, \ernadoo\qte\qte $qte)
 	{
-		$this->request	= $request;
-		$this->template	= $template;
-		$this->user		= $user;
+		$this->request = $request;
+		$this->template = $template;
+		$this->user = $user;
 		$this->log		= $log;
 		$this->qte		= $qte;
 	}
@@ -117,7 +117,7 @@ 
 
 			if ($topic_attribute != \ernadoo\qte\qte::KEEP)
 			{
-				$post_data['topic_attr_id']		= (int) $topic_attribute;
+				$post_data['topic_attr_id'] = (int) $topic_attribute;
 				$post_data['topic_attr_user']	= (int) $this->user->data['user_id'];
 				$post_data['topic_attr_time']	= time();
 
@@ -139,11 +139,11 @@ 
 
 		if ($event['post_data']['force_attr'])
 		{
-			if ($post_data['attr_id'] == \ernadoo\qte\qte::REMOVE && ($event['mode'] == 'post' || ($event['mode'] == 'edit' && $event['post_data']['topic_first_post_id'] == $event['post_id'])) )
+			if ($post_data['attr_id'] == \ernadoo\qte\qte::REMOVE && ($event['mode'] == 'post' || ($event['mode'] == 'edit' && $event['post_data']['topic_first_post_id'] == $event['post_id'])))
 			{
 				$error = $event['error'];
 				$error[] = $this->user->lang['QTE_ATTRIBUTE_UNSELECTED'];
-				$event['error'] = $error ;
+				$event['error'] = $error;
 
 				// init the value
 				$post_data['attr_id'] = 0;