From 620e60adbb21fcbae5d330900183f66a32f6a746 Mon Sep 17 00:00:00 2001 From: gpolins Date: Wed, 5 Sep 2001 23:20:59 +0000 Subject: [PATCH] BCC and Template Update git-svn-id: file:///svn/phpbb/trunk@986 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_mass_email.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php index cc2d32081f..b2f34f8ed3 100644 --- a/phpBB/admin/admin_mass_email.php +++ b/phpBB/admin/admin_mass_email.php @@ -93,12 +93,17 @@ if(isset($HTTP_POST_VARS['submit'])) $email_headers = "From: " . $board_config['board_email_from'] . "\r\n"; $msg = stripslashes($HTTP_POST_VARS["$f_msg"]); + $email_headers .= 'bcc: '; for($i = 0;$i < count($g_list); $i++) { - mail($g_list[$i]['user_email'],$HTTP_POST_VARS["$f_title"],$msg,$email_headers); + if($i != 0) + { + $email_headers.= ' ,'; + } + $email_headers .= $g_list[$i]['user_email']; } - include('page_header_admin.'.$phpEx); - echo ''.$lang['Messages'].' '.$lang['Sent'].'!
'; + mail($board_config['board_email_from'],$HTTP_POST_VARS["$f_title"],$HTTP_POST_VARS["$f_msg"],$email_headers); + $notice = $lang['Messages'].' '.$lang['Sent'].'!'; } //Else, or if they already sent a message @@ -116,11 +121,7 @@ for($i = 0;$i < count($group_list); $i++) } $select_list .= ""; -//Don't include it twice -if(!isset($HTTP_POST_VARS['submit'])) -{ - include('page_header_admin.'.$phpEx); -} +include('page_header_admin.'.$phpEx); $template->set_filenames(array( "body" => "admin/user_email.tpl") @@ -134,6 +135,7 @@ $template->assign_vars(array( "L_EMAIL_SUBJECT" => $lang['Subject'], "L_EMAIL_MSG" => $lang['Message'], "L_EMAIL" => $lang['Email'], + "L_NOTICE" => $notice, "S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx), "S_GROUP_SELECT" => $select_list,