[Phpbb-checkins] CVS: phpBB2 search.php,1.24,1.25

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv19774

Modified Files:
	search.php 
Log Message:
Oops, forgot to commit search.php


Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** search.php	2001/11/09 13:26:55	1.24
--- search.php	2001/11/14 06:39:17	1.25
***************
*** 123,127 ****
  }
  
! 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'];
--- 123,127 ----
  }
  
! 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'];
***************
*** 248,252 ****
  {
  
! 	if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" )
  	{
  		$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
--- 248,252 ----
  {
  
! 	if( $query_keywords != "" || $query_author != "" || $search_id == "newposts" || $search_id == "egosearch" || $search_id == "unanswered")
  	{
  		$synonym_array = @file($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/search_synonyms.txt"); 
***************
*** 260,263 ****
--- 260,281 ----
  			$sortby_dir = "DESC";
  		}
+ 		
+ 		if( $search_id == "egosearch" )
+ 		{
+ 			$query_author = $userdata['username'];
+ 			$show_results = "topics";
+ 			$search_time = 0;
+ 			$sortby = 0;
+ 			$sortby_dir = "DESC";
+ 		}
+ 		
+ 		if( $search_id == "unanswered" )
+ 		{
+ 			$show_results = "topics";
+ 			$search_time = 0;
+ 			$sortby = 0;
+ 			$sortby_dir = "DESC";
+ 		}
+ 		
  
  		$cleaned_search = clean_words_search($query_keywords);
***************
*** 442,445 ****
--- 460,471 ----
  
  		//
+ 		// Unanswered Posts
+ 		//
+ 		if( $search_id == "unanswered" )
+ 		{
+ 			$search_sql .= ( $search_sql == "" ) ? "t.topic_replies = 0 " : "AND t.topic_replies = 0 ";
+ 		}
+ 	
+ 		//
  		// If user is logged in then we'll
  		// check to see which (if any) private
***************
*** 450,454 ****
  		// searching of private forums
  		//
! 		if( $search_sql != "" || $search_id == "newposts" )
  		{
  			$sql = "SELECT  $sql_fields 
--- 476,480 ----
  		// searching of private forums
  		//
! 		if( $search_sql != "" || $search_id == "newposts" || $search_id == "egosearch" || $search_id == "unanswered" )
  		{
  			$sql = "SELECT  $sql_fields 
***************
*** 838,842 ****
  					}
  				}
- 
  				$template->assign_block_vars("searchresults", array( 
  					"TOPIC_TITLE" => $topic_title,
--- 864,867 ----
***************
*** 858,861 ****
--- 883,887 ----
  			{
  				$message = "";
+ 
  
  				if( count($orig_word) )