RobertHeim / phpbb-ext-topictags

acp/manage_tags_controller.php

Doc Comments +3 added lines

@@ -292,6 +292,9 @@
 		}
 	}
 
+	/**
+	 * @param string $u_action
+	 */
 	private function get_tag_link($u_action, $tag_id)
 	{
 		return $u_action . (($tag_id) ? '&tag_id=' . $tag_id : '');

Spacing +11 added lines, -11 removed lines

@@ -104,7 +104,7 @@ 
 				$limit = $this->config['topics_per_page'];
 				$tags_count = $this->tags_manager->count_tags();
 				$start = $this->pagination->validate_start($start, $limit, $tags_count);
-				$base_url = $u_action . "&sort_key=$sort_key";
+				$base_url = $u_action."&sort_key=$sort_key";
 
 				$tags = $this->tags_manager->get_all_tags($start, $limit, $sort_field, $ordering);
 
@@ -114,13 +114,13 @@ 
 					$this->template->assign_block_vars('tags', array(
 						'NAME'				=> $tag['tag'],
 						'ASSIGNMENTS'		=> $tag['count'],
-						'U_DELETE_TAG'		=> $this->get_tag_link($u_action, $tag['id']) . '&action=delete',
-						'U_EDIT_TAG'		=> $this->get_tag_link($u_action, $tag['id']) . '&action=edit_non_ajax',
+						'U_DELETE_TAG'		=> $this->get_tag_link($u_action, $tag['id']).'&action=delete',
+						'U_EDIT_TAG'		=> $this->get_tag_link($u_action, $tag['id']).'&action=edit_non_ajax',
 					));
 				}
 				$this->template->assign_vars(array(
 					'SELECT_SORT_KEY' => $this->create_sort_selects($sort_key),
-					'U_ACTION'        => $u_action . "&sort_key=$sort_key&start=$start",
+					'U_ACTION'        => $u_action."&sort_key=$sort_key&start=$start",
 				));
 			break;
 		}
@@ -140,7 +140,7 @@ 
 			{
 				trigger_error('TOPICTAGS_MISSING_TAG_ID', E_USER_WARNING);
 			}
-			trigger_error($this->user->lang('TOPICTAGS_MISSING_TAG_ID') . adm_back_link($u_action), E_USER_WARNING);
+			trigger_error($this->user->lang('TOPICTAGS_MISSING_TAG_ID').adm_back_link($u_action), E_USER_WARNING);
 		}
 
 		$tag = $this->tags_manager->get_tag_by_id($tag_id);
@@ -153,7 +153,7 @@ 
 			{
 				trigger_error('TOPICTAGS_TAG_DELETED');
 			}
-			trigger_error($this->user->lang('TOPICTAGS_TAG_DELETED') . adm_back_link($u_action));
+			trigger_error($this->user->lang('TOPICTAGS_TAG_DELETED').adm_back_link($u_action));
 		}
 		else
 		{
@@ -181,7 +181,7 @@ 
 				$tag_id = $this->request->variable('tag_id', 0);
 				$old_tag_name = $this->tags_manager->get_tag_by_id($tag_id);
 				$this->template->assign_vars(array(
-					'U_ACTION'				=> $this->get_tag_link($u_action, $tag_id) . '&action=edit_non_ajax',
+					'U_ACTION'				=> $this->get_tag_link($u_action, $tag_id).'&action=edit_non_ajax',
 					'S_EDIT_TAG_NON_AJAX'	=> true,
 					'OLD_TAG_NAME'			=> $old_tag_name,
 				));
@@ -284,17 +284,17 @@ 
 		}
 		if ($success)
 		{
-			trigger_error($msg . adm_back_link($u_action));
+			trigger_error($msg.adm_back_link($u_action));
 		}
 		else
 		{
-			trigger_error($msg . adm_back_link($u_action), E_USER_WARNING);
+			trigger_error($msg.adm_back_link($u_action), E_USER_WARNING);
 		}
 	}
 
 	private function get_tag_link($u_action, $tag_id)
 	{
-		return $u_action . (($tag_id) ? '&tag_id=' . $tag_id : '');
+		return $u_action.(($tag_id) ? '&tag_id='.$tag_id : '');
 	}
 
 	private function create_sort_selects($selected_sort_key)
@@ -310,7 +310,7 @@ 
 
 		foreach ($sort_keys as $key => $text)
 		{
-			$sort_selects .= '<option value="' . $key . '"' . (($selected_sort_key == $key) ? ' selected="selected"' : '') . '>' . $text . '</option>';
+			$sort_selects .= '<option value="'.$key.'"'.(($selected_sort_key == $key) ? ' selected="selected"' : '').'>'.$text.'</option>';
 		}
 		$sort_selects .= '</select>';
 

controller/topic.php

Doc Comments +9 added lines, -1 removed lines

@@ -70,6 +70,8 @@ 
 	/**
 	 *
 	 * @param array $topic_row a db topic row
+	 * @param string $phpbb_root_path
+	 * @param string $php_ext
 	 */
 	public function __construct(array $topic_row,
 		\phpbb\user $user,
@@ -279,11 +281,17 @@ 
 		return $this->topic_row['topic_views'];
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	public function author($mode)
 	{
 		return get_username_string($mode, $this->topic_row['topic_poster'], $this->topic_row['topic_first_poster_name'], $this->topic_row['topic_first_poster_colour']);
 	}
 
+	/**
+	 * @param string $mode
+	 */
 	public function last_author($mode)
 	{
 		return get_username_string($mode, $this->topic_row['topic_last_poster_id'], $this->topic_row['topic_last_poster_name'], $this->topic_row['topic_last_poster_colour']);
@@ -312,7 +320,7 @@ 
 	/**
 	 * This will allow the style designer to output a different header
 	 * or even separate the list of announcements from sticky and normal topics
-	 * @return number
+	 * @return integer
 	 */
 	public function topic_type_switch()
 	{

Spacing +6 added lines, -6 removed lines

@@ -93,10 +93,10 @@ 
 		}
 		$this->forum_id = (int) $this->topic_row['forum_id'];
 
-		$this->view_topic_url_params = 'f=' . $this->forum_id . '&t=' . $this->topic_id;
-		$this->view_topic_url	= append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params);
-		$this->newest_post_url	= append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params . '&view=unread') . '#unread';
-		$this->last_post_url	= append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params . '&p=' . $topic_row['topic_last_post_id']) . '#p' . $topic_row['topic_last_post_id'];
+		$this->view_topic_url_params = 'f='.$this->forum_id.'&t='.$this->topic_id;
+		$this->view_topic_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params);
+		$this->newest_post_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params.'&view=unread').'#unread';
+		$this->last_post_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", $this->view_topic_url_params.'&p='.$topic_row['topic_last_post_id']).'#p'.$topic_row['topic_last_post_id'];
 
 		$this->replies = $phpbb_content_visibility->get_count('topic_posts', $topic_row, $this->forum_id) - 1;
 		// Get folder img, topic status/type related information
