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

Added view newest output for topic search

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1094 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-09-26 22:35:08 +00:00
parent 53dd64926a
commit 275f67a507
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/search.php
View file

@ -21,8 +21,7 @@
***************************************************************************/ ***************************************************************************/
// //
// Massive overhaul for phpBB2, // Massive overhaul for phpBB2, originally based on search code
// originally based on search code
// I knocked together for my own website // I knocked together for my own website
// //
// PSO : 2001 // PSO : 2001
@ -38,8 +37,8 @@ include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
function gensearch_sql($searchstring, $override_all = 0) function gensearch_sql($searchstring, $override_all = 0)
{ {
$searchchars = array("'[\s]+'", "'\/'", "';'", "'@'", "'&'", "'#'", "'_'", "'|'", "'¬'", "'\*'"); $searchchars = array("'[\s]+'", "'\/'", "';'", "'@'", "'#'", "'_'", "'|'", "'¬'", "'\*'");
$replacechars = array(" ", "", "", "", " ", "", "", "", " ", "", "%"); $replacechars = array(" ", "", "", "", " ", "", "", " ", "", "%");
$searchstring = trim(preg_replace($searchchars, $replacechars, strip_tags($searchstring))); $searchstring = trim(preg_replace($searchchars, $replacechars, strip_tags($searchstring)));
@ -194,7 +193,7 @@ function gensearch_sql($searchstring, $override_all = 0)
} }
$findword = $searchlistandtype["AND"][$j]; $findword = $searchlistandtype["AND"][$j];
$searchstring .= " ( pt.post_text LIKE '% $findword %')"; $searchstring .= " ( pt.post_text LIKE '$findword')";
}// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword' }// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword'
} }
elseif($binsearchtype[$i] == "OR" && count($searchlistandtype["OR"])) elseif($binsearchtype[$i] == "OR" && count($searchlistandtype["OR"]))
@ -211,7 +210,7 @@ function gensearch_sql($searchstring, $override_all = 0)
} }
$findword = $searchlistandtype["OR"][$j]; $findword = $searchlistandtype["OR"][$j];
$searchstring .= " ( pt.post_text LIKE '% $findword %' )"; $searchstring .= " ( pt.post_text LIKE '$findword' )";
}// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword' }// OR pt.post_text LIKE '$findword %' OR pt.post_text LIKE '% $findword'
} }
elseif($binsearchtype[$i] == "NOT" && count($searchlistandtype["NOT"])) elseif($binsearchtype[$i] == "NOT" && count($searchlistandtype["NOT"]))
@ -939,6 +938,15 @@ if( $query_keywords != "" || $query_author != "" || $search_id )
} }
} }
if($searchset[$i]['post_time'] >= $userdata['session_last_visit'])
{
$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
}
else
{
$newest_post_img = "";
}
$topic_poster = $searchset[$i]['username']; $topic_poster = $searchset[$i]['username'];
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']); $last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
@ -963,6 +971,7 @@ if( $query_keywords != "" || $query_author != "" || $search_id )
"FORUM_ID" => $forum_id, "FORUM_ID" => $forum_id,
"TOPIC_ID" => $topic_id, "TOPIC_ID" => $topic_id,
"FOLDER" => $folder_image, "FOLDER" => $folder_image,
"NEWEST_POST_IMG" => $newest_post_img,
"TOPIC_POSTER" => $topic_poster, "TOPIC_POSTER" => $topic_poster,
"GOTO_PAGE" => $goto_page, "GOTO_PAGE" => $goto_page,
"REPLIES" => $replies, "REPLIES" => $replies,

13
phpBB/templates/PSO/search_results_topics.tpl
View file

@ -1,7 +1,7 @@
<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> <table width="98%" cellspacing="0" cellpadding="4" border="0" align="center">
<tr> <tr>
<td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME}&nbsp;{L_INDEX}</span></td> <td align="left" valign="bottom" nowrap="nowrap"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</span></td>
</tr> </tr>
</table> </table>
@ -9,7 +9,7 @@
<tr> <tr>
<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0"> <td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
<tr> <tr>
<td class="cat" colspan="7" align="center"><span class="cattitle">&nbsp;<b>{L_SEARCH} - {SEARCH_MATCHES} Matches</b>&nbsp;</span></td> <td class="cat" colspan="7" align="center"><span class="cattitle"><b>{L_SEARCH} {L_FOUND} <u>{SEARCH_MATCHES}</u> {L_MATCHES}</b></span></td>
</tr> </tr>
<tr> <tr>
<th width="4%">&nbsp;</th> <th width="4%">&nbsp;</th>
@ -24,22 +24,17 @@
<tr> <tr>
<td class="row1" align="center" valign="middle">&nbsp;{searchresults.FOLDER}&nbsp;</td> <td class="row1" align="center" valign="middle">&nbsp;{searchresults.FOLDER}&nbsp;</td>
<td class="row2">&nbsp;<span class="gensmall"><a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_NAME}</a></span></td> <td class="row2">&nbsp;<span class="gensmall"><a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_NAME}</a></span></td>
<td class="row2">&nbsp;<span class="gensmall">{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a>&nbsp;{searchresults.GOTO_PAGE}</span></td> <td class="row2">&nbsp;<span class="gensmall">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}">{searchresults.TOPIC_TITLE}</a>&nbsp;{searchresults.GOTO_PAGE}</span></td>
<td class="row1" align="center" valign="middle"><span class="gen">{searchresults.REPLIES}</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="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="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> <td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="gensmall">{searchresults.LAST_POST}</span></td>
</tr> </tr>
<!-- END searchresults --> <!-- 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> <tr>
<td class="cat" colspan="7"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <td class="cat" colspan="7"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td align="left" valign="middle">&nbsp;&nbsp;&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td> <td align="left" valign="middle">&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
<td align="right" valign="middle"><span class="gen">{PAGINATION}&nbsp;</span></td> <td align="right" valign="middle"><span class="gen">{PAGINATION}&nbsp;</span></td>
</tr> </tr>
</table></td> </table></td>

2
phpBB/templates/subSilver/search_results_topics.tpl
View file

@ -31,7 +31,7 @@
<tr> <tr>
<td class="row1" align="center" valign="middle">{searchresults.FOLDER}</td> <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="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.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><span class="gensmall">&nbsp;{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><span class="gensmall">&nbsp;{searchresults.GOTO_PAGE}</span></td>
<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</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="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> <td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>