diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-15 17:43:07 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-10-15 17:43:07 +0000 |
| commit | a47fa4d6cab862a9635f3e30d01ad2740c45a888 (patch) | |
| tree | 10d3ad33badde24948065613ff884cc37ee87781 /phpBB/includes/ucp/ucp_remind.php | |
| parent | 8661a45de596e06e89e8fa8f12efb91293780419 (diff) | |
| download | forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.gz forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.bz2 forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.xz forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.zip | |
Remove need for session_ids for "allowed" bots, dump user_founder/user_active in favour of user_type, new user_type, USER_IGNORE
git-svn-id: file:///svn/phpbb/trunk@4603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_remind.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index 98b44640c1..80b863b321 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -24,7 +24,7 @@ class ucp_remind extends module $username = request_var('username', ''); $email = request_var('email', ''); - $sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_active, user_lang + $sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang FROM ' . USERS_TABLE . " WHERE user_email = '" . $db->sql_escape($email) . "' AND username = '" . $db->sql_escape($username) . "'"; @@ -39,13 +39,14 @@ class ucp_remind extends module } $db->sql_freeresult($result); - if (!$row['user_active']) + if ($row['user_type'] == USER_INACTIVE) { trigger_error($lang['ACCOUNT_INACTIVE']); } $server_url = generate_board_url(); $username = $row['username']; + $user_id = $row['user_id']; $key_len = 54 - strlen($server_url); $key_len = ($str_len > 6) ? $key_len : 6; @@ -74,7 +75,7 @@ class ucp_remind extends module 'PASSWORD' => $user_password, 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey") + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") ); $messenger->send($row['user_notify_type']); |