diff options
| author | Gaëtan Muller <m.gaetan89@gmail.com> | 2014-12-30 02:22:13 +0100 |
|---|---|---|
| committer | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-01-11 13:22:59 +0100 |
| commit | 63da128ee5891971cc9e4f283572e0198174d692 (patch) | |
| tree | e35a7b1020bf944beb198cc9ab1df612ef77760c /phpBB/includes/functions_messenger.php | |
| parent | ef1be6e247cf01a99e68ec85600a80fd62ca9a75 (diff) | |
| download | forums-63da128ee5891971cc9e4f283572e0198174d692.tar forums-63da128ee5891971cc9e4f283572e0198174d692.tar.gz forums-63da128ee5891971cc9e4f283572e0198174d692.tar.bz2 forums-63da128ee5891971cc9e4f283572e0198174d692.tar.xz forums-63da128ee5891971cc9e4f283572e0198174d692.zip | |
[ticket/12487] Update PHP code
PHPBB3-12487
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index bb38e96a53..1a9b1f9e11 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -33,8 +33,6 @@ class messenger /** @var \phpbb\template\template */ protected $template; - var $eol = "\n"; - /** * Constructor */ @@ -44,10 +42,6 @@ class messenger $this->use_queue = (!$config['email_package_size']) ? false : $use_queue; $this->subject = ''; - - // Determine EOL character (\n for UNIX, \r\n for Windows and \r for Mac) - $this->eol = (!defined('PHP_EOL')) ? (($eol = strtolower(substr(PHP_OS, 0, 3))) == 'win') ? "\r\n" : (($eol == 'mac') ? "\r" : "\n") : PHP_EOL; - $this->eol = (!$this->eol) ? "\n" : $this->eol; } /** @@ -497,7 +491,7 @@ class messenger $this->from = $board_contact; } - $encode_eol = ($config['smtp_delivery']) ? "\r\n" : $this->eol; + $encode_eol = ($config['smtp_delivery']) ? "\r\n" : PHP_EOL; // Build to, cc and bcc strings $to = $cc = $bcc = ''; @@ -529,7 +523,7 @@ class messenger } else { - $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $this->eol, $err_msg); + $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, PHP_EOL, $err_msg); } if (!$result) @@ -686,10 +680,6 @@ class queue $this->data = array(); $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx"; - - // Determine EOL character (\n for UNIX, \r\n for Windows and \r for Mac) - $this->eol = (!defined('PHP_EOL')) ? (($eol = strtolower(substr(PHP_OS, 0, 3))) == 'win') ? "\r\n" : (($eol == 'mac') ? "\r" : "\n") : PHP_EOL; - $this->eol = (!$this->eol) ? "\n" : $this->eol; } /** @@ -822,7 +812,7 @@ class queue } else { - $result = phpbb_mail($to, $subject, $msg, $headers, $this->eol, $err_msg); + $result = phpbb_mail($to, $subject, $msg, $headers, PHP_EOL, $err_msg); } if (!$result) |