From 1f670aa48ac77c60b3cd1abc9d1d0bc867887a99 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 3 Mar 2003 10:32:44 +0000 Subject: [PATCH] fixed wrong return path in admin mass mailing - netclectic, fixed bug #1477 git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3586 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_mass_email.php | 2 +- phpBB/includes/usercp_activate.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php index d9b9e70ebd..f542b2b5c7 100644 --- a/phpBB/admin/admin_mass_email.php +++ b/phpBB/admin/admin_mass_email.php @@ -116,7 +116,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) $emailer = new emailer($board_config['smtp_delivery']); - $email_headers = 'Return-Path: ' . $userdata['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n"; + $email_headers = 'Return-Path: ' . $board_config['board_email'] . "\nFrom: " . $board_config['board_email'] . "\n"; $email_headers .= 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\n"; $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n"; diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php index 252bddbaa5..7ef05e3d8f 100644 --- a/phpBB/includes/usercp_activate.php +++ b/phpBB/includes/usercp_activate.php @@ -37,7 +37,7 @@ if ( !($result = $db->sql_query($sql)) ) if ( $row = $db->sql_fetchrow($result) ) { - if ( $row['user_active'] && $row['user_actkey'] == '' ) + if ( $row['user_active'] && trim($row['user_actkey']) == '' ) { $template->assign_vars(array( 'META' => '') @@ -45,7 +45,7 @@ if ( $row = $db->sql_fetchrow($result) ) message_die(GENERAL_MESSAGE, $lang['Already_activated']); } - else if ( $row['user_actkey'] == $HTTP_GET_VARS['act_key'] ) + else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != '')) { $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';