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 +36 added lines, -36 removed lines

@@ -27,7 +27,7 @@ 
 		global $phpbb_container, $db, $user, $phpbb_log, $template, $cache, $request, $table_prefix, $phpbb_root_path;
 		$this->qte = $phpbb_container->get('ernadoo.qte');
 
-		$ext_root_path = $phpbb_root_path . 'ext/ernadoo/qte/';
+		$ext_root_path = $phpbb_root_path.'ext/ernadoo/qte/';
 
 		$action = $request->variable('action', '');
 		$submit = $request->is_set_post('submit');
@@ -147,8 +147,8 @@ 
 
 						if ($attr_id)
 						{
-							$sql = 'UPDATE ' . $table_prefix . 'topics_attr
-								SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+							$sql = 'UPDATE '.$table_prefix.'topics_attr
+								SET ' . $db->sql_build_array('UPDATE', $sql_ary).'
 								WHERE attr_id = ' . (int) $attr_id;
 							$db->sql_query($sql);
 
@@ -157,7 +157,7 @@ 
 						else
 						{
 							$sql = 'SELECT MAX(right_id) AS right_id
-								FROM ' . $table_prefix . 'topics_attr';
+								FROM ' . $table_prefix.'topics_attr';
 							$result = $db->sql_query($sql);
 							$right_id = (int) $db->sql_fetchfield('right_id');
 							$db->sql_freeresult($result);
@@ -165,7 +165,7 @@ 
 							$sql_ary['left_id'] = ($right_id + 1);
 							$sql_ary['right_id'] = ($right_id + 2);
 
-							$sql = 'INSERT INTO ' . $table_prefix . 'topics_attr ' . $db->sql_build_array('INSERT', $sql_ary);
+							$sql = 'INSERT INTO '.$table_prefix.'topics_attr '.$db->sql_build_array('INSERT', $sql_ary);
 							$db->sql_query($sql);
 
 							$message = 'ADDED';
@@ -173,9 +173,9 @@ 
 
 						$cache->destroy('_attr');
 
-						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_' . $message, time(), array($attr_name));
+						$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_'.$message, time(), array($attr_name));
 
-						trigger_error($user->lang['QTE_' . $message] . adm_back_link($this->u_action));
+						trigger_error($user->lang['QTE_'.$message].adm_back_link($this->u_action));
 					}
 				}
 				else if ($attr_id)
@@ -223,7 +223,7 @@ 
 				$template->assign_vars(array(
 					'S_EDIT' => true,
 
-					'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'add' : 'edit&id=' . (int) $attr_id),
+					'U_ACTION' => $this->u_action.'&action='.(($action == 'add') ? 'add' : 'edit&id='.(int) $attr_id),
 					'U_BACK' => $this->u_action,
 					'U_AJAX' => str_replace('&', '&', $this->u_action),
 
@@ -239,8 +239,8 @@ 
 					'S_TEXT' => $attr_type_state ? true : false,
 					'S_USER_COLOUR' => $attr_user_colour_state ? true : false,
 
-					'ICON_ATTR_AUTH_ADD' => '<img src="' . $ext_root_path . 'adm/images/qte_auth_add.gif" alt="' . $user->lang['QTE_AUTH_ADD'] . '" title="' . $user->lang['QTE_AUTH_ADD'] . '" />',
-					'ICON_ATTR_AUTH_REMOVE' => '<img src="' . $ext_root_path . 'adm/images/qte_auth_remove.gif" alt="' . $user->lang['QTE_AUTH_REMOVE'] . '" title="' . $user->lang['QTE_AUTH_REMOVE'] . '" />',
+					'ICON_ATTR_AUTH_ADD' => '<img src="'.$ext_root_path.'adm/images/qte_auth_add.gif" alt="'.$user->lang['QTE_AUTH_ADD'].'" title="'.$user->lang['QTE_AUTH_ADD'].'" />',
+					'ICON_ATTR_AUTH_REMOVE' => '<img src="'.$ext_root_path.'adm/images/qte_auth_remove.gif" alt="'.$user->lang['QTE_AUTH_REMOVE'].'" title="'.$user->lang['QTE_AUTH_REMOVE'].'" />',
 				));
 
 				return;
