From 30aeac65dccceab18e19318e5981118f150c0647 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 4 Oct 2002 13:09:10 +0000 Subject: Well, here are all my changes ... don't blame me if things break :D git-svn-id: file:///svn/phpbb/trunk@2923 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_email.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'phpBB/admin/admin_email.php') diff --git a/phpBB/admin/admin_email.php b/phpBB/admin/admin_email.php index e1e6af523d..27dd13e2db 100644 --- a/phpBB/admin/admin_email.php +++ b/phpBB/admin/admin_email.php @@ -21,14 +21,14 @@ if ( !empty($setmodules) ) { - if ( !$acl->get_acl_admin('general') ) + if ( !$auth->get_acl_admin('general') ) { return; } $filename = basename(__FILE__); $module['General']['Mass_Email'] = $filename . $SID; - + return; } @@ -43,14 +43,14 @@ require('pagestart.' . $phpEx); // // Do we have general admin permissions? // -if ( !$acl->get_acl_admin('general') ) +if ( !$auth->get_acl_admin('general') ) { return; } // // Set some vars -// +// $message = ''; $subject = ''; @@ -80,7 +80,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) $subject = stripslashes($HTTP_POST_VARS['subject']); $message = stripslashes($HTTP_POST_VARS['message']); - + // // Error checking needs to go here ... if no subject and/or // no message then skip over the send and return to the form @@ -102,7 +102,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) $board_config['smtp_host'] = get_cfg_var('SMTP'); } $emailer = new emailer($board_config['smtp_delivery']); - + $email_headers = 'From: ' . $board_config['board_email'] . "\n"; $bcc_list = ''; @@ -111,7 +111,7 @@ if ( isset($HTTP_POST_VARS['submit']) ) $bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $email_list[$i]['user_email']; } $email_headers .= "Bcc: $bcc_list\n"; - + $email_headers .= 'Return-Path: ' . $userdata['board_email'] . "\n"; $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n"; $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; @@ -124,8 +124,8 @@ if ( isset($HTTP_POST_VARS['submit']) ) $emailer->extra_headers($email_headers); $emailer->assign_vars(array( - 'SITENAME' => $board_config['sitename'], - 'BOARD_EMAIL' => $board_config['board_email'], + 'SITENAME' => $board_config['sitename'], + 'BOARD_EMAIL' => $board_config['board_email'], 'MESSAGE' => $message) ); @@ -134,13 +134,13 @@ if ( isset($HTTP_POST_VARS['submit']) ) message_die(MESSAGE, $lang['Email_sent']); } -} +} // // Initial selection // -$sql = "SELECT group_id, group_name +$sql = "SELECT group_id, group_name FROM ".GROUPS_TABLE; $result = $db->sql_query($sql); @@ -164,22 +164,22 @@ page_header($lang['Mass_Email']);

"> - + - + - + - - + + - +
-
+
-- cgit v1.2.1