diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-02-24 20:55:01 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-02-24 20:55:01 +0100 |
| commit | 558ecdcd40fb13bb264839c210996c47e3e81bcb (patch) | |
| tree | 3a58f83d2c9005f49188e6db3756f99a532e6e9e | |
| parent | 465ab7ab922f5342f28c7d625235d3d398b726f0 (diff) | |
| parent | 8586ce890650238e797b15b721eaa142cfc8c7f0 (diff) | |
| download | forums-558ecdcd40fb13bb264839c210996c47e3e81bcb.tar forums-558ecdcd40fb13bb264839c210996c47e3e81bcb.tar.gz forums-558ecdcd40fb13bb264839c210996c47e3e81bcb.tar.bz2 forums-558ecdcd40fb13bb264839c210996c47e3e81bcb.tar.xz forums-558ecdcd40fb13bb264839c210996c47e3e81bcb.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index d0a02567ad..821f0d970d 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -393,6 +393,28 @@ class messenger } /** + * Generates a valid message id to be used in emails + * + * @return string message id + */ + function generate_message_id() + { + global $config; + + $domain = 'phpbb.generated'; + if ($config['server_name']) + { + $domain = $config['server_name']; + } + else if (!empty($_SERVER['SERVER_NAME'])) + { + $domain = $_SERVER['SERVER_NAME']; + } + + return md5(unique_id(time())) . '@' . $domain; + } + + /** * Return email header */ function build_header($to, $cc, $bcc) @@ -418,7 +440,7 @@ class messenger $headers[] = 'Return-Path: <' . $config['board_email'] . '>'; $headers[] = 'Sender: <' . $config['board_email'] . '>'; $headers[] = 'MIME-Version: 1.0'; - $headers[] = 'Message-ID: <' . md5(unique_id(time())) . '@' . $config['server_name'] . '>'; + $headers[] = 'Message-ID: <' . $this->generate_message_id() . '>'; $headers[] = 'Date: ' . date('r', time()); $headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed $headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit |