ErnadoO / qte

acp/main_module.php

Doc Comments +5 added lines, -2 removed lines

@@ -403,6 +403,9 @@ 
 		return $attr;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function qte_move($attr_row, $action = 'move_up', $steps = 1)
 	{
 		global $db, $table_prefix;
@@ -529,8 +532,8 @@ 
 	*
 	* Copy a permission (auth) option
 	*
-	* @param string		$auth_optio			The name of the permission (auth) option
-	* @param int|false	$copy_from			If set, contains the id of the permission from which to copy the new one.
+	* @param string		$auth_option			The name of the permission (auth) option
+	* @param string	$copy_from			If set, contains the id of the permission from which to copy the new one.
 	* @param bool		$clear_dest_perms	True if destination permissions should be deleted
 	* @return null
 	*/

Indentation +9 added lines, -9 removed lines

@@ -525,15 +525,15 @@
 	}
 
 	/**
-	* Permission Copy
-	*
-	* Copy a permission (auth) option
-	*
-	* @param string		$auth_optio			The name of the permission (auth) option
-	* @param int|false	$copy_from			If set, contains the id of the permission from which to copy the new one.
-	* @param bool		$clear_dest_perms	True if destination permissions should be deleted
-	* @return null
-	*/
+	 * Permission Copy
+	 *
+	 * Copy a permission (auth) option
+	 *
+	 * @param string		$auth_optio			The name of the permission (auth) option
+	 * @param int|false	$copy_from			If set, contains the id of the permission from which to copy the new one.
+	 * @param bool		$clear_dest_perms	True if destination permissions should be deleted
+	 * @return null
+	 */
 	private function _copy_permission($auth_option, $copy_from = false, $clear_dest_perms = true)
 	{
 		global $db, $phpbb_root_path, $phpEx;

Spacing +7 added lines, -7 removed lines

@@ -27,18 +27,18 @@ 
 	{
 		global $phpbb_container, $db, $user, $phpbb_log, $template, $cache, $request, $table_prefix;
 
-		$this->qte						= $phpbb_container->get('ernadoo.qte');
-		$this->migrator_tool_permission	= $phpbb_container->get('migrator.tool.permission');
+		$this->qte = $phpbb_container->get('ernadoo.qte');
+		$this->migrator_tool_permission = $phpbb_container->get('migrator.tool.permission');
 
 		$action			= $request->variable('action', '');
 		$submit			= $request->is_set_post('submit');
 		$attr_id		= $request->variable('id', 0);
-		$attr_auth_id	= $request->variable('attr_auth_id', 0);
+		$attr_auth_id = $request->variable('attr_auth_id', 0);
 
 		$error = array();
 		$clear_dest_perms = false;
 
-		$this->tpl_name		= 'acp_attributes';
+		$this->tpl_name = 'acp_attributes';
 		$this->page_title	= 'QTE_MANAGE_TITLE';
 
 		$user->add_lang_ext('ernadoo/qte', array('attributes', 'attributes_acp'));
@@ -156,14 +156,14 @@ 
 							$db->sql_query($sql);
 							$attr_id = $db->sql_nextid();
 
-							$this->migrator_tool_permission->add('f_qte_attr_'.$attr_id);
+							$this->migrator_tool_permission->add('f_qte_attr_' . $attr_id);
 
 							$message = 'ADDED';
 						}
 
 						if ($attr_auth_id)
 						{
-							$this->_copy_permission('f_qte_attr_'.$attr_id, 'f_qte_attr_'.$attr_auth_id, $clear_dest_perms);
+							$this->_copy_permission('f_qte_attr_' . $attr_id, 'f_qte_attr_' . $attr_auth_id, $clear_dest_perms);
 						}
 
 						$cache->destroy('_attr');
@@ -271,7 +271,7 @@ 
 
 					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_REMOVED', time(), array($attr_name));
 
-					$this->migrator_tool_permission->remove('f_qte_attr_'.$attr_id, false);
+					$this->migrator_tool_permission->remove('f_qte_attr_' . $attr_id, false);
 
 					$sql = 'DELETE FROM ' . $table_prefix . 'topics_attr
 						WHERE attr_id = ' . (int) $attr_id;

event/acp_listener.php

Indentation +8 added lines, -8 removed lines

@@ -180,14 +180,14 @@
 	}
 
 	/**
-	* Copies attributes permissions from one forum to others
-	*
-	* @param int	$src_forum_id		The source forum we want to copy permissions from
-	* @param array	$dest_forum_ids		The destination forum(s) we want to copy to
-	* @param bool	$clear_dest_perms	True if destination permissions should be deleted
-	*
-	* @return bool						False on error
-	*/
+	 * Copies attributes permissions from one forum to others
+	 *
+	 * @param int	$src_forum_id		The source forum we want to copy permissions from
+	 * @param array	$dest_forum_ids		The destination forum(s) we want to copy to
+	 * @param bool	$clear_dest_perms	True if destination permissions should be deleted
+	 *
+	 * @return bool						False on error
+	 */
 	private function _copy_attribute_permissions($src_forum_id, $dest_forum_ids, $clear_dest_perms)
 	{
 		// Only one forum id specified

Spacing +7 added lines, -7 removed lines

@@ -36,11 +36,11 @@ 
 
 	public function __construct(\phpbb\request\request $request, \phpbb\cache\driver\driver_interface $cache, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \ernadoo\qte\qte $qte, $table_prefix)
 	{
-		$this->request	= $request;
+		$this->request = $request;
 		$this->cache	= $cache;
-		$this->db		= $db;
+		$this->db = $db;
 		$this->user		= $user;
-		$this->qte		= $qte;
+		$this->qte = $qte;
 
 		$this->table_prefix = $table_prefix;
 	}
@@ -65,7 +65,7 @@ 
 	{
 		$categories				= $event['categories'];
 		$categories				= array_merge($categories, array('qte' => 'ACL_CAT_QTE'));
-		$event['categories']	= $categories;
+		$event['categories'] = $categories;
 
 		$permissions = $event['permissions'];
 
@@ -82,7 +82,7 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$permissions += array(
-				'f_qte_attr_'.$row['attr_id'] => array('lang' => $this->user->lang('QTE_CAN_USE_ATTR', $row['attr_name']), 'cat' => 'qte'),
+				'f_qte_attr_' . $row['attr_id'] => array('lang' => $this->user->lang('QTE_CAN_USE_ATTR', $row['attr_name']), 'cat' => 'qte'),
 			);
 		}
 		$event['permissions'] = $permissions;
@@ -229,7 +229,7 @@ 
 		$dest_forum_ids = array();
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$dest_forum_ids[]	= (int) $row['forum_id'];
+			$dest_forum_ids[] = (int) $row['forum_id'];
 		}
 		$this->db->sql_freeresult($result);
 
