Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

* 'develop' of https://github.com/phpbb/phpbb3: (480 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_queue.php phpBB/includes/search/fulltext_mysql.php phpBB/includes/search/fulltext_native.php phpBB/includes/search/fulltext_postgres.php phpBB/includes/search/fulltext_sphinx.php phpBB/install/database_update.php phpBB/styles/prosilver/template/ajax.js
author: Joas Schilling <nickvergessen@gmx.de> 2013-03-03 20:06:52 +0100
committer: Joas Schilling <nickvergessen@gmx.de> 2013-03-03 20:06:52 +0100
commit: 42c062cedf0b451141e321dd4e7cac84905bcac6 (patch)
tree: 7c6fa2647ebbd56e909356de4a27551dff0be626 /phpBB/includes/search
parent: 3cee183dd4882fdd00deb911bab69287d7754135 (diff)
parent: bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
download: forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar
forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.gz
forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.bz2
forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.xz
forums-42c062cedf0b451141e321dd4e7cac84905bcac6.zip
5 files changed, 213 insertions, 41 deletions
diff --git a/phpBB/includes/search/base.php b/phpBB/includes/search/base.php
index b364dead9a..914cef9167 100644
--- a/phpBB/includes/search/base.php
+++ b/phpBB/includes/search/base.php
@@ -94,7 +94,7 @@ class phpbb_search_base
 	*
 	* @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE
 	*/
-	function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir)
+	function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $sort_dir)
 	{
 		global $cache;
 
@@ -109,6 +109,19 @@ class phpbb_search_base
 			$reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false;
 			$complete = true;
 
+			// Change start parameter in case out of bounds
+			if ($result_count)
+			{
+				if ($start < 0)
+				{
+					$start = 0;
+				}
+				else if ($start >= $result_count)
+				{
+					$start = floor(($result_count - 1) / $per_page) * $per_page;
+				}
+			}
+
 			// 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)
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 913334bd08..e3ec56423e 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -353,7 +353,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts
 		if (!$this->search_query)
@@ -375,6 +375,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			implode(',', $author_ary)
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -475,16 +480,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		$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 = $this->db->sql_query($sql);
+			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
+			$result = $this->db->sql_query($sql_found_rows);
 			$result_count = (int) $this->db->sql_fetchfield('result_count');
 			$this->db->sql_freeresult($result);
 
@@ -494,6 +494,21 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+
+			$id_ary = array_unique($id_ary);
+		}
+
 		// 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);
@@ -520,7 +535,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						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, $author_name, &$id_ary, $start, $per_page)
+	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, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
@@ -544,6 +559,11 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$author_name,
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -638,8 +658,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		// retrieve the total result count if needed
 		if (!$result_count)
 		{
-			$sql = 'SELECT FOUND_ROWS() as result_count';
-			$result = $this->db->sql_query($sql);
+			$sql_found_rows = 'SELECT FOUND_ROWS() as result_count';
+			$result = $this->db->sql_query($sql_found_rows);
 			$result_count = (int) $this->db->sql_fetchfield('result_count');
 			$this->db->sql_freeresult($result);
 
@@ -649,6 +669,20 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+
+			$id_ary = array_unique($id_ary);
+		}
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 3dc44be682..90ea553ddc 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -516,7 +516,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts.
 		if (empty($this->search_query))
@@ -848,10 +848,6 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		}
 		$this->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)
@@ -860,14 +856,14 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			$sql_array_copy = $sql_array;
 			$sql_array_copy['SELECT'] = 'SQL_CALC_FOUND_ROWS p.post_id ';
 
-			$sql = $this->db->sql_build_query('SELECT', $sql_array_copy);
+			$sql_calc = $this->db->sql_build_query('SELECT', $sql_array_copy);
 			unset($sql_array_copy);
 
-			$this->db->sql_query($sql);
+			$this->db->sql_query($sql_calc);
 			$this->db->sql_freeresult($result);
 
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql);
+			$sql_count = 'SELECT FOUND_ROWS() as total_results';
+			$result = $this->db->sql_query($sql_count);
 			$total_results = (int) $this->db->sql_fetchfield('total_results');
 			$this->db->sql_freeresult($result);
 
@@ -877,6 +873,20 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $total_results)
+		{
+			$start = floor(($total_results - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[(($type == 'posts') ? 'post_id' : 'topic_id')];
+			}
+			$this->db->sql_freeresult($result);
+
+		}
+
 		// 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);
@@ -903,7 +913,11 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
+<<<<<<< HEAD
 	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+=======
+	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, $author_name, &$id_ary, &$start, $per_page)
+>>>>>>> bee4f8d8185d4ff5278be758db4ea4a814f09b4f
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
@@ -1077,13 +1091,13 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 		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);
+			$sql_calc = str_replace('SELECT ' . $select, 'SELECT DISTINCT SQL_CALC_FOUND_ROWS p.post_id', $sql);
 
-			$this->db->sql_query($sql);
+			$this->db->sql_query($sql_calc);
 			$this->db->sql_freeresult($result);
 
-			$sql = 'SELECT FOUND_ROWS() as total_results';
-			$result = $this->db->sql_query($sql);
+			$sql_count = 'SELECT FOUND_ROWS() as total_results';
+			$result = $this->db->sql_query($sql_count);
 			$total_results = (int) $this->db->sql_fetchfield('total_results');
 			$this->db->sql_freeresult($result);
 
@@ -1093,6 +1107,19 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 			}
 		}
 
