aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_email.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-08-03 23:52:33 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-08-03 23:52:33 +0000
commitca716517676cff9e66ebd301bf771891d0cb0962 (patch)
tree17560847b65989326f26d395f4b4aa363f4e4053 /phpBB/admin/admin_email.php
parent66295f4bdae6eb6c0dd2f6d165d0faf3f9d7f10d (diff)
downloadforums-ca716517676cff9e66ebd301bf771891d0cb0962.tar
forums-ca716517676cff9e66ebd301bf771891d0cb0962.tar.gz
forums-ca716517676cff9e66ebd301bf771891d0cb0962.tar.bz2
forums-ca716517676cff9e66ebd301bf771891d0cb0962.tar.xz
forums-ca716517676cff9e66ebd301bf771891d0cb0962.zip
Various updates
git-svn-id: file:///svn/phpbb/trunk@2816 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin/admin_email.php')
-rw-r--r--phpBB/admin/admin_email.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/admin/admin_email.php b/phpBB/admin/admin_email.php
index 6c99d61fe1..e1e6af523d 100644
--- a/phpBB/admin/admin_email.php
+++ b/phpBB/admin/admin_email.php
@@ -116,7 +116,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
- $email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\r\n";
+ $email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\n";
$emailer->use_template('admin_send_email');
$emailer->email_address($board_config['board_email']);
@@ -132,9 +132,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
$emailer->send();
$emailer->reset();
- $message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . "index.$phpEx$SID?pane=right" . '">', '</a>');
-
- message_die(MESSAGE, $message);
+ message_die(MESSAGE, $lang['Email_sent']);
}
}
@@ -157,11 +155,11 @@ if ( $row = $db->sql_fetchrow($result) )
}
$select_list .= '</select>';
-page_header($lang['Users']);
+page_header($lang['Mass_Email']);
?>
-<h1><?php echo $lang['Email']; ?></h1>
+<h1><?php echo $lang['Mass_Email']; ?></h1>
<p><?php echo $lang['Mass_email_explain']; ?></p>