Log IMAP errors to log in English, not current user's language

horde · Jan 28, 2014 · 0b14c18 · 0b14c18
1 parent 8b71c1e
commit 0b14c18
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/imp/bin/imp-query-imap-cache b/imp/bin/imp-query-imap-cache
@@ -131,7 +131,7 @@ try {
     $mboxes = $ob->listMailboxes('*', Horde_Imap_Client::MBOX_ALL, array('flat' => true, 'sort' => true));
     $cli->message('User mailbox count: ' . count($mboxes));
 } catch (Horde_Imap_Client_Exception $e) {
-    $cli->fatal('IMAP error: ' . $e->getMessage());
+    $cli->fatal('IMAP error: ' . $e);
 }
 
 $opts = array(
@@ -213,7 +213,7 @@ while (true) {
                         $status = $ob->status($mbox, Horde_Imap_Client::STATUS_UIDVALIDITY | Horde_Imap_Client::STATUS_HIGHESTMODSEQ);
                     } catch (Horde_Imap_Client_Exception $e) {
                         $cli->writeln();
-                        $cli->message('IMAP error: ' . $e->getMessage(), 'cli.error');
+                        $cli->message('IMAP error: ' . $e, 'cli.error');
                     }
                     $cli->message('UIDVALIDITY: ' . $res['uidvalid'] . ' [Server value: ' . (($status['uidvalidity'] != $res['uidvalid']) ? $cli->red($status['uidvalidity']) : $status['uidvalidity']) . ']');
                     if (isset($res[Horde_Imap_Client_Base::CACHE_MODSEQ])) {
@@ -303,7 +303,7 @@ while (true) {
             $cli->message(sprintf('Deleted %d UIDs from cache.', count($uids)), 'cli.success');
         } catch (Horde_Imap_Client_Exception $e) {
             $cli->writeln();
-            $cli->message('Failed deleting UIDs. Error: ' . $e->getMessage(), 'cli.error');
+            $cli->message('Failed deleting UIDs. Error: ' . $e, 'cli.error');
         }
         break;
     }

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
@@ -581,7 +581,10 @@ public function download(Horde_Variables $vars)
     public function exceptionHandler(Exception $e)
     {
         if ($e instanceof Horde_Imap_Client_Exception) {
-            $e = new Horde_Exception_AuthenticationFailure($e->getMessage(), Horde_Auth::REASON_MESSAGE);
+            $e = new Horde_Exception_AuthenticationFailure(
+                $e->getMessage(),
+                Horde_Auth::REASON_MESSAGE
+            );
         }
 
         Horde_ErrorHandler::fatal($e);

diff --git a/imp/lib/Imap.php b/imp/lib/Imap.php
@@ -288,9 +288,8 @@ public function createImapObject($config, $imap = true)
                 : new Horde_Imap_Client_Socket_Pop3($config);
             return $this->_ob;
         } catch (Horde_Imap_Client_Exception $e) {
-            $error = new IMP_Imap_Exception($e);
-            Horde::log($error);
-            throw $error;
+            Horde::log($e->raw_msg);
+            throw new IMP_Imap_Exception($e);
         }
     }
 
@@ -713,7 +712,7 @@ public function __call($method, $params)
                 throw $auth_e;
             }
 
-            Horde::log($error);
+            Horde::log($e->raw_msg);
             throw $error;
         }
 

diff --git a/imp/package.xml b/imp/package.xml
@@ -1285,7 +1285,7 @@
    <package>
     <name>Horde_Imap_Client</name>
     <channel>pear.horde.org</channel>
-    <min>2.17.0</min>
+    <min>2.18.0</min>
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>