@@ -253,8 +253,8 @@ 
 				$this->add_auths($set_permissions['attr_auths']);
 
 				$template->assign_vars(array(
-					'ICON_ATTR_AUTH_ADD' => '<img src="' . $ext_root_path . 'adm/images/qte_auth_add.gif" alt="' . $user->lang['QTE_AUTH_ADD'] . '" title="' . $user->lang['QTE_AUTH_ADD'] . '" />',
-					'ICON_ATTR_AUTH_REMOVE' => '<img src="' . $ext_root_path . 'adm/images/qte_auth_remove.gif" alt="' . $user->lang['QTE_AUTH_REMOVE'] . '" title="' . $user->lang['QTE_AUTH_REMOVE'] . '" />',
+					'ICON_ATTR_AUTH_ADD' => '<img src="'.$ext_root_path.'adm/images/qte_auth_add.gif" alt="'.$user->lang['QTE_AUTH_ADD'].'" title="'.$user->lang['QTE_AUTH_ADD'].'" />',
+					'ICON_ATTR_AUTH_REMOVE' => '<img src="'.$ext_root_path.'adm/images/qte_auth_remove.gif" alt="'.$user->lang['QTE_AUTH_REMOVE'].'" title="'.$user->lang['QTE_AUTH_REMOVE'].'" />',
 				));
 				$this->tpl_name = 'acp_attributes_auths';
 
@@ -264,13 +264,13 @@ 
 
 				if (!$attr_id)
 				{
-					trigger_error($user->lang['QTE_MUST_SELECT'] . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['QTE_MUST_SELECT'].adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				if (confirm_box(true))
 				{
 					$sql = 'SELECT topic_id, topic_attr_id
-						FROM ' . TOPICS_TABLE . '
+						FROM ' . TOPICS_TABLE.'
 						WHERE topic_attr_id = ' . (int) $attr_id;
 					$result = $db->sql_query($sql);
 
@@ -285,14 +285,14 @@ 
 					{
 						$fields = array('topic_attr_id' => 0, 'topic_attr_user' => 0, 'topic_attr_time' => 0);
 
-						$sql = 'UPDATE ' . TOPICS_TABLE . '
-							SET ' . $db->sql_build_array('UPDATE', $fields) . '
+						$sql = 'UPDATE '.TOPICS_TABLE.'
+							SET ' . $db->sql_build_array('UPDATE', $fields).'
 							WHERE ' . $db->sql_in_set('topic_id', array_map('intval', $topic_id_ary));
 						$db->sql_query($sql);
 					}
 
 					$sql = 'SELECT attr_name
-						FROM ' . $table_prefix . 'topics_attr
+						FROM ' . $table_prefix.'topics_attr
 						WHERE attr_id = ' . (int) $attr_id;
 					$result = $db->sql_query($sql);
 					$attr_name = (string) $db->sql_fetchfield('attr_name');
@@ -300,7 +300,7 @@ 
 
 					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_REMOVED', time(), array($attr_name));
 
-					$sql = 'DELETE FROM ' . $table_prefix . 'topics_attr
+					$sql = 'DELETE FROM '.$table_prefix.'topics_attr
 						WHERE attr_id = ' . (int) $attr_id;
 					$db->sql_query($sql);
 
@@ -320,7 +320,7 @@ 
 					}
 					else
 					{
-						trigger_error($user->lang['QTE_REMOVED'] . adm_back_link($this->u_action));
+						trigger_error($user->lang['QTE_REMOVED'].adm_back_link($this->u_action));
 					}
 				}
 				else
@@ -340,11 +340,11 @@ 
 
 				if (!$attr_id)
 				{
-					trigger_error($user->lang['QTE_MUST_SELECT'] . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['QTE_MUST_SELECT'].adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				$sql = 'SELECT *
-					FROM ' . $table_prefix . 'topics_attr
+					FROM ' . $table_prefix.'topics_attr
 					WHERE attr_id = ' . (int) $attr_id;
 				$result = $db->sql_query($sql);
 				$row = $db->sql_fetchrow($result);
@@ -352,13 +352,13 @@ 
 
 				if (!$row)
 				{
-					trigger_error($user->lang['QTE_MUST_SELECT'] . adm_back_link($this->u_action), E_USER_WARNING);
+					trigger_error($user->lang['QTE_MUST_SELECT'].adm_back_link($this->u_action), E_USER_WARNING);
 				}
 
 				$move_attr_name = $this->qte_move($row, $action, 1);
 				if ($move_attr_name !== false)
 				{
-					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_' . strtoupper($action), time(), array($move_attr_name));
+					$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ATTRIBUTE_'.strtoupper($action), time(), array($move_attr_name));
 				}
 
 				if ($request->is_ajax())
@@ -373,7 +373,7 @@ 
 		$template->assign_vars(array('U_ACTION' => $this->u_action));
 
 		$sql = 'SELECT topic_attr_id, COUNT(topic_id) AS total_topics
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			GROUP BY topic_attr_id';
 		$result = $db->sql_query($sql);
 		$stats = array();
@@ -385,7 +385,7 @@ 
 		}
 		$db->sql_freeresult($result);
 
-		$sql = 'SELECT * FROM ' . $table_prefix . 'topics_attr ORDER BY left_id';
+		$sql = 'SELECT * FROM '.$table_prefix.'topics_attr ORDER BY left_id';
 		$result = $db->sql_query($sql);
 
 		while ($row = $db->sql_fetchrow($result))
@@ -409,10 +409,10 @@ 
 				'QTE_COUNT' => (int) $attribute_count,
 				'QTE_PER_CENT' => empty($total_topics) ? 0 : round(intval($attribute_count) * 100 / $total_topics),
 
-				'U_EDIT' => $this->u_action . '&amp;action=edit&amp;id=' . $row['attr_id'],
-				'U_MOVE_UP' => $this->u_action . '&amp;action=move_up&amp;id=' . $row['attr_id'],
-				'U_MOVE_DOWN' => $this->u_action . '&amp;action=move_down&amp;id=' . $row['attr_id'],
-				'U_DELETE' => $this->u_action . '&amp;action=delete&amp;id=' . $row['attr_id'],
+				'U_EDIT' => $this->u_action.'&amp;action=edit&amp;id='.$row['attr_id'],
+				'U_MOVE_UP' => $this->u_action.'&amp;action=move_up&amp;id='.$row['attr_id'],
+				'U_MOVE_DOWN' => $this->u_action.'&amp;action=move_down&amp;id='.$row['attr_id'],
+				'U_DELETE' => $this->u_action.'&amp;action=delete&amp;id='.$row['attr_id'],
 			));
 		}
 		$db->sql_freeresult($result);
