From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 10 Mar 2010 10:04:14 +0000 (-0700)
Subject: Simplify
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e95a4294b71d478549400c58bae486134325c664;p=horde.git

Simplify
---

diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php
index 4fe07b94f..6c2ad9710 100644
--- a/imp/lib/Auth.php
+++ b/imp/lib/Auth.php
@@ -95,20 +95,14 @@ class IMP_Auth
             if (!isset($credentials['server'])) {
                 $credentials['server'] = self::getAutoLoginServer();
             }
-            try {
-                self::_createSession($auth_ob->getCredential());
-                return true;
-            } catch (Horde_Auth_Exception $e) {
+        } else {
+            /* Attempt hordeauth authentication. */
+            $credentials = self::_canAutoLogin();
+            if ($credentials === false) {
                 return false;
             }
         }
 
-        /* Attempt hordeauth authentication. */
-        $credentials = self::_canAutoLogin();
-        if ($credentials === false) {
-            return false;
-        }
-
         try {
             self::_createSession($credentials);
             return true;