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

[James A. <th...@us...>]

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

Modified Files:
	profile.php 
Log Message:
Fixed bug in profile where account reactivation email had wrong link


Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -r1.122 -r1.123
*** profile.php	2001/10/18 22:18:57	1.122
--- profile.php	2001/10/22 01:11:47	1.123
***************
*** 952,956 ****
  				if($mode == "editprofile")
  				{
! 					if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) )
  					{
  						$user_active = 0;
--- 952,956 ----
  				if($mode == "editprofile")
  				{
! 					if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) && $userdata['user_level'] != ADMIN)
  					{
  						$user_active = 0;
***************
*** 1009,1018 ****
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$act_key")
  							);
  							$emailer->send();
  							$emailer->reset();
  
- 							$message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
  
  						}
--- 1009,1025 ----
  								"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 								"U_ACTIVATE" => "http://" . $server_name . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey")
  							);
  							$emailer->send();
  							$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
+ 							if( $userdata['session_logged_in'] )
+ 							{
+ 								session_end($userdata['session_id'], $userdata['user_id']);
+ 							}
  
  
  						}
***************
*** 1023,1027 ****
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
  						);
  
--- 1030,1034 ----
  
  						$template->assign_vars(array(
! 							"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
  						);