@@ -422,7 +422,7 @@ 
 	{
 		global $db, $table_prefix;
 
-		$sql = 'SELECT * FROM ' . $table_prefix . 'topics_attr WHERE attr_id = ' . (int) $attr_id;
+		$sql = 'SELECT * FROM '.$table_prefix.'topics_attr WHERE attr_id = '.(int) $attr_id;
 		$result = $db->sql_query($sql);
 		$attr = $db->sql_fetchrow($result);
 		$db->sql_freeresult($result);
@@ -467,7 +467,7 @@ 
 		global $db, $table_prefix;
 
 		$sql = 'SELECT attr_id, attr_name, left_id, right_id
-			FROM ' . $table_prefix . "topics_attr
+			FROM ' . $table_prefix."topics_attr
 			WHERE " . (($action == 'move_up') ? "right_id < {$attr_row['right_id']} ORDER BY right_id DESC" : "left_id > {$attr_row['left_id']} ORDER BY left_id ASC");
 		$result = $db->sql_query_limit($sql, $steps);
 
@@ -506,7 +506,7 @@ 
 			$move_up_right = $target['right_id'];
 		}
 
-		$sql = 'UPDATE ' . $table_prefix . "topics_attr
+		$sql = 'UPDATE '.$table_prefix."topics_attr
 			SET left_id = left_id + CASE
 				WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up}
 				ELSE {$diff_down}
@@ -530,7 +530,7 @@ 
 		$s_forum_id_options = '';
 
 		$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
-			FROM ' . FORUMS_TABLE . '
+			FROM ' . FORUMS_TABLE.'
 			ORDER BY left_id ASC';
 		$result = $db->sql_query($sql, 600);
 
@@ -569,11 +569,11 @@ 
 			{
 				$cat_right = max($cat_right, $row['right_id']);
 
-				$holding .= '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : ' disabled="disabled"') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
+				$holding .= '<option value="'.$row['forum_id'].'"'.(($row['forum_type'] == FORUM_POST) ? ' class="sep"' : ' disabled="disabled"').$selected.'>'.$padding.$row['forum_name'].'</option>';
 			}
 			else
 			{
-				$s_forum_id_options .= $holding . '<option value="' . $row['forum_id'] . '"' . (($row['forum_type'] == FORUM_POST) ? ' class="sep"' : ' disabled="disabled"') . $selected . '>' . $padding . $row['forum_name'] . '</option>';
+				$s_forum_id_options .= $holding.'<option value="'.$row['forum_id'].'"'.(($row['forum_type'] == FORUM_POST) ? ' class="sep"' : ' disabled="disabled"').$selected.'>'.$padding.$row['forum_name'].'</option>';
 				$holding = '';
 			}
 		}
