diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-12 13:30:54 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-12 13:30:54 +0200 |
| commit | d6e04b603a81d6c55c3bb71974689892762b6a01 (patch) | |
| tree | b093a57b0cd2ad05153eddeb314beab156e3d7a5 /inc/Mailer.class.php | |
| parent | 0ee5ed1e998c1e67c4a0b7687977c4e2e0f29494 (diff) | |
| download | rpg-d6e04b603a81d6c55c3bb71974689892762b6a01.tar.gz rpg-d6e04b603a81d6c55c3bb71974689892762b6a01.tar.bz2 | |
successfully validate Mailer mails with msglint
Diffstat (limited to 'inc/Mailer.class.php')
| -rw-r--r-- | inc/Mailer.class.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php index 0f3321bb9..ff29c2a36 100644 --- a/inc/Mailer.class.php +++ b/inc/Mailer.class.php @@ -41,6 +41,7 @@ class Mailer { global $conf; $server = parse_url(DOKU_URL, PHP_URL_HOST); + if(strpos($server,'.') === false) $server = $server.'.localhost'; $this->partid = md5(uniqid(rand(), true)).'@'.$server; $this->boundary = '----------'.md5(uniqid(rand(), true)); @@ -57,6 +58,7 @@ class Mailer { $this->setHeader('X-DokuWiki-Server', $server); $this->setHeader('X-Auto-Response-Suppress', 'OOF'); $this->setHeader('List-Id', $conf['title'].' <'.$listid.'>'); + $this->setHeader('Date', date('r'), false); } /** @@ -426,7 +428,8 @@ class Mailer { } $mime .= '--'.$this->boundary.MAILHEADER_EOL; - $mime .= 'Content-Type: '.$media['mime'].';'.MAILHEADER_EOL; + $mime .= 'Content-Type: '.$media['mime'].';'.MAILHEADER_EOL. + ' id="'.$cid.'"'.MAILHEADER_EOL; $mime .= 'Content-Transfer-Encoding: base64'.MAILHEADER_EOL; $mime .= "Content-ID: <$cid>".MAILHEADER_EOL; if($media['embed']) { @@ -487,7 +490,8 @@ class Mailer { $body .= chunk_split(base64_encode($this->text), 74, MAILHEADER_EOL); $body .= '--'.$this->boundary.'XX'.MAILHEADER_EOL; $body .= 'Content-Type: multipart/related;'.MAILHEADER_EOL. - ' boundary="'.$this->boundary.'"'.MAILHEADER_EOL; + ' boundary="'.$this->boundary.'";'.MAILHEADER_EOL. + ' type="text/html"'.MAILHEADER_EOL; $body .= MAILHEADER_EOL; } |