[Phpbb-checkins] CVS: phpBB2 search.php,1.21,1.22 privmsg.php,1.35,1.36

[Paul S. O. <ps...@us...>]

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

Modified Files:
	search.php privmsg.php 
Log Message:
Slight mods to the usersearch function, moved to search.php

Index: search.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/search.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** search.php	2001/10/15 23:04:16	1.21
--- search.php	2001/10/16 14:43:03	1.22
***************
*** 400,404 ****
  // Begin core code
  //
! if( $query_keywords != "" || $query_author != "" || $search_id )
  {
  
--- 400,424 ----
  // Begin core code
  //
! if( $mode == "searchuser" )
! {
! 	//
! 	// This handles the simple windowed user search
! 	// functions called from various other scripts. If a 
! 	// script allows an 'inline' user search then this is
! 	// handled by the script itself, this is only for the
! 	// windowed version
! 	//
! 	if( isset($HTTP_POST_VARS['search']) )
! 	{
! 		username_search($HTTP_POST_VARS['search_author'], false);
! 	}
! 	else
! 	{
! 		username_search("", false);
! 	}
! 
! 	exit;
! }
! else if( $query_keywords != "" || $query_author != "" || $search_id )
  {
  

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** privmsg.php	2001/10/14 22:32:38	1.35
--- privmsg.php	2001/10/16 14:43:03	1.36
***************
*** 746,762 ****
  	if( $mode == "searchuser" )
  	{
- 		if( isset($HTTP_POST_VARS['search']) )
- 		{
- 			$username_list = username_search("privmsg.$phpEx", $HTTP_POST_VARS['search_author'], 1);
- 		}
- 		else
- 		{
- 			username_search("privmsg.$phpEx", "", 1);
- 		}
- 		
  		//
! 		// Remove this later
  		//
! 		exit;
  	}
  
--- 746,755 ----
  	if( $mode == "searchuser" )
  	{
  		//
! 		// This 'will' handle a simple user search 
! 		// performed from within the private message post
! 		// form
  		//
! 
  	}
  
***************
*** 1489,1492 ****
--- 1482,1486 ----
  		"S_POST_ACTION" => append_sid("privmsg.$phpEx"),
  			
+ 		"U_SEARCH_USER" => append_sid("search.$phpEx?mode=searchuser"), 
  		"U_VIEW_FORUM" => append_sid("privmsg.$phpEx"))
  	);