@@ -261,7 +261,7 @@ 
 
 	public function mcp_report()
 	{
-		return append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", 'i=reports&mode=reports&f=' . $this->forum_id . '&t=' . $this->topic_id, true, $this->user->session_id);
+		return append_sid("{$this->phpbb_root_path}mcp.{$this->php_ext}", 'i=reports&mode=reports&f='.$this->forum_id.'&t='.$this->topic_id, true, $this->user->session_id);
 	}
 
 	public function forum_name()
@@ -318,6 +318,6 @@ 
 	{
 		$s_type_switch = 0;
 		$s_type_switch_test = ($this->topic_row['topic_type'] == POST_ANNOUNCE || $this->topic_row['topic_type'] == POST_GLOBAL) ? 1 : 0;
-		return ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test;
+		return ($s_type_switch == $s_type_switch_test) ? - 1 : $s_type_switch_test;
 	}
 }

event/main_listener.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 	/**
 	 * Checks whether the mode indicates a new topic or not.
 	 * @param string $mode the mode.
-	 * @return true if mode == post (indicating a new topic), false otherwise
+	 * @return boolean if mode == post (indicating a new topic), false otherwise
 	 */
 	private function is_new_topic($mode)
 	{

Spacing +10 added lines, -10 removed lines

@@ -104,7 +104,7 @@ 
 		$tagsJson = json_decode($tags_string, true);
 		$tags = array();
 
-		for ($i = 0, $count = sizeof($tagsJson); $i<$count; $i++)
+		for ($i = 0, $count = sizeof($tagsJson); $i < $count; $i ++)
 		{
 			$tags[] = trim($tagsJson[$i]['text']);
 		}
@@ -130,7 +130,7 @@ 
 	 */
 	public function index_modify_page_title($event)
 	{
-		if ($this->config[prefixes::CONFIG . '_display_tagcloud_on_index'])
+		if ($this->config[prefixes::CONFIG.'_display_tagcloud_on_index'])
 		{
 			$this->template->assign_vars(array(
 				'RH_TOPICTAGS_DISPLAY_TAGCLOUD_ON_INDEX'	=> true,
@@ -289,16 +289,16 @@ 
 
 		$page_data['RH_TOPICTAGS'] = base64_encode(rawurlencode(json_encode($tags)));
 
-		$page_data['RH_TOPICTAGS_ALLOWED_TAGS_REGEX'] = $this->config[prefixes::CONFIG . '_allowed_tags_regex'];
-		$page_data['RH_TOPICTAGS_CONVERT_SPACE_TO_MINUS'] = $this->config[prefixes::CONFIG . '_convert_space_to_minus'] ? 'true' : 'false';
+		$page_data['RH_TOPICTAGS_ALLOWED_TAGS_REGEX'] = $this->config[prefixes::CONFIG.'_allowed_tags_regex'];
+		$page_data['RH_TOPICTAGS_CONVERT_SPACE_TO_MINUS'] = $this->config[prefixes::CONFIG.'_convert_space_to_minus'] ? 'true' : 'false';
 
-		$page_data['S_RH_TOPICTAGS_WHITELIST_ENABLED'] = $this->config[prefixes::CONFIG . '_whitelist_enabled'];
+		$page_data['S_RH_TOPICTAGS_WHITELIST_ENABLED'] = $this->config[prefixes::CONFIG.'_whitelist_enabled'];
 
-		if ($this->config[prefixes::CONFIG . '_whitelist_enabled'])
+		if ($this->config[prefixes::CONFIG.'_whitelist_enabled'])
 		{
 			$page_data['S_RH_TOPICTAGS_WHITELIST_ENABLED'] = true;
 			$tags = $this->tags_manager->get_whitelist_tags();
-			for ($i = 0, $size = sizeof($tags); $i < $size; $i++)
+			for ($i = 0, $size = sizeof($tags); $i < $size; $i ++)
 			{
 				$this->template->assign_block_vars('rh_topictags_whitelist', array(
 					'LINK' => '#',
@@ -308,7 +308,7 @@ 
 		}
 		else
 		{
-			$page_data['RH_TOPICTAGS_ALLOWED_TAGS_EXP'] = $this->config[prefixes::CONFIG . '_allowed_tags_exp_for_users'];
+			$page_data['RH_TOPICTAGS_ALLOWED_TAGS_EXP'] = $this->config[prefixes::CONFIG.'_allowed_tags_exp_for_users'];
 		}
 		$page_data['S_RH_TOPICTAGS_INCLUDE_NG_TAGS_INPUT'] = true;
 		$page_data['S_RH_TOPICTAGS_INCLUDE_CSS'] = true;
@@ -367,7 +367,7 @@ 
 	{
 		foreach ($tags as $tag)
 		{
-			$this->template->assign_block_vars($block_name, array (
+			$this->template->assign_block_vars($block_name, array(
 				'NAME'	=> $tag,
 				'LINK'	=> $this->helper->route('robertheim_topictags_show_tag_controller', array(
 					'tags'	=> urlencode($tag),
@@ -397,7 +397,7 @@ 
 				$this->assign_tags_to_template('rh_topic_tags', $tags);
 				$this->template->assign_vars(array(
 					'RH_TOPICTAGS_SHOW'	=> true,
-					'META'				=> '<meta name="keywords" content="' . join(', ', $tags) . '">',
+					'META'				=> '<meta name="keywords" content="'.join(', ', $tags).'">',
 				));
 				// tags might want to use our extension's css.
 				$this->template->assign_var('S_RH_TOPICTAGS_INCLUDE_CSS', true);

Braces +1 added lines, -2 removed lines

@@ -73,8 +73,7 @@
 							\phpbb\template\template $template,
 							\phpbb\auth\auth $auth,
 							\robertheim\topictags\service\tagcloud_manager $tagcloud_manager
-	)
-	{
+	) {
 		$this->config = $config;
 		$this->tags_manager = $tags_manager;
 		$this->helper = $helper;

service/tags_manager.php

Doc Comments +15 added lines, -15 removed lines

@@ -61,7 +61,7 @@ 
 	/**
 	 * Remove all tags from the given topic
 	 *
-	 * @param $topic_id
+	 * @param integer $topic_id
 	 * @param $delete_unused_tags if set to true unused tags are removed from the db.
 	 */
 	public function remove_all_tags_from_topic($topic_id, $delete_unused_tags = true)
@@ -196,7 +196,7 @@ 
 	/**
 	 * Deletes all topic-tag-assignments where the topic resides in a forum with tagging disabled.
 	 *
-	 * @param $forum_ids array of forum-ids that should be checked (if null, all are checked).
+	 * @param integer[] $forum_ids array of forum-ids that should be checked (if null, all are checked).
 	 * @return integer count of deleted assignments
 	 */
 	public function delete_tags_from_tagdisabled_forums($forum_ids = null)
@@ -247,7 +247,7 @@ 
 	/**
 	 * Gets all assigned tags
 	 *
-	 * @param $topic_id
+	 * @param integer $topic_id
 	 * @return array of tag names
 	 */
 	public function get_assigned_tags($topic_id)
@@ -268,7 +268,7 @@ 
 	 *
 	 * @param $query prefix of tags to search
 	 * @param $exclude array of tags that should be ignored
-	 * @param $count count of tags to return
+	 * @param integer $count count of tags to return
 	 * @return array (array('text' => '...'), array('text' => '...'))
 	 */
 	public function get_tag_suggestions($query, $exclude, $count)
@@ -584,7 +584,7 @@ 
 	 * Checks whether the given tag is blacklisted.
 	 *
 	 * @param string $tag
-	 * @return boolean true, if the tag is on the blacklist, false otherwise
+	 * @return boolean|null true, if the tag is on the blacklist, false otherwise
 	 */
 	private function is_on_blacklist($tag)
 	{
@@ -603,7 +603,7 @@ 
 	 * Checks whether the given tag is whitelisted.
 	 *
 	 * @param string $tag
-	 * @return boolean true, if the tag is on the whitelist, false otherwise
+	 * @return boolean|null true, if the tag is on the whitelist, false otherwise
 	 */
 	private function is_on_whitelist($tag)
 	{
@@ -631,7 +631,7 @@ 
 	 *
 	 * @param $tag the tag to check
 	 * @param $is_clean wether the tag has already been cleaned or not.
-	 * @return true if the tag matches, false otherwise
+	 * @return boolean if the tag matches, false otherwise
 	 */
 	public function is_valid_tag($tag, $is_clean = false)
 	{
@@ -705,7 +705,7 @@ 
 	 * Trims the tag to 30 characters and replaced spaces to "-" if configured.
 	 *
 	 * @param the tag to clean
-	 * @return cleaned tag
+	 * @return string tag
 	 */
 	public function clean_tag($tag)
 	{
@@ -729,7 +729,7 @@ 
 	 * Checks if tagging is enabled in the given forum.
 	 *
 	 * @param $forum_id the id of the forum
-	 * @return true if tagging is enabled in the given forum, false if not
+	 * @return boolean if tagging is enabled in the given forum, false if not
 	 */
 	public function is_tagging_enabled_in_forum($forum_id)
 	{
@@ -744,7 +744,7 @@ 
 	/**
 	 * Enables tagging engine in all forums (not categories and links).
 	 *
-	 * @return number of affected forums (should be the count of all forums (type FORUM_POST ))
+	 * @return integer of affected forums (should be the count of all forums (type FORUM_POST ))
 	 */
 	public function enable_tags_in_all_forums()
 	{
@@ -755,7 +755,7 @@ 
 	 * en/disables tagging engine in all forums (not categories and links).
 	 *
 	 * @param boolean $enable true to enable and false to disabl the engine
-	 * @return number of affected forums (should be the count of all forums (type FORUM_POST ))
+	 * @return integer of affected forums (should be the count of all forums (type FORUM_POST ))
 	 */
 	private function set_tags_enabled_in_all_forums($enable)
 	{
@@ -775,7 +775,7 @@ 
 	/**
 	 * Disables tagging engine in all forums (not categories and links).
 	 *
-	 * @return number of affected forums (should be the count of all forums (type FORUM_POST ))
+	 * @return integer of affected forums (should be the count of all forums (type FORUM_POST ))
 	 */
 	public function disable_tags_in_all_forums()
 	{
@@ -807,7 +807,7 @@ 
 	/**
 	 * Checks if tagging is enabled or for all forums (not categories and links).
 	 *
-	 * @return true if for all forums tagging is enabled (type FORUM_POST ))
+	 * @return boolean if for all forums tagging is enabled (type FORUM_POST ))
 	 */
 	public function is_enabled_in_all_forums()
 	{
@@ -817,7 +817,7 @@ 
 	/**
 	 * Checks if tagging is disabled or for all forums (not categories and links).
 	 *
-	 * @return true if for all forums tagging is disabled (type FORUM_POST ))
+	 * @return boolean if for all forums tagging is disabled (type FORUM_POST ))
 	 */
 	public function is_disabled_in_all_forums()
 	{
@@ -885,7 +885,7 @@ 
 	 * @param int $tag_to_delete_id the id of the tag to delete
 	 * @param string $tag_to_keep must be valid
 	 * @param int $tag_to_keep_id the id of the tag to keep
-	 * @return the new count of assignments of the kept tag
+	 * @return integer new count of assignments of the kept tag
 	 */
 	public function merge($tag_to_delete_id, $tag_to_keep, $tag_to_keep_id)
 	{

Spacing +66 added lines, -66 removed lines

@@ -50,12 +50,12 @@ 
 					db_helper $db_helper,
 					$table_prefix)
 	{
-		$this->db			= $db;
-		$this->config		= $config;
-		$this->config_text	= $config_text;
-		$this->auth			= $auth;
-		$this->db_helper	= $db_helper;
-		$this->table_prefix	= $table_prefix;
+		$this->db = $db;
+		$this->config = $config;
+		$this->config_text = $config_text;
+		$this->auth = $auth;
+		$this->db_helper = $db_helper;
+		$this->table_prefix = $table_prefix;
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	public function remove_all_tags_from_topics(array $topic_ids, $delete_unused_tags = true)
 	{
 		// remove tags from topic
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS. '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
 			WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids);
 		$this->db->sql_query($sql);
 		if ($delete_unused_tags)
@@ -94,10 +94,10 @@ 
 	private function get_unused_tag_ids()
 	{
 		$sql = 'SELECT t.id
-			FROM ' . $this->table_prefix . tables::TAGS . ' t
+			FROM ' . $this->table_prefix.tables::TAGS.' t
 			WHERE NOT EXISTS (
 				SELECT 1
-				FROM ' . $this->table_prefix . tables::TOPICTAGS . ' tt
+				FROM ' . $this->table_prefix.tables::TOPICTAGS.' tt
 					WHERE tt.tag_id = t.id
 			)';
 		return $this->db_helper->get_ids($sql);
@@ -116,7 +116,7 @@ 
 			// nothing to do
 			return 0;
 		}
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TAGS.'
 			WHERE ' . $this->db->sql_in_set('id', $ids);
 		$this->db->sql_query($sql);
 		return $this->db->sql_affectedrows();
@@ -147,7 +147,7 @@ 
 		}
 
 		// delete all tag-assignments where the tag is not valid
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
 			WHERE ' . $this->db->sql_in_set('tag_id', $ids_of_invalid_tags);
 		$this->db->sql_query($sql);
 		$removed_count = $this->db->sql_affectedrows();
@@ -160,10 +160,10 @@ 
 	private function get_assignment_ids_where_topic_does_not_exist()
 	{
 		$sql = 'SELECT tt.id
-			FROM ' . $this->table_prefix . tables::TOPICTAGS . ' tt
+			FROM ' . $this->table_prefix.tables::TOPICTAGS.' tt
 			WHERE NOT EXISTS (
 				SELECT 1
-				FROM ' . TOPICS_TABLE . ' topics
+				FROM ' . TOPICS_TABLE.' topics
 					WHERE topics.topic_id = tt.topic_id
 			)';
 		return $this->db_helper->get_ids($sql);
@@ -183,7 +183,7 @@ 
 			return 0;
 		}
 		// delete all tag-assignments where the topic does not exist anymore
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
 			WHERE ' . $this->db->sql_in_set('id', $ids);
 		$this->db->sql_query($sql);
 		$removed_count = $this->db->sql_affectedrows();
@@ -210,16 +210,16 @@ 
 				// performance improvement because we already know the result of querying the db.
 				return 0;
 			}
-			$forums_sql_where = ' AND ' . $this->db->sql_in_set('f.forum_id', $forum_ids);
+			$forums_sql_where = ' AND '.$this->db->sql_in_set('f.forum_id', $forum_ids);
 		}
 
 		// get ids of all topic-assignments to topics that reside in a forum with tagging disabled.
 		$sql = 'SELECT tt.id
-			FROM ' . $this->table_prefix . tables::TOPICTAGS . ' tt
+			FROM ' . $this->table_prefix.tables::TOPICTAGS.' tt
 			WHERE EXISTS (
 				SELECT 1
-				FROM ' . TOPICS_TABLE . ' topics,
-					' . FORUMS_TABLE . " f
+				FROM ' . TOPICS_TABLE.' topics,
+					' . FORUMS_TABLE." f
 				WHERE topics.topic_id = tt.topic_id
 					AND f.forum_id = topics.forum_id
 					AND f.rh_topictags_enabled = 0
@@ -233,7 +233,7 @@ 
 			return 0;
 		}
 		// delete these assignments
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
 			WHERE ' . $this->db->sql_in_set('id', $delete_ids);
 		$this->db->sql_query($sql);
 		$removed_count = $this->db->sql_affectedrows();
@@ -255,8 +255,8 @@ 
 		$topic_id = (int) $topic_id;
 		$sql = 'SELECT t.tag
 			FROM
-				' . $this->table_prefix . tables::TAGS . ' AS t,
-				' . $this->table_prefix . tables::TOPICTAGS . " AS tt
+				' . $this->table_prefix.tables::TAGS.' AS t,
+				' . $this->table_prefix.tables::TOPICTAGS." AS tt
 			WHERE tt.topic_id = $topic_id
 				AND t.id = tt.tag_id";
 		return $this->db_helper->get_array_by_fieldname($sql, 'tag');
@@ -280,15 +280,15 @@ 
 		$exclude_sql = '';
 		if (!empty($exclude))
 		{
-			$exclude_sql = ' AND ' . $this->db->sql_in_set('t.tag', $exclude, true, true);
+			$exclude_sql = ' AND '.$this->db->sql_in_set('t.tag', $exclude, true, true);
 		}
 		$sql_array = array(
 			// we must fetch count, because postgres needs the context for ordering
 			'SELECT'	=> 't.tag, t.count',
 			'FROM'		=> array(
-				$this->table_prefix . tables::TAGS		=> 't',
+				$this->table_prefix.tables::TAGS		=> 't',
 			),
-			'WHERE'		=> 't.tag ' . $this->db->sql_like_expression($query . $this->db->get_any_char()) . "
+			'WHERE'		=> 't.tag '.$this->db->sql_like_expression($query.$this->db->get_any_char())."
 							$exclude_sql",
 			'ORDER_BY'	=> 't.count DESC',
 		);
@@ -328,7 +328,7 @@ 
 				'tag_id'	=> $id
 			);
 		}
-		$this->db->sql_multi_insert($this->table_prefix . tables::TOPICTAGS, $sql_ary);
+		$this->db->sql_multi_insert($this->table_prefix.tables::TOPICTAGS, $sql_ary);
 
 		// garbage collection
 		$this->delete_unused_tags();
@@ -366,7 +366,7 @@ 
 		}
 
 		// create the new tags
-		$this->db->sql_multi_insert($this->table_prefix . tables::TAGS, $sql_ary_new_tags);
+		$this->db->sql_multi_insert($this->table_prefix.tables::TAGS, $sql_ary_new_tags);
 	}
 
 	/**
@@ -403,10 +403,10 @@ 
 				// note that this case is different from $tags == null where we want to get ALL existing tags.
 				return array();
 			}
-			$where = 'WHERE ' . $this->db->sql_in_set('tag', $tags);
+			$where = 'WHERE '.$this->db->sql_in_set('tag', $tags);
 		}
 		$sql = 'SELECT id, tag
-			FROM ' . $this->table_prefix . tables::TAGS . "
+			FROM ' . $this->table_prefix.tables::TAGS."
 			$where";
 		if ($only_ids)
 		{
@@ -469,7 +469,7 @@ 
 		if (!$casesensitive)
 		{
 			$tag_count = sizeof($tags_copy);
-			for ($i = 0; $i < $tag_count; $i++)
+			for ($i = 0; $i < $tag_count; $i ++)
 			{
 				$tags_copy[$i] = utf8_strtolower($tags_copy[$i]);
 			}
@@ -516,7 +516,7 @@ 
 		{
 			$sql_where_topic_access = $this->db->sql_in_set('topics.forum_id', $forum_ary, false, true);
 		}
-		$sql_where_topic_access .= ' AND topics.topic_visibility = ' . ITEM_APPROVED;
+		$sql_where_topic_access .= ' AND topics.topic_visibility = '.ITEM_APPROVED;
 		return $sql_where_topic_access;
 	}
 
@@ -532,7 +532,7 @@ 
 	{
 		if (empty($tags))
 		{
-			return 'SELECT topics.* FROM ' . TOPICS_TABLE . ' topics WHERE 0=1';
+			return 'SELECT topics.* FROM '.TOPICS_TABLE.' topics WHERE 0=1';
 		}
 
 		// validate mode
@@ -546,10 +546,10 @@ 
 			$tag_count = sizeof($tags);
 			// http://stackoverflow.com/questions/26038114/sql-select-distinct-where-exist-row-for-each-id-in-other-table
 			$sql = 'SELECT topics.*
-				FROM 	' . TOPICS_TABLE								. ' topics
-					JOIN ' . $this->table_prefix . tables::TOPICTAGS	. ' tt ON tt.topic_id = topics.topic_id
-					JOIN ' . $this->table_prefix . tables::TAGS			. ' t  ON tt.tag_id = t.id
-					JOIN ' . FORUMS_TABLE								. " f  ON f.forum_id = topics.forum_id
+				FROM 	' . TOPICS_TABLE.' topics
+					JOIN ' . $this->table_prefix.tables::TOPICTAGS.' tt ON tt.topic_id = topics.topic_id
+					JOIN ' . $this->table_prefix.tables::TAGS.' t  ON tt.tag_id = t.id
+					JOIN ' . FORUMS_TABLE." f  ON f.forum_id = topics.forum_id
 				WHERE
 					$sql_where_tag_in
 					AND f.rh_topictags_enabled = 1
@@ -564,8 +564,8 @@ 
 				'SELECT'	=> 'topics.*',
 				'FROM'		=> array(
 					TOPICS_TABLE							=> 'topics',
-					$this->table_prefix . tables::TOPICTAGS	=> 'tt',
-					$this->table_prefix . tables::TAGS		=> 't',
+					$this->table_prefix.tables::TOPICTAGS	=> 'tt',
+					$this->table_prefix.tables::TAGS		=> 't',
 					FORUMS_TABLE							=> 'f',
 				),
 				'WHERE'		=> " $sql_where_tag_in
@@ -622,7 +622,7 @@ 
 	 */
 	public function get_whitelist_tags()
 	{
-		return json_decode($this->config_text->get(prefixes::CONFIG . '_whitelist'), true);
+		return json_decode($this->config_text->get(prefixes::CONFIG.'_whitelist'), true);
 	}
 
 	/**
@@ -735,7 +735,7 @@ 
 	{
 		$field = 'rh_topictags_enabled';
 		$sql = "SELECT $field
-			FROM " . FORUMS_TABLE . '
+			FROM ".FORUMS_TABLE.'
 			WHERE ' . $this->db->sql_build_array('SELECT', array('forum_id' => (int) $forum_id));
 		$status = (int) $this->db_helper->get_field($sql, $field);
 		return $status > 0;
@@ -759,12 +759,12 @@ 
 	 */
 	private function set_tags_enabled_in_all_forums($enable)
 	{
-		$sql_ary =  array(
+		$sql_ary = array(
 			'rh_topictags_enabled'	=> $enable ? 1 : 0
 		);
-		$sql = 'UPDATE ' . FORUMS_TABLE . '
-			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
-			WHERE forum_type = ' . FORUM_POST . '
+		$sql = 'UPDATE '.FORUMS_TABLE.'
+			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
+			WHERE forum_type = ' . FORUM_POST.'
 				AND rh_topictags_enabled = ' . ($enable ? '0' : '1');
 		$this->db->sql_query($sql);
 		$affected_rows = $this->db->sql_affectedrows();
@@ -796,7 +796,7 @@ 
 			'FROM'		=> array(
 				FORUMS_TABLE => 'f',
 			),
-			'WHERE'		=> 'f.rh_topictags_enabled = ' . ($status? '0' : '1') . '
+			'WHERE'		=> 'f.rh_topictags_enabled = '.($status ? '0' : '1').'
 				AND forum_type = ' . FORUM_POST,
 		);
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -832,7 +832,7 @@ 
 		$sql_array = array(
 			'SELECT'	=> 'id',
 			'FROM'		=> array(
-				$this->table_prefix . tables::TAGS		=> 't',
+				$this->table_prefix.tables::TAGS		=> 't',
 			),
 		);
 		$sql = $this->db->sql_build_query('SELECT_DISTINCT', $sql_array);
@@ -842,18 +842,18 @@ 
 		{
 			$tag_id = $tag['id'];
 			$sql = 'SELECT COUNT(tt.id) as count
-				FROM ' . TOPICS_TABLE . ' topics,
-					' . FORUMS_TABLE . ' f,
-					' . $this->table_prefix . tables::TOPICTAGS . ' tt
-				WHERE tt.tag_id = ' . $tag_id . '
+				FROM ' . TOPICS_TABLE.' topics,
+					' . FORUMS_TABLE.' f,
+					' . $this->table_prefix.tables::TOPICTAGS.' tt
+				WHERE tt.tag_id = ' . $tag_id.'
 					AND topics.topic_id = tt.topic_id
 					AND f.forum_id = topics.forum_id
 					AND f.rh_topictags_enabled = 1';
 			$this->db->sql_query($sql);
 			$count = $this->db->sql_fetchfield('count');
 
-			$sql = 'UPDATE ' . $this->table_prefix . tables::TAGS . '
-				SET count = ' . $count . '
+			$sql = 'UPDATE '.$this->table_prefix.tables::TAGS.'
+				SET count = ' . $count.'
 				WHERE id = ' . $tag_id;
 			$this->db->sql_query($sql);
 		}
@@ -870,9 +870,9 @@ 
 		$sql_array = array(
 			'SELECT'	=> 'tt.topic_id',
 			'FROM'		=> array(
-				$this->table_prefix . tables::TOPICTAGS	=> 'tt',
+				$this->table_prefix.tables::TOPICTAGS	=> 'tt',
 			),
-			'WHERE'		=> 'tt.tag_id = ' . ((int) $tag_id),
+			'WHERE'		=> 'tt.tag_id = '.((int) $tag_id),
 		);
 		$sql = $this->db->sql_build_query('SELECT_DISTINCT', $sql_array);
 		return $this->db_helper->get_ids($sql, 'topic_id');
@@ -896,8 +896,8 @@ 
 		$topic_ids_already_assigned = $this->get_topic_ids_by_tag_id($tag_to_keep_id);
 		if (!empty($topic_ids_already_assigned))
 		{
-			$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS. '
-				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids_already_assigned) . '
+			$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
+				WHERE ' . $this->db->sql_in_set('topic_id', $topic_ids_already_assigned).'
 					AND tag_id = ' . (int) $tag_to_delete_id;
 			$this->db->sql_query($sql);
 		}
@@ -905,8 +905,8 @@ 
 		$sql_ary = array(
 			'tag_id'	=> $tag_to_keep_id,
 		);
-		$sql = 'UPDATE ' . $this->table_prefix . tables::TOPICTAGS . '
-			SET  ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE '.$this->table_prefix.tables::TOPICTAGS.'
+			SET  ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 			WHERE tag_id = ' . (int) $tag_to_delete_id;
 		$this->db->sql_query($sql);
 
@@ -922,11 +922,11 @@ 
 	 */
 	public function delete_tag($tag_id)
 	{
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TOPICTAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TOPICTAGS.'
 			WHERE tag_id = ' . ((int) $tag_id);
 		$this->db->sql_query($sql);
 
-		$sql = 'DELETE FROM ' . $this->table_prefix . tables::TAGS . '
+		$sql = 'DELETE FROM '.$this->table_prefix.tables::TAGS.'
 			WHERE id = ' . ((int) $tag_id);
 		$this->db->sql_query($sql);
 	}
@@ -944,8 +944,8 @@ 
 			'tag'			=> $new_name_clean,
 			'tag_lowercase'	=> utf8_strtolower($new_name_clean),
 		);
-		$sql = 'UPDATE ' . $this->table_prefix . tables::TAGS . '
-			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE '.$this->table_prefix.tables::TAGS.'
+			SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 			WHERE id = ' . ((int) $tag_id);
 		$this->db->sql_query($sql);
 		return $this->count_topics_by_tags(array($new_name_clean), 'AND', true);
@@ -962,9 +962,9 @@ 
 		$sql_array = array(
 			'SELECT'	=> 't.tag',
 			'FROM'		=> array(
-				$this->table_prefix . tables::TAGS		=> 't',
+				$this->table_prefix.tables::TAGS		=> 't',
 			),
-			'WHERE'		=> 't.id = ' . ((int) $tag_id),
+			'WHERE'		=> 't.id = '.((int) $tag_id),
 		);
 		$sql = $this->db->sql_build_query('SELECT_DISTINCT', $sql_array);
 		return $this->db_helper->get_field($sql, 'tag', 1);
@@ -992,8 +992,8 @@ 
 				$sort_field = 'tag';
 		}
 		$direction = $asc ? 'ASC' : 'DESC';
-		$sql = 'SELECT * FROM ' . $this->table_prefix . tables::TAGS . '
-			ORDER BY ' . $sort_field . ' ' . $direction;
+		$sql = 'SELECT * FROM '.$this->table_prefix.tables::TAGS.'
+			ORDER BY ' . $sort_field.' '.$direction;
 		$field_names = array(
 			'id',
 			'tag',
@@ -1010,7 +1010,7 @@ 
 	 */
 	public function count_tags()
 	{
-		$sql = 'SELECT COUNT(*) as count_tags FROM ' . $this->table_prefix . tables::TAGS;
+		$sql = 'SELECT COUNT(*) as count_tags FROM '.$this->table_prefix.tables::TAGS;
 		return (int) $this->db_helper->get_field($sql, 'count_tags');
 	}
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -734,7 +734,7 @@
 	public function is_tagging_enabled_in_forum($forum_id)
 	{
 		$field = 'rh_topictags_enabled';
-		$sql = "SELECT $field
+		$sql = "select $field
 			FROM " . FORUMS_TABLE . '
 			WHERE ' . $this->db->sql_build_array('SELECT', array('forum_id' => (int) $forum_id));
 		$status = (int) $this->db_helper->get_field($sql, $field);

controller/main.php

Indentation +1 added lines, -1 removed lines

@@ -262,7 +262,7 @@
 			 * @var	array	row			Array with topic data
 			 * @var	array	topic_row	Template array with topic data
 			 * @since 0.0.13-b1
-			*/
+			 */
 			$vars = array('row', 'topic_row');
 			extract($this->phpbb_dispatcher->trigger_event('robertheim.topictags.viewforum_modify_topicrow', compact($vars)));
 

Spacing +7 added lines, -7 removed lines

@@ -97,7 +97,7 @@ 
 	 */
 	public function show()
 	{
-		$this->tagcloud_manager->assign_tagcloud_to_template(-1);
+		$this->tagcloud_manager->assign_tagcloud_to_template(- 1);
 		return $this->helper->render('tags.html', 'Tags');
 	}
 
@@ -129,7 +129,7 @@ 
 		$tags = $all_tags['valid'];
 		$tags_string = join(', ', $tags);
 		$this->template->assign_var('RH_TOPICTAGS_SEARCH_HEADER',
-			$this->user->lang('RH_TOPICTAGS_SEARCH_HEADER_' . $mode, $tags_string)
+			$this->user->lang('RH_TOPICTAGS_SEARCH_HEADER_'.$mode, $tags_string)
 		);
 		if (empty($tags))
 		{
@@ -138,7 +138,7 @@ 
 			return $this->helper->render('show_tag.html', $this->user->lang('RH_TOPICTAGS_TAG_SEARCH'));
 		}
 
-		$topics_count	= $this->tags_manager->count_topics_by_tags($tags, $mode, $casesensitive);
+		$topics_count = $this->tags_manager->count_topics_by_tags($tags, $mode, $casesensitive);
 		if ($topics_count <= 0)
 		{
 			$this->template->assign_var('NO_TOPICS_FOR_TAG', $this->user->lang('RH_TOPICTAGS_NO_TOPICS_FOR_TAG_'.$mode,
@@ -146,14 +146,14 @@ 
 		}
 		else
 		{
-			$pagination		= $this->pagination;
+			$pagination = $this->pagination;
 
 			$start			= $this->request->variable('start', 0);
 			$limit			= $this->config['topics_per_page'];
 
 			$start			= $pagination->validate_start($start, $limit, $topics_count);
 
-			$topics			= $this->tags_manager->get_topics_by_tags($tags, $start, $limit, $mode, $casesensitive);
+			$topics = $this->tags_manager->get_topics_by_tags($tags, $start, $limit, $mode, $casesensitive);
 
 			$base_url		= $this->helper->route('robertheim_topictags_show_tag_controller', array(
 				'tags'	=> urlencode($tags_string),
@@ -187,7 +187,7 @@ 
 	 */
 	private function display_topics($topics)
 	{
-		include_once($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
+		include_once($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext);
 
 		$pagination = $this->pagination;
 
@@ -290,6 +290,6 @@ 
 			$json_response->send($tags);
 		}
 		// fake a 404
-		return $this->helper->error($this->user->lang('RH_TOPICTAGS_TAG_SUGGEST_TAG_ROUTE_ERROR', $this->helper->get_current_url()) , 404);
+		return $this->helper->error($this->user->lang('RH_TOPICTAGS_TAG_SUGGEST_TAG_ROUTE_ERROR', $this->helper->get_current_url()), 404);
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -73,8 +73,7 @@
 						$phpbb_root_path,
 						\robertheim\topictags\service\tags_manager $tags_manager,
 						\robertheim\topictags\service\tagcloud_manager $tagcloud_manager
-	)
-	{
+	) {
 		$this->config = $config;
 		$this->template = $template;
 		$this->helper = $helper;

language/es/topictags_acp.php

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
 	'TOPICTAGS_BLACKLIST_EXP'					=> 'Lista de etiquetas prohibidas.<br/>NOTA: Todas las etiquetas que no están conformes con la expresión regular siempre serán rechazadas.',
 
 	'TOPICTAGS_ALLOWED_TAGS_REGEX'				=> 'Expresión regular para etiquetas permitidas',
-	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'ADVERTENCIA: No cambie esto, si no sabe lo que está haciendo. <strong>Las etiquetas pueden ser de 30 caracteres como máximo</strong>, por favor considere esto durante el diseño de expresiones regulares.<br/>Tenga en cuenta que las etiquetas no válidas, no se pueden buscar después, pero todavía se muestran en los temas.<br/>Considere la limpieza de las etiquetas no válidas (ver sección de mantenimiento).<br/>Por defecto: ' . $lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'ADVERTENCIA: No cambie esto, si no sabe lo que está haciendo. <strong>Las etiquetas pueden ser de 30 caracteres como máximo</strong>, por favor considere esto durante el diseño de expresiones regulares.<br/>Tenga en cuenta que las etiquetas no válidas, no se pueden buscar después, pero todavía se muestran en los temas.<br/>Considere la limpieza de las etiquetas no válidas (ver sección de mantenimiento).<br/>Por defecto: '.$lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
 
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS'			=> 'Convertir “ ” a “-”',
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS_EXP'		=> 'Si se establece en sí, todos los espacios (“ ”) se convierten automáticamente a menos (“-”).<br/>NOTA 1: En la expresión regular se debe permitir “-”; de lo contrario se rechazarán las etiquetas con espacios en blanco.<br/>NOTA 2: Las etiquetas existentes con espacios NO se convertirán automáticamente.',
 
 	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS'		=> 'Explicación para los usuarios',
-	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'Este texto se muestra a los usuarios y debe explicar qué etiquetas se permiten, y cuáles no.<br/>Por defecto: ' . $lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'Este texto se muestra a los usuarios y debe explicar qué etiquetas se permiten, y cuáles no.<br/>Por defecto: '.$lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
 
 	'TOPICTAGS_MANAGE_TAGS_EXP'					=> 'La tabla muestra todas las etiquetas existentes. Aquí puede eliminarlas (y todas sus asignaciones) o editar una etiqueta. También puede combinar etiquetas, con la edición de una etiqueta y el establecimiento de su nombre para que sea igual a otra etiqueta y así se fusionarán automáticamente.',
 	'TOPICTAGS_NO_TAGS'							=> 'No hay etiquetas todavía.',

language/en/topictags_acp.php

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
 	'TOPICTAGS_BLACKLIST_EXP'					=> 'List of forbidden tags.<br/>NOTE: All tags that are not conform with the regex are always rejected.',
 
 	'TOPICTAGS_ALLOWED_TAGS_REGEX'				=> 'Regular Expression for allowed tags',
-	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'WARNING: Do not change this, if you don\'t know what you are doing. <strong>Tags can be 30 characters at maximum and delimiter must be “/”</strong>, please consider this during regex design.<br/>Note that afterwards invalid tags are not searchable, but are still displayed in the topics.<br/>Consider pruning the invalid tags (see maintenance-section).<br/>default: ' . $lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'WARNING: Do not change this, if you don\'t know what you are doing. <strong>Tags can be 30 characters at maximum and delimiter must be “/”</strong>, please consider this during regex design.<br/>Note that afterwards invalid tags are not searchable, but are still displayed in the topics.<br/>Consider pruning the invalid tags (see maintenance-section).<br/>default: '.$lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
 
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS'			=> 'Convert “ ” to “-”',
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS_EXP'		=> 'If set to yes, all spaces (“ ”) are automatically converted to minus (“-”).<br/>NOTE 1: In the regex you must allow “-”; otherwise tags with whitespaces will be rejected.<br/>NOTE 2: Existing tags with spaces will NOT be converted automatically.',
 
 	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS'		=> 'Explanation for Users',
-	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'This text is shown to the users and should explain which tags are allowed and which not.<br/>default: ' . $lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'This text is shown to the users and should explain which tags are allowed and which not.<br/>default: '.$lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
 
 	'TOPICTAGS_MANAGE_TAGS_EXP'					=> 'The table shows all existing tags. Here you can <ul><li>delete a tag (and all their assignments).</li><li>edit a tag (double click the tags\' names for faster workflow).</li><li>merge tags by editing a tag and setting its name so that it equals another tag - they will be merged automatically.</li></ul>',
 	'TOPICTAGS_NO_TAGS'							=> 'There are no tags yet.',

language/ru/topictags_acp.php

Spacing +2 added lines, -2 removed lines

@@ -114,13 +114,13 @@
 	'TOPICTAGS_BLACKLIST_EXP'					=> 'Список запрещенных тегов.<br/>ПРИМЕЧАНИЕ: Все теги, которые не соответствуют регулярным выражением, всегда отклоняются.',
 
 	'TOPICTAGS_ALLOWED_TAGS_REGEX'				=> 'Регулярное выражение для разрешенных тегов',
-	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'ВНИМАНИЕ: Не изменяйте значение, если вы не уверены в своих действиях. <strong>Теги могуть состоять максимум из 30 символов</strong>, учитывайте это.<br/>Обратите внимание, что после изменения регулярных выражений недействительные теги по-прежнему будут отображаться в темах, но исключаются из поиска по тегам.<br/>Рассмотрим удаление неправильных тегов (см. секцию техобслуживания).<br/>По-умолчанию: ' . $lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_REGEX_EXP'			=> 'ВНИМАНИЕ: Не изменяйте значение, если вы не уверены в своих действиях. <strong>Теги могуть состоять максимум из 30 символов</strong>, учитывайте это.<br/>Обратите внимание, что после изменения регулярных выражений недействительные теги по-прежнему будут отображаться в темах, но исключаются из поиска по тегам.<br/>Рассмотрим удаление неправильных тегов (см. секцию техобслуживания).<br/>По-умолчанию: '.$lang['ACP_RH_TOPICTAGS_REGEX_DEFAULT'],
 
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS'			=> 'Преобразование “ ” в “-”',
 	'TOPICTAGS_CONVERT_SPACE_TO_MINUS_EXP'		=> 'Если установлено “Да”, все пробелы (“ ”) автоматически заменяются знаком тире (“-”).<br/>ПРИМЕЧАНИЕ 1: В регулярном выражении необходимо разрешить “-”; в противном случае теги с пробелами будут отклонены.<br/>ПРИМЕЧАНИЕ 2: Существующие теги с пробелами не будут преобразованы автоматически.',
 
 	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS'		=> 'Объяснение для пользователей',
-	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'Этот текст отображается для пользователей и объясняет, какие теги разрешены, а какие нет.<br/>По умолчанию: ' . $lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
+	'TOPICTAGS_ALLOWED_TAGS_EXP_FOR_USERS_EXP'	=> 'Этот текст отображается для пользователей и объясняет, какие теги разрешены, а какие нет.<br/>По умолчанию: '.$lang['ACP_RH_TOPICTAGS_REGEX_EXP_FOR_USERS_DEFAULT'],
 
 	'TOPICTAGS_MANAGE_TAGS_EXP'					=> 'В таблице показаны все существующие теги. Здесь вы можете удалять их (и все их значения) или редактировать. Вы также можете объединять теги, изменив имя одного тега таким образом, что оно станет равным имени другого тега, в этом случае они будут объединены автоматически.',
 	'TOPICTAGS_NO_TAGS'							=> 'Теги еще не были созданы.',

acp/white_and_blacklist_controller.php

Spacing +11 added lines, -11 removed lines

@@ -86,14 +86,14 @@ 
 
 		if ($this->request->is_set_post('submit'))
 		{
-			if (! check_form_key($form_name))
+			if (!check_form_key($form_name))
 			{
 				trigger_error('FORM_INVALID');
 			}
 
-			$this->config->set(prefixes::CONFIG . '_' . $list_name . '_enabled', $this->request->variable(prefixes::CONFIG . '_' . $list_name . '_enabled', 0));
-			$list = rawurldecode(base64_decode($this->request->variable(prefixes::CONFIG . '_' . $list_name, '')));
-			if (! empty($list))
+			$this->config->set(prefixes::CONFIG.'_'.$list_name.'_enabled', $this->request->variable(prefixes::CONFIG.'_'.$list_name.'_enabled', 0));
+			$list = rawurldecode(base64_decode($this->request->variable(prefixes::CONFIG.'_'.$list_name, '')));
+			if (!empty($list))
 			{
 				$list = json_decode($list, true);
 				$tags = array();
@@ -104,21 +104,21 @@ 
 				$list = json_encode($tags);
 			}
 			// store the list
-			$this->config_text->set(prefixes::CONFIG . '_' . $list_name, $list);
-			trigger_error($this->user->lang('TOPICTAGS_' . $list_name_upper . '_SAVED') . adm_back_link($u_action));
+			$this->config_text->set(prefixes::CONFIG.'_'.$list_name, $list);
+			trigger_error($this->user->lang('TOPICTAGS_'.$list_name_upper.'_SAVED').adm_back_link($u_action));
 		}
 
 		// display
-		$list = $this->config_text->get(prefixes::CONFIG . '_' . $list_name);
+		$list = $this->config_text->get(prefixes::CONFIG.'_'.$list_name);
 		$list = base64_encode(rawurlencode($list));
 		$this->template->assign_vars(
 			array(
-				'TOPICTAGS_VERSION'								=> $this->user->lang('TOPICTAGS_INSTALLED', $this->config[prefixes::CONFIG . '_version']),
-				'TOPICTAGS_' . $list_name_upper . '_ENABLED'	=> $this->config[prefixes::CONFIG . '_' . $list_name . '_enabled'],
-				'TOPICTAGS_' . $list_name_upper					=> $list,
+				'TOPICTAGS_VERSION'								=> $this->user->lang('TOPICTAGS_INSTALLED', $this->config[prefixes::CONFIG.'_version']),
+				'TOPICTAGS_'.$list_name_upper.'_ENABLED'	=> $this->config[prefixes::CONFIG.'_'.$list_name.'_enabled'],
+				'TOPICTAGS_'.$list_name_upper					=> $list,
 				'S_RH_TOPICTAGS_INCLUDE_NG_TAGS_INPUT'			=> true,
 				'S_RH_TOPICTAGS_INCLUDE_CSS'					=> true,
-				'TOPICTAGS_CONVERT_SPACE_TO_MINUS'				=> $this->config[prefixes::CONFIG . '_convert_space_to_minus'] ? 'true' : 'false',
+				'TOPICTAGS_CONVERT_SPACE_TO_MINUS'				=> $this->config[prefixes::CONFIG.'_convert_space_to_minus'] ? 'true' : 'false',
 				'S_ERROR'										=> (sizeof($errors)) ? true : false,
 				'ERROR_MSG'										=> implode('<br />', $errors),
 				'U_ACTION'										=> $u_action