holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patched PHPMailer to allow to use STARTTLS and TLS version>=1, enhanced wizard to autodetect hosted 1-and-1 domains by using Mozilla ISPDB on MX or domain-part of MX, fixed folder detection to not require folders below INBOX

Browse Source
This commit is contained in:
Ralf Becker 2014-04-04 08:31:28 +00:00
parent 2b9d33b0b5
commit b5818b931f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/inc/class.phpmailer.inc.php
View File

@ -864,15 +864,26 @@ class PHPMailer {
$port = $this->Port; $port = $this->Port;
} }
$hostA = explode("://", $host); $hostA = explode("://", $host);
if (strtolower($hostA[0]) == 'tls' || strtolower($hostA[0]) == 'ssl') { if (in_array(strtolower($hostA[0]), array('tls', 'ssl', 'tlsv1'))) {
$this->SMTPSecure = strtolower($hostA[0]); $this->SMTPSecure = strtolower($hostA[0]);
$host = $hostA[1]; $host = $hostA[1];
} }
$tls = ($this->SMTPSecure == 'tls'); $tls = ($this->SMTPSecure == 'tls'); // starttls
$ssl = ($this->SMTPSecure == 'ssl'); switch($this->SMTPSecure)
{
case 'tls': // STARTTLS
$tls = true;
break;
case 'ssl':
$host = 'ssl://'.$host;
break;
case 'tlsv1': // require minimum tls version 1.0, no more ssl 2 or 3
$host = 'tls://'.$host;
break;
}
if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) { if ($this->smtp->Connect($host, $port, $this->Timeout)) {
$hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname()); $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
$this->smtp->Hello($hello); $this->smtp->Hello($hello);