aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/admin_email.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-07-06 18:48:33 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-07-06 18:48:33 +0000
commit1b320bbb006a685d33032a6d1a39de44b4e858a7 (patch)
tree79959cc9ae9d93be18ecf5b56eb991b5511ec8bd /phpBB/adm/admin_email.php
parentf31b471ee12c96eb1a61484c684202f4d3a8b8bd (diff)
downloadforums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar
forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.gz
forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.bz2
forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.xz
forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.zip
merged log tables, added new log_type (critical).
changed email class a little bit. bug fixed the queue a little bit. git-svn-id: file:///svn/phpbb/trunk@4210 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/admin_email.php')
-rw-r--r--phpBB/adm/admin_email.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php
index 00353ee399..e16bfedca5 100644
--- a/phpBB/adm/admin_email.php
+++ b/phpBB/adm/admin_email.php
@@ -101,10 +101,10 @@ if (isset($_POST['submit']))
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer(true);
- $extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\r\n";
- $extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\r\n";
- $extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\r\n";
- $extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\r\n";
+ $extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\n";
+ $extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n";
+ $extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n";
+ $extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n";
foreach ($email_list as $lang => $to_ary)
{
@@ -129,7 +129,7 @@ if (isset($_POST['submit']))
}
}
- $emailer->queue->save();
+ $emailer->mail_queue->save();
unset($email_list);
if ($group_id)