@@ -629,7 +629,7 @@ 
 			$template->assign_vars(array(
 				'S_VERSION_UNSTABLE' => true,
 				'S_VERSION_DEV' => true,
-				'VERSION_WARNING' => $user->lang('QTE_DEV_WARNING', $version) . '<br />' . $user->lang['QTE_DEV_WARNING_DEV'],
+				'VERSION_WARNING' => $user->lang('QTE_DEV_WARNING', $version).'<br />'.$user->lang['QTE_DEV_WARNING_DEV'],
 			));
 		}
 		else if (stripos($version, '-a') !== false)

event/acp_listener.php

Spacing +4 added lines, -4 removed lines

@@ -74,8 +74,8 @@ 
 
 	public function delete_user($event)
 	{
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET topic_attr_user = ' . ANONYMOUS . '
+		$sql = 'UPDATE '.TOPICS_TABLE.'
+			SET topic_attr_user = ' . ANONYMOUS.'
 			WHERE topic_attr_user = ' . (int) $event['user_ids'];
 		$this->db->sql_query($sql);
 	}
@@ -193,8 +193,8 @@ 
 							$attr['attr_auths'][0]['forums_ids'][] = $event['forum_data']['forum_id'];
 							$sql_ary = array('attr_auths' => json_encode($attr['attr_auths']));
 
-							$sql = 'UPDATE ' . $this->table_prefix . 'topics_attr
-								SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+							$sql = 'UPDATE '.$this->table_prefix.'topics_attr
+								SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 								WHERE attr_id = ' . (int) $attr['attr_id'];
 							$this->db->sql_query($sql);
 						}

migrations/v11x/v110.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	{
 		return array(
 			'update_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					array('attr_desc', array('VCHAR:60', '')),
 				),
 			),
@@ -46,7 +46,7 @@ 
 	{
 		return array(
 			'update_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					array('attr_desc', array('VCHAR', '')),
 				),
 			),

migrations/v100/rc4.php

Spacing +4 added lines, -4 removed lines

@@ -35,13 +35,13 @@ 
 	{
 		return array(
 			'drop_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					'allowed_forums',
 					'allowed_groups',
 				),
 			),
 			'add_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					'attr_desc'     => array('VCHAR', ''),
 					'attr_auths'    => array('MTEXT', ''),
 				),
@@ -53,13 +53,13 @@ 
 	{
 		return array(
 			'add_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					'allowed_forums'	=> array('TEXT', ''),
 					'allowed_groups'	=> array('TEXT', ''),
 				),
 			),
 			'drop_columns'	   => array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					'attr_desc',
 					'attr_auths',
 				),

qte.php

Doc Comments +3 added lines, -3 removed lines

@@ -680,7 +680,7 @@ 
 	* Generate list of groups
 	*
 	* @param int	$group_ids		The default groups id to mark as selected
-	* @param array	$exclude_ids	The group ids to exclude from the list, false (default) if you whish to exclude no id
+	* @param boolean	$exclude_ids	The group ids to exclude from the list, false (default) if you whish to exclude no id
 	* @param int	$manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only.
 	*
 	* @return string The list of options.
@@ -753,7 +753,7 @@ 
 	* @param	int		$forum_id		Forum id
 	* @param	array	$user_groups	User's groups
 	* @param	int		$author_id		Topic author id
