Skip to content

EspoCRM – Open Source CRM Application

New error status

Taras Machyshyna258d7dc9fc6
diff --git a/application/Espo/Core/Mail/Sender.php b/application/Espo/Core/Mail/Sender.php
index 26a6d9e5d3..617e461bf4 100644
--- a/application/Espo/Core/Mail/Sender.php
+++ b/application/Espo/Core/Mail/Sender.php
@@ -368,25 +368,37 @@ class Sender
private function handleException(Exception|TransportExceptionInterface $e): never
{
if ($e instanceof TransportExceptionInterface) {
- $message = "unknownError";
-
- if (
- stripos($e->getMessage(), 'password') !== false ||
- stripos($e->getMessage(), 'credentials') !== false ||
- stripos($e->getMessage(), '5.7.8') !== false ||
- stripos($e->getMessage(), '5.7.3') !== false
- ) {
- $message = 'invalidCredentials';
- }
-
$this->log->error("Email sending error: " . $e->getMessage(), ['exception' => $e]);
+ $message = $this->getErrorMessage($e);
+
throw new SendingError($message);
}
throw new SendingError($e->getMessage());
}
+ private function getErrorMessage(TransportExceptionInterface $e): string
+ {
+ if (
+ stripos($e->getMessage(), 'password') !== false ||
+ stripos($e->getMessage(), 'credentials') !== false ||
+ stripos($e->getMessage(), '5.7.8') !== false ||
+ stripos($e->getMessage(), '5.7.3') !== false
+ ) {
+ return 'invalidCredentials';
+ }
+
+ if (
+ stripos($e->getMessage(), '5.1.1') !== false ||
+ stripos($e->getMessage(), '5.4.6') !== false
+ ) {
+ return 'recipientNotFound';
+ }
+
+ return "unknownError";
+ }
+
private function addRecipientAddresses(Email $email, Message $message): void
{
$value = $email->get('to');