diff options
Diffstat (limited to 'phpBB/includes/usercp_activate.php')
| -rw-r--r-- | phpBB/includes/usercp_activate.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php index cb2a38b2ac..e823e4d211 100644 --- a/phpBB/includes/usercp_activate.php +++ b/phpBB/includes/usercp_activate.php @@ -26,7 +26,7 @@ if ( !defined('IN_PHPBB') ) exit; } -$sql = "SELECT user_active, user_id, user_email, user_newpasswd, user_lang, user_actkey +$sql = "SELECT user_active, user_id, user_email, user_newpasswd, user_lang, user_actkey FROM " . USERS_TABLE . " WHERE user_id = " . intval($HTTP_GET_VARS[POST_USERS_URL]); if ( !($result = $db->sql_query($sql)) ) @@ -49,19 +49,19 @@ if ( $row = $db->sql_fetchrow($result) ) $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']; + SET user_active = 1, user_actkey = ''" . $sql_update_pass . " + WHERE user_id = " . $row['user_id']; if ( !($result = $db->sql_query($sql)) ) { message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); } - if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' ) + if ( $config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' ) { include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($board_config['smtp_delivery']); + $emailer = new emailer($config['smtp_delivery']); - $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\n"; + $email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\n"; $emailer->use_template('admin_welcome_activated', $row['user_lang']); $emailer->email_address($row['user_email']); @@ -69,10 +69,10 @@ if ( $row = $db->sql_fetchrow($result) ) $emailer->extra_headers($email_headers); $emailer->assign_vars(array( - 'SITENAME' => $board_config['sitename'], + 'SITENAME' => $config['sitename'], 'USERNAME' => $username, 'PASSWORD' => $password_confirm, - 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig'])) + 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])) ); $emailer->send(); $emailer->reset(); @@ -89,7 +89,7 @@ if ( $row = $db->sql_fetchrow($result) ) 'META' => '<meta http-equiv="refresh" content="10;url=' . append_sid("index.$phpEx") . '">') ); - $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; + $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; message_die(GENERAL_MESSAGE, $message); } } |