[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.27,1.28 admin_userauth.php,1.22,1.23

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

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

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

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** admin_users.php	2001/10/16 10:49:11	1.27
--- admin_users.php	2001/10/16 14:43:03	1.28
***************
*** 21,26 ****
   ***************************************************************************/
  
- define("IN_ADMIN", true);
- 
  if($setmodules == 1)
  {
--- 21,24 ----
***************
*** 36,41 ****
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
- include($phpbb_root_path . 'includes/post.'.$phpEx);
- include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
--- 34,37 ----
***************
*** 128,140 ****
  if( $mode == "searchuser" )
  {
- 	if( isset($HTTP_POST_VARS['search']) )
- 	{
- 		$username_list = username_search("admin_users.$phpEx", $HTTP_POST_VARS['search_author'], 1);
- 	}
- 	else
- 	{
- 		username_search("admin_users.$phpEx", "", 1);
- 	}
- 	
  	//
  	// Remove this later
--- 124,127 ----
***************
*** 142,146 ****
  	exit;
  }
! else if ( ($mode == "edit" && (isset($HTTP_POST_VARS['username']) && $mode != "save" ) || ( isset($HTTP_POST_VARS[POST_USERS_URL]) || isset($HTTP_GET_VARS[POST_USERS_URL]) ) ) )
  {
  	//
--- 129,133 ----
  	exit;
  }
! else if ( ($mode == "edit") || (isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL])) )
  {
  	//
***************
*** 236,240 ****
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = '<option value="0">No Special Rank</option>';
  
  	for($i = 0; $i < $rank_count; $i++)
--- 223,227 ----
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "";
  
  	for($i = 0; $i < $rank_count; $i++)
***************
*** 242,246 ****
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $rank_id )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
--- 229,233 ----
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		if ( $this_userdata['user_rank'] == $i + 1 )
  		{
  			$rank_select_box .= "<option value=\"" . $rank_id . "\" selected=\"selected\">" . $rank . "</option>";
***************
*** 409,415 ****
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : 0;
  	
! 	$user_rank_sql = ", user_rank = " . $user_rank;
  
  	if(isset($HTTP_POST_VARS['submit']))
--- 396,402 ----
  	$user_allowpm = (!empty($HTTP_POST_VARS['user_allowpm'])) ? intval($HTTP_POST_VARS['user_allowpm']) : 0;
  	$user_allowavatar = (!empty($HTTP_POST_VARS['user_allowavatar'])) ? intval($HTTP_POST_VARS['user_allowavatar']) : 0;
! 	$user_rank = (!empty($HTTP_POST_VARS['user_rank'])) ? intval($HTTP_POST_VARS['user_rank']) : "";
  	
! 	$user_rank_sql = (isset($user_rank)) ? ", user_rank = " . $user_rank : "";
  
  	if(isset($HTTP_POST_VARS['submit']))
***************
*** 547,551 ****
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile<br>$sql")
  				);
  				$template->pparse("body");
--- 534,538 ----
  				$template->assign_vars(array(
  					"MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
! 					"MESSAGE_TEXT" => "Error updating user profile")
  				);
  				$template->pparse("body");
***************
*** 571,574 ****
--- 558,563 ----
  	// Default user selection box
  	//
+ 	// This should be altered on the final system
+ 	//
  	$sql = "SELECT user_id, username
  		FROM " . USERS_TABLE . "
***************
*** 596,600 ****
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("admin_users.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_users.$phpEx"),
--- 585,589 ----
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_users.$phpEx"),

Index: admin_userauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_userauth.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** admin_userauth.php	2001/10/15 20:49:39	1.22
--- admin_userauth.php	2001/10/16 14:43:03	1.23
***************
*** 965,969 ****
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("admin_users.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_userauth.$phpEx"))
--- 965,969 ----
  		"L_FIND_USERNAME" => $lang['Find_username'],
  
! 		"U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"), 
  
  		"S_USER_ACTION" => append_sid("admin_userauth.$phpEx"))