Move trunk/phpBB to old_trunk/phpBB

git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0

3 files changed, 0 insertions, 2741 deletions

diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
deleted file mode 100644
index 8c4b8f3c7d..0000000000
--- a/phpBB/includes/search/fulltext_mysql.php
+++ /dev/null
@@ -1,767 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/search/search.' . PHP_EXT);
-
-/**
-* fulltext_mysql
-* Fulltext search for MySQL
-* @package search
-*/
-class fulltext_mysql extends search_backend
-{
-	private $stats = array();
-	public $word_length = array();
-	private $split_words = array();
-	public $search_query;
-	public $common_words = array();
-
-	function __construct(&$error)
-	{
-		$this->word_length = array('min' => phpbb::$config['fulltext_mysql_min_word_len'], 'max' => phpbb::$config['fulltext_mysql_max_word_len']);
-
-		$error = false;
-	}
-
-	/**
-	* Checks for correct MySQL version and stores min/max word length in the config
-	*/
-	public function init()
-	{
-		$result = phpbb::$db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\'');
-		$info = phpbb::$db->sql_fetchrow($result);
-		phpbb::$db->sql_freeresult($result);
-
-		$engine = '';
-		if (isset($info['Engine']))
-		{
-			$engine = $info['Engine'];
-		}
-		else if (isset($info['Type']))
-		{
-			$engine = $info['Type'];
-		}
-
-		if ($engine != 'MyISAM')
-		{
-			return phpbb::$user->lang['FULLTEXT_MYSQL_NOT_MYISAM'];
-		}
-
-		$sql = 'SHOW VARIABLES
-			LIKE \'ft\_%\'';
-		$result = phpbb::$db->sql_query($sql);
-
-		$mysql_info = array();
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$mysql_info[$row['Variable_name']] = $row['Value'];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		set_config('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']);
-		set_config('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']);
-
-		return false;
-	}
-
-	/**
-	* Splits keywords entered by a user into an array of words stored in $this->split_words
-	* Stores the tidied search query in $this->search_query
-	*
-	* @param string &$keywords Contains the keyword as entered by the user
-	* @param string $terms is either 'all' or 'any'
-	* @return bool false if no valid keywords were found and otherwise true
-	*/
-	public function split_keywords(&$keywords, $terms)
-	{
-		if ($terms == 'all')
-		{
-			$match		= array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#');
-			$replace	= array(' +', ' |', ' -', ' +', ' -', ' |');
-
-			$keywords = preg_replace($match, $replace, $keywords);
-		}
-
-		// Filter out as above
-		$split_keywords = preg_replace("#[\n\r\t]+#", ' ', trim(htmlspecialchars_decode($keywords)));
-
-		// Split words
-		$split_keywords = preg_replace('#([^\p{L}\p{N}\'*"()])#u', '$1$1', str_replace('\'\'', '\' \'', trim($split_keywords)));
-
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*"()]|^)([+\-|]?(?:[\p{L}\p{N}*"()]+\'?)*[\p{L}\p{N}*"()])(?:[^\p{L}\p{N}*"()]|$)#u', $split_keywords, $matches);
-		$this->split_words = $matches[1];
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if (phpbb::$config['max_num_search_keywords'] && sizeof($this->split_words) > phpbb::$config['max_num_search_keywords'])
-		{
-			trigger_error(phpbb::$user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', phpbb::$config['max_num_search_keywords'], sizeof($this->split_words)));
-		}
-
-		// to allow phrase search, we need to concatenate quoted words
-		$tmp_split_words = array();
-		$phrase = '';
-		foreach ($this->split_words as $word)
-		{
-			if ($phrase)
-			{
-				$phrase .= ' ' . $word;
-				if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-				{
-					$tmp_split_words[] = $phrase;
-					$phrase = '';
-				}
-			}
-			else if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1)
-			{
-				$phrase = $word;
-			}
-			else
-			{
-				$tmp_split_words[] = $word . ' ';
-			}
-		}
-		if ($phrase)
-		{
-			$tmp_split_words[] = $phrase;
-		}
-
-		$this->split_words = $tmp_split_words;
-
-		unset($tmp_split_words);
-		unset($phrase);
-
-		foreach ($this->split_words as $i => $word)
-		{
-			$clean_word = preg_replace('#^[+\-|"]#', '', $word);
-
-			// check word length
-			$clean_len = utf8_strlen(str_replace('*', '', $clean_word));
-			if (($clean_len < phpbb::$config['fulltext_mysql_min_word_len']) || ($clean_len > phpbb::$config['fulltext_mysql_max_word_len']))
-			{
-				$this->common_words[] = $word;
-				unset($this->split_words[$i]);
-			}
-		}
-
-		if ($terms == 'any')
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0) || (strpos($word, '|') === 0))
-				{
-					$word = substr($word, 1);
-				}
-				$this->search_query .= $word . ' ';
-			}
-		}
-		else
-		{
-			$this->search_query = '';
-			foreach ($this->split_words as $word)
-			{
-				if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0))
-				{
-					$this->search_query .= $word . ' ';
-				}
-				else if (strpos($word, '|') === 0)
-				{
-					$this->search_query .= substr($word, 1) . ' ';
-				}
-				else
-				{
-					$this->search_query .= '+' . $word . ' ';
-				}
-			}
-		}
-
-		$this->search_query = utf8_htmlspecialchars($this->search_query);
-
-		if ($this->search_query)
-		{
-			$this->split_words = array_values($this->split_words);
-			sort($this->split_words);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Turns text into an array of words
-	*/
-	private function split_message($text)
-	{
-		// Split words
-		$text = preg_replace('#([^\p{L}\p{N}\'*])#u', '$1$1', str_replace('\'\'', '\' \'', trim($text)));
-
-		$matches = array();
-		preg_match_all('#(?:[^\p{L}\p{N}*]|^)([+\-|]?(?:[\p{L}\p{N}*]+\'?)*[\p{L}\p{N}*])(?:[^\p{L}\p{N}*]|$)#u', $text, $matches);
-		$text = $matches[1];
-
-		// remove too short or too long words
-		$text = array_values($text);
-		for ($i = 0, $n = sizeof($text); $i < $n; $i++)
-		{
-			$text[$i] = trim($text[$i]);
-			if (utf8_strlen($text[$i]) < phpbb::$config['fulltext_mysql_min_word_len'] || utf8_strlen($text[$i]) > phpbb::$config['fulltext_mysql_max_word_len'])
-			{
-				unset($text[$i]);
-			}
-		}
-
-		return array_values($text);
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first.
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		&$fields			contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		&$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids if the author should be ignored during the search the array is empty
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No keywords? No posts.
-		if (!$this->search_query)
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			implode(', ', $this->split_words),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		$join_topic = ($type == 'posts') ? false : true;
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$join_topic = true;
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$sql_match = 'p.post_subject';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			case 'msgonly':
-				$sql_match = 'p.post_text';
-				$sql_match_where = '';
-			break;
-
-			case 'firstpost':
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = ' AND p.post_id = t.topic_first_post_id';
-				$join_topic = true;
-			break;
-
-			default:
-				$sql_match = 'p.post_subject, p.post_text';
-				$sql_match_where = '';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary === array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		$sql_select			= (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : '';
-		$sql_select			= ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id';
-		$sql_from			= ($join_topic) ? TOPICS_TABLE . ' t, ' : '';
-		$field				= ($type == 'posts') ? 'post_id' : 'topic_id';
-		$sql_author			= (sizeof($author_ary) == 1) ? ' = ' . $author_ary[0] : 'IN (' . implode(', ', $author_ary) . ')';
-
-		$sql_where_options = $sql_sort_join;
-		$sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : '';
-		$sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : '';
-		$sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_where_options .= $m_approve_fid_sql;
-		$sql_where_options .= (sizeof($author_ary)) ? ' AND p.poster_id ' . $sql_author : '';
-		$sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_where_options .= $sql_match_where;
-
-		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE MATCH ($sql_match) AGAINST ('" . phpbb::$db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE)
-				$sql_where_options
-			ORDER BY $sql_sort";
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$id_ary = array_unique($id_ary);
-
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
-
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$result_count)
-		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = phpbb::$db->sql_query($sql);
-			$result_count = (int) phpbb::$db->sql_fetchfield('result_count');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $result_count;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param int $start indicates the first index of the page
-	* @param int $per_page number of ids each page is supposed to contain
-	* @return total number of results
-	*/
-	public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No author? No posts.
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$result_count = 0;
-		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $result_count;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		$sql_author		= phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		// If the cache was completely empty count the results
-		$calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS ';
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT {$calc_results}p.post_id
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT {$calc_results}t.topic_id
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id
-				ORDER BY $sql_sort";
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		// retrieve the total result count if needed
-		if (!$result_count)
-		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = phpbb::$db->sql_query($sql);
-			$result_count = (int) phpbb::$db->sql_fetchfield('result_count');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$result_count)
-			{
-				return false;
-			}
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $result_count;
-		}
-		return false;
-	}
-
-	/**
-	* Destroys cached search results, that contained one of the new words in a post so the results won't be outdated.
-	*
-	* @param string $mode contains the post mode: edit, post, reply, quote ...
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		// Split old and new post/subject to obtain array of words
-		$split_text = $this->split_message($message);
-		$split_title = ($subject) ? $this->split_message($subject) : array();
-
-		$words = array_unique(array_merge($split_text, $split_title));
-
-		unset($split_text);
-		unset($split_title);
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache($words, array($poster_id));
-
-		unset($words);
-	}
-
-	/**
-	* Destroy cached results, that might be outdated after deleting a post
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		$this->destroy_cache(array(), $author_ids);
-	}
-
-	/**
-	* Destroy old cache entries
-	*/
-	public function tidy()
-	{
-		// destroy too old cached search results
-		$this->destroy_cache(array());
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Create fulltext index
-	*/
-	public function create_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (!isset($this->stats['post_subject']))
-		{
-			//$alter[] = 'MODIFY post_subject varchar(100) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL';
-			$alter[] = 'ADD FULLTEXT (post_subject)';
-		}
-
-		if (!isset($this->stats['post_text']))
-		{
-			$alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL';
-			$alter[] = 'ADD FULLTEXT (post_text)';
-		}
-
-		if (!isset($this->stats['post_content']))
-		{
-			$alter[] = 'ADD FULLTEXT post_content (post_subject, post_text)';
-		}
-
-		if (sizeof($alter))
-		{
-			phpbb::$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Drop fulltext index
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		// Make sure we can actually use MySQL with fulltext indexes
-		if ($error = $this->init())
-		{
-			return $error;
-		}
-
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		$alter = array();
-
-		if (isset($this->stats['post_subject']))
-		{
-			$alter[] = 'DROP INDEX post_subject';
-		}
-
-		if (isset($this->stats['post_text']))
-		{
-			$alter[] = 'DROP INDEX post_text';
-		}
-
-		if (isset($this->stats['post_content']))
-		{
-			$alter[] = 'DROP INDEX post_content';
-		}
-
-		if (sizeof($alter))
-		{
-			phpbb::$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter));
-		}
-
-		phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-
-		return false;
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return (isset($this->stats['post_text']) && isset($this->stats['post_subject']) && isset($this->stats['post_content'])) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (empty($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			phpbb::$user->lang['FULLTEXT_MYSQL_TOTAL_POSTS']			=> ($this->index_created()) ? $this->stats['total_posts'] : 0,
-		);
-	}
-
-	private function get_stats()
-	{
-		if (phpbb::$db->dbms_type !== 'mysql')
-		{
-			$this->stats = array();
-			return;
-		}
-
-		$sql = 'SHOW INDEX
-			FROM ' . POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			// deal with older MySQL versions which didn't use Index_type
-			$index_type = (isset($row['Index_type'])) ? $row['Index_type'] : $row['Comment'];
-
-			if ($index_type == 'FULLTEXT')
-			{
-				if ($row['Key_name'] == 'post_text')
-				{
-					$this->stats['post_text'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_subject')
-				{
-					$this->stats['post_subject'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_content')
-				{
-					$this->stats['post_content'] = $row;
-				}
-			}
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT COUNT(post_id) as total_posts
-			FROM ' . POSTS_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_posts'] = (int) phpbb::$db->sql_fetchfield('total_posts');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Display nothing, we force UTF-8 support in all versions of PHP
-	*/
-	function acp()
-	{
-		$tpl = '';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array()
-		);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
deleted file mode 100644
index a2cb8936b5..0000000000
--- a/phpBB/includes/search/fulltext_native.php
+++ /dev/null
@@ -1,1667 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* @ignore
-*/
-include_once(PHPBB_ROOT_PATH . 'includes/search/search.' . PHP_EXT);
-
-/**
-* fulltext_native
-* phpBB's own db driven fulltext search, version 2
-* @package search
-*/
-class fulltext_native extends search_backend
-{
-	private $stats = array();
-	public $word_length = array();
-	public $search_query;
-	public $common_words = array();
-
-	private $must_contain_ids = array();
-	private $must_not_contain_ids = array();
-	private $must_exclude_one_ids = array();
-
-	/**
-	* Initialises the fulltext_native search backend with min/max word length and makes sure the UTF-8 normalizer is loaded.
-	*
-	* @param	boolean|string	&$error	is passed by reference and should either be set to false on success or an error message on failure.
-	*
-	* @access	public
-	*/
-	function __construct(&$error)
-	{
-		$this->word_length = array('min' => phpbb::$config['fulltext_native_min_chars'], 'max' => phpbb::$config['fulltext_native_max_chars']);
-
-		/**
-		* Load the UTF tools
-		*/
-		if (!class_exists('utf_normalizer'))
-		{
-			include(PHPBB_ROOT_PATH . 'includes/utf/utf_normalizer.' . PHP_EXT);
-		}
-
-
-		$error = false;
-	}
-
-	/**
-	* This function fills $this->search_query with the cleaned user search query.
-	*
-	* If $terms is 'any' then the words will be extracted from the search query
-	* and combined with | inside brackets. They will afterwards be treated like
-	* an standard search query.
-	*
-	* Then it analyses the query and fills the internal arrays $must_not_contain_ids,
-	* $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search().
-	*
-	* @param	string	$keywords	contains the search query string as entered by the user
-	* @param	string	$terms		is either 'all' (use search query as entered, default words to 'must be contained in post')
-	* 	or 'any' (find all posts containing at least one of the given words)
-	* @return	boolean				false if no valid keywords were found and otherwise true
-	*
-	* @access	public
-	*/
-	public function split_keywords($keywords, $terms)
-	{
-		$keywords = trim($this->cleanup($keywords, '+-|()*'));
-
-		// allow word|word|word without brackets
-		if ((strpos($keywords, ' ') === false) && (strpos($keywords, '|') !== false) && (strpos($keywords, '(') === false))
-		{
-			$keywords = '(' . $keywords . ')';
-		}
-
-		$open_bracket = $space = false;
-		for ($i = 0, $n = strlen($keywords); $i < $n; $i++)
-		{
-			if ($open_bracket !== false)
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						if ($open_bracket + 1 == $i)
-						{
-							$keywords[$i - 1] = '|';
-							$keywords[$i] = '|';
-						}
-						$open_bracket = false;
-					break;
-					case '(':
-						$keywords[$i] = '|';
-					break;
-					case '+':
-					case '-':
-					case ' ':
-						$keywords[$i] = '|';
-					break;
-				}
-			}
-			else
-			{
-				switch ($keywords[$i])
-				{
-					case ')':
-						$keywords[$i] = ' ';
-					break;
-					case '(':
-						$open_bracket = $i;
-						$space = false;
-					break;
-					case '|':
-						$keywords[$i] = ' ';
-					break;
-					case '-':
-					case '+':
-						$space = $keywords[$i];
-					break;
-					case ' ':
-						if ($space !== false)
-						{
-							$keywords[$i] = $space;
-						}
-					break;
-					default:
-						$space = false;
-				}
-			}
-		}
-
-		if ($open_bracket)
-		{
-			$keywords .= ')';
-		}
-
-		$match = array(
-			'#  +#',
-			'#\|\|+#',
-			'#(\+|\-)(?:\+|\-)+#',
-			'#\(\|#',
-			'#\|\)#',
-		);
-		$replace = array(
-			' ',
-			'|',
-			'$1',
-			'(',
-			')',
-		);
-
-		$keywords = preg_replace($match, $replace, $keywords);
-		$num_keywords = sizeof(explode(' ', $keywords));
-
-		// We limit the number of allowed keywords to minimize load on the database
-		if (phpbb::$config['max_num_search_keywords'] && $num_keywords > phpbb::$config['max_num_search_keywords'])
-		{
-			trigger_error(phpbb::$user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', phpbb::$config['max_num_search_keywords'], $num_keywords));
-		}
-
-		// $keywords input format: each word separated by a space, words in a bracket are not separated
-
-		// the user wants to search for any word, convert the search query
-		if ($terms == 'any')
-		{
-			$words = array();
-
-			preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $words);
-			if (sizeof($words[1]))
-			{
-				$keywords = '(' . implode('|', $words[1]) . ')';
-			}
-		}
-
-		// set the search_query which is shown to the user
-		$this->search_query = $keywords;
-
-		$exact_words = array();
-		preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
-		$exact_words = $exact_words[1];
-
-		$common_ids = $words = array();
-
-		if (sizeof($exact_words))
-		{
-			$sql = 'SELECT word_id, word_text, word_common
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('word_text', $exact_words);
-			$result = phpbb::$db->sql_query($sql);
-
-			// store an array of words and ids, remove common words
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['word_common'])
-				{
-					$this->common_words[] = $row['word_text'];
-					$common_ids[$row['word_text']] = (int) $row['word_id'];
-					continue;
-				}
-
-				$words[$row['word_text']] = (int) $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-		unset($exact_words);
-
-		// now analyse the search query, first split it using the spaces
-		$query = explode(' ', $keywords);
-
-		$this->must_contain_ids = array();
-		$this->must_not_contain_ids = array();
-		$this->must_exclude_one_ids = array();
-
-		$mode = '';
-		$ignore_no_id = true;
-
-		foreach ($query as $word)
-		{
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// words which should not be included
-			if ($word[0] == '-')
-			{
-				$word = substr($word, 1);
-
-				// a group of which at least one may not be in the resulting posts
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-					$mode = 'must_exclude_one';
-				}
-				// one word which should not be in the resulting posts
-				else
-				{
-					$mode = 'must_not_contain';
-				}
-				$ignore_no_id = true;
-			}
-			// words which have to be included
-			else
-			{
-				// no prefix is the same as a +prefix
-				if ($word[0] == '+')
-				{
-					$word = substr($word, 1);
-				}
-
-				// a group of words of which at least one word should be in every resulting post
-				if ($word[0] == '(')
-				{
-					$word = array_unique(explode('|', substr($word, 1, -1)));
-				}
-				$ignore_no_id = false;
-				$mode = 'must_contain';
-			}
-
-			if (empty($word))
-			{
-				continue;
-			}
-
-			// if this is an array of words then retrieve an id for each
-			if (is_array($word))
-			{
-				$non_common_words = array();
-				$id_words = array();
-				foreach ($word as $i => $word_part)
-				{
-					if (strpos($word_part, '*') !== false)
-					{
-						$id_words[] = '\'' . phpbb::$db->sql_escape(str_replace('*', '%', $word_part)) . '\'';
-						$non_common_words[] = $word_part;
-					}
-					else if (isset($words[$word_part]))
-					{
-						$id_words[] = $words[$word_part];
-						$non_common_words[] = $word_part;
-					}
-					else
-					{
-						$len = utf8_strlen($word_part);
-						if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-						{
-							$this->common_words[] = $word_part;
-						}
-					}
-				}
-				if (sizeof($id_words))
-				{
-					sort($id_words);
-					if (sizeof($id_words) > 1)
-					{
-						$this->{$mode . '_ids'}[] = $id_words;
-					}
-					else
-					{
-						$mode = ($mode == 'must_exclude_one') ? 'must_not_contain' : $mode;
-						$this->{$mode . '_ids'}[] = $id_words[0];
-					}
-				}
-				// throw an error if we shall not ignore unexistant words
-				else if (!$ignore_no_id && sizeof($non_common_words))
-				{
-					trigger_error(phpbb::$user->lang('WORDS_IN_NO_POST', implode(', ', $non_common_words)));
-				}
-				unset($non_common_words);
-			}
-			// else we only need one id
-			else if (($wildcard = strpos($word, '*') !== false) || isset($words[$word]))
-			{
-				if ($wildcard)
-				{
-					$len = utf8_strlen(str_replace('*', '', $word));
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						$this->{$mode . '_ids'}[] = '\'' . phpbb::$db->sql_escape(str_replace('*', '%', $word)) . '\'';
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-				else
-				{
-					$this->{$mode . '_ids'}[] = $words[$word];
-				}
-			}
-			// throw an error if we shall not ignore unexistant words
-			else if (!$ignore_no_id)
-			{
-				if (!isset($common_ids[$word]))
-				{
-					$len = utf8_strlen($word);
-					if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
-					{
-						trigger_error(phpbb::$db->lang('WORD_IN_NO_POST', $word));
-					}
-					else
-					{
-						$this->common_words[] = $word;
-					}
-				}
-			}
-			else
-			{
-				$len = utf8_strlen($word);
-				if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
-				{
-					$this->common_words[] = $word;
-				}
-			}
-		}
-
-		// we can't search for negatives only
-		if (!sizeof($this->must_contain_ids))
-		{
-			return false;
-		}
-
-		sort($this->must_contain_ids);
-		sort($this->must_not_contain_ids);
-		sort($this->must_exclude_one_ids);
-
-		if (!empty($this->search_query))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* Performs a search on keywords depending on display specific params. You have to run split_keywords() first.
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	string		&$fields			contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched)
-	* @param	string		&$terms				is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words)
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids if the author should be ignored during the search the array is empty
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No keywords? No posts.
-		if (empty($this->search_query))
-		{
-			return false;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			serialize($this->must_contain_ids),
-			serialize($this->must_not_contain_ids),
-			serialize($this->must_exclude_one_ids),
-			$type,
-			$fields,
-			$terms,
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		$sql_where = array();
-		$group_by = false;
-		$m_num = 0;
-		$w_num = 0;
-
-		$sql_array = array(
-			'SELECT'	=> ($type == 'posts') ? 'p.post_id' : 'p.topic_id',
-			'FROM'		=> array(
-				SEARCH_WORDMATCH_TABLE	=> array(),
-				SEARCH_WORDLIST_TABLE	=> array(),
-			),
-			'LEFT_JOIN' => array(array(
-				'FROM'	=> array(POSTS_TABLE => 'p'),
-				'ON'	=> 'm0.post_id = p.post_id',
-			)),
-		);
-
-		$title_match = '';
-		$group_by = true;
-		// Build some display specific sql strings
-		switch ($fields)
-		{
-			case 'titleonly':
-				$title_match = 'title_match = 1';
-				$group_by = false;
-			// no break
-			case 'firstpost':
-				$sql_array['FROM'][TOPICS_TABLE] = 't';
-				$sql_where[] = 'p.post_id = t.topic_first_post_id';
-			break;
-
-			case 'msgonly':
-				$title_match = 'title_match = 0';
-				$group_by = false;
-			break;
-		}
-
-		if ($type == 'topics')
-		{
-			if (!isset($sql_array['FROM'][TOPICS_TABLE]))
-			{
-				$sql_array['FROM'][TOPICS_TABLE] = 't';
-				$sql_where[] = 'p.topic_id = t.topic_id';
-			}
-			$group_by = true;
-		}
-
-		/**
-		* @todo Add a query optimizer (handle stuff like "+(4|3) +4")
-		*/
-
-		foreach ($this->must_contain_ids as $subquery)
-		{
-			if (is_array($subquery))
-			{
-				$group_by = true;
-
-				$word_id_sql = array();
-				$word_ids = array();
-				foreach ($subquery as $id)
-				{
-					if (is_string($id))
-					{
-						$sql_array['LEFT_JOIN'][] = array(
-							'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-							'ON'	=> "w$w_num.word_text LIKE $id"
-						);
-						$word_ids[] = "w$w_num.word_id";
-
-						$w_num++;
-					}
-					else
-					{
-						$word_ids[] = $id;
-					}
-				}
-
-				$sql_where[] = phpbb::$db->sql_in_set("m$m_num.word_id", $word_ids);
-
-				unset($word_id_sql);
-				unset($word_ids);
-			}
-			else if (is_string($subquery))
-			{
-				$sql_array['FROM'][SEARCH_WORDLIST_TABLE][] = 'w' . $w_num;
-
-				$sql_where[] = "w$w_num.word_text LIKE $subquery";
-				$sql_where[] = "m$m_num.word_id = w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-			else
-			{
-				$sql_where[] = "m$m_num.word_id = $subquery";
-			}
-
-			$sql_array['FROM'][SEARCH_WORDMATCH_TABLE][] = 'm' . $m_num;
-
-			if ($title_match)
-			{
-				$sql_where[] = "m$m_num.$title_match";
-			}
-
-			if ($m_num != 0)
-			{
-				$sql_where[] = "m$m_num.post_id = m0.post_id";
-			}
-			$m_num++;
-		}
-
-		foreach ($this->must_not_contain_ids as $key => $subquery)
-		{
-			if (is_string($subquery))
-			{
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-					'ON'	=> "w$w_num.word_text LIKE $subquery"
-				);
-
-				$this->must_not_contain_ids[$key] = "w$w_num.word_id";
-
-				$group_by = true;
-				$w_num++;
-			}
-		}
-
-		if (sizeof($this->must_not_contain_ids))
-		{
-			$sql_array['LEFT_JOIN'][] = array(
-				'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-				'ON'	=> phpbb::$db->sql_in_set("m$m_num.word_id", $this->must_not_contain_ids) . (($title_match) ? " AND m$m_num.$title_match" : '') . " AND m$m_num.post_id = m0.post_id"
-			);
-
-			$sql_where[] = "m$m_num.word_id IS NULL";
-			$m_num++;
-		}
-
-		foreach ($this->must_exclude_one_ids as $ids)
-		{
-			$is_null_joins = array();
-			foreach ($ids as $id)
-			{
-				if (is_string($id))
-				{
-					$sql_array['LEFT_JOIN'][] = array(
-						'FROM'	=> array(SEARCH_WORDLIST_TABLE => 'w' . $w_num),
-						'ON'	=> "w$w_num.word_text LIKE $id"
-					);
-					$id = "w$w_num.word_id";
-
-					$group_by = true;
-					$w_num++;
-				}
-
-				$sql_array['LEFT_JOIN'][] = array(
-					'FROM'	=> array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num),
-					'ON'	=> "m$m_num.word_id = $id AND m$m_num.post_id = m0.post_id" . (($title_match) ? " AND m$m_num.$title_match" : '')
-				);
-				$is_null_joins[] = "m$m_num.word_id IS NULL";
-
-				$m_num++;
-			}
-			$sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')';
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$sql_where[] = 'p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary !== array(-1))
-		{
-			$sql_where[] = '(p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		if ($topic_id)
-		{
-			$sql_where[] = 'p.topic_id = ' . $topic_id;
-		}
-
-		if (sizeof($author_ary))
-		{
-			$sql_where[] = phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		}
-
-		if (sizeof($ex_fid_ary))
-		{
-			$sql_where[] = phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true);
-		}
-
-		if ($sort_days)
-		{
-			$sql_where[] = 'p.post_time >= ' . (time() - ($sort_days * 86400));
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-
-		$is_mysql = false;
-		// if the total result count is not cached yet, retrieve it from the db
-		if (!$total_results)
-		{
-			$sql = '';
-			$sql_array_count = $sql_array;
-
-			if (phpbb::$db->dbms_type === 'mysql')
-			{
-				$sql_array_copy = $sql_array;
-
-				// $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT'];
-				$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
-
-				$is_mysql = true;
-			}
-			else
-			{
-				if (!phpbb::$db->count_distinct)
-				{
-					$sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id';
-					$sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results
-							FROM (' . phpbb::$db->sql_build_query('SELECT', $sql_array_count) . ')';
-				}
-
-				$sql_array_count['SELECT'] = ($type == 'posts') ? 'COUNT(DISTINCT p.post_id) AS total_results' : 'COUNT(DISTINCT p.topic_id) AS total_results';
-				$sql = (!$sql) ? phpbb::$db->sql_build_query('SELECT', $sql_array_count) : $sql;
-
-				$result = phpbb::$db->sql_query($sql);
-				$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$total_results)
-				{
-					return false;
-				}
-			}
-
-			unset($sql_array_count, $sql);
-		}
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_array['FROM'][USERS_TABLE] = 'u';
-				$sql_where[] = 'u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				if (!isset($sql_array['FROM'][TOPICS_TABLE]))
-				{
-					$sql_array['FROM'][TOPICS_TABLE] = 't';
-					$sql_where[] = 'p.topic_id = t.topic_id';
-				}
-			break;
-
-			case 'f':
-				$sql_array['FROM'][FORUMS_TABLE] = 'f';
-				$sql_where[] = 'f.forum_id = p.forum_id';
-			break;
-		}
-
-		$sql_array['WHERE'] = implode(' AND ', $sql_where);
-		$sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : '';
-		$sql_array['ORDER_BY'] = $sql_sort;
-
-		unset($sql_where, $sql_sort, $group_by);
-
-		$sql = phpbb::$db->sql_build_query('SELECT', $sql_array);
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!sizeof($id_ary))
-		{
-			return false;
-		}
-
-		// if we use mysql and the total result count is not cached yet, retrieve it from the db
-		if (!$total_results && $is_mysql && !empty($sql_array_copy))
-		{
-			$sql = phpbb::$db->sql_build_query('SELECT', $sql_array_copy);
-			unset($sql_array_copy);
-
-			phpbb::$db->sql_query($sql);
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = phpbb::$db->sql_query($sql);
-			$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
-		$this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir);
-		$id_ary = array_slice($id_ary, 0, (int) $per_page);
-
-		return $total_results;
-	}
-
-	/**
-	* Performs a search on an author's posts without caring about message contents. Depends on display specific params
-	*
-	* @param	string		$type				contains either posts or topics depending on what should be searched for
-	* @param	boolean		$firstpost_only		if true, only topic starting posts will be considered
-	* @param	array		&$sort_by_sql		contains SQL code for the ORDER BY part of a query
-	* @param	string		&$sort_key			is the key of $sort_by_sql for the selected sorting
-	* @param	string		&$sort_dir			is either a or d representing ASC and DESC
-	* @param	string		&$sort_days			specifies the maximum amount of days a post may be old
-	* @param	array		&$ex_fid_ary		specifies an array of forum ids which should not be searched
-	* @param	array		&$m_approve_fid_ary	specifies an array of forum ids in which the searcher is allowed to view unapproved posts
-	* @param	int			&$topic_id			is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched
-	* @param	array		&$author_ary		an array of author ids
-	* @param	array		&$id_ary			passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered
-	* @param	int			$start				indicates the first index of the page
-	* @param	int			$per_page			number of ids each page is supposed to contain
-	* @return	boolean|int						total number of results
-	*
-	* @access	public
-	*/
-	public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page)
-	{
-		// No author? No posts.
-		if (!sizeof($author_ary))
-		{
-			return 0;
-		}
-
-		// generate a search_key from all the options to identify the results
-		$search_key = md5(implode('#', array(
-			'',
-			$type,
-			($firstpost_only) ? 'firstpost' : '',
-			'',
-			'',
-			$sort_days,
-			$sort_key,
-			$topic_id,
-			implode(',', $ex_fid_ary),
-			implode(',', $m_approve_fid_ary),
-			implode(',', $author_ary)
-		)));
-
-		// try reading the results from cache
-		$total_results = 0;
-		if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE)
-		{
-			return $total_results;
-		}
-
-		$id_ary = array();
-
-		// Create some display specific sql strings
-		$sql_author		= phpbb::$db->sql_in_set('p.poster_id', $author_ary);
-		$sql_fora		= (sizeof($ex_fid_ary)) ? ' AND ' . phpbb::$db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '';
-		$sql_time		= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : '';
-		$sql_topic_id	= ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : '';
-		$sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : '';
-
-		// Build sql strings for sorting
-		$sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
-		$sql_sort_table = $sql_sort_join = '';
-		switch ($sql_sort[0])
-		{
-			case 'u':
-				$sql_sort_table	= USERS_TABLE . ' u, ';
-				$sql_sort_join	= ' AND u.user_id = p.poster_id ';
-			break;
-
-			case 't':
-				$sql_sort_table	= ($type == 'posts' && !$firstpost_only) ? TOPICS_TABLE . ' t, ' : '';
-				$sql_sort_join	= ($type == 'posts' && !$firstpost_only) ? ' AND t.topic_id = p.topic_id ' : '';
-			break;
-
-			case 'f':
-				$sql_sort_table	= FORUMS_TABLE . ' f, ';
-				$sql_sort_join	= ' AND f.forum_id = p.forum_id ';
-			break;
-		}
-
-		if (!sizeof($m_approve_fid_ary))
-		{
-			$m_approve_fid_sql = ' AND p.post_approved = 1';
-		}
-		else if ($m_approve_fid_ary == array(-1))
-		{
-			$m_approve_fid_sql = '';
-		}
-		else
-		{
-			$m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . phpbb::$db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')';
-		}
-
-		$select = ($type == 'posts') ? 'p.post_id' : 't.topic_id';
-		$is_mysql = false;
-
-		// If the cache was completely empty count the results
-		if (!$total_results)
-		{
-			if (phpbb::$db->dbms_type === 'mysql')
-			{
-//				$select = 'SQL_CALC_FOUND_ROWS ' . $select;
-				$is_mysql = true;
-			}
-			else
-			{
-				if ($type == 'posts')
-				{
-					$sql = 'SELECT COUNT(p.post_id) as total_results
-						FROM ' . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
-						WHERE $sql_author
-							$sql_topic_id
-							$sql_firstpost
-							$m_approve_fid_sql
-							$sql_fora
-							$sql_time";
-				}
-				else
-				{
-					if (phpbb::$db->count_distinct)
-					{
-						$sql = 'SELECT COUNT(DISTINCT t.topic_id) as total_results';
-					}
-					else
-					{
-						$sql = 'SELECT COUNT(topic_id) as total_results
-							FROM (SELECT DISTINCT t.topic_id';
-					}
-
-					$sql .= ' FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-						WHERE $sql_author
-							$sql_topic_id
-							$sql_firstpost
-							$m_approve_fid_sql
-							$sql_fora
-							AND t.topic_id = p.topic_id
-							$sql_time" . ((phpbb::$db->count_distinct) ? '' : ')');
-				}
-				$result = phpbb::$db->sql_query($sql);
-
-				$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-				phpbb::$db->sql_freeresult($result);
-
-				if (!$total_results)
-				{
-					return false;
-				}
-			}
-		}
-
-		// Build the query for really selecting the post_ids
-		if ($type == 'posts')
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . "
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					$sql_sort_join
-					$sql_time
-				ORDER BY $sql_sort";
-			$field = 'post_id';
-		}
-		else
-		{
-			$sql = "SELECT $select
-				FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
-				WHERE $sql_author
-					$sql_topic_id
-					$sql_firstpost
-					$m_approve_fid_sql
-					$sql_fora
-					AND t.topic_id = p.topic_id
-					$sql_sort_join
-					$sql_time
-				GROUP BY t.topic_id, " . $sort_by_sql[$sort_key] . '
-				ORDER BY ' . $sql_sort;
-			$field = 'topic_id';
-		}
-
-		// Only read one block of posts from the db and then cache it
-		$result = phpbb::$db->sql_query_limit($sql, phpbb::$config['search_block_size'], $start);
-
-		while ($row = phpbb::$db->sql_fetchrow($result))
-		{
-			$id_ary[] = $row[$field];
-		}
-		phpbb::$db->sql_freeresult($result);
-
-		if (!$total_results && $is_mysql)
-		{
-			// Count rows for the executed queries. Replace $select within $sql with SQL_CALC_FOUND_ROWS, and run it.
-			$sql = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
-
-			phpbb::$db->sql_query($sql);
-			phpbb::$db->sql_freeresult($result);
-
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = phpbb::$db->sql_query($sql);
-			$total_results = (int) phpbb::$db->sql_fetchfield('total_results');
-			phpbb::$db->sql_freeresult($result);
-
-			if (!$total_results)
-			{
-				return false;
-			}
-		}
-
-		if (sizeof($id_ary))
-		{
-			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
-			$id_ary = array_slice($id_ary, 0, $per_page);
-
-			return $total_results;
-		}
-		return false;
-	}
-
-	/**
-	* Split a text into words of a given length
-	*
-	* The text is converted to UTF-8, cleaned up, and split. Then, words that
-	* conform to the defined length range are returned in an array.
-	*
-	* NOTE: duplicates are NOT removed from the return array
-	*
-	* @param	string	$text	Text to split, encoded in UTF-8
-	* @return	array			Array of UTF-8 words
-	*
-	* @access	private
-	*/
-	private function split_message($text)
-	{
-		$match = $words = array();
-
-		/**
-		* Taken from the original code
-		*/
-		// Do not index code
-		$match[] = '#\[code(?:=.*?)?(\:?[0-9a-z]{5,})\].*?\[\/code(\:?[0-9a-z]{5,})\]#is';
-		// BBcode
-		$match[] = '#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?[0-9a-z]{5,})\]#';
-
-		$min = $this->word_length['min'];
-		$max = $this->word_length['max'];
-
-		$isset_min = $min - 1;
-
-		/**
-		* Clean up the string, remove HTML tags, remove BBCodes
-		*/
-		$word = strtok($this->cleanup(preg_replace($match, ' ', strip_tags($text)), -1), ' ');
-
-		while (strlen($word))
-		{
-			if (strlen($word) > 255 || strlen($word) <= $isset_min)
-			{
-				/**
-				* Words longer than 255 bytes are ignored. This will have to be
-				* changed whenever we change the length of search_wordlist.word_text
-				*
-				* Words shorter than $isset_min bytes are ignored, too
-				*/
-				$word = strtok(' ');
-				continue;
-			}
-
-			$len = utf8_strlen($word);
-
-			/**
-			* Test whether the word is too short to be indexed.
-			*
-			* Note that this limit does NOT apply to CJK and Hangul
-			*/
-			if ($len < $min)
-			{
-				/**
-				* Note: this could be optimized. If the codepoint is lower than Hangul's range
-				* we know that it will also be lower than CJK ranges
-				*/
-				if ((strncmp($word, utf_normalizer::UTF8_HANGUL_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_HANGUL_LAST, 3) > 0)
-				 && (strncmp($word, utf_normalizer::UTF8_CJK_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_LAST, 3) > 0)
-				 && (strncmp($word, utf_normalizer::UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_B_LAST, 4) > 0))
-				{
-					$word = strtok(' ');
-					continue;
-				}
-			}
-
-			$words[] = $word;
-			$word = strtok(' ');
-		}
-
-		return $words;
-	}
-
-	/**
-	* Updates wordlist and wordmatch tables when a message is posted or changed
-	*
-	* @param	string	$mode		Contains the post mode: edit, post, reply, quote
-	* @param	int		$post_id	The id of the post which is modified/created
-	* @param	string	&$message	New or updated post content
-	* @param	string	&$subject	New or updated post subject
-	* @param	int		$poster_id	Post author's user id
-	* @param	int		$forum_id	The id of the forum in which the post is located
-	*
-	* @access	public
-	*/
-	public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id)
-	{
-		if (!phpbb::$config['fulltext_native_load_upd'])
-		{
-			/**
-			* The search indexer is disabled, return
-			*/
-			return;
-		}
-
-		// Split old and new post/subject to obtain array of 'words'
-		$split_text = $this->split_message($message);
-		$split_title = $this->split_message($subject);
-
-		$cur_words = array('post' => array(), 'title' => array());
-
-		$words = array();
-		if ($mode == 'edit')
-		{
-			$words['add']['post'] = array();
-			$words['add']['title'] = array();
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDLIST_TABLE . ' w, ' . SEARCH_WORDMATCH_TABLE . " m
-				WHERE m.post_id = $post_id
-					AND w.word_id = m.word_id";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$which = ($row['title_match']) ? 'title' : 'post';
-				$cur_words[$which][$row['word_text']] = $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			$words['add']['post'] = array_diff($split_text, array_keys($cur_words['post']));
-			$words['add']['title'] = array_diff($split_title, array_keys($cur_words['title']));
-			$words['del']['post'] = array_diff(array_keys($cur_words['post']), $split_text);
-			$words['del']['title'] = array_diff(array_keys($cur_words['title']), $split_title);
-		}
-		else
-		{
-			$words['add']['post'] = $split_text;
-			$words['add']['title'] = $split_title;
-			$words['del']['post'] = array();
-			$words['del']['title'] = array();
-		}
-		unset($split_text);
-		unset($split_title);
-
-		// Get unique words from the above arrays
-		$unique_add_words = array_unique(array_merge($words['add']['post'], $words['add']['title']));
-
-		// We now have unique arrays of all words to be added and removed and
-		// individual arrays of added and removed words for text and title. What
-		// we need to do now is add the new words (if they don't already exist)
-		// and then add (or remove) matches between the words and this post
-		if (sizeof($unique_add_words))
-		{
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('word_text', $unique_add_words);
-			$result = phpbb::$db->sql_query($sql);
-
-			$word_ids = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$word_ids[$row['word_text']] = $row['word_id'];
-			}
-			phpbb::$db->sql_freeresult($result);
-			$new_words = array_diff($unique_add_words, array_keys($word_ids));
-
-			phpbb::$db->sql_transaction('begin');
-			if (sizeof($new_words))
-			{
-				$sql_ary = array();
-
-				foreach ($new_words as $word)
-				{
-					$sql_ary[] = array('word_text' => (string) $word, 'word_count' => 0);
-				}
-				phpbb::$db->sql_return_on_error(true);
-				phpbb::$db->sql_multi_insert(SEARCH_WORDLIST_TABLE, $sql_ary);
-				phpbb::$db->sql_return_on_error(false);
-			}
-			unset($new_words, $sql_ary);
-		}
-		else
-		{
-			phpbb::$db->sql_transaction('begin');
-		}
-
-		// now update the search match table, remove links to removed words and add links to new words
-		foreach ($words['del'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql_in = array();
-				foreach ($word_ary as $word)
-				{
-					$sql_in[] = $cur_words[$word_in][$word];
-				}
-
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in) . '
-						AND post_id = ' . intval($post_id) . "
-						AND title_match = $title_match";
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-
-				unset($sql_in);
-			}
-		}
-
-		phpbb::$db->sql_return_on_error(true);
-		foreach ($words['add'] as $word_in => $word_ary)
-		{
-			$title_match = ($word_in == 'title') ? 1 : 0;
-
-			if (sizeof($word_ary))
-			{
-				$sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . ' (post_id, word_id, title_match)
-					SELECT ' . (int) $post_id . ', word_id, ' . (int) $title_match . '
-					FROM ' . SEARCH_WORDLIST_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_text', $word_ary);
-				phpbb::$db->sql_query($sql);
-
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count + 1
-					WHERE ' . phpbb::$db->sql_in_set('word_text', $word_ary);
-				phpbb::$db->sql_query($sql);
-			}
-		}
-		phpbb::$db->sql_return_on_error(false);
-
-		phpbb::$db->sql_transaction('commit');
-
-		// destroy cached search results containing any of the words removed or added
-		$this->destroy_cache(array_unique(array_merge($words['add']['post'], $words['add']['title'], $words['del']['post'], $words['del']['title'])), array($poster_id));
-
-		unset($unique_add_words);
-		unset($words);
-		unset($cur_words);
-	}
-
-	/**
-	* Removes entries from the wordmatch table for the specified post_ids
-	*/
-	public function index_remove($post_ids, $author_ids, $forum_ids)
-	{
-		if (sizeof($post_ids))
-		{
-			$sql = 'SELECT w.word_id, w.word_text, m.title_match
-				FROM ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . ' w
-				WHERE ' . phpbb::$db->sql_in_set('m.post_id', $post_ids) . '
-					AND w.word_id = m.word_id';
-			$result = phpbb::$db->sql_query($sql);
-
-			$message_word_ids = $title_word_ids = $word_texts = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				if ($row['title_match'])
-				{
-					$title_word_ids[] = $row['word_id'];
-				}
-				else
-				{
-					$message_word_ids[] = $row['word_id'];
-				}
-				$word_texts[] = $row['word_text'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($title_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $title_word_ids) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-			}
-
-			if (sizeof($message_word_ids))
-			{
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_count = word_count - 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $message_word_ids) . '
-						AND word_count > 0';
-				phpbb::$db->sql_query($sql);
-			}
-
-			unset($title_word_ids);
-			unset($message_word_ids);
-
-			$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-				WHERE ' . phpbb::$db->sql_in_set('post_id', $post_ids);
-			phpbb::$db->sql_query($sql);
-		}
-
-		$this->destroy_cache(array_unique($word_texts), $author_ids);
-	}
-
-	/**
-	* Tidy up indexes: Tag 'common words' and remove
-	* words no longer referenced in the match table
-	*/
-	public function tidy()
-	{
-		// Is the fulltext indexer disabled? If yes then we need not
-		// carry on ... it's okay ... I know when I'm not wanted boo hoo
-		if (!phpbb::$config['fulltext_native_load_upd'])
-		{
-			set_config('search_last_gc', time(), true);
-			return;
-		}
-
-		$destroy_cache_words = array();
-
-		// Remove common words
-		if (phpbb::$config['num_posts'] >= 100 && phpbb::$config['fulltext_native_common_thres'])
-		{
-			$common_threshold = ((double) phpbb::$config['fulltext_native_common_thres']) / 100.0;
-			// First, get the IDs of common words
-			$sql = 'SELECT word_id, word_text
-				FROM ' . SEARCH_WORDLIST_TABLE . '
-				WHERE word_count > ' . floor(phpbb::$config['num_posts'] * $common_threshold) . '
-					OR word_common = 1';
-			$result = phpbb::$db->sql_query($sql);
-
-			$sql_in = array();
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				$sql_in[] = $row['word_id'];
-				$destroy_cache_words[] = $row['word_text'];
-			}
-			phpbb::$db->sql_freeresult($result);
-
-			if (sizeof($sql_in))
-			{
-				// Flag the words
-				$sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . '
-					SET word_common = 1
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in);
-				phpbb::$db->sql_query($sql);
-
-				// by setting search_last_gc to the new time here we make sure that if a user reloads because the
-				// following query takes too long, he won't run into it again
-				set_config('search_last_gc', time(), true);
-
-				// Delete the matches
-				$sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
-					WHERE ' . phpbb::$db->sql_in_set('word_id', $sql_in);
-				phpbb::$db->sql_query($sql);
-			}
-			unset($sql_in);
-		}
-
-		if (sizeof($destroy_cache_words))
-		{
-			// destroy cached search results containing any of the words that are now common or were removed
-			$this->destroy_cache(array_unique($destroy_cache_words));
-		}
-
-		set_config('search_last_gc', time(), true);
-	}
-
-	/**
-	* Deletes all words from the index
-	*/
-	public function delete_index($acp_module, $u_action)
-	{
-		if (phpbb::$db->features['truncate'])
-		{
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDLIST_TABLE);
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDMATCH_TABLE);
-			phpbb::$db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
-		}
-		else
-		{
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE);
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE);
-			phpbb::$db->sql_query('DELETE FROM ' . SEARCH_RESULTS_TABLE);
-		}
-	}
-
-	/**
-	* Returns true if both FULLTEXT indexes exist
-	*/
-	public function index_created()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return ($this->stats['total_words'] && $this->stats['total_matches']) ? true : false;
-	}
-
-	/**
-	* Returns an associative array containing information about the indexes
-	*/
-	public function index_stats()
-	{
-		if (!sizeof($this->stats))
-		{
-			$this->get_stats();
-		}
-
-		return array(
-			phpbb::$db->lang['TOTAL_WORDS']		=> $this->stats['total_words'],
-			phpbb::$db->lang['TOTAL_MATCHES']	=> $this->stats['total_matches'],
-		);
-	}
-
-	private function get_stats()
-	{
-		$sql = 'SELECT COUNT(*) as total_words
-			FROM ' . SEARCH_WORDLIST_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_words'] = (int) phpbb::$db->sql_fetchfield('total_words');
-		phpbb::$db->sql_freeresult($result);
-
-		$sql = 'SELECT COUNT(*) as total_matches
-			FROM ' . SEARCH_WORDMATCH_TABLE;
-		$result = phpbb::$db->sql_query($sql);
-		$this->stats['total_matches'] = (int) phpbb::$db->sql_fetchfield('total_matches');
-		phpbb::$db->sql_freeresult($result);
-	}
-
-	/**
-	* Clean up a text to remove non-alphanumeric characters
-	*
-	* This method receives a UTF-8 string, normalizes and validates it, replaces all
-	* non-alphanumeric characters with strings then returns the result.
-	*
-	* Any number of "allowed chars" can be passed as a UTF-8 string in NFC.
-	*
-	* @param	string	$text			Text to split, in UTF-8 (not normalized or sanitized)
-	* @param	string	$allowed_chars	String of special chars to allow
-	* @return	string					Cleaned up text, only alphanumeric chars are left
-	*
-	* @todo normalizer::cleanup being able to be used?
-	*/
-	private function cleanup($text, $allowed_chars = null)
-	{
-		static $conv = array(), $conv_loaded = array();
-		$words = $allow = array();
-
-		$utf_len_mask = array(
-			"\xC0"	=>	2,
-			"\xD0"	=>	2,
-			"\xE0"	=>	3,
-			"\xF0"	=>	4
-		);
-
-		/**
-		* Replace HTML entities and NCRs
-		*/
-		$text = htmlspecialchars_decode(utf8_decode_ncr($text), ENT_QUOTES);
-
-		/**
-		* Load the UTF-8 normalizer
-		*
-		* If we use it more widely, an instance of that class should be held in a
-		* a global variable instead
-		*/
-		utf_normalizer::nfc($text);
-
-		/**
-		* The first thing we do is:
-		*
-		* - convert ASCII-7 letters to lowercase
-		* - remove the ASCII-7 non-alpha characters
-		* - remove the bytes that should not appear in a valid UTF-8 string: 0xC0,
-		*   0xC1 and 0xF5-0xFF
-		*
-		* @todo in theory, the third one is already taken care of during normalization and those chars should have been replaced by Unicode replacement chars
-		*/
-		$sb_match	= "ISTCPAMELRDOJBNHFGVWUQKYXZ\r\n\t!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\xC0\xC1\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
-		$sb_replace	= 'istcpamelrdojbnhfgvwuqkyxz                                                                              ';
-
-		/**
-		* This is the list of legal ASCII chars, it is automatically extended
-		* with ASCII chars from $allowed_chars
-		*/
-		$legal_ascii = ' eaisntroludcpmghbfvq10xy2j9kw354867z';
-
-		/**
-		* Prepare an array containing the extra chars to allow
-		*/
-		if (isset($allowed_chars[0]))
-		{
-			$pos = 0;
-			$len = strlen($allowed_chars);
-			do
-			{
-				$c = $allowed_chars[$pos];
-
-				if ($c < "\x80")
-				{
-					/**
-					* ASCII char
-					*/
-					$sb_pos = strpos($sb_match, $c);
-					if (is_int($sb_pos))
-					{
-						/**
-						* Remove the char from $sb_match and its corresponding
-						* replacement in $sb_replace
-						*/
-						$sb_match = substr($sb_match, 0, $sb_pos) . substr($sb_match, $sb_pos + 1);
-						$sb_replace = substr($sb_replace, 0, $sb_pos) . substr($sb_replace, $sb_pos + 1);
-						$legal_ascii .= $c;
-					}
-
-					++$pos;
-				}
-				else
-				{
-					/**
-					* UTF-8 char
-					*/
-					$utf_len = $utf_len_mask[$c & "\xF0"];
-					$allow[substr($allowed_chars, $pos, $utf_len)] = 1;
-					$pos += $utf_len;
-				}
-			}
-			while ($pos < $len);
-		}
-
-		$text = strtr($text, $sb_match, $sb_replace);
-		$ret = '';
-
-		$pos = 0;
-		$len = strlen($text);
-
-		do
-		{
-			/**
-			* Do all consecutive ASCII chars at once
-			*/
-			if ($spn = strspn($text, $legal_ascii, $pos))
-			{
-				$ret .= substr($text, $pos, $spn);
-				$pos += $spn;
-			}
-
-			if ($pos >= $len)
-			{
-				return $ret;
-			}
-
-			/**
-			* Capture the UTF char
-			*/
-			$utf_len = $utf_len_mask[$text[$pos] & "\xF0"];
-			$utf_char = substr($text, $pos, $utf_len);
-			$pos += $utf_len;
-
-			if (($utf_char >= UTF8_HANGUL_FIRST && $utf_char <= UTF8_HANGUL_LAST)
-			 || ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST)
-			 || ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST))
-			{
-				/**
-				* All characters within these ranges are valid
-				*
-				* We separate them with a space in order to index each character
-				* individually
-				*/
-				$ret .= ' ' . $utf_char . ' ';
-				continue;
-			}
-
-			if (isset($allow[$utf_char]))
-			{
-				/**
-				* The char is explicitly allowed
-				*/
-				$ret .= $utf_char;
-				continue;
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				/**
-				* The char is mapped to something, maybe to itself actually
-				*/
-				$ret .= $conv[$utf_char];
-				continue;
-			}
-
-			/**
-			* The char isn't mapped, but did we load its conversion table?
-			*
-			* The search indexer table is split into blocks. The block number of
-			* each char is equal to its codepoint right-shifted for 11 bits. It
-			* means that out of the 11, 16 or 21 meaningful bits of a 2-, 3- or
-			* 4- byte sequence we only keep the leftmost 0, 5 or 10 bits. Thus,
-			* all UTF chars encoded in 2 bytes are in the same first block.
-			*/
-			if (isset($utf_char[2]))
-			{
-				if (isset($utf_char[3]))
-				{
-					/**
-					* 1111 0nnn 10nn nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0011 1111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 7) | ((ord($utf_char[1]) & 0x3F) << 1) | ((ord($utf_char[2]) & 0x20) >> 5);
-				}
-				else
-				{
-					/**
-					* 1110 nnnn 10nx xxxx 10xx xxxx
-					* 0000 0111 0010 0000
-					*/
-					$idx = ((ord($utf_char[0]) & 0x07) << 1) | ((ord($utf_char[1]) & 0x20) >> 5);
-				}
-			}
-			else
-			{
-				/**
-				* 110x xxxx 10xx xxxx
-				* 0000 0000 0000 0000
-				*/
-				$idx = 0;
-			}
-
-			/**
-			* Check if the required conv table has been loaded already
-			*/
-			if (!isset($conv_loaded[$idx]))
-			{
-				$conv_loaded[$idx] = 1;
-				$file = PHPBB_ROOT_PATH . 'includes/utf/data/search_indexer_' . $idx . '.' . PHP_EXT;
-
-				if (file_exists($file))
-				{
-					$conv += include($file);
-				}
-			}
-
-			if (isset($conv[$utf_char]))
-			{
-				$ret .= $conv[$utf_char];
-			}
-			else
-			{
-				/**
-				* We add an entry to the conversion table so that we
-				* don't have to convert to codepoint and perform the checks
-				* that are above this block
-				*/
-				$conv[$utf_char] = ' ';
-				$ret .= ' ';
-			}
-		}
-		while (1);
-
-		return $ret;
-	}
-
-	/**
-	* Returns a list of options for the ACP to display
-	*/
-	public function acp()
-	{
-		/**
-		* if we need any options, copied from fulltext_native for now, will have to be adjusted or removed
-		*/
-
-		$tpl = '
-		<dl>
-			<dt><label for="fulltext_native_load_upd">' . phpbb::$db->lang['YES_SEARCH_UPDATE'] . ':</label><br /><span>' . phpbb::$db->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '</span></dt>
-			<dd><label><input type="radio" id="fulltext_native_load_upd" name="config[fulltext_native_load_upd]" value="1"' . ((phpbb::$config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . phpbb::$db->lang['YES'] . '</label><label><input type="radio" name="config[fulltext_native_load_upd]" value="0"' . ((!phpbb::$config['fulltext_native_load_upd']) ? ' checked="checked"' : '') . ' class="radio" /> ' . phpbb::$db->lang['NO'] . '</label></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_min_chars">' . phpbb::$db->lang['MIN_SEARCH_CHARS'] . ':</label><br /><span>' . phpbb::$db->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_min_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_min_chars]" value="' . (int) phpbb::$config['fulltext_native_min_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_max_chars">' . phpbb::$db->lang['MAX_SEARCH_CHARS'] . ':</label><br /><span>' . phpbb::$db->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_max_chars" type="text" size="3" maxlength="3" name="config[fulltext_native_max_chars]" value="' . (int) phpbb::$config['fulltext_native_max_chars'] . '" /></dd>
-		</dl>
-		<dl>
-			<dt><label for="fulltext_native_common_thres">' . phpbb::$db->lang['COMMON_WORD_THRESHOLD'] . ':</label><br /><span>' . phpbb::$db->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_native_common_thres" type="text" size="3" maxlength="3" name="config[fulltext_native_common_thres]" value="' . (int) phpbb::$config['fulltext_native_common_thres'] . '" /> %</dd>
-		</dl>
-		';
-
-		// These are fields required in the config table
-		return array(
-			'tpl'		=> $tpl,
-			'config'	=> array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100')
-		);
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
deleted file mode 100644
index 89d5935258..0000000000
--- a/phpBB/includes/search/search.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
-*
-* @package search
-* @version $Id$
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-/**
-* search_backend
-* optional base class for search plugins providing simple caching based on ACM
-* and functions to retrieve ignore_words and synonyms
-* @package search
-*/
-class search_backend
-{
-	const SEARCH_RESULT_NOT_IN_CACHE = 0;
-	const SEARCH_RESULT_IN_CACHE = 1;
-	const SEARCH_RESULT_INCOMPLETE = 2;
-
-	public $ignore_words = array();
-	public $match_synonym = array();
-	public $replace_synonym = array();
-
-	function __construct(&$error)
-	{
-		// This class cannot be used as a search plugin
-		$error = true;
-	}
-
-	/**
-	* Retrieves a language dependend list of words that should be ignored by the search
-	*/
-	public function get_ignore_words()
-	{
-		if (!sizeof($this->ignore_words))
-		{
-			$words = array();
-
-			if (file_exists(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_ignore_words.' . PHP_EXT))
-			{
-				// include the file containing ignore words
-				include(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_ignore_words.' . PHP_EXT);
-			}
-
-			$this->ignore_words = $words;
-			unset($words);
-		}
-	}
-
-	/**
-	* Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them
-	*/
-	public function get_synonyms()
-	{
-		if (!sizeof($this->match_synonym))
-		{
-			$synonyms = array();
-
-			if (file_exists(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_synonyms.' . PHP_EXT))
-			{
-				// include the file containing synonyms
-				include(phpbb::$user->lang_path . phpbb::$user->lang_name . '/search_synonyms.' . PHP_EXT);
-			}
-
-			$this->match_synonym = array_keys($synonyms);
-			$this->replace_synonym = array_values($synonyms);
-
-			unset($synonyms);
-		}
-	}
-
-	/**
-	* Retrieves cached search results
-	*
-	* @param int &$result_count will contain the number of all results for the search (not only for the current page)
-	* @param array &$id_ary is filled with the ids belonging to the requested page that are stored in the cache
-	*
-	* @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
-	*/
-	protected function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
-	{
-		if (!($stored_ids = phpbb::$acm->get('search_results_' . $search_key)))
-		{
-			// no search results cached for this search_key
-			return self::SEARCH_RESULT_NOT_IN_CACHE;
-		}
-		else
-		{
-			$result_count = $stored_ids[-1];
-			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
-			$complete = true;
-
-			// change the start to the actual end of the current request if the sort direction differs
-			// from the dirction in the cache and reverse the ids later
-			if ($reverse_ids)
-			{
-				$start = $result_count - $start - $per_page;
-
-				// the user requested a page past the last index
-				if ($start < 0)
-				{
-					return self::SEARCH_RESULT_NOT_IN_CACHE;
-				}
-			}
-
-			for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++)
-			{
-				if (!isset($stored_ids[$i]))
-				{
-					$complete = false;
-				}
-				else
-				{
-					$id_ary[] = $stored_ids[$i];
-				}
-			}
-			unset($stored_ids);
-
-			if ($reverse_ids)
-			{
-				$id_ary = array_reverse($id_ary);
-			}
-
-			if (!$complete)
-			{
-				return self::SEARCH_RESULT_INCOMPLETE;
-			}
-			return self::SEARCH_RESULT_IN_CACHE;
-		}
-	}
-
-	/**
-	* Caches post/topic ids
-	*
-	* @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element
-	* 	must have the absolute index $start in the result set.
-	*/
-	protected function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, $start, $sort_dir)
-	{
-		$length = min(sizeof($id_ary), phpbb::$config['search_block_size']);
-
-		// nothing to cache so exit
-		if (!$length)
-		{
-			return;
-		}
-
-		$store_ids = array_slice($id_ary, 0, $length);
-
-		// create a new resultset if there is none for this search_key yet
-		// or add the ids to the existing resultset
-		if (!($store = phpbb::$acm->get('search_results_' . $search_key)))
-		{
-			// add the current keywords to the recent searches in the cache which are listed on the search page
-			if (!empty($keywords) || sizeof($author_ary))
-			{
-				$sql = 'SELECT search_time
-					FROM ' . SEARCH_RESULTS_TABLE . '
-					WHERE search_key = \'' . phpbb::$db->sql_escape($search_key) . '\'';
-				$result = phpbb::$db->sql_query($sql);
-
-				if (!phpbb::$db->sql_fetchrow($result))
-				{
-					$sql_ary = array(
-						'search_key'		=> $search_key,
-						'search_time'		=> time(),
-						'search_keywords'	=> $keywords,
-						'search_authors'	=> ' ' . implode(' ', $author_ary) . ' '
-					);
-
-					$sql = 'INSERT INTO ' . SEARCH_RESULTS_TABLE . ' ' . phpbb::$db->sql_build_array('INSERT', $sql_ary);
-					phpbb::$db->sql_query($sql);
-				}
-				phpbb::$db->sql_freeresult($result);
-			}
-
-			$sql = 'UPDATE ' . USERS_TABLE . '
-				SET user_last_search = ' . time() . '
-				WHERE user_id = ' . phpbb::$user->data['user_id'];
-			phpbb::$db->sql_query($sql);
-
-			$store = array(-1 => $result_count, -2 => $sort_dir);
-			$id_range = range($start, $start + $length - 1);
-		}
-		else
-		{
-			// we use one set of results for both sort directions so we have to calculate the indizes
-			// for the reversed array and we also have to reverse the ids themselves
-			if ($store[-2] != $sort_dir)
-			{
-				$store_ids = array_reverse($store_ids);
-				$id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1);
-			}
-			else
-			{
-				$id_range = range($start, $start + $length - 1);
-			}
-		}
-
-		$store_ids = array_combine($id_range, $store_ids);
-
-		// append the ids
-		if (is_array($store_ids))
-		{
-			$store += $store_ids;
-
-			// if the cache is too big
-			if (sizeof($store) - 2 > 20 * phpbb::$config['search_block_size'])
-			{
-				// remove everything in front of two blocks in front of the current start index
-				for ($i = 0, $n = $id_range[0] - 2 * phpbb::$config['search_block_size']; $i < $n; $i++)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-
-				// remove everything after two blocks after the current stop index
-				end($id_range);
-				for ($i = $store[-1] - 1, $n = current($id_range) + 2 * phpbb::$config['search_block_size']; $i > $n; $i--)
-				{
-					if (isset($store[$i]))
-					{
-						unset($store[$i]);
-					}
-				}
-			}
-			phpbb::$acm->put('search_results_' . $search_key, $store, phpbb::$config['search_store_results']);
-
-			$sql = 'UPDATE ' . SEARCH_RESULTS_TABLE . '
-				SET search_time = ' . time() . '
-				WHERE search_key = \'' . phpbb::$db->sql_escape($search_key) . '\'';
-			phpbb::$db->sql_query($sql);
-		}
-
-		unset($store);
-		unset($store_ids);
-		unset($id_range);
-	}
-
-	/**
-	* Removes old entries from the search results table and removes searches with keywords that contain a word in $words.
-	*/
-	public function destroy_cache($words, $authors = false)
-	{
-		// clear all searches that searched for the specified words
-		if (sizeof($words))
-		{
-			$sql_where = '';
-			foreach ($words as $word)
-			{
-				$sql_where .= " OR search_keywords " . phpbb::$db->sql_like_expression(phpbb::$db->any_char . $word . phpbb::$db->any_char);
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE search_keywords LIKE '%*%' $sql_where";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				phpbb::$acm->destroy('search_results_' . $row['search_key']);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		// clear all searches that searched for the specified authors
-		if (is_array($authors) && sizeof($authors))
-		{
-			$sql_where = '';
-			foreach ($authors as $author)
-			{
-				$sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\'';
-			}
-
-			$sql = 'SELECT search_key
-				FROM ' . SEARCH_RESULTS_TABLE . "
-				WHERE $sql_where";
-			$result = phpbb::$db->sql_query($sql);
-
-			while ($row = phpbb::$db->sql_fetchrow($result))
-			{
-				phpbb::$acm->destroy('search_results_' . $row['search_key']);
-			}
-			phpbb::$db->sql_freeresult($result);
-		}
-
-		$sql = 'DELETE
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE search_time < ' . (time() - phpbb::$config['search_store_results']);
-		phpbb::$db->sql_query($sql);
-	}
-}
-
-?>
\ No newline at end of file