composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.0' into develop

Browse Source 
# Conflicts:
#	sources/Core/Email/EmailSwiftMailer.php

Email by SMTP with self-signed certificate ported from EmailSwiftMailer to EmailLaminas
This commit is contained in:
Eric Espie
2022-11-30 14:35:13 +01:00
parent f02e95e8bf 7bb12c35ea
commit 93e0dde1a1
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Core/Email/EmailLaminas.php
View File

@@ -170,6 +170,8 @@ class EMailLaminas extends Email
$sEncryption = self::$m_oConfig->Get('email_transport_smtp.encryption');
$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
$bAllowSelfSigned = static::$m_oConfig->Get('email_transport_smtp.allow_self_signed');
$bVerifyPeer = static::$m_oConfig->Get('email_transport_smtp.verify_peer');
$oTransport = new Smtp();
$aOptions = [
@@ -179,6 +181,8 @@ class EMailLaminas extends Email
'connection_config' => [
'ssl' => $sEncryption,
],
'allow_self_signed' => $bAllowSelfSigned,
'verify_peer' => $bVerifyPeer,
];
if (strlen($sUserName) > 0) {
$aOptions['connection_config']['username'] = $sUserName;