[mms] Handle IN-USE, LOGIN-DELAY, and SYS/TEMP error codes when authe…

…nticating to POP3 servers.
horde · Apr 23, 2014 · 3d0125a · 3d0125a
1 parent 0b0a5f0
commit 3d0125a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php
@@ -260,7 +260,9 @@ protected function _login()
 
                 return true;
             } catch (Horde_Imap_Client_Exception $e) {
-                if (!empty($this->_init['authmethod'])) {
+                if (!empty($this->_init['authmethod']) &&
+                    ($e->getCode() != $e::LOGIN_UNAVAILABLE) &&
+                    ($e->getCode() != $e::POP3_TEMP_ERROR)) {
                     $this->_setInit();
                     return $this->login();
                 }
@@ -269,7 +271,7 @@ protected function _login()
 
         throw new Horde_Imap_Client_Exception(
             Horde_Imap_Client_Translation::r("POP3 server denied authentication."),
-            $e->getCode() ? $e->getCode() : Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED
+            $e->getCode() ?: $e::LOGIN_AUTHENTICATIONFAILED
         );
     }
 

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Handle IN-USE, LOGIN-DELAY, and SYS/TEMP error codes when authenticating to POP3 servers.
 * [mms] Fix TLS negotiation with POP3 servers.
 * [mms] Fix throwing authentication exception when using Digest-MD5.
  </notes>
@@ -2359,6 +2360,7 @@
    <date>2014-04-16</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Handle IN-USE, LOGIN-DELAY, and SYS/TEMP error codes when authenticating to POP3 servers.
 * [mms] Fix TLS negotiation with POP3 servers.
 * [mms] Fix throwing authentication exception when using Digest-MD5.
    </notes>