makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for bug #484526

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1449 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson 2001-11-26 09:50:31 +00:00
parent e1d1cb0c32
commit 31790512b2
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/lang_english/lang_main.php
View file

@ -461,6 +461,7 @@ $lang['File_no_data'] = "The file at the URL you gave contains no data";
$lang['No_connection_URL'] = "A connection could not be made to the URL you gave";
$lang['Incomplete_URL'] = "The URL you entered is incomplete";
$lang['Wrong_remote_avatar_format'] = "The URL of the remote avatar is not valid";
$lang['No_send_account_inactive'] = "Sorry but you're password cannot be retrived because you account is currently inactive. Please contact the forum administrator for more information";
$lang['Always_smile'] = "Always enable Smilies";
$lang['Always_html'] = "Always allow HTML";

8
phpBB/profile.php
View file

@ -1642,7 +1642,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
$email = (!empty($HTTP_POST_VARS['email'])) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : "";
$sql = "SELECT user_id, username, user_email
$sql = "SELECT user_id, username, user_email, user_active
FROM " . USERS_TABLE . "
WHERE user_email = '$email'
AND username = '$username'";
@ -1656,6 +1656,12 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$row = $db->sql_fetchrow($result);
$username = $row['username'];
if($row['user_active'] == 0)
{
message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
}
$user_actkey = generate_activation_key();
$user_password = generate_password();