-	* @return	bool
+	* @return	boolean|null
 	*/
 	private function _check_auth_attribute($attr_auth, $forum_id, $user_groups, $author_id)
 	{
@@ -774,7 +774,7 @@ 
 	*
 	* @param	array	$user_groups	User's groups
 	* @param	array	$hide_attr		Groups which can't delete attribute in a forum
-	* @return	bool
+	* @return	boolean|null
 	*/
 	private function _check_auth_remove_attr(&$user_groups, $hide_attr)
 	{

Indentation +131 added lines, -131 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\config\config					$config				Config 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 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\config\config					$config				Config 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 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\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, $root_path, $php_ext, $table_prefix)
 	{
 		$this->request		= $request;
@@ -85,12 +85,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))
@@ -115,24 +115,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)
 	{
 		$sql = 'SELECT user_id, username, user_colour
@@ -153,16 +153,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	array	$hide_attr		Groups which can't delete attribute in this forum
-	* @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	array	$hide_attr		Groups which can't delete attribute in this forum
+	 * @param	string	$viewtopic_url	Topic's url
+	 *
+	 * @return	null
+	 */
 	public function attr_select($forum_id = 0, $author_id = 0, $attribute_id = 0, $hide_attr = array(), $viewtopic_url = '')
 	{
 		// load language
@@ -233,10 +233,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()
 	{
 		// load language
@@ -286,13 +286,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)
 	{
 		// load language
@@ -349,13 +349,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)
 	{
 		// load language
@@ -412,14 +412,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))
@@ -449,14 +449,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))
@@ -485,16 +485,16 @@ 
 
 
 	/**
-	* 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	array	$hide_attr			Groups which can't delete attribute in this forum
-	*
-	* @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	array	$hide_attr			Groups which can't delete attribute in this forum
+	 *
+	 * @return	null
+	 */
 	public function attr_apply($attribute_id = 0, $topic_id = 0, $forum_id = 0, $topic_attribute = '', $hide_attr = array())
 	{
 		if (empty($topic_id) || empty($forum_id) || empty($attribute_id))
@@ -573,13 +573,13 @@ 
 	}
 
 	/**
-	* Change topic attribute in mcp
-	*
-	* @param	int		$attribute_id		New attribute id
-	* @param	array	$topic_ids			Topics ids
-	*
-	* @return	null
-	*/
+	 * Change topic attribute in mcp
+	 *
+	 * @param	int		$attribute_id		New attribute id
+	 * @param	array	$topic_ids			Topics ids
+	 *
+	 * @return	null
+	 */
 	public function mcp_attr_apply($attribute_id = 0, $topic_ids = array())
 	{
 		// load language
@@ -667,24 +667,24 @@ 
 	}
 
 	/**
-	* Getter...
-	*
-	* @return	array
-	*/
+	 * Getter...
+	 *
+	 * @return	array
+	 */
 	public function getAttr()
 	{
 		return $this->_attr;
 	}
 
 	/**
-	* Generate list of groups
-	*
-	* @param int	$group_ids		The default groups id to mark as selected
-	* @param array	$exclude_ids	The group ids to exclude from the list, false (default) if you whish to exclude no id
-	* @param int	$manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only.
-	*
-	* @return string The list of options.
-	*/
+	 * Generate list of groups
+	 *
+	 * @param int	$group_ids		The default groups id to mark as selected
+	 * @param array	$exclude_ids	The group ids to exclude from the list, false (default) if you whish to exclude no id
+	 * @param int	$manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only.
+	 *
+	 * @return string The list of options.
+	 */
 	public function qte_group_select($group_ids, $exclude_ids = array(), $manage_founder = false)
 	{
 		$exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $this->db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : '';
@@ -711,9 +711,9 @@ 
 	}
 
 	/**
-	* borrowed from "Categories Hierarchy" : used to check if a language key exists
-	* @todo delete
-	*/
+	 * borrowed from "Categories Hierarchy" : used to check if a language key exists
+	 * @todo delete
+	 */
 	public function attr_lng_key($key)
 	{
 		// load language
@@ -729,12 +729,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)
 	{
 		$a_name = preg_replace("#[^a-z0-9 _-]#", '', strtolower($a_name));
@@ -747,14 +747,14 @@ 
 	}
 
 	/**
-	* Check if user can apply an attribute
-	*
-	* @param	array	$attr_auth		Forum auth
-	* @param	int		$forum_id		Forum id
-	* @param	array	$user_groups	User's groups
-	* @param	int		$author_id		Topic author id
-	* @return	bool
-	*/
+	 * Check if user can apply an attribute
+	 *
+	 * @param	array	$attr_auth		Forum auth
+	 * @param	int		$forum_id		Forum id
+	 * @param	array	$user_groups	User's groups
+	 * @param	int		$author_id		Topic author id
+	 * @return	bool
+	 */
 	private function _check_auth_attribute($attr_auth, $forum_id, $user_groups, $author_id)
 	{
 		$forum_ids = $attr_auth['forums_ids'];
@@ -770,12 +770,12 @@ 
 	}
 
 	/**
-	* Check if user can delete an attribute
-	*
-	* @param	array	$user_groups	User's groups
-	* @param	array	$hide_attr		Groups which can't delete attribute in a forum
-	* @return	bool
-	*/
+	 * Check if user can delete an attribute
+	 *
+	 * @param	array	$user_groups	User's groups
+	 * @param	array	$hide_attr		Groups which can't delete attribute in a forum
+	 * @return	bool
+	 */
 	private function _check_auth_remove_attr(&$user_groups, $hide_attr)
 	{
 		// include that file !
@@ -804,10 +804,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 +41 added lines, -41 removed lines

@@ -69,16 +69,16 @@ 
 	*/
 	public function __construct(\phpbb\request\request $request, \phpbb\cache\driver\driver_interface $cache, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\template\template $template, \phpbb\user $user, \phpbb\log\log $log, $root_path, $php_ext, $table_prefix)
 	{
-		$this->request		= $request;
-		$this->cache		= $cache;
-		$this->config		= $config;
-		$this->db			= $db;
-		$this->template		= $template;
-		$this->user			= $user;
-		$this->log			= $log;
-
-		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->request = $request;
+		$this->cache = $cache;
+		$this->config = $config;
+		$this->db = $db;
+		$this->template = $template;
+		$this->user = $user;
+		$this->log = $log;
+
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 		$this->table_prefix = $table_prefix;
 
 		$this->_get_attributes();
@@ -96,9 +96,9 @@ 
 		if (!empty($topic_list))
 		{
 			$sql = 'SELECT u.user_id, u.username, u.user_colour
-				FROM ' . USERS_TABLE . ' u
-				LEFT JOIN ' . TOPICS_TABLE . ' t ON (u.user_id = t.topic_attr_user)
-				WHERE ' . $this->db->sql_in_set('t.topic_id', array_map('intval', $topic_list)) . '
+				FROM ' . USERS_TABLE.' u
+				LEFT JOIN ' . TOPICS_TABLE.' t ON (u.user_id = t.topic_attr_user)
+				WHERE ' . $this->db->sql_in_set('t.topic_id', array_map('intval', $topic_list)).'
 					AND t.topic_attr_user <> ' . ANONYMOUS;
 			$result = $this->db->sql_query($sql);
 
@@ -136,12 +136,12 @@ 
 	public function get_users_by_user_id($user_id)
 	{
 		$sql = 'SELECT user_id, username, user_colour
-			FROM ' . USERS_TABLE . '
+			FROM ' . USERS_TABLE.'
 			WHERE user_id = ' . (int) $user_id;
 		$result = $this->db->sql_query($sql);
 
 		$this->name = array();
-		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'],
@@ -226,7 +226,7 @@ 
 				'S_QTE_EMPTY'		=> (empty($attribute_id) || ($attribute_id == -1) || ($attribute_id == -2)),
 				'S_QTE_SELECTED'	=> ($show_remove && ($attribute_id == -1)),
 
-				'L_QTE_SELECT'		=> $this->user->lang['QTE_ATTRIBUTE_' . (!empty($attribute_id) ? ($show_remove ? 'REMOVE' : 'RESTRICT') : 'ADD')],
+				'L_QTE_SELECT'		=> $this->user->lang['QTE_ATTRIBUTE_'.(!empty($attribute_id) ? ($show_remove ? 'REMOVE' : 'RESTRICT') : 'ADD')],
 				'U_QTE_URL'			=> !empty($viewtopic_url) ? append_sid($viewtopic_url, array('attr_id' => -1)) : false,
 			));
 		}
@@ -444,7 +444,7 @@ 
 
 			$attribute_name = str_replace(array('%mod%', '%date%'), array($attribute_username, $attribute_date), $this->attr_lng_key($this->_attr[$attribute_id]['attr_name']));
 
-			return !$this->_attr[$attribute_id]['attr_type'] ? '<span' . $attribute_colour . '>' . $attribute_name . '</span>' : $this->attr_img_key($this->_attr[$attribute_id]['attr_img'], $attribute_name);
+			return !$this->_attr[$attribute_id]['attr_type'] ? '<span'.$attribute_colour.'>'.$attribute_name.'</span>' : $this->attr_img_key($this->_attr[$attribute_id]['attr_img'], $attribute_name);
 		}
 	}
 
