ErnadoO / qte

acp/main_module.php

Doc Comments +3 added lines

@@ -462,6 +462,9 @@
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function qte_move($attr_row, $action = 'move_up', $steps = 1)
 	{
 		global $db, $table_prefix;

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, false);
+							$this->migrator_tool_permission->add('f_qte_attr_' . $attr_id, false);
 
 							$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;

search/fulltext_attribute.php

Doc Comments -12 removed lines

@@ -33,18 +33,6 @@
 	/**
 	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first
 	*
-	* @param	array		$keywords_ary		contains each words to search
-	* @param	string		$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		$ex_cid_ary			specifies an array of category ids which should not be searched
-	* @param	int			$cat_id				is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	int								total number of results
 	*/
 	public function attribute_search($attribute_id, $type, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{

Spacing +9 added lines, -9 removed lines

@@ -26,8 +26,8 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db)
 	{
-		$this->config	= $config;
-		$this->db		= $db;
+		$this->config = $config;
+		$this->db = $db;
 	}
 
 	/**
@@ -81,11 +81,11 @@ 
 		$id_ary = array();
 
 		// Create some display specific sql strings
-		$sql_attribute	= 't.topic_attr_id = ' . (int) $attribute_id;
+		$sql_attribute = 't.topic_attr_id = ' . (int) $attribute_id;
 		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . $this->db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
+		$sql_topic_id = ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
 		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_firstpost	= ' AND p.post_id = t.topic_first_post_id';
+		$sql_firstpost = ' AND p.post_id = t.topic_first_post_id';
 
 		// Build sql strings for sorting
 		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
@@ -93,13 +93,13 @@ 
 		switch ($sql_sort[0])
 		{
 			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
+				$sql_sort_table = USERS_TABLE . ' u, ';
+				$sql_sort_join = ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
 			break;
 
 			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
+				$sql_sort_table = FORUMS_TABLE . ' f, ';
+				$sql_sort_join = ' AND f.forum_id = p.forum_id ';
 			break;
 		}
 

migrations/v200/convert_old_permissions.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
-			$auth_option = 'f_qte_attr_'.$row['attr_id'];
+			$auth_option = 'f_qte_attr_' . $row['attr_id'];
 			$migrator_tool_permission->add($auth_option, false);
 
 			$attr_permissions_array[$auth_option] = json_decode($row['attr_auths'], true);

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

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

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();
@@ -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;
 			}
@@ -251,7 +251,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]))
 			{
@@ -284,7 +284,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]))
 			{
@@ -395,8 +395,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)
 		{
@@ -470,8 +470,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)
 		{
@@ -582,7 +582,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/acp_listener.php

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'];
 
@@ -78,7 +78,7 @@ 
 		foreach ($this->qte->getAttr() as $attr)
 		{
 			$permissions += array(
-				'f_qte_attr_'.$attr['attr_id'] => array('lang' => $this->user->lang('QTE_CAN_USE_ATTR', $attr['attr_name']), 'cat' => 'qte'),
+				'f_qte_attr_' . $attr['attr_id'] => array('lang' => $this->user->lang('QTE_CAN_USE_ATTR', $attr['attr_name']), 'cat' => 'qte'),
 			);
 		}
 		$event['permissions'] = $permissions;
@@ -225,7 +225,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);
 
@@ -243,7 +243,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: