Merge remote-tracking branch 'origin/master' into video-audio

1 files changed, 46 insertions, 0 deletions

diff --git a/_test/tests/inc/mailer.test.php b/_test/tests/inc/mailer.test.php
index 053e216b8..ef78692b3 100644
--- a/_test/tests/inc/mailer.test.php
+++ b/_test/tests/inc/mailer.test.php
@@ -15,6 +15,11 @@ class TestMailer extends Mailer {
     public function prepareHeaders() {
         return parent::prepareHeaders();
     }
+
+    public function cleanHeaders() {
+        parent::cleanHeaders();
+    }
+
 }
 
 class mailer_test extends DokuWikiTest {
@@ -67,6 +72,47 @@ class mailer_test extends DokuWikiTest {
         $this->assertArrayNotHasKey('Test-Header',$headers);
     }
 
+    function test_addresses(){
+        $mail = new TestMailer();
+
+        $mail->to('andi@splitbrain.org');
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('andi@splitbrain.org', $headers['To']);
+
+        $mail->to('<andi@splitbrain.org>');
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('andi@splitbrain.org', $headers['To']);
+
+        $mail->to('Andreas Gohr <andi@splitbrain.org>');
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('Andreas Gohr <andi@splitbrain.org>', $headers['To']);
+
+        $mail->to('Andreas Gohr <andi@splitbrain.org> , foo <foo@example.com>');
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('Andreas Gohr <andi@splitbrain.org>, foo <foo@example.com>', $headers['To']);
+
+        $mail->to('Möp <moep@example.com> , foo <foo@example.com>');
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('=?UTF-8?B?TcO2cA==?= <moep@example.com>, foo <foo@example.com>', $headers['To']);
+
+        $mail->to(array('Möp <moep@example.com> ',' foo <foo@example.com>'));
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('=?UTF-8?B?TcO2cA==?= <moep@example.com>, foo <foo@example.com>', $headers['To']);
+
+        $mail->to(array('Beet, L van <lvb@example.com>',' foo <foo@example.com>'));
+        $mail->cleanHeaders();
+        $headers = $mail->prop('headers');
+        $this->assertEquals('=?UTF-8?B?QmVldCwgTCB2YW4=?= <lvb@example.com>, foo <foo@example.com>', $headers['To']);
+
+
+    }
+
     function test_simplemail(){
         global $conf;
         $conf['htmlmail'] = 0;