diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-26 09:50:31 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-26 09:50:31 +0000 |
| commit | 31790512b24c68e8c0eb1d26281e899aa828ed51 (patch) | |
| tree | da02243c5398727b34bcd8151792b7d502a5e8f3 /phpBB | |
| parent | e1d1cb0c320215e3baa413f4d51e88ba78852f25 (diff) | |
| download | forums-31790512b24c68e8c0eb1d26281e899aa828ed51.tar forums-31790512b24c68e8c0eb1d26281e899aa828ed51.tar.gz forums-31790512b24c68e8c0eb1d26281e899aa828ed51.tar.bz2 forums-31790512b24c68e8c0eb1d26281e899aa828ed51.tar.xz forums-31790512b24c68e8c0eb1d26281e899aa828ed51.zip | |
Fix for bug #484526
git-svn-id: file:///svn/phpbb/trunk@1449 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/lang_english/lang_main.php | 1 | ||||
| -rw-r--r-- | phpBB/profile.php | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php index 2ec49b6e28..4206da5a69 100644 --- a/phpBB/language/lang_english/lang_main.php +++ b/phpBB/language/lang_english/lang_main.php @@ -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"; diff --git a/phpBB/profile.php b/phpBB/profile.php index 74fbed9296..cfaabeb3c3 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -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(); |