Merge branch '2023.11' into 2024.11

tine-groupware · Feb 17, 2025 · e25f1f8 · e25f1f8
2 parents 52b8add + 3eb7472
commit e25f1f8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/tine20/Felamimail/Controller/Message/Send.php b/tine20/Felamimail/Controller/Message/Send.php
@@ -850,10 +850,15 @@ protected function _setMailRecipients(Zend_Mail $_mail, Felamimail_Model_Message
         return $nonPrivateRecipients;
     }
 
-    protected function _getErrorException($messageText)
+    protected function _getErrorException(string $messageText): Tinebase_Exception_SystemGeneric
     {
         $translation = Tinebase_Translation::getTranslation('Felamimail');
-        $message = sprintf($translation->_('Error: %s'), $messageText);
+        if (preg_match('/evp_decrypt/i', $messageText)) {
+            $message = $translation->_(
+                'Decryption Error: Maybe your shared credential cache key is longer than 24 chars?');
+        } else {
+            $message = sprintf($translation->_('Error: %s'), $messageText);
+        }
         $tesg = new Tinebase_Exception_SystemGeneric($message);
         $tesg->setTitle($translation->_('Could not send message'));