@@ -247,7 +247,7 @@ 
 		$acl_options_ids = array();
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$acl_options_ids[]	= (int) $row['auth_option_id'];
+			$acl_options_ids[] = (int) $row['auth_option_id'];
 		}
 
 		// From the mysql documentation:

event/search_listener.php

Spacing +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@ 
 
 	public function __construct(\phpbb\request\request $request, \ernadoo\qte\qte $qte, \ernadoo\qte\search\fulltext_attribute $qte_search)
 	{
-		$this->request		= $request;
-		$this->qte			= $qte;
-		$this->qte_search	= $qte_search;
+		$this->request = $request;
+		$this->qte = $qte;
+		$this->qte_search = $qte_search;
 	}
 
 	static public function getSubscribedEvents()
@@ -119,8 +119,8 @@ 
 	{
 		if ($this->searc_attr)
 		{
-			$keywords	= utf8_normalize_nfc($this->request->variable('keywords', '', true));
-			$author		= $this->request->variable('author', '', true);
+			$keywords = utf8_normalize_nfc($this->request->variable('keywords', '', true));
+			$author = $this->request->variable('author', '', true);
 
 			if (!$keywords && !$author)
 			{

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;
 	}
@@ -119,7 +119,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();
 
@@ -142,11 +142,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;

event/mcp_listener.php

Indentation +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@
 	protected $qte;
 
 	/**
-	* Constructor
-	*
-	* @param \phpbb\request\request					$request			Request object
-	* @param \ernadoo\qte\qte						$qte				QTE object
-	*/
+	 * Constructor
+	 *
+	 * @param \phpbb\request\request					$request			Request object
+	 * @param \ernadoo\qte\qte						$qte				QTE object
+	 */
 	public function __construct(\phpbb\request\request $request, \ernadoo\qte\qte $qte)
 	{
 		$this->request	= $request;

Spacing +4 added lines, -4 removed lines

@@ -30,8 +30,8 @@ 
 	*/
 	public function __construct(\phpbb\request\request $request, \ernadoo\qte\qte $qte)
 	{
-		$this->request	= $request;
-		$this->qte		= $qte;
+		$this->request = $request;
+		$this->qte = $qte;
 	}
 
 	static public function getSubscribedEvents()
@@ -56,8 +56,8 @@ 
 
 	public function mcp_select_assign_attributes($event)
 	{
-		$attr_id	= (int) $this->request->variable('attr_id', 0);
-		$forum_id	= (int) $event['forum_info']['forum_id'];
+		$attr_id = (int) $this->request->variable('attr_id', 0);
+		$forum_id = (int) $event['forum_info']['forum_id'];
 
 		if ($attr_id)
 		{

qte.php

Indentation +107 added lines, -107 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,15 +156,15 @@ 
 	}
 
 	/**
-	* 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
-	*
-	* @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
+	 *
+	 * @return	null
+	 */
 	public function attr_select($forum_id, $author_id = 0, $attribute_id = 0, $viewtopic_url = '')
 	{
 		$show_select	= false;
@@ -217,10 +217,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)
@@ -240,13 +240,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)
@@ -268,13 +268,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)
@@ -301,14 +301,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))
@@ -338,14 +338,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))
@@ -372,17 +372,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))
@@ -456,14 +456,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);
@@ -549,10 +549,10 @@ 
 	}
 
 	/**
-	* Getter...
-	*
-	* @return	array
-	*/
+	 * Getter...
+	 *
+	 * @return	array
+	 */
 	public function getAttr()
 	{
 		return $this->_attr;
@@ -565,12 +565,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))
@@ -582,10 +582,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 +18 added lines, -18 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();
@@ -103,7 +103,7 @@ 
 					AND t.topic_attr_user <> ' . ANONYMOUS;
 			$result = $this->db->sql_query($sql);
 
