mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 13:28:55 +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:
Paul S. Owen
parent
83eb43ec36
commit
2d9d67fea8
8 changed files with 894 additions and 248 deletions
|
|
@ -205,8 +205,10 @@ if($total_categories = $db->sql_numrows($q_categories))
|
|||
"USERS_BROWSING" => $users_browsing,
|
||||
|
||||
"L_FORUM_LOCKED" => $lang['Forum_is_locked'],
|
||||
"L_MARK_FORUMS_READ" => $lang['Mark_all_forums'],
|
||||
"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>" : " ";
|
||||
|
||||
|
|
|
|||
930
phpBB/search.php
930
phpBB/search.php
File diff suppressed because it is too large
Load diff
|
|
@ -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 class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
|
||||
<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="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>
|
||||
</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