From bb908c9eae1c2c39bb585855ae16ceb43eebac2c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 15 Jun 2003 12:08:20 +0000 Subject: [PATCH] ok, last commit. Please, now everything should work as expected. git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@4133 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/emailer.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index 3d212629bd..d7a3ff1f77 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -27,8 +27,7 @@ class emailer { var $msg, $subject, $extra_headers; - var $to_addres, $cc_address, $bcc_address; - var $reply_to, $from; + var $addresses, $reply_to, $from; var $use_smtp; var $tpl_msg = array(); @@ -205,7 +204,7 @@ class emailer } // Build header - $this->extra_headers = (($this->replyto != '') ? "Reply-to: <$this->replyto>\n" : '') . (($this->from != '') ? "From: <$this->from>\n" : "From: <" . $board_config['board_email'] . ">\n") . "Return-Path: <" . $board_config['board_email'] . ">\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s Z', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . (($cc != '') ? "Cc:$cc\n" : '') . (($bcc != '') ? "Bcc:$bcc\n" : '') . trim($this->extra_headers); + $this->extra_headers = (($this->replyto != '') ? "Reply-to: <$this->replyto>\n" : '') . (($this->from != '') ? "From: <$this->from>\n" : "From: <" . $board_config['board_email'] . ">\n") . "Return-Path: <" . $board_config['board_email'] . ">\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . gmdate('D, d M Y H:i:s Z', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . trim($this->extra_headers) . (($cc != '') ? "Cc:$cc\n" : '') . (($bcc != '') ? "Bcc:$bcc\n" : ''); $empty_to_header = ($to == '') ? TRUE : FALSE; $to = ($to == '') ? (($board_config['sendmail_fix'] && !$this->use_smtp) ? ' ' : 'Undisclosed-recipients:;') : $to;