From fa7313eb84af5dad79291a2c8d290d882854bba2 Mon Sep 17 00:00:00 2001
From: James Atkinson <thefinn@users.sourceforge.net>
Date: Mon, 22 Oct 2001 01:11:48 +0000
Subject: [PATCH] Fixed bug in profile where account reactivation email had
 wrong link

git-svn-id: file:///svn/phpbb/trunk@1241 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/lang_english/lang_main.php | 11 +++++++++++
 phpBB/profile.php                         | 15 +++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php
index fad8c06e11..441e306794 100644
--- a/phpBB/language/lang_english/lang_main.php
+++ b/phpBB/language/lang_english/lang_main.php
@@ -503,6 +503,8 @@ $lang['Notify_on_privmsg'] = "Notify on Private Message";
 $lang['Hide_user'] = "Hide your online status";
 
 $lang['Profile_updated'] = "Your profile has been updated";
+$lang['Profile_updated_inactive'] = "Your profile has been updated, however you have changed vital details thus your account is now inactive. Check your email to find out how to reactivate your account, or if admin activation is require wait for the administrator to reactivate your account";
+
 $lang['to_return_index'] = "to return to the index";
 
 $lang['Password_mismatch'] = "The passwords you entered did not match";
@@ -1115,6 +1117,15 @@ $lang['add_disallow'] = "Add a disallowed username";
 $lang['add_disallow_explain'] = "You can disallow a username using the wildcard character '*' to match any character";
 $lang['no_disallowed'] = "No Disallowed Usernames";
 
+//
+// Styles Admin
+//
+$lang['Styles_admin'] = "Styles Administration";
+$lang['Styles_explain'] = "In this panel you can edit or remove styles from your forum. To import a new styles click on 'Add New' in the left hand panel, to create a new styles click on 'Create New'";
+$lang['Style'] = "Style";
+$lang['Template'] = "Template";
+
+
 //
 // That's all Folks!
 // -------------------------------------------------
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 8b647dbca8..12a62feead 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -951,7 +951,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 			{
 				if($mode == "editprofile")
 				{
-					if($email != $current_email && ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) )
+					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;
 						$user_actkey = generate_activation_key();
@@ -1008,12 +1008,19 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 								"USERNAME" => $username,
 								"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")
+								"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']);
+							}
 
-							$message = $lang['Profile_updated'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_index'];
 
 						}
 						else
@@ -1022,7 +1029,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
 						}
 
 						$template->assign_vars(array(
-							"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("index.$phpEx") . '">')
+							"META" => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">')
 						);
 
 						message_die(GENERAL_MESSAGE, $message);