[Phpbb-checkins] CVS: phpBB2 profile.php,1.123,1.124

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

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

Modified Files:
	profile.php 
Log Message:
Fixed error #475726 + lang updates

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** profile.php	2001/10/22 01:11:47	1.123
--- profile.php	2001/11/03 19:33:33	1.124
***************
*** 77,93 ****
  			if($email_taken['user_email'] != "")
  			{
! 				return(0);
  			}
  
! 			return(1);
  		}
  		else
  		{
! 			return(0);
  		}
  	}
  	else
  	{
! 		return(0);
  	}
  }
--- 77,93 ----
  			if($email_taken['user_email'] != "")
  			{
! 				return false;
  			}
  
! 			return true;
  		}
  		else
  		{
! 			return false;
  		}
  	}
  	else
  	{
! 		return false;
  	}
  }
***************
*** 752,758 ****
  									if($mode == "editprofile")
  									{
! 										if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id))
  										{
! 											@unlink("./" . $board_config['avatar_path'] . "/" . $user_id);
  										}
  									}
--- 752,758 ----
  									if($mode == "editprofile")
  									{
! 										if( @file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']) )
  										{
! 											@unlink("./" . $board_config['avatar_path'] . "/". $userdata['user_avatar']);
  										}
  									}
***************
*** 857,863 ****
  											if($mode == "editprofile")
  											{
! 												if(file_exists("./" . $board_config['avatar_path'] . "/" . $user_id))
  												{
! 													@unlink("./" . $board_config['avatar_path'] . "/" . $user_id);
  												}
  											}
--- 857,863 ----
  											if($mode == "editprofile")
  											{
! 												if(file_exists("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']))
  												{
! 													@unlink("./" . $board_config['avatar_path'] . "/" . $userdata['user_avatar']);
  												}
  											}
***************
*** 1014,1018 ****
  							$emailer->reset();
  							
! 							$message = $lang['Profile_updated_inactive'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  					
  							// Log the user out as their account is no longer active
--- 1014,1018 ----
  							$emailer->reset();
  							
! 							$message = $lang['Profile_updated_inactive'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  					
  							// Log the user out as their account is no longer active
***************
*** 1026,1030 ****
  						else
  						{
! 							$message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  						}
  
--- 1026,1030 ----
  						else
  						{
! 							$message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  						}
  
***************
*** 1161,1165 ****
  								);
  
! 								$message = $message . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  
  								message_die(GENERAL_MESSAGE, $message);
--- 1161,1165 ----
  								);
  
! 								$message = $message . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  
  								message_die(GENERAL_MESSAGE, $message);
***************
*** 1677,1681 ****
  				);
  
! 				$message = $lang['Password_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  
  				message_die(GENERAL_MESSAGE, $message);
--- 1677,1681 ----
  				);
  
! 				$message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'],  "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>");
  
  				message_die(GENERAL_MESSAGE, $message);