@@ -527,13 +527,13 @@ 
 			);
 		}
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $fields) . '
+		$sql = 'UPDATE '.TOPICS_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $fields).'
 			WHERE topic_id = ' . (int) $topic_id;
 		$this->db->sql_query($sql);
 
 		$sql = 'SELECT topic_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			WHERE topic_moved_id = ' . (int) $topic_id;
 		$result = $this->db->sql_query($sql);
 		$shadow_topic_id = (int) $this->db->sql_fetchfield('topic_id');
@@ -541,8 +541,8 @@ 
 
 		if (!empty($shadow_topic_id))
 		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $fields) . '
+			$sql = 'UPDATE '.TOPICS_TABLE.'
+				SET ' . $this->db->sql_build_array('UPDATE', $fields).'
 				WHERE topic_id = ' . $shadow_topic_id;
 			$this->db->sql_query($sql);
 		}
@@ -554,8 +554,8 @@ 
 		$this->user->add_lang('posting');
 		$this->user->add_lang_ext('ernadoo/qte', 'attributes');
 
-		$message = $this->user->lang['QTE_ATTRIBUTE_' . ($attribute_id == -1 ? 'REMOVED' : (empty($topic_attribute) ? 'ADDED' : 'UPDATED'))] . '<br /><br />' . sprintf($this->user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
-		$message .= '<br /><br />' . sprintf($this->user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$this->root_path}viewforum.$this->php_ext", 'f=' . $forum_id) . '">', '</a>');
+		$message = $this->user->lang['QTE_ATTRIBUTE_'.($attribute_id == -1 ? 'REMOVED' : (empty($topic_attribute) ? 'ADDED' : 'UPDATED'))].'<br /><br />'.sprintf($this->user->lang['VIEW_MESSAGE'], '<a href="'.$meta_url.'">', '</a>');
+		$message .= '<br /><br />'.sprintf($this->user->lang['RETURN_FORUM'], '<a href="'.append_sid("{$this->root_path}viewforum.$this->php_ext", 'f='.$forum_id).'">', '</a>');
 
 		if ($this->request->is_ajax())
 		{
@@ -599,7 +599,7 @@ 
 		$current_time = time();
 
 		$sql = 'SELECT topic_id, forum_id, topic_title, topic_attr_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_id', array_map('intval', $topic_ids));
 		$result = $this->db->sql_query($sql);
 
@@ -612,7 +612,7 @@ 
 				'topic_id'	=> $row['topic_id'],
 				$row['topic_title'],
 			);
