diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-31 16:56:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-31 16:56:15 +0000 |
| commit | 46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0 (patch) | |
| tree | 2f8fd4b59b67fa390f3d29ab2a78142d34888ec8 /phpBB/includes/functions_messenger.php | |
| parent | 54f79e200fdba8e6eee74a0a8aed68a2ca71ec5e (diff) | |
| download | forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.gz forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.bz2 forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.tar.xz forums-46f3bd40a8ed2c5cfcb6b229f7ebab5678e41bf0.zip | |
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)
- fixes for bugs #6694, #6664 and #6662
git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f2ad76f892..06da2f0999 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -363,12 +363,12 @@ class messenger if (empty($this->replyto)) { - $this->replyto = '<' . $config['board_email'] . '>'; + $this->replyto = '<' . $config['board_contact'] . '>'; } if (empty($this->from)) { - $this->from = '<' . $config['board_email'] . '>'; + $this->from = '<' . $config['board_conact'] . '>'; } // Build to, cc and bcc strings @@ -474,7 +474,7 @@ class messenger foreach ($addresses as $address) { - $this->jabber->send_message($address, 'normal', NULL, array('body' => $this->msg)); + $this->jabber->send_message($address, 'normal', NULL, array('body' => $this->msg, 'subject' => $this->subject)); } sleep(1); @@ -637,7 +637,7 @@ class queue case 'jabber': foreach ($addresses as $address) { - if ($this->jabber->send_message($address, 'normal', NULL, array('body' => $msg)) === false) + if ($this->jabber->send_message($address, 'normal', NULL, array('body' => $msg, 'subject' => $subject)) === false) { messenger::error('JABBER', $this->jabber->get_log()); continue 3; @@ -781,10 +781,10 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') // Something we really didn't take into consideration originally $header_array = explode("\r\n", $headers); $headers = ''; - + foreach ($header_array as $header) { - if (preg_match('#^cc:#si', $header) || preg_match('#^bcc:#si', $header)) + if (strpos(strtolower($header), 'cc:') === 0 || strpos(strtolower($header), 'bcc:') === 0) { $header = ''; } @@ -865,7 +865,7 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') // From this point onward most server response codes should be 250 // Specify who the mail is from.... - $smtp->server_send('MAIL FROM:<' . $config['board_email'] . '>'); + $smtp->server_send('MAIL FROM:<' . $config['board_contact'] . '>'); if ($err_msg = $smtp->server_parse('250', __LINE__)) { $smtp->close_session($err_msg); |