-			while($row = $this->db->sql_fetchrow($result))
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$this->_name[$row['user_id']] = array(
 					'user_id'		=> (int) $row['user_id'],
@@ -143,7 +143,7 @@ 
 				WHERE user_id = ' . (int) $user_id;
 			$result = $this->db->sql_query($sql);
 
-			while($row = $this->db->sql_fetchrow($result) )
+			while ($row = $this->db->sql_fetchrow($result))
 			{
 				$this->_name[$row['user_id']] = array(
 					'user_id'		=> (int) $row['user_id'],
@@ -168,10 +168,10 @@ 
 	public function attr_select($forum_id, $author_id = 0, $attribute_id = 0, $viewtopic_url = '')
 	{
 		$show_select	= false;
-		$current_time	= time();
-		$can_edit		= $this->auth->acl_get('m_qte_attr_edit', $forum_id);
+		$current_time = time();
+		$can_edit = $this->auth->acl_get('m_qte_attr_edit', $forum_id);
 		$can_remove		= $this->auth->acl_get('m_qte_attr_del', $forum_id);
-		$is_author		= $this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id;
+		$is_author = $this->user->data['is_registered'] && $this->user->data['user_id'] == $author_id;
 
 		// Basic auth
 		if (!$can_remove && !$can_edit && !$is_author)
@@ -181,7 +181,7 @@ 
 
 		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;
 			}
@@ -279,7 +279,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]))
 			{
@@ -390,8 +390,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)
 		{
@@ -466,8 +466,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)
 		{
@@ -578,7 +578,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;"' : '');
 	}
 
 	/**