-			$this->log->add('mod', $this->user->data['user_id'], $this->user->ip, 'MCP_ATTRIBUTE_' . $message, $current_time, $additional_data);
+			$this->log->add('mod', $this->user->data['user_id'], $this->user->ip, 'MCP_ATTRIBUTE_'.$message, $current_time, $additional_data);
 		}
 		$this->db->sql_freeresult($result);
 
@@ -633,13 +633,13 @@ 
 			);
 		}
 
-		$sql = 'UPDATE ' . TOPICS_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $fields) . '
+		$sql = 'UPDATE '.TOPICS_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $fields).'
 			WHERE ' . $this->db->sql_in_set('topic_id', array_map('intval', $topic_ids));
 		$this->db->sql_query($sql);
 
 		$sql = 'SELECT topic_id
-			FROM ' . TOPICS_TABLE . '
+			FROM ' . TOPICS_TABLE.'
 			WHERE ' . $this->db->sql_in_set('topic_moved_id', array_map('intval', $topic_ids));
 		$result = $this->db->sql_query($sql);
 
@@ -652,8 +652,8 @@ 
 
 		if (sizeof($shadow_topic_ids))
 		{
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
-				SET ' . $this->db->sql_build_array('UPDATE', $fields) . '
+			$sql = 'UPDATE '.TOPICS_TABLE.'
+				SET ' . $this->db->sql_build_array('UPDATE', $fields).'
 				WHERE ' . $this->db->sql_in_set('topic_id', array_map('intval', $shadow_topic_ids));
 			$this->db->sql_query($sql);
 		}
@@ -661,7 +661,7 @@ 
 		$redirect = $this->request->variable('redirect', $this->user->data['session_page']);
 
 		meta_refresh(3, $redirect);
-		trigger_error($this->user->lang['QTE_TOPIC' . (sizeof($topic_ids) == 1 ? '' : 'S') . '_ATTRIBUTE_' . $message] . '<br /><br />' . sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $redirect . '">', '</a>'));
+		trigger_error($this->user->lang['QTE_TOPIC'.(sizeof($topic_ids) == 1 ? '' : 'S').'_ATTRIBUTE_'.$message].'<br /><br />'.sprintf($this->user->lang['RETURN_PAGE'], '<a href="'.$redirect.'">', '</a>'));
 
 		return;
 	}
