1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00

Bouncing email notifications added on login. DKIM support added for outgoing mail. PHP Mailer upgraded to v5.2.8

This commit is contained in:
Cameron
2015-05-25 13:37:17 -07:00
parent 0557e770eb
commit 219c68e5ed
10 changed files with 669 additions and 613 deletions

View File

@@ -320,6 +320,21 @@ class e107Email extends PHPMailer
$this->From = $tp->toHTML(vartrue($pref['replyto_email'],$overrides['siteadminemail']),'','RAWTEXT');
$this->WordWrap = 76; // Set a sensible default
$pref['mail_dkim'] = 1;
$privatekeyfile = e_SYSTEM.'dkim_private.key';
if($pref['mail_dkim'] && is_readable($privatekeyfile))
{
$this->DKIM_domain = e_DOMAIN; // 'example.com';
$this->DKIM_private = $privatekeyfile;
$this->DKIM_selector = 'phpmailer';
$this->DKIM_passphrase = ''; //key is not encrypted
$this->DKIM_identifier = $this->From;
}
// Now look for any overrides - slightly cumbersome way of doing it, but does give control over what can be set from here
// Options are those accepted by the arraySet() method.
if(!empty($overrides))