mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-11 22:08:54 +00:00
New search 'stuff' ... not complete
git-svn-id: file:///svn/phpbb/trunk@1051 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
83eb43ec36
commit
2d9d67fea8
8 changed files with 894 additions and 248 deletions
|
@ -206,7 +206,9 @@ if($total_categories = $db->sql_numrows($q_categories))
|
|||
|
||||
"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
|
||||
"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'],
|
||||
"L_SEARCH_NEW" => $lang['Search_new'],
|
||||
|
||||
"U_SEARCH_NEW" => append_sid("search.$phpEx?search_id=newposts"),
|
||||
"U_MARK_READ" => append_sid("index.$phpEx?mark=forums"),
|
||||
"U_NEWEST_USER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid"))
|
||||
);
|
||||
|
|
|
@ -39,6 +39,8 @@
|
|||
//
|
||||
$lang['Forum'] = "Forum";
|
||||
$lang['Forums'] = "Forums";
|
||||
$lang['Category'] = "Category";
|
||||
$lang['Categories'] = "Categories";
|
||||
$lang['Topic'] = "Topic";
|
||||
$lang['Topics'] = "Topics";
|
||||
$lang['Reply'] = "Reply";
|
||||
|
@ -527,15 +529,25 @@ $lang['View_Information'] = "View Information";
|
|||
//
|
||||
// Search
|
||||
//
|
||||
$lang['Search_query'] = "Search Query";
|
||||
$lang['Search_options'] = "Search Options";
|
||||
$lang['Search_keywords'] = "Search for Keywords";
|
||||
$lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches. To define a phrase enclose it within """;
|
||||
$lang['Search_author'] = "Search for Author";
|
||||
$lang['Search_author_explain'] = "Use * as a wildcard for partial matches";
|
||||
$lang['Search_for_any'] = "Search for any terms or use query as entered";
|
||||
$lang['Search_for_all'] = "Search for all terms";
|
||||
$lang['Search_author'] = "Search for Author";
|
||||
$lang['Limit_chars'] = "Limit charaters returned to";
|
||||
$lang['Return_first'] = "Return first"; // followed by xxx characters
|
||||
$lang['characters'] = "characters";
|
||||
$lang['Search_previous'] = "Search previous"; // followed by days, weeks, months, year, all
|
||||
$lang['Sort_by'] = "Sort by";
|
||||
$lang['Sort_Ascending'] = "Sort Ascending";
|
||||
$lang['Sort_Decending'] = "Sort Descending";
|
||||
$lang['Display_results'] = "Display results as";
|
||||
$lang['All'] = "All";
|
||||
|
||||
$lang['No_search_match'] = "No topics or posts met your search criteria";
|
||||
$lang['Search_new'] = "View posts since last visit";
|
||||
//
|
||||
// Topic Admin <= Should be blank for now
|
||||
//
|
||||
|
|
|
@ -251,8 +251,8 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
|
|||
|
||||
$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : " ";
|
||||
|
||||
$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
|
||||
$search = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\">" . $lang['Search_user_posts'] . "</a>";
|
||||
$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
|
||||
$search = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=topics") . "\">" . $lang['Search_user_posts'] . "</a>";
|
||||
|
||||
$www_img = ($profiledata['user_website']) ? "<a href=\"" . stripslashes($profiledata['user_website']) . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : " ";
|
||||
|
||||
|
|
724
phpBB/search.php
724
phpBB/search.php
|
@ -30,11 +30,9 @@
|
|||
$phpbb_root_path = "./";
|
||||
include($phpbb_root_path . 'extension.inc');
|
||||
include($phpbb_root_path . 'common.'.$phpEx);
|
||||
include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
|
||||
|
||||
$pagetype = "search";
|
||||
$page_title = "Search Forums";
|
||||
|
||||
//
|
||||
// -----------------------
|
||||
// Page specific functions
|
||||
//
|
||||
function gensearch_sql($searchstring, $override_all = 0)
|
||||
|
@ -65,22 +63,16 @@ function gensearch_sql($searchstring, $override_all = 0)
|
|||
for($i = 0; $i < count($words); $i++)
|
||||
{
|
||||
//
|
||||
// First see if we've got a single
|
||||
// word enclosed in quotes. If so remove
|
||||
// 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 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
|
||||
// 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)
|
||||
// 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))
|
||||
{
|
||||
|
@ -201,16 +193,9 @@ function gensearch_sql($searchstring, $override_all = 0)
|
|||
$searchstring .= " AND ";
|
||||
}
|
||||
$findword = $searchlistandtype["AND"][$j];
|
||||
$is_phrase_word = $searchlist_isphrase["AND"][$j];
|
||||
if($is_phrase_word)
|
||||
{
|
||||
$searchstring .= " ( pt.post_text LIKE '% $findword %' OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword' OR pt.post_text LIKE '$findword' )";
|
||||
}
|
||||
else
|
||||
{
|
||||
$searchstring .= "pt.post_text LIKE '%$findword%'";
|
||||
}
|
||||
}
|
||||
|
||||
$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"]))
|
||||
{
|
||||
|
@ -225,16 +210,9 @@ function gensearch_sql($searchstring, $override_all = 0)
|
|||
$searchstring .= " OR ";
|
||||
}
|
||||
$findword = $searchlistandtype["OR"][$j];
|
||||
$is_phrase_word = $searchlist_isphrase["OR"][$j];
|
||||
if($is_phrase_word)
|
||||
{
|
||||
$searchstring .= " ( pt.post_text LIKE '% $findword %' OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword' OR pt.post_text LIKE '$findword' )";
|
||||
}
|
||||
else
|
||||
{
|
||||
$searchstring .= "pt.post_text LIKE '%$findword%'";
|
||||
}
|
||||
}
|
||||
|
||||
$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"]))
|
||||
{
|
||||
|
@ -249,16 +227,9 @@ function gensearch_sql($searchstring, $override_all = 0)
|
|||
$searchstring .= " AND ";
|
||||
}
|
||||
$findword = $searchlistandtype["NOT"][$j];
|
||||
$is_phrase_word = $searchlist_isphrase["NOT"][$j];
|
||||
if($is_phrase_word)
|
||||
{
|
||||
|
||||
$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 .= "pt.post_text NOT LIKE '%$findword%'";
|
||||
}
|
||||
}
|
||||
}//
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -295,12 +266,7 @@ function gensearch_sql($searchstring, $override_all = 0)
|
|||
}
|
||||
//
|
||||
// End of functions defns
|
||||
//
|
||||
|
||||
|
||||
//
|
||||
// Start of page proper
|
||||
//
|
||||
// ----------------------
|
||||
|
||||
//
|
||||
// Start session management
|
||||
|
@ -311,27 +277,117 @@ init_userprefs($userdata);
|
|||
// End session management
|
||||
//
|
||||
|
||||
//
|
||||
// Define initial vars
|
||||
//
|
||||
if( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) )
|
||||
{
|
||||
$query_keywords = ( isset($HTTP_POST_VARS['search_keywords']) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$query_keywords = "";
|
||||
}
|
||||
|
||||
if( isset($HTTP_POST_VARS['search_author']) || isset($HTTP_GET_VARS['search_author']) )
|
||||
{
|
||||
$query_author = ( isset($HTTP_POST_VARS['search_author']) ) ? $HTTP_POST_VARS['search_author'] : $HTTP_GET_VARS['search_author'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$query_author = "";
|
||||
}
|
||||
|
||||
$search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : "";
|
||||
|
||||
if( isset($HTTP_POST_VARS['addterms']) )
|
||||
{
|
||||
$search_all_terms = ( $HTTP_POST_VARS['addterms'] == "all" ) ? 1 : 0;
|
||||
}
|
||||
else if( isset($HTTP_GET_VARS['addterms']) )
|
||||
{
|
||||
$search_all_terms = ( $HTTP_GET_VARS['addterms'] == "all" ) ? 1 : 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_all_terms = 0;
|
||||
}
|
||||
|
||||
if( isset($HTTP_POST_VARS['charsreqd']) || isset($HTTP_GET_VARS['charsreqd']) )
|
||||
{
|
||||
$return_chars = ( isset($HTTP_POST_VARS['charsreqd']) ) ? $HTTP_POST_VARS['charsreqd'] : $HTTP_GET_VARS['charsreqd'];
|
||||
if( $return_chars == "all" )
|
||||
{
|
||||
$return_chars = -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$return_chars = 200;
|
||||
}
|
||||
|
||||
$search_cat = ( isset($HTTP_POST_VARS['searchcat']) ) ? $HTTP_POST_VARS['searchcat'] : "";
|
||||
$search_forum = ( isset($HTTP_POST_VARS['searchforum']) ) ? $HTTP_POST_VARS['searchforum'] : "";
|
||||
|
||||
if( isset($HTTP_POST_VARS['sortby']) || isset($HTTP_GET_VARS['sortby']) )
|
||||
{
|
||||
$sortby = (isset($HTTP_POST_VARS['sortby'])) ? $HTTP_POST_VARS['sortby'] : $HTTP_GET_VARS['sortby'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sortby = 0;
|
||||
}
|
||||
|
||||
if( isset($HTTP_POST_VARS['sortdir']) || isset($HTTP_GET_VARS['sortdir']) )
|
||||
{
|
||||
$sortby_dir = (isset($HTTP_POST_VARS['sortdir'])) ? $HTTP_POST_VARS['sortdir'] : $HTTP_GET_VARS['sortdir'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$sortby_dir = "DESC";
|
||||
}
|
||||
|
||||
if( isset($HTTP_POST_VARS['showresults']) || isset($HTTP_GET_VARS['showresults']) )
|
||||
{
|
||||
$show_results = (isset($HTTP_POST_VARS['showresults'])) ? $HTTP_POST_VARS['showresults'] : $HTTP_GET_VARS['showresults'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$show_results = "posts";
|
||||
}
|
||||
|
||||
if(!empty($HTTP_POST_VARS['resultdays']) )
|
||||
{
|
||||
$search_time = time() - ( $HTTP_POST_VARS['resultdays'] * 86400 );
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_time = 0;
|
||||
}
|
||||
|
||||
$start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
|
||||
|
||||
$querystring = (isset($HTTP_POST_VARS['querystring'])) ? $HTTP_POST_VARS['querystring'] : ( (!empty($HTTP_GET_VARS['q'])) ? $HTTP_GET_VARS['q'] : "" );
|
||||
$authorstring = (isset($HTTP_POST_VARS['authorstring'])) ? $HTTP_POST_VARS['authorstring'] : ( (!empty($HTTP_GET_VARS['a'])) ? $HTTP_GET_VARS['a'] : "" );
|
||||
|
||||
$return_chars = ($HTTP_POST_VARS['charsreqd'] != "all") ? $HTTP_POST_VARS['charsreqd'] : -1;
|
||||
$return_chars = (isset($HTTP_GET_VARS['c'])) ? ( ($HTTP_GET_VARS['c'] != "all") ? $HTTP_GET_VARS['c'] : -1 ) : $return_chars;
|
||||
$searchall = ($HTTP_POST_VARS['addterms'] == "all") ? 1 : ( ($HTTP_GET_VARS['m'] == "all") ? 1 : 0 );
|
||||
$searchforum = (isset($HTTP_POST_VARS['searchforum'])) ? $HTTP_POST_VARS['searchforum'] : $HTTP_GET_VARS['f'] ;
|
||||
$sortby = (isset($HTTP_POST_VARS['sortby'])) ? $HTTP_POST_VARS['sortby'] : $HTTP_GET_VARS['b'];
|
||||
$sortby_dir = (isset($HTTP_POST_VARS['sortdir'])) ? $HTTP_POST_VARS['sortdir'] : $HTTP_GET_VARS['d'];
|
||||
|
||||
//
|
||||
// Define some globally used data
|
||||
//
|
||||
$sortby_types = array("Post Time", "Post Subject", "Topic Title", "Author Name", "Forum");
|
||||
$sortby_sql = array("p.post_time", "pt.post_subject", "t.topic_title", "u.username", "f.forum_id");
|
||||
|
||||
if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) && (!empty($querystring) || !empty($authorstring)))
|
||||
//
|
||||
// Begin core code
|
||||
//
|
||||
if( $query_keywords != "" || $query_author != "" || $search_id )
|
||||
{
|
||||
|
||||
if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" )
|
||||
{
|
||||
if( $search_id == "newposts" )
|
||||
{
|
||||
$show_results = "topics";
|
||||
$search_time = $userdata['session_last_visit'];
|
||||
$sortby = 0;
|
||||
$sortby_dir = "DESC";
|
||||
}
|
||||
//
|
||||
// Limit to search to accessible
|
||||
// forums
|
||||
|
@ -341,8 +397,14 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
//
|
||||
// Start building appropriate SQL query
|
||||
//
|
||||
$sql = "SELECT pt.post_text, pt.post_subject, p.forum_id, p.post_id, p.topic_id, p.post_time, f.forum_name, t.topic_title, t.topic_replies, t.topic_views, u.username, u.user_id
|
||||
FROM ".FORUMS_TABLE." f, ".TOPICS_TABLE." t, ".USERS_TABLE." u, ".POSTS_TEXT_TABLE." pt, ".POSTS_TABLE." p ";
|
||||
$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, " . 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 p.poster_id = u2.user_id";
|
||||
|
||||
$sql = "SELECT $sql_fields
|
||||
FROM $sql_from ";
|
||||
|
||||
//
|
||||
// If user is logged in then we'll
|
||||
|
@ -354,66 +416,235 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
// searching of private forums
|
||||
//
|
||||
|
||||
if($querystring != "" || $authorstring != "")
|
||||
if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" )
|
||||
{
|
||||
$search_sql = "";
|
||||
if($querystring != "")
|
||||
if($query_keywords != "")
|
||||
{
|
||||
$searchdata = gensearch_sql($querystring, $searchall);
|
||||
$searchdata = gensearch_sql($query_keywords, $search_all_terms);
|
||||
$search_sql = $searchdata[0];
|
||||
}
|
||||
if($authorstring != "")
|
||||
|
||||
if($query_author != "")
|
||||
{
|
||||
$search_sql = preg_replace("/\(\)/", "", $search_sql);
|
||||
$authorstring = $authorstring;
|
||||
$search_sql .= ($search_sql == "") ? "(u.username LIKE '%$authorstring%')" : " AND (u.username LIKE '%$authorstring%')";
|
||||
$search_sql .= ($search_sql == "") ? "u.username LIKE '%$query_author%'" : " AND (u.username LIKE '%$query_author%')";
|
||||
}
|
||||
|
||||
if(!ereg("\([ ]*\)",$search_sql))
|
||||
if( !ereg("\([ ]*\)", $search_sql) || $search_id == "newposts" )
|
||||
{
|
||||
$sql .= "WHERE $search_sql
|
||||
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)";
|
||||
$sql .= ( $search_id == "newposts" ) ? "WHERE $sql_where" : "WHERE $search_sql AND $sql_where";
|
||||
|
||||
if($searchforum != "all")
|
||||
if( $search_forum != "all" )
|
||||
{
|
||||
$sql .= ($is_auth_ary[$searchforum]['auth_read']) ? " AND (f.forum_id = '$searchforum')" : "";
|
||||
$sql .= ( $is_auth_ary[$searchforum]['auth_read'] ) ? " AND f.forum_id = '$searchforum'" : "";
|
||||
}
|
||||
|
||||
while(list($key, $value) = each($is_auth_ary))
|
||||
{
|
||||
if( !$value['auth_read'] )
|
||||
{
|
||||
$sql .= " AND (f.forum_id <> $key )";
|
||||
$sql .= " AND f.forum_id <> $key ";
|
||||
}
|
||||
}
|
||||
|
||||
if( $search_time )
|
||||
{
|
||||
$sql .= " AND p.post_time >= $search_time ";
|
||||
}
|
||||
|
||||
if( $show_results != "posts")
|
||||
{
|
||||
$sql .= " GROUP BY t.topic_id ";
|
||||
}
|
||||
|
||||
$sql .= " ORDER BY " . $sortby_sql[$sortby] . " $sortby_dir";
|
||||
|
||||
$result = $db->sql_query($sql);
|
||||
if(!$result)
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(QUERY_ERROR, "Couldn't obtain search results", __LINE__, __FILE__);
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
$searchset = $db->sql_fetchrowset($result);
|
||||
|
||||
//
|
||||
// Clean up search results table
|
||||
//
|
||||
$sql = "SELECT session_id
|
||||
FROM " . SESSIONS_TABLE;
|
||||
if( $result = $db->sql_query($sql) )
|
||||
{
|
||||
$delete_search_id_sql = "";
|
||||
while( $row = $db->sql_fetchrow($result) )
|
||||
{
|
||||
if( $delete_search_id_sql != "" )
|
||||
{
|
||||
$delete_search_id_sql .= ", ";
|
||||
}
|
||||
$delete_search_id_sql .= "'" . $row['session_id'] . "'";
|
||||
}
|
||||
|
||||
if( $delete_search_id_sql != "" )
|
||||
{
|
||||
$sql = "DELETE FROM phpbb_search_results
|
||||
WHERE session_id NOT IN ($delete_search_id_sql)";
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't delete old search id sessions", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Store new result data
|
||||
//
|
||||
if( count($searchset) )
|
||||
{
|
||||
$search_results = "";
|
||||
for($i = 0; $i < count($searchset); $i++)
|
||||
{
|
||||
if( $show_results == "posts")
|
||||
{
|
||||
$search_results .= ($search_results != "") ? ", " . $searchset[$i]['post_id'] : $searchset[$i]['post_id'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_results .= ($search_results != "") ? ", " . $searchset[$i]['topic_id'] : $searchset[$i]['topic_id'];
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// 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] = "";
|
||||
|
||||
$result_array = serialize($store_search_data);
|
||||
unset($store_search_data);
|
||||
unset($search_results);
|
||||
|
||||
mt_srand ((double) microtime() * 1000000);
|
||||
$search_id = mt_rand();
|
||||
|
||||
$sql = "UPDATE phpbb_search_results
|
||||
SET search_id = $search_id, search_array = '$result_array'
|
||||
WHERE session_id = '" . $userdata['session_id'] . "'";
|
||||
$result = $db->sql_query($sql);
|
||||
if( !$result || !$db->sql_affectedrows() )
|
||||
{
|
||||
$sql = "INSERT INTO phpbb_search_results (search_id, session_id, search_array)
|
||||
VALUES($search_id, '" . $userdata['session_id'] . "', '$result_array')";
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't insert search results", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
message_die(GENERAL_MESSAGE, $lang['No_search_match']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$search_id = $HTTP_GET_VARS['search_id'];
|
||||
|
||||
$sql = "SELECT search_array
|
||||
FROM phpbb_search_results
|
||||
WHERE search_id = '$search_id'
|
||||
AND session_id = '". $userdata['session_id'] . "'";
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
if( $db->sql_numrows($result) )
|
||||
{
|
||||
$row = $db->sql_fetchrow($result);
|
||||
|
||||
$row = unserialize($row['search_array']);
|
||||
$search_results = $row['results'];
|
||||
$searchdata = $row['data'];
|
||||
|
||||
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
|
||||
FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt
|
||||
WHERE 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)";
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql = "SELECT t.*, f.forum_id, f.forum_name, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username
|
||||
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f, " . USERS_TABLE . " u, " . USERS_TABLE . " u2, " . POSTS_TABLE . " p
|
||||
WHERE t.topic_id IN ($search_results)
|
||||
AND f.forum_id = t.forum_id
|
||||
AND u.user_id = t.topic_poster
|
||||
AND p.post_id = t.topic_last_post_id
|
||||
AND p.poster_id = u2.user_id";
|
||||
}
|
||||
|
||||
$sql .= " ORDER BY " . $sortby_sql[$sortby] . " $sortby_dir";
|
||||
|
||||
if( !$result = $db->sql_query($sql) )
|
||||
{
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$searchset = $db->sql_fetchrowset($result);
|
||||
}
|
||||
else
|
||||
{
|
||||
header("Location: " . append_sid("search.$phpEx"));
|
||||
}
|
||||
}
|
||||
|
||||
if( count($searchset) )
|
||||
{
|
||||
|
||||
//
|
||||
// Output header
|
||||
//
|
||||
$page_title = $lang['Search'];
|
||||
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
|
||||
|
||||
//
|
||||
// Define censored word matches
|
||||
//
|
||||
$orig_word = array();
|
||||
$replacement_word = array();
|
||||
obtain_word_list($orig_word, $replacement_word);
|
||||
|
||||
if( $showresults == "posts" )
|
||||
{
|
||||
$template->set_filenames(array(
|
||||
"body" => "search_results_body.tpl",
|
||||
"body" => "search_results_posts.tpl",
|
||||
"jumpbox" => "jumpbox.tpl")
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
$template->set_filenames(array(
|
||||
"body" => "search_results_topics.tpl",
|
||||
"jumpbox" => "jumpbox.tpl")
|
||||
);
|
||||
}
|
||||
|
||||
$jumpbox = make_jumpbox();
|
||||
$template->assign_vars(array(
|
||||
"JUMPBOX_LIST" => $jumpbox,
|
||||
"SELECT_NAME" => POST_FORUM_URL)
|
||||
"L_GO" => $lang['Go'],
|
||||
"L_JUMP_TO" => $lang['Jump_to'],
|
||||
"L_SELECT_FORUM" => $lang['Select_forum'],
|
||||
|
||||
"S_JUMPBOX_LIST" => $jumpbox,
|
||||
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
|
||||
);
|
||||
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
|
||||
|
||||
|
@ -426,7 +657,7 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
for($j = 1; $j < count($searchdata); $j++)
|
||||
{
|
||||
$search_string[] = "'(" . preg_quote($searchdata[$j], "'") . ")'i";
|
||||
$replace_string[] = "<font color=\"#CC0000\"><b>\\1</b></font>";
|
||||
$replace_string[] = "<font color=\"#" . $theme['fontcolor3'] . "\"><b>\\1</b></font>";
|
||||
}
|
||||
|
||||
for($i = $start; $i < min($start + $board_config['posts_per_page'], count($searchset)); $i++)
|
||||
|
@ -440,6 +671,8 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
|
||||
$message = $searchset[$i]['post_text'];
|
||||
|
||||
if( $showresults == "posts" )
|
||||
{
|
||||
if($return_chars != 0 )
|
||||
{
|
||||
if($return_chars != -1)
|
||||
|
@ -447,28 +680,86 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
$message = (strlen($message) > $return_chars) ? substr($message, 0, $return_chars) . " ..." : $message;
|
||||
}
|
||||
|
||||
$message = strip_tags($message);
|
||||
//
|
||||
// Remove BBCode
|
||||
// If the board has HTML off but the post has HTML
|
||||
// on then we process it, else leave it alone
|
||||
//
|
||||
$message = preg_replace("/\[.*\]/", "", $message);
|
||||
if( $return_chars != -1 )
|
||||
{
|
||||
if( $searchset[$i]['enable_html'] )
|
||||
{
|
||||
$message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $message);
|
||||
}
|
||||
|
||||
$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||
}
|
||||
else
|
||||
{
|
||||
$bbcode_uid = $searchset[$i]['bbcode_uid'];
|
||||
$user_sig = $searchset[$i]['user_sig'];
|
||||
|
||||
if( !$board_config['allow_html'] )
|
||||
{
|
||||
if( $user_sig != "" && $searchset[$i]['enable_sig'] )
|
||||
{
|
||||
$user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig);
|
||||
}
|
||||
|
||||
if( $searchset[$i]['enable_html'] )
|
||||
{
|
||||
$message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $message);
|
||||
}
|
||||
}
|
||||
|
||||
if( $board_config['allow_bbcode'] && $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);
|
||||
}
|
||||
|
||||
$message = bbencode_second_pass($message, $bbcode_uid);
|
||||
}
|
||||
else if( !$board_config['allow_bbcode'] && $bbcode_uid != "" )
|
||||
{
|
||||
$message = preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
|
||||
}
|
||||
|
||||
$message = make_clickable($message);
|
||||
|
||||
if( $searchset[$i]['enable_sig'] )
|
||||
{
|
||||
$message .= "<br /><br />_________________<br />" . make_clickable($user_sig);
|
||||
}
|
||||
}
|
||||
|
||||
if( count($orig_word) )
|
||||
{
|
||||
$topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']);
|
||||
$post_subject = ( $searchset[$i]['post_subject'] != "" ) ? preg_replace($orig_word, $replacement_word, $searchset[$i]['post_subject']) : $topic_title;
|
||||
|
||||
$message = preg_replace($orig_word, $replacement_word, $message);
|
||||
}
|
||||
|
||||
if($board_config['allow_smilies'] && $searchset[$i]['enable_smilies'])
|
||||
{
|
||||
$message = smilies_pass($message);
|
||||
}
|
||||
|
||||
$message = str_replace("\n", "<br />", $message);
|
||||
|
||||
if( count($searchdata) > 1 )
|
||||
{
|
||||
$message = preg_replace($search_string, $replace_string, $message);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
$message = "";
|
||||
}
|
||||
|
||||
$template->assign_block_vars("searchresults", array(
|
||||
"TOPIC_TITLE" => $searchset[$i]['topic_title'],
|
||||
"TOPIC_TITLE" => $topic_title,
|
||||
"FORUM_NAME" => $searchset[$i]['forum_name'],
|
||||
"POST_SUBJECT" => $searchset[$i]['post_subject'],
|
||||
"POST_SUBJECT" => $post_subject,
|
||||
"POST_DATE" => $post_date,
|
||||
"POSTER_NAME" => $searchset[$i]['username'],
|
||||
"TOPIC_REPLIES" => $searchset[$i]['topic_replies'],
|
||||
|
@ -478,12 +769,166 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
"U_POST" => $post_url,
|
||||
"U_TOPIC" => $topic_url,
|
||||
"U_FORUM" => $forum_url,
|
||||
"U_USER_PROFILE" => $poster_url
|
||||
));
|
||||
"U_USER_PROFILE" => $poster_url)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
$message = "";
|
||||
|
||||
if( count($orig_word) )
|
||||
{
|
||||
$topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']);
|
||||
}
|
||||
|
||||
$base_url = "search.php?q=" . urlencode($querystring) . "&a=" . urlencode($authorstring) . "&c=$return_chars&m=$searchall&f=$searchforum&b=" . urlencode($sortby) . "&dosearch=1";
|
||||
$topic_type = $searchset[$i]['topic_type'];
|
||||
|
||||
if($topic_type == POST_ANNOUNCE)
|
||||
{
|
||||
$topic_type = $lang['Topic_Announcement'] . " ";
|
||||
}
|
||||
else if($topic_type == POST_STICKY)
|
||||
{
|
||||
$topic_type = $lang['Topic_Sticky'] . " ";
|
||||
}
|
||||
else
|
||||
{
|
||||
$topic_type = "";
|
||||
}
|
||||
|
||||
if( $searchset[$i]['topic_vote'] )
|
||||
{
|
||||
$topic_type .= $lang['Topic_Poll'] . " ";
|
||||
}
|
||||
|
||||
$forum_id = $searchset[$i]['forum_id'];
|
||||
$topic_id = $searchset[$i]['topic_id'];
|
||||
|
||||
$replies = $searchset[$i]['topic_replies'];
|
||||
|
||||
if($replies > $board_config['posts_per_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'])
|
||||
{
|
||||
if($times > 4)
|
||||
{
|
||||
if( $j + $board_config['posts_per_page'] >= $replies + 1 )
|
||||
{
|
||||
$goto_page .= " ... <a href=\"".append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j") . "\">$times</a>";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if($times != 1)
|
||||
{
|
||||
$goto_page .= ", ";
|
||||
}
|
||||
$goto_page .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&start=$j") . "\">$times</a>";
|
||||
}
|
||||
$times++;
|
||||
}
|
||||
$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)
|
||||
{
|
||||
$topic_type = $lang['Topic_Moved'] . " ";
|
||||
$topic_id = $searchset[$i]['topic_moved_id'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if($searchset[$i]['topic_type'] == POST_ANNOUNCE)
|
||||
{
|
||||
$folder = $images['folder_announce'];
|
||||
$folder_new = $images['folder_announce_new'];
|
||||
}
|
||||
else if($searchset[$i]['topic_type'] == POST_STICKY)
|
||||
{
|
||||
$folder = $images['folder_sticky'];
|
||||
$folder_new = $images['folder_sticky_new'];
|
||||
}
|
||||
else
|
||||
{
|
||||
if($replies >= $board_config['hot_threshold'])
|
||||
{
|
||||
$folder = $images['folder_hot'];
|
||||
$folder_new = $images['folder_new_hot'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$folder = $images['folder'];
|
||||
$folder_new = $images['folder_new'];
|
||||
}
|
||||
}
|
||||
|
||||
if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) && $searchset[$i]['post_time'] > $userdata['session_last_visit'] )
|
||||
{
|
||||
$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
|
||||
}
|
||||
else
|
||||
{
|
||||
if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
|
||||
{
|
||||
$folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
|
||||
}
|
||||
else
|
||||
{
|
||||
$folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$topic_poster = $searchset[$i]['username'];
|
||||
|
||||
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
|
||||
|
||||
if($searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '')
|
||||
{
|
||||
$last_post_user = $searchset[$i]['post_username'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$last_post_user = $searchset[$i]['user2'];
|
||||
}
|
||||
|
||||
$last_post = $last_post_time . "<br />" . $lang['by'] . " ";
|
||||
$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $searchset[$i]['id2']) . "\">" . $last_post_user . "</a> ";
|
||||
$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . "#" . $searchset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\" /></a>";
|
||||
|
||||
$views = $searchset[$i]['topic_views'];
|
||||
|
||||
$template->assign_block_vars("searchresults", array(
|
||||
"FORUM_NAME" => $searchset[$i]['forum_name'],
|
||||
"FORUM_ID" => $forum_id,
|
||||
"TOPIC_ID" => $topic_id,
|
||||
"FOLDER" => $folder_image,
|
||||
"TOPIC_POSTER" => $topic_poster,
|
||||
"GOTO_PAGE" => $goto_page,
|
||||
"REPLIES" => $replies,
|
||||
"TOPIC_TITLE" => $topic_title,
|
||||
"TOPIC_TYPE" => $topic_type,
|
||||
"VIEWS" => $views,
|
||||
"LAST_POST" => $last_post,
|
||||
|
||||
"U_VIEW_FORUM" => $forum_url,
|
||||
"U_VIEW_TOPIC" => $topic_url,
|
||||
"U_TOPIC_POSTER_PROFILE" => $topic_poster_profile_url)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$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),
|
||||
|
@ -500,21 +945,18 @@ if((isset($HTTP_POST_VARS['dosearch']) || isset($HTTP_GET_VARS['dosearch'])) &&
|
|||
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// This will be replaced by
|
||||
// an auth function return of
|
||||
// all accessible forums ... I think
|
||||
// Search forum
|
||||
//
|
||||
$sql = "SELECT forum_name, forum_id
|
||||
FROM " . FORUMS_TABLE . "
|
||||
ORDER BY cat_id, forum_order";
|
||||
$sql = "SELECT c.cat_title, c.cat_id, f.forum_name, f.forum_id
|
||||
FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
|
||||
WHERE f.cat_id = c.cat_id
|
||||
ORDER BY c.cat_id, f.forum_order";
|
||||
$result = $db->sql_query($sql);
|
||||
if(!$result)
|
||||
{
|
||||
message_die(QUERY_ERROR, "Couldn't obtain forum_name/forum_id", __LINE__, __FILE__);
|
||||
message_die(GENERAL_ERROR, "Couldn't obtain forum_name/forum_id", "", __LINE__, __FILE__, $sql);
|
||||
}
|
||||
|
||||
$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
|
||||
|
@ -526,51 +968,101 @@ while($row = $db->sql_fetchrow($result))
|
|||
if($is_auth_ary[$row['forum_id']]['auth_read'])
|
||||
{
|
||||
$s_forums .= "<option value=\"" . $row['forum_id'] . "\">" . $row['forum_name'] . "</option>";
|
||||
if(empty($list_cat[$row['cat_id']]))
|
||||
{
|
||||
$list_cat[$row['cat_id']] = $row['cat_title'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Category to search
|
||||
//
|
||||
$s_categories = "<option value=\"all\">" . $lang['All'] . "</option>";
|
||||
while( list($cat_id, $cat_title) = each($list_cat))
|
||||
{
|
||||
$s_categories .= "<option value=\"$cat_id\">$cat_title</option>";
|
||||
}
|
||||
|
||||
//
|
||||
// Number of chars returned
|
||||
//
|
||||
$s_characters = "<option value=\"all\">" . $lang['All'] . "</option>";
|
||||
$s_characters .= "<option value=\"0\">0</option>";
|
||||
$s_characters .= "<option value=\"25\">25</option>";
|
||||
$s_characters .= "<option value=\"50\">50</option>";
|
||||
|
||||
for($i = 100; $i < 1100 ; $i += 100)
|
||||
{
|
||||
$s_characters .= "<option value=\"$i\"" . ( ($i == 100) ? "selected>" : ">" ). "$i</option>";
|
||||
$selected = ($i == 200) ? "selected=\"selected\"" : "";
|
||||
$s_characters .= "<option value=\"$i\"$selected>$i</option>";
|
||||
}
|
||||
|
||||
//
|
||||
// Sorting
|
||||
//
|
||||
$s_sortby = "";
|
||||
for($i = 0; $i < count($sortby_types); $i++)
|
||||
{
|
||||
$s_sortby .= "<option value=\"$i\">" . $sortby_types[$i] . "</option>";
|
||||
}
|
||||
|
||||
//
|
||||
// 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']);
|
||||
|
||||
$s_time = "<select name=\"resultdays\">";
|
||||
for($i = 0; $i < count($previous_days); $i++)
|
||||
{
|
||||
$selected = ($topic_days == $previous_days[$i]) ? " selected=\"selected\"" : "";
|
||||
$s_time .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>";
|
||||
}
|
||||
$s_time .= "</select>";
|
||||
|
||||
$page_title = $lang['Search'];
|
||||
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
|
||||
|
||||
$template->set_filenames(array(
|
||||
"body" => "search_body.tpl",
|
||||
"jumpbox" => "jumpbox.tpl")
|
||||
);
|
||||
|
||||
$jumpbox = make_jumpbox();
|
||||
$template->assign_vars(array(
|
||||
"JUMPBOX_LIST" => $jumpbox,
|
||||
"SELECT_NAME" => POST_FORUM_URL)
|
||||
"L_GO" => $lang['Go'],
|
||||
"L_JUMP_TO" => $lang['Jump_to'],
|
||||
"L_SELECT_FORUM" => $lang['Select_forum'],
|
||||
|
||||
"S_JUMPBOX_LIST" => $jumpbox,
|
||||
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
|
||||
);
|
||||
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
|
||||
|
||||
$s_hidden_fields = "<input type=\"hidden\" name=\"dosearch\" value=\"1\">";
|
||||
|
||||
$template->assign_vars(array(
|
||||
"L_SEARCH_QUERY" => $lang['Search_query'],
|
||||
"L_SEARCH_OPTIONS" => $lang['Search_options'],
|
||||
"L_SEARCH_KEYWORDS" => $lang['Search_keywords'],
|
||||
"L_SEARCH_KEYWORDS_EXPLAIN" => $lang['Search_keywords_explain'],
|
||||
"L_SEARCH_AUTHOR" => $lang['Search_author'],
|
||||
"L_SEARCH_AUTHOR_EXPLAIN" => $lang['Search_author_explain'],
|
||||
"L_SEARCH_ANY_TERMS" => $lang['Search_for_any'],
|
||||
"L_SEARCH_ALL_TERMS" => $lang['Search_for_all'],
|
||||
"L_SEARCH_AUTHOR" => $lang['Search_author'],
|
||||
"L_LIMIT_CHARACTERS" => $lang['Limit_chars'],
|
||||
"L_CATEGORY" => $lang['Category'],
|
||||
"L_RETURN_FIRST" => $lang['Return_first'],
|
||||
"L_CHARACTERS" => $lang['characters'],
|
||||
"L_SORT_BY" => $lang['Sort_by'],
|
||||
"L_SORT_ASCENDING" => $lang['Sort_Ascending'],
|
||||
"L_SORT_DECENDING" => $lang['Sort_Decending'],
|
||||
"L_SORT_DESCENDING" => $lang['Sort_Decending'],
|
||||
"L_SEARCH_PREVIOUS" => $lang['Search_previous'],
|
||||
"L_DISPLAY_RESULTS" => $lang['Display_results'],
|
||||
|
||||
"S_SEARCH_ACTION" => append_sid("search.$phpEx"),
|
||||
"S_CHARACTER_OPTIONS" => $s_characters,
|
||||
"S_FORUM_OPTIONS" => $s_forums,
|
||||
"S_CATEGORY_OPTIONS" => $s_categories,
|
||||
"S_TIME_OPTIONS" => $s_time,
|
||||
"S_SORT_OPTIONS" => $s_sortby,
|
||||
"S_HIDDEN_FIELDS" => $s_hidden_fields)
|
||||
);
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
|
||||
<td align="right"><span class="gensmall"><a href="{U_SEARCH_NEW}">{L_SEARCH_NEW}</a></span></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
@ -26,7 +27,7 @@
|
|||
<td class="row2"><span class="gen"><a href="{catrow.forumrow.U_VIEWFORUM}">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td>
|
||||
<td class="row1" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.TOPICS}</span></td>
|
||||
<td class="row2" width="5%" align="center" valign="middle"><span class="gen">{catrow.forumrow.POSTS}</span></td>
|
||||
<td class="row1" width="15%" align="center" valign="middle" NOWRAP><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
|
||||
<td class="row1" width="15%" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
|
||||
<td class="row2" width="5%" align="center" valign="middle"><span class="gensmall">{catrow.forumrow.MODERATORS}</span></td>
|
||||
</tr>
|
||||
<!-- END forumrow -->
|
||||
|
|
|
@ -1,45 +1,54 @@
|
|||
<div align="center"><table width="70%" cellspacing="0" cellpadding="4" border="0">
|
||||
<form action="{S_SEARCH_ACTION}" method="post"><table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></font></td>
|
||||
<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
|
||||
</tr>
|
||||
</table></div>
|
||||
</table>
|
||||
|
||||
<div align="center"><table border="0" cellpadding="1" cellspacing="0" width="70%">
|
||||
<tr><form action="{S_SEARCH_ACTION}" method="post">
|
||||
<td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%">
|
||||
<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
|
||||
<tr>
|
||||
<td colspan="2" bgcolor="{T_TH_COLOR3}" align="center"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}"> <b>{L_SEARCH}</b> </font></td>
|
||||
<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
|
||||
<tr>
|
||||
<td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_QUERY}</b></span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">Search query: </td>
|
||||
<td bgcolor="{T_TD_COLOR1}"><input type="text" name="querystring" size="40"><br><input type="radio" name="addterms" value="any" checked><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}">{L_SEARCH_ANY_TERMS}<br><input type="radio" name="addterms" value="all">{L_SEARCH_ALL_TERMS}</td>
|
||||
<td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td>
|
||||
<td class="row2" colspan="2" valign="top"><input type="text" name="search_keywords" size="60" /><br /><input type="radio" name="addterms" value="any" checked="checked" /><span class="gensmall">{L_SEARCH_ANY_TERMS}<br /><input type="radio" name="addterms" value="all" />{L_SEARCH_ALL_TERMS}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_SEARCH_AUTHOR}: </td>
|
||||
<td bgcolor="{T_TD_COLOR1}"><input type="text" name="authorstring"></td>
|
||||
<td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br /><span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td>
|
||||
<td class="row2" colspan="2" valign="top"><input type="text" name="search_author" size="40" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_FORUM}: </td>
|
||||
<td bgcolor="{T_TD_COLOR1}"><select name="searchforum">{S_FORUM_OPTIONS}</select></td>
|
||||
<td class="cat" colspan="4" align="center"><span class="cattitle"><b>{L_SEARCH_OPTIONS}</b></span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_LIMIT_CHARACTERS}: </td>
|
||||
<td bgcolor="{T_TD_COLOR1}"><select name="charsreqd">{S_CHARACTER_OPTIONS}</select></td>
|
||||
<td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td>
|
||||
<td class="row2"><select name="searchforum">{S_FORUM_OPTIONS}</select></td>
|
||||
<td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td>
|
||||
<td class="row2"><select name="charsreqd">{S_CHARACTER_OPTIONS}</select> <span class="gen">{L_CHARACTERS}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td bgcolor="{T_TD_COLOR1}" align="right"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}" color="{T_FONTCOLOR1}">{L_SORT_BY}: </td>
|
||||
<td bgcolor="{T_TD_COLOR1}" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><select name="sortby">{S_SORT_OPTIONS}</select> <input type="radio" name="sortdir" value="ASC"> {L_SORT_ASCENDING} <input type="radio" name="sortdir" value="DESC" checked> {L_SORT_DECENDING} </td>
|
||||
<td class="row1" align="right"><span class="gen">{L_CATEGORY}: </span></td>
|
||||
<td class="row2"><select name="searchcat">{S_CATEGORY_OPTIONS}</select></td>
|
||||
<td class="row1" align="right"><span class="gen">{L_SORT_BY}: </span></td>
|
||||
<td class="row2" valign="middle"><select name="sortby">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sortdir" value="ASC" /> <span class="gensmall">{L_SORT_ASCENDING}</span> <input type="radio" name="sortdir" value="DESC" checked="checked" /> <span class="gensmall">{L_SORT_DESCENDING}</span> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" bgcolor="{T_TH_COLOR2}" align="center">{S_HIDDEN_FIELDS}<input type="submit" value="{L_SEARCH}"></td>
|
||||
<td class="row1" align="right"><span class="gen">{L_DISPLAY_RESULTS}: </span></td>
|
||||
<td class="row2"><input type="radio" name="showresults" value="posts" checked="checked" /> <span class="gensmall">{L_POSTS}</span> <input type="radio" name="showresults" value="topics" /> <span class="gensmall">{L_TOPICS}</span> </td>
|
||||
<td class="row1" align="right"><span class="gen">{L_SEARCH_PREVIOUS}: </span></td>
|
||||
<td class="row2" valign="middle">{S_TIME_OPTIONS}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SEARCH}" /></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</form></tr>
|
||||
</table></div>
|
||||
</tr>
|
||||
</table></form>
|
||||
|
||||
<div align="center"><table width="70%" border="0">
|
||||
<table width="98%" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left" valign="top"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}"><b>{S_TIMEZONE}</b></font></td>
|
||||
<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
|
||||
<td align="right" valign="top" nowrap>{JUMPBOX}</td>
|
||||
</tr>
|
||||
</table>
|
72
phpBB/templates/PSO/search_results_posts.tpl
Normal file
72
phpBB/templates/PSO/search_results_posts.tpl
Normal file
|
@ -0,0 +1,72 @@
|
|||
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
|
||||
<tr>
|
||||
<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
|
||||
<tr>
|
||||
<td class="cat" colspan="2" align="center"><span class="cattitle"> <b>{L_SEARCH} - {SEARCH_MATCHES} Matches</b> </span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<br clear="all" />
|
||||
|
||||
<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
|
||||
<tr>
|
||||
<td class="tablebg"><table border="0" cellpadding="0" cellspacing="1" width="100%">
|
||||
<!-- BEGIN searchresults -->
|
||||
<tr>
|
||||
<td class="cat" colspan="2" align="left"><table cellpadding="4" cellspacing="1" border="0">
|
||||
<tr>
|
||||
<td><span class="gen"><img src="images/folder.gif"> {L_FORUM}: <a href="{U_FORUM}">{searchresults.FORUM_NAME}</a></span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" rowspan="2" width="20%"><table height="100%" cellspacing="0" cellpadding="4" border="0">
|
||||
<tr>
|
||||
<td valign="top"><span class="gen"><b><a href="{searchresults.U_USER_PROFILE}">{searchresults.POSTER_NAME}</a></b></span><br><br><span class="gen">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br>{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b><br></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
<td width="80%"><table width="100%" cellspacing="0" cellpadding="4" border="0">
|
||||
<tr>
|
||||
<td class="row1"><span class="gen">{L_TOPIC}: <a href="{searchresults.U_TOPIC}">{searchresults.TOPIC_TITLE}</a></span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><table width="100%" height="100%" cellspacing="0" cellpadding="4" border="0">
|
||||
<tr>
|
||||
<td class="row2"><img src="images/icon_minipost.gif" alt="Post image icon" border="0"></a><span class="gensmall">{L_POSTED}: {searchresults.POST_DATE} Post Subject: <a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></span><hr></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td height="100%" class="row2"><span class="gen">{searchresults.MESSAGE}</span><br><br></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
<!-- END searchresults -->
|
||||
<tr>
|
||||
<td class="cat" colspan="2"><table width="100%" cellspacing="0" cellpadding="4" border="0">
|
||||
<tr>
|
||||
<td align="left" valign="middle"> <span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span> </td>
|
||||
<td align="right" valign="middle"><span class="gen">{PAGINATION}</span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<br clear="all" />
|
||||
|
||||
<div align="center"><table width="98%" border="0">
|
||||
<tr>
|
||||
<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
|
||||
<td align="right" valign="top" nowrap="nowrap">{JUMPBOX}</td>
|
||||
</tr>
|
||||
</table>
|
58
phpBB/templates/PSO/search_results_topics.tpl
Normal file
58
phpBB/templates/PSO/search_results_topics.tpl
Normal file
|
@ -0,0 +1,58 @@
|
|||
|
||||
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
|
||||
<tr>
|
||||
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
|
||||
<tr>
|
||||
<td class="cat" colspan="7" align="center"><span class="cattitle"> <b>{L_SEARCH} - {SEARCH_MATCHES} Matches</b> </span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th width="4%"> </th>
|
||||
<th> {L_FORUM} </th>
|
||||
<th> {L_TOPICS} </th>
|
||||
<th> {L_REPLIES} </th>
|
||||
<th> {L_AUTHOR} </th>
|
||||
<th> {L_VIEWS} </th>
|
||||
<th> {L_LASTPOST} </th>
|
||||
</tr>
|
||||
<!-- BEGIN searchresults -->
|
||||
<tr>
|
||||
<td class="row1" align="center" valign="middle"> {searchresults.FOLDER} </td>
|
||||
<td class="row2"> <span class="gensmall"><a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_NAME}</a></span></td>
|
||||
<td class="row2"> <span class="gensmall">{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> {searchresults.GOTO_PAGE}</span></td>
|
||||
<td class="row1" align="center" valign="middle"><span class="gen">{searchresults.REPLIES}</span></td>
|
||||
<td class="row2" align="center" valign="middle"><span class="gen"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}">{searchresults.TOPIC_POSTER}</a></span></td>
|
||||
<td class="row1" align="center" valign="middle"><span class="gen">{searchresults.VIEWS}</span></td>
|
||||
<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{searchresults.LAST_POST}</span></td>
|
||||
</tr>
|
||||
<!-- END searchresults -->
|
||||
<!-- BEGIN nosearchresults -->
|
||||
<tr>
|
||||
<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
|
||||
</tr>
|
||||
<!-- END nosearchresults -->
|
||||
<tr>
|
||||
<td class="cat" colspan="7"><table width="100%" cellspacing="0" cellpadding="0" border="0">
|
||||
<tr>
|
||||
<td align="left" valign="middle"> <span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span> </td>
|
||||
<td align="right" valign="middle"><span class="gen">{PAGINATION} </span></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<br clear="all" />
|
||||
|
||||
<table width="98%" border="0" align="center">
|
||||
<tr>
|
||||
<td align="left" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
|
||||
<td align="right" valign="top" nowrap>{JUMPBOX}</td>
|
||||
</tr>
|
||||
</table>
|
Loading…
Add table
Reference in a new issue