[Phpbb-checkins] CVS: phpBB2 profile.php,1.159,1.160

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

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

Modified Files:
	profile.php 
Log Message:
Minor change, checks for existence of required avatar directories when deciding whether to enable various avatar options.

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -r1.159 -r1.160
*** profile.php	2001/12/22 12:54:59	1.159
--- profile.php	2001/12/24 14:46:35	1.160
***************
*** 613,617 ****
  					{
  						$password = md5($password);
! 						$passwd_sql = "user_password = '" . str_replace("\'", "''", $password) . "', ";
  					}
  				}
--- 613,617 ----
  					{
  						$password = md5($password);
! 						$passwd_sql = "user_password = '$password', ";
  					}
  				}
***************
*** 1403,1407 ****
  
  				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . str_replace("\"", "&quot;", $user_id) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . str_replace("\"", "&quot;", $username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . str_replace("\"", "&quot;", $email) . '" />';
--- 1403,1407 ----
  
  				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . str_replace("\"", "&quot;", $username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . str_replace("\"", "&quot;", $email) . '" />';
***************
*** 1652,1664 ****
  				$template->assign_block_vars("avatarblock", array() );
  
! 				if($board_config['allow_avatar_upload'])
  				{
  					$template->assign_block_vars("avatarblock.avatarupload", array() );
  				}
  				if($board_config['allow_avatar_remote'])
  				{
  					$template->assign_block_vars("avatarblock.avatarremote", array() );
  				}
! 				if($board_config['allow_avatar_local'])
  				{
  					$template->assign_block_vars("avatarblock.avatargallery", array() );
--- 1652,1666 ----
  				$template->assign_block_vars("avatarblock", array() );
  
! 				if($board_config['allow_avatar_upload'] && file_exists("./" . $board_config['avatar_path']) )
  				{
  					$template->assign_block_vars("avatarblock.avatarupload", array() );
  				}
+ 
  				if($board_config['allow_avatar_remote'])
  				{
  					$template->assign_block_vars("avatarblock.avatarremote", array() );
  				}
! 
! 				if($board_config['allow_avatar_local'] && file_exists("./" . $board_config['avatar_gallery_path']) )
  				{
  					$template->assign_block_vars("avatarblock.avatargallery", array() );