+		if ($start >= $total_results)
+		{
+			$start = floor(($total_results - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+		}
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir);
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 71ef347a1b..d5deb47222 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -343,7 +343,7 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts
 		if (!$this->search_query)
@@ -371,6 +371,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			implode(',', $author_ary)
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -463,10 +468,14 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$tmp_sql_match[] = "to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', " . $sql_match_column . ") @@ to_tsquery ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', '" . $this->db->sql_escape($this->tsearch_query) . "')";
 		}
 
+		$this->db->sql_transaction('begin');
+
+		$sql_from = "FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p";
+		$sql_where = "WHERE (" . implode(' OR ', $tmp_sql_match) . ")
+			$sql_where_options";
 		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE (" . implode(' OR ', $tmp_sql_match) . ")
-			$sql_where_options
+			$sql_from
+			$sql_where
 			ORDER BY $sql_sort";
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -478,15 +487,15 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 
 		$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)
 		{
-			$result_count = sizeof ($id_ary);
+			$sql_count = "SELECT COUNT(*) as result_count
+				$sql_from
+				$sql_where";
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
+			$this->db->sql_freeresult($result);
 
 			if (!$result_count)
 			{
@@ -494,6 +503,23 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+
+			$id_ary = array_unique($id_ary);
+		}
+
 		// 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);
@@ -520,7 +546,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
+<<<<<<< HEAD
 	public function author_search($type, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+=======
+	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, $author_name, &$id_ary, &$start, $per_page)
+>>>>>>> bee4f8d8185d4ff5278be758db4ea4a814f09b4f
 	{
 		// No author? No posts
 		if (!sizeof($author_ary))
@@ -544,6 +574,11 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$author_name,
 		)));
 
+		if ($start < 0)
+		{
+			$start = 0;
+		}
+
 		// try reading the results from cache
 		$result_count = 0;
 		if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == SEARCH_RESULT_IN_CACHE)
@@ -623,6 +658,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$field = 'topic_id';
 		}
 
+		$this->db->sql_transaction('begin');
+
 		// Only read one block of posts from the db and then cache it
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -635,7 +672,35 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		// retrieve the total result count if needed
 		if (!$result_count)
 		{
-			$result_count = sizeof ($id_ary);
+			if ($type == 'posts')
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					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";
+			}
+			else
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					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]";
+			}
+
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
 
 			if (!$result_count)
 			{
@@ -643,6 +708,22 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				$id_ary[] = (int) $row[$field];
+			}
+			$this->db->sql_freeresult($result);
+
+			$id_ary = array_unique($id_ary);
+		}
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 7c0be91083..441fb2583b 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -454,7 +454,7 @@ class phpbb_search_fulltext_sphinx
 	* @param	int			$per_page			number of ids each page is supposed to contain
 	* @return	boolean|int						total number of results
 	*/
-	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, $start, $per_page)
+	public function keyword_search($type, $fields, $terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $post_visibility, $topic_id, $author_ary, $author_name, &$id_ary, &$start, $per_page)
 	{
 		// No keywords? No posts.
 		if (!strlen($this->search_query) && !sizeof($author_ary))
@@ -611,6 +611,25 @@ class phpbb_search_fulltext_sphinx
 			}
 		}
 
+		$result_count = $result['total_found'];
+
+		if ($start >= $result_count)
+		{
+			$start = floor(($result_count - 1) / $per_page) * $per_page;
+
+			$this->sphinx->SetLimits((int) $start, (int) $per_page, SPHINX_MAX_MATCHES);
+			$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
+
+			// Could be connection to localhost:9312 failed (errno=111,
+			// msg=Connection refused) during rotate, retry if so
+			$retries = SPHINX_CONNECT_RETRIES;
+			while (!$result && (strpos($this->sphinx->GetLastError(), "errno=111,") !== false) && $retries--)
+			{
+				usleep(SPHINX_CONNECT_WAIT_TIME);
+				$result = $this->sphinx->Query($search_query_prefix . str_replace('&quot;', '"', $this->search_query), $this->indexes);
+			}
+		}
+
 		$id_ary = array();
 		if (isset($result['matches']))
 		{
@@ -631,8 +650,6 @@ class phpbb_search_fulltext_sphinx
 			return false;
 		}
 
-		$result_count = $result['total_found'];
-
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
 
 		return $result_count;
@@ -880,8 +897,8 @@ class phpbb_search_fulltext_sphinx
 			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
-			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt>
-			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6">' . $this->config_file_data . '</textarea>' : $this->config_file_data) . '</dd>
+			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</span></dt>
+			<dd>' . (($this->config_generate()) ? '<textarea readonly="readonly" rows="6" id="sphinx_config_data">' . htmlspecialchars($this->config_file_data) . '</textarea>' : $this->config_file_data) . '</dd>
 		<dl>
 		';
author	Joas Schilling <nickvergessen@gmx.de>	2013-03-03 20:06:52 +0100
committer	Joas Schilling <nickvergessen@gmx.de>	2013-03-03 20:06:52 +0100
commit	42c062cedf0b451141e321dd4e7cac84905bcac6 (patch)
tree	7c6fa2647ebbd56e909356de4a27551dff0be626 /phpBB/includes/search
parent	3cee183dd4882fdd00deb911bab69287d7754135 (diff)
parent	bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff)
download	forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.gz forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.bz2 forums-42c062cedf0b451141e321dd4e7cac84905bcac6.tar.xz forums-42c062cedf0b451141e321dd4e7cac84905bcac6.zip