makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

ah, what the heck ... let's throw this in CVS

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4500 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-09-15 16:33:12 +00:00
parent a4a989dbfe
commit 6bc091f373
5 changed files with 865 additions and 1187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/language/en/lang_main.php
View file

@ -1120,6 +1120,7 @@ $lang += array(
'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.', 'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.',
'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered', 'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered',
'SEARCH_ANY_TERMS' => 'Search for any terms', 'SEARCH_ANY_TERMS' => 'Search for any terms',
'SEARCH_SUBFORUMS' => 'Search subforums',
'SEARCH_WITHIN' => 'Search within', 'SEARCH_WITHIN' => 'Search within',
'SEARCH_TITLE_MSG' => 'Topic titles and message text', 'SEARCH_TITLE_MSG' => 'Topic titles and message text',
'SEARCH_MSG_ONLY' => 'Message text only', 'SEARCH_MSG_ONLY' => 'Message text only',
@ -1144,10 +1145,13 @@ $lang += array(
'ALL_AVAILABLE' => 'All available', 'ALL_AVAILABLE' => 'All available',
'ALL_RESULTS' => 'All results', 'ALL_RESULTS' => 'All results',
'NO_SEARCHABLE_FORUMS' => 'You do not have permissions to search any forum on this site', 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.',
'NO_SEARCH_MATCH' => 'No topics or posts met your search criteria', 'NO_SEARCH_RESULTS' => 'No suitable matches were found.',
'FOUND_SEARCH_MATCH' => 'Search found %d match', 'FOUND_SEARCH_MATCH' => 'Search found %d match',
'FOUND_SEARCH_MATCHES' => 'Search found %d matches', 'FOUND_SEARCH_MATCHES' => 'Search found %d matches',
'SEARCHED_FOR' => 'Search term used',
'IGNORED_TERMS' => 'ignored',
'SEARCH_IN_RESULTS' => 'Search these results',
'NOT_AUTHORISED' => 'Not Authorised', 'NOT_AUTHORISED' => 'Not Authorised',
); );

1619
phpBB/search.php
View file

File diff suppressed because it is too large Load diff

29
phpBB/styles/subSilver/template/search_body.html
View file

