From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 30 Jul 2009 03:30:57 +0000 (-0600)
Subject: Another weird workaround for auth application.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=83676b531c4bb551eaa5bf14bf20807716220607;p=horde.git

Another weird workaround for auth application.

Callback must not have checkperms set or else we run into issues with
looping of LoginTasks. For sanity, do the check inside the auth callback
itself.
---

diff --git a/imp/lib/api.php b/imp/lib/api.php
index be91a973d..c616dec7d 100644
--- a/imp/lib/api.php
+++ b/imp/lib/api.php
@@ -150,7 +150,8 @@ $_services = array(
     ),
 
     'authAuthenticateCallback' => array(
-        'args' => array()
+        'args' => array(),
+        'checkperms' => false
     ),
 
     'authTransparent' => array(
@@ -705,8 +706,10 @@ function _imp_authTransparent()
  */
 function _imp_authAuthenticateCallback()
 {
-    require_once dirname(__FILE__) . '/base.php';
-    IMP_Auth::authenticateCallback();
+    if (Horde_Auth::getAuth()) {
+        require_once dirname(__FILE__) . '/base.php';
+        IMP_Auth::authenticateCallback();
+    }
 }
 
 /**