diff --git a/sources/Core/Email/EmailLaminas.php b/sources/Core/Email/EmailLaminas.php index 53031d3839..fd3402463a 100644 --- a/sources/Core/Email/EmailLaminas.php +++ b/sources/Core/Email/EmailLaminas.php @@ -28,8 +28,10 @@ use Combodo\iTop\Core\Authentication\Client\OAuth\OAuthClientProviderFactory; use Laminas\Mail\Header\ContentType; use Laminas\Mail\Message; +use Laminas\Mail\Protocol\Smtp\Auth\Oauth; use Laminas\Mail\Transport\File; use Laminas\Mail\Transport\FileOptions; +use Laminas\Mail\Transport\Sendmail; use Laminas\Mail\Transport\Smtp; use Laminas\Mail\Transport\SmtpOptions; use Laminas\Mime\Mime; @@ -211,7 +213,7 @@ class EMailLaminas extends Email $oOptions = new SmtpOptions($aOptions); $oTransport->setOptions($oOptions); - \Laminas\Mail\Protocol\Smtp\Auth\Oauth::setProvider(OAuthClientProviderFactory::GetProviderForSMTP()); + Oauth::setProvider(OAuthClientProviderFactory::GetProviderForSMTP()); break; case 'Null': @@ -228,7 +230,7 @@ class EMailLaminas extends Email case 'PHPMail': default: - $oTransport = new Smtp(); + $oTransport = new Sendmail(); } $oKPI = new ExecutionKPI(); @@ -240,8 +242,8 @@ class EMailLaminas extends Email return EMAIL_SEND_OK; } catch (Laminas\Mail\Transport\Exception\RuntimeException $e) { - IssueLog::Warning('Email sending failed: Some recipients were invalid'); - $aIssues = array('Some recipients were invalid.'); + IssueLog::Warning('Email sending failed: '.$e->getMessage()); + $aIssues = array($e->getMessage()); $oKPI->ComputeStats('Email Sent', 'Error received'); return EMAIL_SEND_ERROR;