mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
New search system, this isn't final, needs alterations, etc. can redeem this against the full priced version with included coupon
git-svn-id: file:///svn/phpbb/trunk@1293 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
parent
cb427774a6
commit
4e5a771123
4 changed files with 774 additions and 452 deletions
311
phpBB/develop/search_fill.php
Normal file
311
phpBB/develop/search_fill.php
Normal file
|
|
@ -0,0 +1,311 @@
|
|||
<?php
|
||||
|
||||
function clean_words($entry, &$stopword_list, &$synonym_list)
|
||||
{
|
||||
$init_match = array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%");
|
||||
$init_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ");
|
||||
|
||||
$later_match = array("-", "~", "+", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "*", "!");
|
||||
$later_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
|
||||
|
||||
$entry = " " . stripslashes(strip_tags(strtolower($entry))) . " ";
|
||||
|
||||
$entry = preg_replace("/[\n\r]/is", " ", $entry);
|
||||
$entry = preg_replace("/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/si", " ", $entry);
|
||||
|
||||
$entry = str_replace($init_match, $init_replace, $entry);
|
||||
|
||||
$entry = preg_replace("/\[code:[0-9]+:[0-9a-z]{10,}\].*?\[\/code:[0-9]+:[0-9a-z]{10,}\]/is", " ", $entry);
|
||||
$entry = preg_replace("/\[img\].*?\[\/img\]/is", " ", $entry);
|
||||
$entry = preg_replace("/\[\/?[a-z\*=\+\-]+[0-9a-z]?(\:[a-z0-9]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/si", " ", $entry);
|
||||
$entry = preg_replace("/\[\/?[a-z\*]+[=\+\-]?[0-9a-z]+?:[a-z0-9]{10,}[=.*?]?\]/si", " ", $entry);
|
||||
$entry = preg_replace("/\[\/?url(=.*?)?\]/si", " ", $entry);
|
||||
$entry = preg_replace("/\b[0-9]+\b/si", " ", $entry);
|
||||
$entry = preg_replace("/\b&[a-z]+;\b/is", " ", $entry);
|
||||
$entry = preg_replace("/\b[a-z0-9]{1,2}?\b/si", " ", $entry);
|
||||
$entry = preg_replace("/\b[a-z0-9]{50,}?\b/si", " ", $entry);
|
||||
|
||||
$entry = str_replace($later_match, $later_replace, $entry);
|
||||
|
||||
if( !empty($stopword_list) )
|
||||
{
|
||||
for ($j = 0; $j < count($stopword_list); $j++)
|
||||
{
|
||||
$filter_word = trim(strtolower($stopword_list[$j]));
|
||||
$entry = preg_replace("/\b" . preg_quote($filter_word, "/") . "\b/is", " ", $entry);
|
||||
}
|
||||
}
|
||||
|
||||
if( !empty($synonym_list) )
|
||||
{
|
||||
for ($j = 0; $j < count($synonym_list); $j++)
|
||||
{
|
||||
list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
|
||||
$entry = preg_replace("/\b" . preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
|
||||
}
|
||||
}
|
||||
|
||||
return $entry;
|
||||
}
|
||||
|
||||
function split_words(&$entry)
|
||||
{
|
||||
preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
|
||||
|
||||
return $split_entries[1];
|
||||
}
|
||||
|
||||
function remove_common($percent)
|
||||
{
|
||||
global $db;
|
||||
|
||||
$sql = "SELECT sl.word_id, SUM(sm.word_count) AS post_occur_count
|
||||
FROM phpbb_search_wordlist sl, phpbb_search_wordmatch sm
|
||||
WHERE sl.word_id = sm.word_id
|
||||
GROUP BY sl.word_id
|
||||
ORDER BY post_occur_count DESC";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain search word sums", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$post_count = $db->sql_numrows($result);
|
||||
$rowset = $db->sql_fetchrowset($result);
|
||||
|
||||
$sql = "SELECT COUNT(post_id) AS total_posts
|
||||
FROM phpbb_posts";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain post count", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$row = $db->sql_fetchrow($result);
|
||||
|
||||
$words_removed = 0;
|
||||
|
||||
for($i = 0; $i < $post_count; $i++)
|
||||
{
|
||||
if( ($rowset[$i]['post_occur_count'] / $row['total_posts'] ) >= $percent )
|
||||
{
|
||||
$sql = "DELETE FROM phpbb_search_wordlist
|
||||
WHERE word_id = " . $rowset[$i]['word_id'];
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't delete word list entry", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$sql = "DELETE FROM phpbb_search_wordmatch
|
||||
WHERE word_id = " . $rowset[$i]['word_id'];
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't delete word match entry", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$words_removed++;
|
||||
}
|
||||
}
|
||||
|
||||
return $words_removed;
|
||||
}
|
||||
|
||||
set_time_limit(2400);
|
||||
|
||||
$phpbb_root_path = "../";
|
||||
|
||||
include($phpbb_root_path . 'extension.inc');
|
||||
include($phpbb_root_path . 'config.'.$phpEx);
|
||||
include($phpbb_root_path . 'includes/constants.'.$phpEx);
|
||||
include($phpbb_root_path . 'includes/db.'.$phpEx);
|
||||
|
||||
//
|
||||
// Try and load stopword and synonym files
|
||||
//
|
||||
//$stopword_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
|
||||
//$synonym_array = file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
|
||||
$stopword_array = file($phpbb_root_path . "language/lang_english/search_stopwords.txt");
|
||||
$synonym_array = file($phpbb_root_path . "language/lang_english/search_synonyms.txt");
|
||||
|
||||
//
|
||||
// Build search ...
|
||||
//
|
||||
$start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
|
||||
|
||||
$sql = "SELECT *
|
||||
FROM " . POSTS_TEXT_TABLE . "
|
||||
ORDER BY post_id ASC
|
||||
LIMIT $start, 200";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
$error = $db->sql_error();
|
||||
die("Couldn't select words :: " . $sql . " :: " . $error['message']);
|
||||
}
|
||||
|
||||
$rowset = $db->sql_fetchrowset($result);
|
||||
|
||||
if( $post_rows = $db->sql_numrows($result) )
|
||||
{
|
||||
|
||||
// $sql = "LOCK TABLES phpbb_posts_text WRITE";
|
||||
// $result = $db->sql_query($sql);
|
||||
|
||||
for($i = 0; $i < $post_rows; $i++ )
|
||||
{
|
||||
$matches = array();
|
||||
|
||||
$post_id = $rowset[$i]['post_id'];
|
||||
$data = $rowset[$i]['post_text'];
|
||||
|
||||
$text = clean_words($data, $stopword_array, $synonym_array);
|
||||
$matches = split_words($text);
|
||||
|
||||
if( count($matches) )
|
||||
{
|
||||
$word = array();
|
||||
$word_count = array();
|
||||
$phrase_string = $text;
|
||||
|
||||
$sql_in = "";
|
||||
for ($j = 0; $j < count($matches); $j++)
|
||||
{
|
||||
$this_word = strtolower(trim($matches[$j]));
|
||||
|
||||
if( empty($word_count[$this_word]) )
|
||||
{
|
||||
$word_count[$this_word] = 1;
|
||||
}
|
||||
|
||||
$new_word = true;
|
||||
for($k = 0; $k < count($word); $k++)
|
||||
{
|
||||
if( $this_word == $word[$k] )
|
||||
{
|
||||
$new_word = false;
|
||||
$word_count[$this_word]++;
|
||||
}
|
||||
}
|
||||
|
||||
if( $new_word )
|
||||
{
|
||||
$word[] = $this_word;
|
||||
}
|
||||
}
|
||||
|
||||
for($j = 0; $j < count($word); $j++)
|
||||
{
|
||||
if( $word[$j] )
|
||||
{
|
||||
if( $sql_in != "" )
|
||||
{
|
||||
$sql_in .= ", ";
|
||||
}
|
||||
$sql_in .= "'" . $word[$j] . "'";
|
||||
}
|
||||
}
|
||||
|
||||
$sql = "SELECT word_id, word_text
|
||||
FROM phpbb_search_wordlist
|
||||
WHERE word_text IN ($sql_in)";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
$error = $db->sql_error();
|
||||
die("Couldn't select words :: " . $sql . " :: " . $error['message']);
|
||||
}
|
||||
|
||||
if( $word_check_count = $db->sql_numrows($result) )
|
||||
{
|
||||
$check_words = $db->sql_fetchrowset($result);
|
||||
}
|
||||
|
||||
for ($j = 0; $j < count($word); $j++)
|
||||
{
|
||||
if( $word[$j] )
|
||||
{
|
||||
$new_match = true;
|
||||
|
||||
if( $word_check_count )
|
||||
{
|
||||
for($k = 0; $k < $word_check_count; $k++)
|
||||
{
|
||||
if( $word[$j] == $check_words[$k]['word_text'] )
|
||||
{
|
||||
$new_match = false;
|
||||
$word_id = $check_words[$k]['word_id'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if( $new_match )
|
||||
{
|
||||
$sql = "INSERT INTO phpbb_search_wordlist (word_text)
|
||||
VALUES ('". addslashes($word[$j]) . "')";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
$error = $db->sql_error();
|
||||
die("Couldn't insert new word :: " . $sql . " :: " . $error['message']);
|
||||
}
|
||||
|
||||
$word_id = $db->sql_nextid();
|
||||
}
|
||||
|
||||
$sql = "INSERT INTO phpbb_search_wordmatch (post_id, word_id, word_count, title_match)
|
||||
VALUES ($post_id, $word_id, " . $word_count[$word[$j]] . ", 0)";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
$error = $db->sql_error();
|
||||
die("Couldn't insert new word match :: " . $sql . " :: " . $error['message']);
|
||||
}
|
||||
|
||||
$phrase_string = preg_replace("/\b" . preg_quote($word[$j], "/") . "\b/is", $word_id, $phrase_string);
|
||||
}
|
||||
}
|
||||
/*
|
||||
$phrase_string = trim(preg_replace("/ {2,}/s", " ", str_replace(array("*", "'"), " ", $phrase_string)));
|
||||
|
||||
$sql = "INSERT INTO phpbb_search_phrasematch (post_id, phrase_list)
|
||||
VALUES ($post_id, '$phrase_string')";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
$error = $db->sql_error();
|
||||
die("Couldn't insert new phrase match :: " . $sql . " :: " . $error['message']);
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
// $sql = "UNLOCK TABLES";
|
||||
// $result = $db->sql_query($sql);
|
||||
|
||||
}
|
||||
|
||||
if( $post_rows == 200 )
|
||||
{
|
||||
header("Location: search_fill.php?start=" . ($start+200) . "&total=" . ($start + $post_rows));
|
||||
}
|
||||
|
||||
?>
|
||||
<html>
|
||||
<body>
|
||||
|
||||
<?php
|
||||
|
||||
$total_rows = ( $HTTP_GET_VARS['total'] ) ? $HTTP_GET_VARS['total'] : $post_rows;
|
||||
|
||||
echo "<BR><BR>Total posts = " . $total_rows . "<BR><BR>";
|
||||
|
||||
echo remove_common(0.4);
|
||||
|
||||
exit;
|
||||
|
||||
?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
575
phpBB/search.php
575
phpBB/search.php
|
|
@ -20,12 +20,6 @@
|
|||
*
|
||||
***************************************************************************/
|
||||
|
||||
//
|
||||
// Massive overhaul for phpBB2, originally based on search code
|
||||
// I knocked together for my own website
|
||||
//
|
||||
// PSO : 2001
|
||||
//
|
||||
$phpbb_root_path = "./";
|
||||
include($phpbb_root_path . 'extension.inc');
|
||||
include($phpbb_root_path . 'common.'.$phpEx);
|
||||
|
|
@ -34,234 +28,65 @@ include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
|
|||
// -----------------------
|
||||
// Page specific functions
|
||||
//
|
||||
function gensearch_sql($searchstring, $override_all = 0)
|
||||
function clean_words_search($entry)
|
||||
{
|
||||
|
||||
$searchchars = array("'[\s]+'", "'\/'", "';'", "'@'", "'#'", "'_'", "'|'", "'¬'", "'\*'");
|
||||
$replacechars = array(" ", "", "", "", " ", "", "", " ", "", "%");
|
||||
$char_match = array("^", "$", "&", "(", ")", "<", ">", "`", "'", "|", ",", "@", "_", "?", "%", "~", ".", "[", "]", "{", "}", ":", "\\", "/", "=", "#", "\"", ";", "!");
|
||||
$char_replace = array(" ", " ", " ", " ", " ", " ", " ", " ", "", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ");
|
||||
|
||||
$searchstring = trim(preg_replace($searchchars, $replacechars, strip_tags($searchstring)));
|
||||
$entry = " " . strip_tags(strtolower($entry)) . " ";
|
||||
|
||||
//
|
||||
// Here could go a file containing words to ignore,
|
||||
// eg. common words such as the, a, to, etc. or
|
||||
// specific words which should not be search on
|
||||
//
|
||||
// This is what I actually use on the Typhoon site. The
|
||||
// complicated thing here is that on my site I maintain
|
||||
// a cleaned out version of all stories with these words removed
|
||||
// What could be done here is that all non-phrased search
|
||||
// words are matched against words to exclude, removing
|
||||
// the possibility of missed matches on certain phrases.
|
||||
//
|
||||
$entry = str_replace("+", " and ", $entry);
|
||||
$entry = str_replace("-", " not ", $entry);
|
||||
$entry = str_replace($char_match, $char_replace, $entry);
|
||||
|
||||
$words = split(" ", strtolower($searchstring));
|
||||
$phrase = false;
|
||||
$j = 0;
|
||||
$entry = preg_replace("/\b[0-9]+\b/", " ", $entry);
|
||||
|
||||
for($i = 0; $i < count($words); $i++)
|
||||
{
|
||||
//
|
||||
// First see if we've got a single word enclosed in quotes. If so remove
|
||||
// quotes and store word
|
||||
//
|
||||
// Next see if we've got an opening quote if we do then we assume a phrase is
|
||||
// being entered so store first word (if any) and set $phrase to true
|
||||
//
|
||||
// Next check if we've got a closing quote if so end phrase input
|
||||
//
|
||||
// Finally store any other word (checking to see if phrase is true (if so
|
||||
// store word in the same array position as previous word matches)
|
||||
//
|
||||
if(preg_match("/^([\+\-]*)\"(.*?)\"/", $words[$i], $word))
|
||||
{
|
||||
$is_phrase[$j] = true;
|
||||
$searchwords[$j] = $word[2];
|
||||
if($word[1] == "+" || $word[1] == "-")
|
||||
{
|
||||
$searchwords[$j] = $word[1] . $searchwords[$j];
|
||||
return $entry;
|
||||
}
|
||||
$j++;
|
||||
}
|
||||
elseif(preg_match("/^(.*?)\"$/", $words[$i], $word))
|
||||
|
||||
function remove_stop_words($entry, &$stopword_list)
|
||||
{
|
||||
$phrase = false;
|
||||
$searchwords[$j] .= " " . $word[1];
|
||||
$j++;
|
||||
}
|
||||
elseif(preg_match("/^([\+\-]*)\"(.*?)$/", $words[$i], $word) && !$override_all)
|
||||
|
||||
if( !empty($stopword_list) )
|
||||
{
|
||||
$phrase = true;
|
||||
$is_phrase[$j] = true;
|
||||
$searchwords[$j] = trim($word[2]);
|
||||
if($word[1] == "+" || $word[1] == "-")
|
||||
for ($j = 0; $j < count($stopword_list); $j++)
|
||||
{
|
||||
$searchwords[$j] = $word[1] . $searchwords[$j];
|
||||
}
|
||||
}
|
||||
else
|
||||
$filter_word = trim(strtolower($stopword_list[$j]));
|
||||
if( $filter_word != "and" && $filter_word != "or" && $filter_word != "not" )
|
||||
{
|
||||
if($phrase)
|
||||
{
|
||||
$searchwords[$j] .= " " . $words[$i];
|
||||
}
|
||||
else
|
||||
{
|
||||
$searchwords[$j] = $words[$i];
|
||||
$j++;
|
||||
$entry = preg_replace("/\b" . preg_quote($filter_word, "/") . "\b/is", " ", $entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!$override_all)
|
||||
{
|
||||
$i = 0;
|
||||
$searchtype = "OR";
|
||||
$bin_and = $bin_not = $bin_or = false;
|
||||
|
||||
while($i < count($searchwords))
|
||||
{
|
||||
if($searchwords[$i] == "and" || $searchwords[$i] == "+")
|
||||
{
|
||||
$searchtype = "AND";
|
||||
$bin_and = true;
|
||||
$i++;
|
||||
}
|
||||
elseif(ereg("\+", $searchwords[$i]))
|
||||
{
|
||||
$searchwords[$i] = ereg_replace("(\+)", "", $searchwords[$i]);
|
||||
$searchtype = "AND";
|
||||
$bin_and = true;
|
||||
}
|
||||
elseif($searchwords[$i] == "not" || $searchwords[$i] == "-")
|
||||
{
|
||||
$searchtype = "NOT";
|
||||
$bin_not = true;
|
||||
$i++;
|
||||
}
|
||||
elseif(ereg("\-", $searchwords[$i]))
|
||||
{
|
||||
$searchwords[$i] = ereg_replace("(\-)", "", $searchwords[$i]);
|
||||
$searchtype = "NOT";
|
||||
$bin_not = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
$searchtype = "OR";
|
||||
$bin_or = true;
|
||||
}
|
||||
$searchwords[$i] = ereg_replace("(\+|\-)", "", $searchwords[$i]);
|
||||
$searchforwords[] = trim($searchwords[$i]);
|
||||
if( trim($searchwords[$i]) )
|
||||
{
|
||||
$searchlist_isphrase[$searchtype][] = $is_phrase[$i];
|
||||
$searchlistandtype[$searchtype][] = trim($searchwords[$i]);
|
||||
}
|
||||
$i++;
|
||||
return $entry;
|
||||
}
|
||||
|
||||
if($bin_or)
|
||||
function replace_synonyms($entry, &$synonym_list)
|
||||
{
|
||||
$binsearchtype[] = "OR";
|
||||
}
|
||||
if($bin_and)
|
||||
if( !empty($synonym_list) )
|
||||
{
|
||||
$binsearchtype[] = "AND";
|
||||
}
|
||||
if($bin_not)
|
||||
for ($j = 0; $j < count($synonym_list); $j++)
|
||||
{
|
||||
$binsearchtype[] = "NOT";
|
||||
}
|
||||
list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_list[$j])));
|
||||
|
||||
//
|
||||
// Search for words (OR AND and NOT arrays)
|
||||
//
|
||||
$searchstring = "";
|
||||
for($i = 0; $i < count($binsearchtype); $i++)
|
||||
if( $match_synonym != "and" && $match_synonym != "or" && $match_synonym != "not" &&
|
||||
$replace_synonym != "and" && $replace_synonym != "or" && $replace_synonym != "not" )
|
||||
{
|
||||
if($binsearchtype[$i] == "AND" && count($searchlistandtype["AND"]))
|
||||
{
|
||||
if($i > 0)
|
||||
{
|
||||
$searchstring .= ") AND (";
|
||||
$entry = preg_replace("/\b" . preg_quote(trim($match_synonym), "/") . "\b/is", " " . trim($replace_synonym) . " ", $entry);
|
||||
}
|
||||
for($j = 0; $j < count($searchlistandtype["AND"]); $j++)
|
||||
{
|
||||
if($j != 0)
|
||||
{
|
||||
$searchstring .= " AND ";
|
||||
}
|
||||
$findword = $searchlistandtype["AND"][$j];
|
||||
|
||||
$searchstring .= " ( pt.post_text LIKE '$findword')";
|
||||
}// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword'
|
||||
}
|
||||
elseif($binsearchtype[$i] == "OR" && count($searchlistandtype["OR"]))
|
||||
{
|
||||
if($i > 0)
|
||||
{
|
||||
$searchstring .= ") AND (";
|
||||
}
|
||||
for($j = 0; $j < count($searchlistandtype["OR"]); $j++)
|
||||
{
|
||||
if($j != 0)
|
||||
{
|
||||
$searchstring .= " OR ";
|
||||
}
|
||||
$findword = $searchlistandtype["OR"][$j];
|
||||
|
||||
$searchstring .= " ( pt.post_text LIKE '$findword' )";
|
||||
}// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword'
|
||||
}
|
||||
elseif($binsearchtype[$i] == "NOT" && count($searchlistandtype["NOT"]))
|
||||
{
|
||||
if($i > 0)
|
||||
{
|
||||
$searchstring .= ") AND (";
|
||||
}
|
||||
for($j = 0; $j < count($searchlistandtype["NOT"]); $j++)
|
||||
{
|
||||
if($j != 0)
|
||||
{
|
||||
$searchstring .= " AND ";
|
||||
}
|
||||
$findword = $searchlistandtype["NOT"][$j];
|
||||
|
||||
$searchstring .= " ( pt.post_text NOT LIKE '% $findword %' AND pt.post_text NOT LIKE '$findword %' AND pt.post_text NOT LIKE '% $findword' AND pt.post_text NOT LIKE '$findword' ) ";
|
||||
}//
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$searchstring = "";
|
||||
$i = 0;
|
||||
|
||||
while($i < count($searchwords))
|
||||
{
|
||||
$searchwords[$i] = eregi_replace("(\+)|(\-)|(^and$)|(^or$)|(^not$)|(\")|( )", "", $searchwords[$i]);
|
||||
if($i > 0 && $i < count($searchwords) && $searchwords[$i] != "")
|
||||
{
|
||||
$searchstring .= " AND ";
|
||||
}
|
||||
if($searchwords[$i] != "")
|
||||
{
|
||||
$searchstring .= "( pt.post_text LIKE '%".$searchwords[$i]."%' )";
|
||||
$searchforwords[] = trim($searchwords[$i]);
|
||||
}
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
$searchstring = "( $searchstring )";
|
||||
|
||||
$searchdata[0] = $searchstring;
|
||||
for($i = 0; $i < count($searchforwords); $i++)
|
||||
{
|
||||
$searchdata[$i+1] = $searchforwords[$i];
|
||||
return $entry;
|
||||
}
|
||||
|
||||
return $searchdata;
|
||||
function split_words(&$entry)
|
||||
{
|
||||
preg_match_all("/(\*?[a-z0-9]+\*?)|\b([a-z0-9]+)\b/is", $entry, $split_entries);
|
||||
|
||||
return $split_entries[1];
|
||||
}
|
||||
//
|
||||
// End of functions defns
|
||||
|
|
@ -424,6 +249,9 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
|
||||
if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" )
|
||||
{
|
||||
$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt");
|
||||
$stopword_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_stopwords.txt");
|
||||
|
||||
if( $search_id == "newposts" )
|
||||
{
|
||||
$show_results = "topics";
|
||||
|
|
@ -432,34 +260,170 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
$sortby_dir = "DESC";
|
||||
}
|
||||
|
||||
$cleaned_search = clean_words_search($query_keywords);
|
||||
$cleaned_search = remove_stop_words($cleaned_search, $stopword_array);
|
||||
$cleaned_search = replace_synonyms($cleaned_search, $synonym_array);
|
||||
|
||||
$split_search = array();
|
||||
$split_search = split_words($cleaned_search);
|
||||
|
||||
$word_match = array();
|
||||
$current_match_type = "and";
|
||||
|
||||
for($i = 0; $i < count($split_search); $i++)
|
||||
{
|
||||
if( $split_search[$i] == "and" )
|
||||
{
|
||||
$current_match_type = "and";
|
||||
}
|
||||
else if( $split_search[$i] == "or" )
|
||||
{
|
||||
$current_match_type = "or";
|
||||
}
|
||||
else if( $split_search[$i] == "not" )
|
||||
{
|
||||
$current_match_type = "not";
|
||||
}
|
||||
else
|
||||
{
|
||||
if( !empty($search_all_terms) )
|
||||
{
|
||||
$current_match_type = "and";
|
||||
}
|
||||
|
||||
$word_match[$current_match_type][] = $split_search[$i];
|
||||
}
|
||||
}
|
||||
|
||||
@reset($word_match);
|
||||
|
||||
$word_count = 0;
|
||||
$result_list = array();
|
||||
|
||||
while( list($match_type, $match_word_list) = each($word_match) )
|
||||
{
|
||||
for($i = 0; $i < count($match_word_list); $i++ )
|
||||
{
|
||||
$match_word = str_replace("*", "%", $match_word_list[$i]);
|
||||
|
||||
$sql = "SELECT m.post_id, m.word_count
|
||||
FROM phpbb_search_wordlist w, phpbb_search_wordmatch m
|
||||
WHERE w.word_text LIKE '$match_word'
|
||||
AND m.word_id = w.word_id
|
||||
ORDER BY m.post_id, m.word_count DESC";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't matched posts", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$row = array();
|
||||
|
||||
while( $temp_row = $db->sql_fetchrow($result) )
|
||||
{
|
||||
$row['' . $temp_row['post_id'] . ''] = $temp_row['word_count'];
|
||||
}
|
||||
|
||||
@reset($row);
|
||||
|
||||
while( list($post_id, $match_count) = each($row) )
|
||||
{
|
||||
if( !$word_count )
|
||||
{
|
||||
$result_list['' . $post_id . ''] = $match_count;
|
||||
}
|
||||
else if( $match_type == "and" )
|
||||
{
|
||||
$result_list['' . $post_id . ''] = ( $result_list['' . $post_id . ''] ) ? $result_list['' . $post_id . ''] + intval($match_count) : 0;
|
||||
}
|
||||
else if( $match_type == "or" )
|
||||
{
|
||||
if( $result_list['' . $post_id . ''] )
|
||||
{
|
||||
$result_list['' . $post_id . ''] += intval($match_count);
|
||||
}
|
||||
else
|
||||
{
|
||||
$result_list['' . $post_id . ''] = 0;
|
||||
$result_list['' . $post_id . ''] += intval($match_count);
|
||||
}
|
||||
}
|
||||
else if( $match_type == "not" )
|
||||
{
|
||||
$result_list['' . $post_id . ''] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if( $match_type == "and" && $word_count )
|
||||
{
|
||||
@reset($row);
|
||||
@reset($result_list);
|
||||
|
||||
while( list($post_id, $match_count) = each($result_list) )
|
||||
{
|
||||
if( !$row['' . $post_id . ''] )
|
||||
{
|
||||
$result_list['' . $post_id . ''] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
$word_count++;
|
||||
}
|
||||
}
|
||||
|
||||
@reset($result_list);
|
||||
|
||||
$total_posts = 0;
|
||||
$sql_post_id_in = "";
|
||||
while( list($post_id, $matches) = each($result_list) )
|
||||
{
|
||||
if( $matches )
|
||||
{
|
||||
if( $sql_post_id_in != "" )
|
||||
{
|
||||
$sql_post_id_in .= ", ";
|
||||
}
|
||||
$sql_post_id_in .= $post_id;
|
||||
|
||||
$total_posts++;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Start building appropriate SQL query
|
||||
//
|
||||
$sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig" : "f.forum_id, f.forum_name, t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
|
||||
|
||||
$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2";
|
||||
|
||||
$sql_where = ( $show_results == "posts") ? "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND p.topic_id = t.topic_id AND p.poster_id = u.user_id" : "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND t.topic_id = p.topic_id AND u.user_id = t.topic_poster AND p2.post_id = t.topic_last_post_id AND u2.user_id = p2.poster_id";
|
||||
|
||||
//
|
||||
// If user is logged in then we'll
|
||||
// check to see which (if any) private
|
||||
// forums they are allowed to view and
|
||||
// include them in the search.
|
||||
//
|
||||
// If not logged in we explicitly prevent
|
||||
// searching of private forums
|
||||
//
|
||||
|
||||
if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" )
|
||||
/* switch(SQL_LAYER)
|
||||
{
|
||||
case 'mysql':
|
||||
case 'postgresql':
|
||||
$post_text_substring = "SUBSTRING(pt.post_text, 1, $return_chars) AS post_text";
|
||||
break;
|
||||
|
||||
case 'mssql':
|
||||
case 'odbc':
|
||||
$post_text_substring = "SUBSTR(pt.post_text, 1, $return_chars) AS post_text";
|
||||
break;
|
||||
}
|
||||
*/
|
||||
$sql_fields = ( $show_results == "posts") ? "pt.post_text, pt.post_subject, p.post_id, p.post_time, p.post_username, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid" : "f.forum_id, f.forum_name, t.topic_id, t.topic_title, t.topic_poster, t.topic_time, t.topic_views, t.topic_replies, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username" ;
|
||||
|
||||
$sql_from = ( $show_results == "posts") ? FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt" : FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2";
|
||||
|
||||
$sql_where = ( $show_results == "posts") ? "pt.post_id = p.post_id AND f.forum_id = p.forum_id AND p.topic_id = t.topic_id AND p.poster_id = u.user_id" : "f.forum_id = p.forum_id AND t.topic_id = p.topic_id AND u.user_id = t.topic_poster AND p2.post_id = t.topic_last_post_id AND u2.user_id = p2.poster_id";
|
||||
|
||||
$search_sql = "";
|
||||
if($query_keywords != "")
|
||||
|
||||
//
|
||||
// Keyword search
|
||||
//
|
||||
if( $sql_post_id_in != "" )
|
||||
{
|
||||
$searchdata = gensearch_sql($query_keywords, $search_all_terms);
|
||||
$search_sql = $searchdata[0];
|
||||
$search_sql .= "p.post_id IN ($sql_post_id_in) ";
|
||||
}
|
||||
|
||||
//
|
||||
// Author name search
|
||||
//
|
||||
if( $query_author != "" )
|
||||
{
|
||||
$search_sql = preg_replace("/\(\)/", "", $search_sql);
|
||||
|
|
@ -476,7 +440,16 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
}
|
||||
}
|
||||
|
||||
if( !ereg("\([ ]*\)", $search_sql) || $search_id == "newposts" )
|
||||
//
|
||||
// If user is logged in then we'll
|
||||
// check to see which (if any) private
|
||||
// forums they are allowed to view and
|
||||
// include them in the search.
|
||||
//
|
||||
// If not logged in we explicitly prevent
|
||||
// searching of private forums
|
||||
//
|
||||
if( $search_sql != "" || $search_id == "newposts" )
|
||||
{
|
||||
$sql = "SELECT $sql_fields
|
||||
FROM $sql_from ";
|
||||
|
|
@ -540,6 +513,12 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
if( ( $total_match_count = $db->sql_numrows($result) ) > 500 )
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, "Your search returned too many matches, refine your search criteria and try again");
|
||||
}
|
||||
|
||||
$searchset = $db->sql_fetchrowset($result);
|
||||
|
||||
//
|
||||
|
|
@ -573,7 +552,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
//
|
||||
// Store new result data
|
||||
//
|
||||
if( count($searchset) )
|
||||
if( $total_match_count )
|
||||
{
|
||||
$search_results = "";
|
||||
for($i = 0; $i < count($searchset); $i++)
|
||||
|
|
@ -588,14 +567,16 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
}
|
||||
}
|
||||
|
||||
$per_page = ( $show_results == "posts" ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
|
||||
|
||||
//
|
||||
// Combine both results and search data (apart from original query)
|
||||
// so we can serialize it and place it in the DB
|
||||
//
|
||||
$store_search_data = array();
|
||||
$store_search_data['results'] = $search_results;
|
||||
$store_search_data['data'] = $searchdata;
|
||||
$store_search_data['data'][0] = "";
|
||||
$store_search_data['word_array'] = $split_search;
|
||||
$store_search_data['match_count'] = $total_match_count;
|
||||
|
||||
$result_array = serialize($store_search_data);
|
||||
unset($store_search_data);
|
||||
|
|
@ -623,6 +604,9 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
message_die(GENERAL_MESSAGE, $lang['No_search_match']);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['No_search_match']);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -642,19 +626,22 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
{
|
||||
$row = $db->sql_fetchrow($result);
|
||||
|
||||
$row = unserialize($row['search_array']);
|
||||
$search_results = $row['results'];
|
||||
$searchdata = $row['data'];
|
||||
$search_data = unserialize($row['search_array']);
|
||||
unset($row);
|
||||
|
||||
$search_results = $search_data['results'];
|
||||
$total_match_count = $search_data['match_count'];
|
||||
$split_search = $search_data['word_array'];
|
||||
|
||||
if( $show_results == "posts" )
|
||||
{
|
||||
$sql = "SELECT pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig
|
||||
$sql = "SELECT pt.post_text, pt.post_subject, p.*, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid
|
||||
FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt
|
||||
WHERE pt.post_id = p.post_id
|
||||
WHERE p.post_id IN ($search_results)
|
||||
AND pt.post_id = p.post_id
|
||||
AND f.forum_id = p.forum_id
|
||||
AND p.topic_id = t.topic_id
|
||||
AND p.poster_id = u.user_id
|
||||
AND p.post_id IN ($search_results)";
|
||||
AND p.poster_id = u.user_id";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -667,7 +654,9 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
AND p.poster_id = u2.user_id";
|
||||
}
|
||||
|
||||
$sql .= " ORDER BY " . $sortby_sql[$sortby] . " $sortby_dir";
|
||||
$per_page = ( $show_results == "posts" ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
|
||||
|
||||
$sql .= " ORDER BY " . $sortby_sql[$sortby] . " $sortby_dir LIMIT $start, " . $per_page;
|
||||
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
|
|
@ -724,25 +713,48 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
|
||||
|
||||
$template->assign_vars(array(
|
||||
"SEARCH_MATCHES" => count($searchset),
|
||||
"SEARCH_MATCHES" => $total_match_count,
|
||||
|
||||
"L_FOUND" => $lang['found'],
|
||||
"L_MATCHES" => (count($searchset) == 1) ? $lang['match'] : $lang['matches'],
|
||||
"L_TOPIC" => $lang['Topic'])
|
||||
);
|
||||
|
||||
for($j = 1; $j < count($searchdata); $j++)
|
||||
$highlight_matches = "";
|
||||
for($j = 0; $j < count($split_search); $j++ )
|
||||
{
|
||||
$search_string[] = "'(" . preg_quote($searchdata[$j], "'") . ")'i";
|
||||
$split_word = $split_search[$j];
|
||||
|
||||
if( $split_word != "and" && $split_word != "or" && $split_word != "not" )
|
||||
{
|
||||
$highlight_matches .= " " . $split_word;
|
||||
|
||||
$search_string[] = "#\b(" . preg_quote(str_replace("*", ".*?", $split_word), "#") . ")\b#i";
|
||||
$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
|
||||
|
||||
for ($k = 0; $k < count($synonym_array); $k++)
|
||||
{
|
||||
list($replace_synonym, $match_synonym) = split(" ", trim(strtolower($synonym_array[$k])));
|
||||
|
||||
if( $replace_synonym == $split_word )
|
||||
{
|
||||
$search_string[] = "#\b(" . preg_quote($match_synonym, "#") . ")\b#i";
|
||||
$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
|
||||
|
||||
$highlight_matches .= " " . $match_synonym;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for($i = $start; $i < min($start + $board_config['posts_per_page'], count($searchset)); $i++)
|
||||
$highlight_matches = urlencode(trim($highlight_matches));
|
||||
|
||||
for($i = 0; $i < min($per_page, count($searchset)); $i++)
|
||||
{
|
||||
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_id']);
|
||||
$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id']);
|
||||
$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $searchset[$i]['topic_id'] . "&highlight=$highlight_matches");
|
||||
$poster_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['user_id']);
|
||||
$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=".$searchset[$i]['post_id']."#".$searchset[$i]['post_id']);
|
||||
$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['post_id'] . "&highlight=$highlight_matches#" . $searchset[$i]['post_id']);
|
||||
|
||||
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
|
||||
|
||||
|
|
@ -763,45 +775,38 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
//
|
||||
if( $return_chars != -1 )
|
||||
{
|
||||
if( $searchset[$i]['enable_html'] )
|
||||
{
|
||||
$message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $message);
|
||||
}
|
||||
|
||||
$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||
$message = preg_replace("#<([\/]?.*?)>#is", "<\\1>", $message);
|
||||
$message = preg_replace("/[img\:[0-9a-z\:]+\].*?\[\/img\:[0-9a-z\:]+\]/si", "", $message);
|
||||
$message = preg_replace("/[\/[a-z\*]+\:[0-9a-z\:]+\]/si", "", $message);
|
||||
}
|
||||
else
|
||||
{
|
||||
$bbcode_uid = $searchset[$i]['bbcode_uid'];
|
||||
|
||||
$user_sig = $searchset[$i]['user_sig'];
|
||||
$user_sig_bbcode_uid = $searchset[$i]['user_sig_bbcode_uid'];
|
||||
|
||||
if( !$board_config['allow_html'] )
|
||||
{
|
||||
if( $user_sig != "" && $searchset[$i]['enable_sig'] )
|
||||
if( $user_sig != "" && $searchset[$i]['enable_sig'] && $userdata['user_allowhtml'] )
|
||||
{
|
||||
$user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig);
|
||||
}
|
||||
|
||||
if( $searchset[$i]['enable_html'] )
|
||||
if( $postrow[$i]['enable_html'] )
|
||||
{
|
||||
$message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $message);
|
||||
}
|
||||
}
|
||||
|
||||
if( $board_config['allow_bbcode'] && $bbcode_uid != "" )
|
||||
if( $user_sig != "" && $searchset[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
|
||||
{
|
||||
if( $user_sig != "" && $searchset[$i]['enable_sig'] )
|
||||
{
|
||||
$sig_uid = make_bbcode_uid();
|
||||
$user_sig = bbencode_first_pass($user_sig, $sig_uid);
|
||||
$user_sig = bbencode_second_pass($user_sig, $sig_uid);
|
||||
$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
|
||||
}
|
||||
|
||||
$message = bbencode_second_pass($message, $bbcode_uid);
|
||||
}
|
||||
else if( !$board_config['allow_bbcode'] && $bbcode_uid != "" )
|
||||
if( $bbcode_uid != "" )
|
||||
{
|
||||
$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||
$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||
}
|
||||
|
||||
$message = make_clickable($message);
|
||||
|
|
@ -827,7 +832,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
|
||||
$message = str_replace("\n", "<br />", $message);
|
||||
|
||||
if( count($searchdata) > 1 )
|
||||
if( count($search_string) )
|
||||
{
|
||||
$message = preg_replace($search_string, $replace_string, $message);
|
||||
}
|
||||
|
|
@ -883,18 +888,20 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
|
||||
$replies = $searchset[$i]['topic_replies'];
|
||||
|
||||
if($replies > $board_config['posts_per_page'])
|
||||
if( $replies > $board_config['topics_per_page'] )
|
||||
{
|
||||
$goto_page = " (<img src=\"" . $images['icon_minipost'] . "\" alt=\"" . $lang['Goto_page'] . "\" />" . $lang['Goto_page'] . ": ";
|
||||
$goto_page = "[ <img src=\"" . $images['icon_minipost'] . "\" alt=\"" . $lang['Goto_page'] . "\" />" . $lang['Goto_page'] . ": ";
|
||||
|
||||
$times = 1;
|
||||
for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
|
||||
for($j = 0; $j < $replies + 1; $j += $board_config['topics_per_page'])
|
||||
{
|
||||
$base_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j&highlight=$highlight_matches");
|
||||
|
||||
if( $times > 4 )
|
||||
{
|
||||
if( $j + $board_config['posts_per_page'] >= $replies + 1 )
|
||||
if( $j + $board_config['topics_per_page'] >= $replies + 1 )
|
||||
{
|
||||
$goto_page .= " ... <a href=\"".append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j") . "\">$times</a>";
|
||||
$goto_page .= " ... <a href=\"$base_url\">$times</a>";
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -903,29 +910,32 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
{
|
||||
$goto_page .= ", ";
|
||||
}
|
||||
$goto_page .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j") . "\">$times</a>";
|
||||
|
||||
$goto_page .= "<a href=\"$base_url\">$times</a>";
|
||||
}
|
||||
|
||||
$times++;
|
||||
}
|
||||
$goto_page .= ")";
|
||||
$goto_page .= " ]";
|
||||
}
|
||||
else
|
||||
{
|
||||
$goto_page = "";
|
||||
}
|
||||
|
||||
if($searchset[$i]['topic_status'] == TOPIC_LOCKED)
|
||||
{
|
||||
$folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"" . $lang['Topic_locked'] . "\" />";
|
||||
}
|
||||
else if( $searchset[$i]['topic_status'] == TOPIC_MOVED )
|
||||
if( $searchset[$i]['topic_status'] == TOPIC_MOVED )
|
||||
{
|
||||
$topic_type = $lang['Topic_Moved'] . " ";
|
||||
$topic_id = $searchset[$i]['topic_moved_id'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if( $searchset[$i]['topic_type'] == POST_ANNOUNCE )
|
||||
if( $searchset[$i]['topic_status'] == TOPIC_LOCKED )
|
||||
{
|
||||
$folder = $images['folder_locked'];
|
||||
$folder_new = $images['folder_locked_new'];
|
||||
}
|
||||
else if( $searchset[$i]['topic_type'] == POST_ANNOUNCE )
|
||||
{
|
||||
$folder = $images['folder_announce'];
|
||||
$folder_new = $images['folder_announce_new'];
|
||||
|
|
@ -940,7 +950,7 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
if( $replies >= $board_config['hot_threshold'] )
|
||||
{
|
||||
$folder = $images['folder_hot'];
|
||||
$folder_new = $images['folder_new_hot'];
|
||||
$folder_new = $images['folder_hot_new'];
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -961,7 +971,8 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
}
|
||||
else
|
||||
{
|
||||
$folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
|
||||
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
|
||||
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1018,9 +1029,9 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
|
|||
$base_url = "search.$phpEx?search_id=$search_id&showresults=" . $show_results . "&sortby=" . $sortby . "&sortdir=" . $sortby_dir . "&charsreqd=" . $return_chars;
|
||||
|
||||
$template->assign_vars(array(
|
||||
"PAGINATION" => generate_pagination($base_url, count($searchset), $board_config['posts_per_page'], $start),
|
||||
"ON_PAGE" => (floor($start/$board_config['posts_per_page'])+1),
|
||||
"TOTAL_PAGES" => ceil((count($searchset))/$board_config['posts_per_page']),
|
||||
"PAGINATION" => generate_pagination($base_url, $total_match_count, $per_page, $start),
|
||||
"ON_PAGE" => floor( $start / $per_page ) + 1,
|
||||
"TOTAL_PAGES" => ceil( $total_match_count / $per_page ),
|
||||
|
||||
"L_OF" => $lang['of'],
|
||||
"L_PAGE" => $lang['Page'],
|
||||
|
|
@ -1098,7 +1109,7 @@ for($i = 0; $i < count($sortby_types); $i++)
|
|||
// Search time
|
||||
//
|
||||
$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364);
|
||||
$previous_days_text = array($lang['All'], "1 " . $lang['Day'], "7 " . $lang['Days'], "2 " . $lang['Weeks'], "1 " . $lang['Month'], "3 ". $lang['Months'], "6 " . $lang['Months'], "1 " . $lang['Year']);
|
||||
$previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']);
|
||||
|
||||
$s_time = "";
|
||||
for($i = 0; $i < count($previous_days); $i++)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
</span> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="catSides" colspan="4" align="center" height="28"><b><span class="gen">{L_SEARCH_OPTIONS}</span></b></td>
|
||||
<th class="thHead" colspan="4" height="25">{L_SEARCH_OPTIONS}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td>
|
||||
|
|
@ -61,19 +61,19 @@
|
|||
<tr>
|
||||
<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}: </span></td>
|
||||
<td class="row2" nowrap="nowrap">
|
||||
<input type="radio" name="showresults" value="posts" checked />
|
||||
<input type="radio" name="showresults" value="posts" />
|
||||
<span class="genmed">{L_POSTS}
|
||||
<input type="radio" name="showresults" value="topics" />
|
||||
<input type="radio" name="showresults" value="topics" checked="checked" />
|
||||
{L_TOPICS}</span></td>
|
||||
<td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}: </span></td>
|
||||
<td class="row2" valign="middle"><span class="genmed">
|
||||
<select class="post" name="sortby">{S_TIME_OPTIONS}
|
||||
<select class="post" name="resultdays">{S_TIME_OPTIONS}
|
||||
</select>
|
||||
</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="catBottom" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS}
|
||||
<input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" />
|
||||
<input class="liteoption" type="submit" value="{L_SEARCH}" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<tr>
|
||||
<td class="row1" align="center" valign="middle">{searchresults.FOLDER}</td>
|
||||
<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
|
||||
<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><span class="gensmall"> {searchresults.GOTO_PAGE}</span></td>
|
||||
<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
|
||||
<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
|
||||
<td class="row2" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></span></td>
|
||||
<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue