[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.28,1.29

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

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

Modified Files:
	admin_users.php 
Log Message:
Various fixes and updates so it actually works correctly ... ;)

Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** admin_users.php	2001/10/16 14:43:03	1.28
--- admin_users.php	2001/10/16 15:41:05	1.29
***************
*** 34,37 ****
--- 34,39 ----
  $phpbb_root_dir = "./../";
  require('pagestart.inc');
+ include($phpbb_root_dir . 'includes/bbcode.'.$phpEx);
+ include($phpbb_root_dir . 'includes/post.'.$phpEx);
  
  if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
***************
*** 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])) )
  {
  	//
--- 131,135 ----
  	exit;
  }
! else if( $mode == "edit" && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset($HTTP_POST_VARS[POST_USERS_URL]) ) )
  {
  	//
***************
*** 223,227 ****
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "";
  
  	for($i = 0; $i < $rank_count; $i++)
--- 225,229 ----
  	$rank_rows = $db->sql_fetchrowset($result);
  
! 	$rank_select_box = "<option value=\"0\">" . $lang['No_assigned_rank'] . "</option>";
  
  	for($i = 0; $i < $rank_count; $i++)
***************
*** 229,240 ****
  		$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>";
! 		}
! 		else
! 		{
! 			$rank_select_box .= "<option value=\"" . $rank_id . "\">" . $rank . "</option>";		
! 		}	
  	}
  
--- 231,237 ----
  		$rank = $rank_rows[$i]['rank_title'];
  		$rank_id = $rank_rows[$i]['rank_id'];
! 		
! 		$selected = ( $this_userdata['user_rank'] == $i + 1 ) ? "selected=\"selected\"" : "";
! 		$rank_select_box .= "<option value=\"" . $rank_id . "\"$selected>" . $rank . "</option>";
  	}
  
***************
*** 352,356 ****
  	$template->pparse("body");
  }
! else if( $HTTP_POST_VARS['mode'] == "save" )
  {
  	//
--- 349,353 ----
  	$template->pparse("body");
  }
! else if( $mode == "save" && isset($HTTP_POST_VARS['submit']) )
  {
  	//
***************
*** 396,403 ****
  	$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']))
  	{
--- 393,398 ----
  	$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;
  	
  	if(isset($HTTP_POST_VARS['submit']))
  	{
***************
*** 512,516 ****
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey' " . $user_rank_sql . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )
--- 507,511 ----
  		{
  			$sql = "UPDATE " . USERS_TABLE . "
! 				SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_lang = '$user_lang', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_active = $user_status, user_actkey = '$user_actkey', user_rank = $user_rank" . $avatar_sql . "
  				WHERE user_id = $user_id";
  			if( $result = $db->sql_query($sql) )