[mms] Better exception message for a 550 error, since it is common an…

…d may be displayed to an end user (Request #12990).
horde · Mar 4, 2014 · 1464d79 · 1464d79
1 parent 6b684b2
commit 1464d79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/framework/Smtp/lib/Horde/Smtp/Exception.php b/framework/Smtp/lib/Horde/Smtp/Exception.php
@@ -117,7 +117,6 @@ public function setSmtpCode($code)
 
         switch ($code) {
         case 450:
-        case 550:
             $this->raw_msg = Horde_Smtp_Translation::r("Mailbox unavailable.");
             $this->message = Horde_Smtp_Translation::t($this->raw_msg);
             $this->code = self::MAILBOX_UNAVAILABLE;
@@ -141,6 +140,12 @@ public function setSmtpCode($code)
             $this->code = self::LOGIN_REQUIREAUTHENTICATION;
             break;
 
+        case 550:
+            $this->raw_msg = Horde_Smtp_Translation::r("Message could not be delivered - the address was not found, is unknown, or is not receiving messages.");
+            $this->message = Horde_Smtp_Translation::t($this->raw_msg);
+            $this->code = self::MAILBOX_UNAVAILABLE;
+            break;
+
         case 551:
             $this->code = self::UNKNOWN_LOCAL_USER;
             break;

diff --git a/framework/Smtp/package.xml b/framework/Smtp/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Better exception message for a 550 error, since it is common and may be displayed to an end user (Request #12990).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -338,7 +338,7 @@
    <date>2014-02-11</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Better exception message for a 550 error, since it is common and may be displayed to an end user (Request #12990).
    </notes>
   </release>
  </changelog>