@@ -687,12 +687,12 @@ 
 	*/
 	public function qte_group_select($group_ids, $exclude_ids = array(), $manage_founder = false)
 	{
-		$exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $this->db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : '';
-		$sql_and = !$this->config['coppa_enable'] ? ($exclude_sql ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : '';
-		$sql_founder = ($manage_founder !== false) ? (($exclude_sql || $sql_and) ? ' AND ' : ' WHERE ') . 'group_founder_manage = ' . (int) $manage_founder : '';
+		$exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE '.$this->db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : '';
+		$sql_and = !$this->config['coppa_enable'] ? ($exclude_sql ? ' AND ' : ' WHERE ')."group_name <> 'REGISTERED_COPPA'" : '';
+		$sql_founder = ($manage_founder !== false) ? (($exclude_sql || $sql_and) ? ' AND ' : ' WHERE ').'group_founder_manage = '.(int) $manage_founder : '';
 
 		$sql = 'SELECT group_id, group_name, group_type
-			FROM ' . GROUPS_TABLE . "
+			FROM ' . GROUPS_TABLE."
 			$exclude_sql
 			$sql_and
 			$sql_founder
@@ -703,7 +703,7 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			$selected = in_array($row['group_id'], $group_ids) ? ' selected="selected"' : '';
-			$s_group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '') . ' value="' . $row['group_id'] . '"' . $selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+			$s_group_options .= '<option'.(($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '').' value="'.$row['group_id'].'"'.$selected.'>'.(($row['group_type'] == GROUP_SPECIAL) ? $this->user->lang['G_'.$row['group_name']] : $row['group_name']).'</option>';
 		}
 		$this->db->sql_freeresult($result);
 
@@ -725,7 +725,7 @@ 
 	// borrowed from "Categories Hierarchy" : used to check if a image key exists
 	public function attr_img_key($key, $alt)
 	{
-		return empty($key) ? '' : (preg_match('#^[a-z0-9_-]+$#i', $key) ? $this->user->img($key, $alt) : '<img src="' . (preg_match('#^(ht|f)tp[s]?\://#i', $key) ? $key : $this->root_path . $key) . '" alt="' . $alt . '" title="' . $alt . '" />');
+		return empty($key) ? '' : (preg_match('#^[a-z0-9_-]+$#i', $key) ? $this->user->img($key, $alt) : '<img src="'.(preg_match('#^(ht|f)tp[s]?\://#i', $key) ? $key : $this->root_path.$key).'" alt="'.$alt.'" title="'.$alt.'" />');
 	}
 
 	/**
@@ -743,7 +743,7 @@ 
 			$a_name .= '-qte';
 		}
 
-		return ' class="qte-attr ' . $a_name . '"' . (!empty($a_colour) ? ' style="color:#' . $a_colour . '; font-weight:bold;"' : '');
+		return ' class="qte-attr '.$a_name.'"'.(!empty($a_colour) ? ' style="color:#'.$a_colour.'; font-weight:bold;"' : '');
 	}
 
 	/**
@@ -781,7 +781,7 @@ 
 		// include that file !
 		if (!function_exists('group_memberships'))
 		{
-			include $this->root_path . 'includes/functions_user.' . $this->php_ext;
+			include $this->root_path.'includes/functions_user.'.$this->php_ext;
 		}
 
 		// get groups membership !
@@ -813,7 +813,7 @@ 
 		if (($this->_attr = $this->cache->get('_attr')) === false)
 		{
 			$sql = 'SELECT *
-				FROM ' . $this->table_prefix . 'topics_attr
+				FROM ' . $this->table_prefix.'topics_attr
 				ORDER BY left_id ASC';
 			$result = $this->db->sql_query($sql);
 

migrations/v100/rc3.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	{
 		return array(
 			'add_tables'		=> array(
-				$this->table_prefix . 'topics_attr'		=> array(
+				$this->table_prefix.'topics_attr'		=> array(
 					'COLUMNS'		  => array(
 						'attr_id'			=> array('UINT', null, 'auto_increment'),
 						'attr_type'			=> array('BOOL', 0),
@@ -72,7 +72,7 @@ 
 	{
 		return array(
 			'drop_tables'		=> array(
-				$this->table_prefix . 'topics_attr',
+				$this->table_prefix.'topics_attr',
 			),
 			'drop_columns'	   => array(
 				TOPICS_TABLE		   => array(

event/main_listener.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 	public function viewtopic_attr_apply($event)
 	{
 		$attr_id = (int) $this->request->variable('attr_id', 0);
-		if ( $attr_id )
+		if ($attr_id)
 		{
 			$this->qte->get_users_by_topic_id(array($event['topic_id']));
 			$this->qte->attr_apply($attr_id, $event['topic_id'], $event['forum_id'], $event['topic_data']['topic_attr_id'], (array) unserialize(trim($event['topic_data']['hide_attr'])));
@@ -204,7 +204,7 @@ 
 						$attr_name,
 					);
 
-					$this->log->add('mod', $this->user->data['user_id'], $this->user->ip, 'MCP_ATTRIBUTE_' . ($event['data']['attr_id'] == \ernadoo\qte\qte::REMOVE ? 'REMOVED' : 'UPDATED'), time(), $log_data);
+					$this->log->add('mod', $this->user->data['user_id'], $this->user->ip, 'MCP_ATTRIBUTE_'.($event['data']['attr_id'] == \ernadoo\qte\qte::REMOVE ? 'REMOVED' : 'UPDATED'), time(), $log_data);
 				}
 			}
 		}