diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-06-10 01:49:57 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-06-10 01:49:57 +0000 |
| commit | e9bec6c557abece75afddb8b1c092866462669b4 (patch) | |
| tree | 238864c8740b2ffa1ae970ceab9b8545a53aef17 /phpBB/includes | |
| parent | b2d06c7309f6889a746449f656bfa34d7642d87a (diff) | |
| download | forums-e9bec6c557abece75afddb8b1c092866462669b4.tar forums-e9bec6c557abece75afddb8b1c092866462669b4.tar.gz forums-e9bec6c557abece75afddb8b1c092866462669b4.tar.bz2 forums-e9bec6c557abece75afddb8b1c092866462669b4.tar.xz forums-e9bec6c557abece75afddb8b1c092866462669b4.zip | |
Fixes in line with 2.0.1
git-svn-id: file:///svn/phpbb/trunk@2629 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/usercp_activate.php | 94 |
1 files changed, 52 insertions, 42 deletions
diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php index 6edff84e52..cb2a38b2ac 100644 --- a/phpBB/includes/usercp_activate.php +++ b/phpBB/includes/usercp_activate.php @@ -8,7 +8,6 @@ * * $Id$ * - * ***************************************************************************/ /*************************************************************************** @@ -27,70 +26,81 @@ if ( !defined('IN_PHPBB') ) exit; } -$sql = "SELECT user_id, user_email, user_newpasswd, user_lang +$sql = "SELECT user_active, user_id, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " - WHERE user_actkey = '" . str_replace("\'", "''", $HTTP_GET_VARS['act_key']) . "'"; -if ( $result = $db->sql_query($sql) ) + WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]); +if ( !($result = $db->sql_query($sql)) ) { - if ( $row = $db->sql_fetchrow($result) ) + message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); +} + +if ( $row = $db->sql_fetchrow($result) ) +{ + if ( $row['user_active'] && $row['user_actkey'] == '' ) + { + $template->assign_vars(array( + 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') + ); + + message_die(GENERAL_MESSAGE, $lang['Already_activated']); + } + else if ( $row['user_actkey'] == $HTTP_GET_VARS['act_key'] ) { - $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ""; + $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; $sql = "UPDATE " . USERS_TABLE . " SET user_active = 1, user_actkey = ''" . $sql_update_pass . " - WHERE user_id = " . $row['user_id']; - if ( $result = $db->sql_query($sql) ) + WHERE user_id = " . $row['user_id']; + if ( !($result = $db->sql_query($sql)) ) { - if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' ) - { - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($board_config['smtp_delivery']); + message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); + } - $email_headers = 'From: ' . $board_config['board_email'] . "\r\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' ) + { + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); - $emailer->use_template('admin_welcome_activated', $row['user_lang']); - $emailer->email_address($row['user_email']); - $emailer->set_subject();//$lang['Account_activated_subject'] - $emailer->extra_headers($email_headers); + $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n"; - $emailer->assign_vars(array( - 'SITENAME' => $board_config['sitename'], - 'USERNAME' => $username, - 'PASSWORD' => $password_confirm, - 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig'])) - ); - $emailer->send(); - $emailer->reset(); + $emailer->use_template('admin_welcome_activated', $row['user_lang']); + $emailer->email_address($row['user_email']); + $emailer->set_subject();//$lang['Account_activated_subject'] + $emailer->extra_headers($email_headers); - $template->assign_vars(array( - 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') - ); + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'USERNAME' => $username, + 'PASSWORD' => $password_confirm, + 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig'])) + ); + $emailer->send(); + $emailer->reset(); - message_die(GENERAL_MESSAGE, $lang['Account_active_admin']); - } - else - { - $template->assign_vars(array( - 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') - ); + $template->assign_vars(array( + 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') + ); - $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; - message_die(GENERAL_MESSAGE, $message); - } + message_die(GENERAL_MESSAGE, $lang['Account_active_admin']); } else { - message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); + $template->assign_vars(array( + 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') + ); + + $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; + message_die(GENERAL_MESSAGE, $message); } } else { - message_die(GENERAL_ERROR, $lang['Wrong_activation']); //wrongactiv + message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); } } else { - message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); + message_die(GENERAL_MESSAGE, $lang['No_such_user']); } -?> +?>
\ No newline at end of file |