[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.57.2.5,1.57.2.6

[Doug K. <dou...@us...>]

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

Modified Files:
      Tag: phpBB-2_0_0
	admin_users.php 
Log Message:
Ok, by this time, bugs 397, 427, 429, 450, and 472 should be fixed.

--Doug


Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.57.2.5
retrieving revision 1.57.2.6
diff -C2 -r1.57.2.5 -r1.57.2.6
*** admin_users.php	12 Jun 2002 15:54:39 -0000	1.57.2.5
--- admin_users.php	27 Jun 2002 22:54:09 -0000	1.57.2.6
***************
*** 202,216 ****
  		}
  
- 		if( $user_status == 0 )
- 		{
- 			// User is (made) inactive. Delete all their sessions.
- 			$sql = "DELETE FROM " . SESSIONS_TABLE . " 
- 				WHERE session_user_id = $user_id";
- 			if( !$db->sql_query($sql) )
- 			{
- 				message_die(GENERAL_ERROR, 'Could not delete this users sessions', '', __LINE__, __FILE__, $sql);
- 			}
- 		}
- 
  		if( $signature != "" )
  		{
--- 202,205 ----
***************
*** 220,224 ****
  				$sig_length_check = preg_replace('/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is', '\\1\\3\\4', $sig_length_check);
  			}
- 			$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
  
  			// Only create a new bbcode_uid when there was no uid yet.
--- 209,212 ----
***************
*** 239,245 ****
  		// Avatar stuff
  		//
- 		//
- 		// Avatar stuff
- 		//
  		$avatar_sql = "";
  		if( isset($HTTP_POST_VARS['avatardel']) )
--- 227,230 ----
***************
*** 1124,1128 ****
  		);
  
! 		if( file_exists('./../' . $board_config['avatar_path'] ) )
  		{
  			if ( $form_enctype != '' )
--- 1109,1113 ----
  		);
  
! 		if( file_exists('./../' . $board_config['avatar_path'] ) && ($board_config['allow_avatar_upload'] == TRUE) )
  		{
  			if ( $form_enctype != '' )
***************
*** 1133,1139 ****
  		}
  
! 		if( file_exists('./../' . $board_config['avatar_gallery_path'] ) )
  		{
  			$template->assign_block_vars('avatar_local_gallery', array() );
  		}
  	}
--- 1118,1129 ----
  		}
  
! 		if( file_exists('./../' . $board_config['avatar_gallery_path'] ) && ($board_config['allow_avatar_local'] == TRUE) )
  		{
  			$template->assign_block_vars('avatar_local_gallery', array() );
+ 		}
+ 		
+ 		if( $board_config['allow_avatar_remote'] == TRUE )
+ 		{
+ 			$template->assign_block_vars('avatar_remote_link', array() );
  		}
  	}