@ -20,29 +20,29 @@
</tr> </tr>
<tr> <tr>
<td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td> <td class="row1" colspan="2"><b class="genmed">{L_SEARCH_FORUMS}: </b><br /><span class="gensmall">{L_SEARCH_FORUMS_EXPLAIN}</span></td>
<td class="row2" colspan="2"><select name="search_forum" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td> <td class="row2" colspan="2"><select name="search_forum[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></td>
</tr> </tr>
<tr> <tr>
<th colspan="4">{L_SEARCH_OPTIONS}</th> <th colspan="4">{L_SEARCH_OPTIONS}</th>
</tr> </tr>
<tr> <tr>
<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_CHILD}: </b><br /><span class="gensmall">{L_SEARCH_CHILD_EXPLAIN}</span></td> <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_SUBFORUMS}: </b></td>
<td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_subforum" value="1" /> <span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="search_subforum" value="0" checked="checked" /> <span class="genmed">{L_NO}</td> <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_child" value="1" checked="checked" /> <span class="genmed">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="search_child" value="0" /> <span class="genmed">{L_NO}</span></td>
<td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td> <td class="row1" width="25%" nowrap="nowrap"><b class="genmed">{L_SEARCH_WITHIN}: </b></td>
<td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_fields" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" name="search_fields" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" name="search_fields" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span></td> <td class="row2" width="25%" nowrap="nowrap"><input type="radio" name="search_fields" value="all" checked="checked" /> <span class="genmed">{L_SEARCH_TITLE_MSG}</span><br /><input type="radio" name="search_fields" value="msgonly" /> <span class="genmed">{L_SEARCH_MSG_ONLY}</span> <br /><input type="radio" name="search_fields" value="titleonly" /> <span class="genmed">{L_SEARCH_TITLE_ONLY}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" nowrap="nowrap"><b class="genmed">{L_SORT_BY}: </b></td> <td class="row1"><b class="genmed">{L_RESULT_SORT}: </b></td>
<td class="row2" valign="middle" nowrap="nowrap"><select name="sort_by">{S_SORT_OPTIONS}</select><br /><input type="radio" name="sort_dir" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" name="sort_dir" value="d" checked /> <span class="genmed">{L_SORT_DESCENDING}</span> </td> <td class="row2" nowrap="nowrap">{S_SELECT_SORT_KEY}<br /><input type="radio" name="sd" value="a" /> <span class="genmed">{L_SORT_ASCENDING}</span><br /><input type="radio" name="sd" value="d" checked="checked" /> <span class="genmed">{L_SORT_DESCENDING}</span></td>
<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td>
<td class="row2" nowrap="nowrap"><select name="return_chars">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td>
</tr>
<tr>
<td class="row1" nowrap="nowrap"><b class="genmed">{L_SEARCH_PREVIOUS}: </b></td>
<td class="row2" valign="middle"><select name="search_time">{S_TIME_OPTIONS}</select></td>
<td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td> <td class="row1" nowrap="nowrap"><b class="genmed">{L_DISPLAY_RESULTS}: </b></td>
<td class="row2" nowrap="nowrap"><input type="radio" name="show_results" value="posts" /> <span class="genmed">{L_POSTS}</span>&nbsp;&nbsp;<input type="radio" name="show_results" value="topics" checked="checked" /> <span class="genmed">{L_TOPICS}</td> <td class="row2" nowrap="nowrap"><input type="radio" name="show_results" value="posts" /> <span class="genmed">{L_POSTS}</span>&nbsp;&nbsp;<input type="radio" name="show_results" value="topics" checked="checked" /> <span class="genmed">{L_TOPICS}</td>
</tr> </tr>
<tr>
<td class="row1" width="25%"><b class="genmed">{L_RESULT_DAYS}: </b></td>
<td class="row2" width="25%" nowrap="nowrap">{S_SELECT_SORT_DAYS}</td>
<td class="row1" nowrap="nowrap"><b class="genmed">{L_RETURN_FIRST}: </b></td>
<td class="row2" nowrap="nowrap"><select name="return_chars">{S_CHARACTER_OPTIONS}</select> <span class="genmed">{L_POST_CHARACTERS}</span></td>
</tr>
<tr> <tr>
<td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td> <td class="cat" colspan="4" align="center">{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
</tr> </tr>
@ -52,7 +52,7 @@
<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th colspan="3">{L_RECENT_SEARCHES}</th> <th colspan="2">{L_RECENT_SEARCHES}</th>
</tr> </tr>
<!-- BEGIN recentsearch --> <!-- BEGIN recentsearch -->
<!-- IF recentsearch.S_ROW_COUNT is even --> <!-- IF recentsearch.S_ROW_COUNT is even -->
@ -60,9 +60,8 @@
<!-- ELSE --> <!-- ELSE -->
<tr class="row1"> <tr class="row1">
<!-- ENDIF --> <!-- ENDIF -->
<td class="gen"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td> <td class="gen" width="70%"><a href="{recentsearch.U_KEYWORDS}">{recentsearch.KEYWORDS}</a></td>
<td class="gen" align="center">{recentsearch.RESULTS}</td> <td class="gen" width="30%"align="center">{recentsearch.TIME}</td>
<td class="gen" align="center">{recentsearch.TIME}</td>
</tr> </tr>
<!-- END recentsearch --> <!-- END recentsearch -->
</table> </table>

65
phpBB/styles/subSilver/template/search_results_posts.html
View file

@ -1,53 +1,76 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <form method="post" action="{S_SEARCH_ACTION}"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td> <td colspan="2" align="left"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
</tr>
<tr>
<td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
<td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="search_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
</tr> </tr>
</table> </table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td class="nav" align="left"><a href="{U_INDEX}">{L_INDEX}</a></td>
</tr> </tr>
</table> </table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center"> <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th width="150" height="25" class="thCornerL" nowrap="nowrap">{L_AUTHOR}</th> <th width="150" nowrap="nowrap">{L_AUTHOR}</th>
<th width="100%" class="thCornerR" nowrap="nowrap">{L_MESSAGE}</th> <th width="100%" nowrap="nowrap">{L_MESSAGE}</th>
</tr> </tr>
<!-- BEGIN searchresults --> <!-- BEGIN searchresults -->
<tr class="row2">
<td colspan="2"><span class="topictitle">{L_TOPIC}: <a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a> in forum: <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></span></td>
</tr>
<tr class="row1">
<td width="150" align="center" valign="middle"><b class="postauthor">{searchresults.POSTER_NAME}</b></td>
<td><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td class="catHead" colspan="2" height="28"><span class="topictitle">{L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td> <td valign="middle">{searchresults.POST_ICON_IMG}</td>
<td>&nbsp;</td>
<td class="postdetails" width="100%" valign="middle">{L_SUBJECT}: <b><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></b></td>
</tr>
</table></td>
</tr>
<tr class="row1">
<td width="150" align="center" valign="top"><br /><span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /></td>
<td valign="top"><table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr>
<td class="postbody">{searchresults.MESSAGE}</td>
</tr> </tr>
<tr> <tr>
<td width="150" align="left" valign="top" class="row1" rowspan="2"><span class="name"><b>{searchresults.POSTER_NAME}</b></span><br /> <td class="postdetails" align="right">{searchresults.MINI_POST_IMG}{L_POSTED}: {searchresults.POST_DATE}</td>
<br /> </tr>
<span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br /> </table></td>
{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br />
</td>
<td width="100%" valign="top" class="row1">{searchresults.MINI_POST_IMG}<span class="postdetails">{L_FORUM}:&nbsp;<b><a href="{searchresults.U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b>&nbsp; &nbsp;{L_POSTED}: {searchresults.POST_DATE}&nbsp; &nbsp;{L_SUBJECT}: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td>
</tr> </tr>
<tr> <tr>
<td valign="top" class="row1"><span class="postbody">{searchresults.MESSAGE}</span></td> <td class="spacer" colspan="2"><img src="images/spacer.gif" height="1" alt="" /></td>
</tr> </tr>
<!-- END searchresults --> <!-- END searchresults -->
<tr> <tr>
<td class="catBottom" colspan="2" height="28" align="center">&nbsp; </td> <td class="cat" colspan="2" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
</tr> </tr>
</table> </table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <table width="95%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr> <tr>
<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td> <td class="nav">{PAGE_NUMBER}</td>
<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td> <td class="gensmall" align="right">{S_TIMEZONE}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td class="nav" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
</tr> </tr>
</table> </table>
<table width="100%" cellspacing="2" border="0" align="center"> </form>
<table width="95%" cellspacing="2" border="0" align="center">
<tr> <tr>
<td valign="top" align="right">{JUMPBOX}</td> <td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
</tr> </tr>
</table> </table>

43
phpBB/styles/subSilver/template/search_results_topics.html
View file

@ -1,14 +1,12 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<table width="95%" cellspacing="2" cellpadding="2" border="0" align="center"> <form method="post" action="{S_SEARCH_ACTION}"><table width="95%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td class="genmed" align="left" valign="bottom"><span class="maintitle">{SEARCH_MATCHES}</span><br /></td> <td colspan="2" align="left"><span class="titles">{SEARCH_MATCHES}</span><br /></td>
</tr> </tr>
<tr> <tr>
<td class="genmed">Search terms used: {SEARCH_WORDS}</td> <td class="genmed">{L_SEARCHED_FOR} <a href="{U_SEARCH_WORDS}"><b>{SEARCH_WORDS}</b></a> {L_IGNORED_TERMS} <b>{IGNORED_WORDS}</b></td>
</tr> <td align="right"><span class="genmed">{L_SEARCH_IN_RESULTS}: </span><input type="text" name="search_keywords" value="" /> <input class="btnlite" type="submit" name="submit" value="{L_GO}" /></td>
<tr>
<td class="genmed">Terms ignored: {STOPPED_WORDS}</td>
</tr> </tr>
</table> </table>
@ -21,39 +19,44 @@
<table width="95%" cellpadding="4" cellspacing="1" border="0" class="tablebg" align="center"> <table width="95%" cellpadding="4" cellspacing="1" border="0" class="tablebg" align="center">
<tr> <tr>
<th width="4%" nowrap="nowrap">&nbsp;</th> <th width="4%" nowrap="nowrap">&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_FORUM}&nbsp;</th> <th colspan="2" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th> <th nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th> <th nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th> <th nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th> <th nowrap="nowrap">&nbsp;{L_LAST_POST}&nbsp;</th>
</tr> </tr>
<!-- BEGIN searchresults --> <!-- BEGIN searchresults -->
<tr valign="middle"> <tr valign="middle">
<td class="row1" align="center"><img src="{searchresults.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{searchresults.L_TOPIC_FOLDER_ALT}" title="{searchresults.L_TOPIC_FOLDER_ALT}" /></td> <td class="row1" align="center">{searchresults.TOPIC_FOLDER_IMG}</td>
<td class="row1"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></td> <td class="row1" width="25" align="center" valign="middle">{searchresults.TOPIC_ICON_IMG}</td>
<td class="row2"><a class="topictitle" href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a><span class="gensmall"><br />{searchresults.GOTO_PAGE}</td> <td class="row2"><a class="topictitle" href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a><span class="gensmall"><!-- IF topicrow.GOTO_PAGE --><br />{topicrow.GOTO_PAGE}<!-- ENDIF --></span><br /><span class="gensmall">in <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></span></td>
<td class="row1" align="center">{searchresults.TOPIC_AUTHOR}</td> <td class="row1" align="center"><span class="topicauthor">{searchresults.TOPIC_AUTHOR}</span></td>
<td class="row2" align="center">{searchresults.REPLIES}</td> <td class="row2" align="center"><span class="topicdetails">{searchresults.TOPIC_REPLIES}</span></td>
<td class="row1" align="center">{searchresults.VIEWS}</td> <td class="row1" align="center"><span class="topicdetails">{searchresults.TOPIC_VIEWS}</span></td>
<td class="row2" align="center" nowrap="nowrap">{searchresults.LAST_POST_TIME}<br />{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}</td> <td class="row2" align="center" nowrap="nowrap"><span class="topicdetails">{searchresults.LAST_POST_TIME}<br />{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}</span></td>
</tr> </tr>
<!-- END searchresults --> <!-- END searchresults -->
<tr> <tr>
<td class="cat" colspan="7" valign="middle">&nbsp; </td> <td class="cat" colspan="7" valign="middle" align="center"><span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
</tr> </tr>
</table> </table>
<table width="95%" cellspacing="2" border="0" align="center" cellpadding="2"> <table width="95%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr> <tr>
<td class="nav" align="left" valign="top">{PAGE_NUMBER}</td> <td class="nav">{PAGE_NUMBER}</td>
<td class="nav" align="right" valign="top" nowrap="nowrap">{PAGINATION}<br />{S_TIMEZONE}</td> <td class="gensmall" align="right">{S_TIMEZONE}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td class="nav" align="right" valign="bottom" nowrap="nowrap">{PAGINATION}</td>
</tr> </tr>
</table> </table>
</form>
<table width="95%" cellspacing="2" border="0" align="center"> <table width="95%" cellspacing="2" border="0" align="center">
<tr> <tr>
<td valign="top" align="right">{JUMPBOX}</td> <td valign="top" align="right"><!-- INCLUDE jumpbox.html --></td>
</tr> </tr>
</table> </table>