ErnadoO / qte

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

qte.php

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