From: Jan Schneider Date: Fri, 15 Jan 2010 00:10:13 +0000 (+0100) Subject: This is necessary for me to get transparent authentication working. It always X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ddc2732b034ded03b4baea926245bc9193a52e29;p=horde.git This is necessary for me to get transparent authentication working. It always throwed "No authentication available." otherwise. --- diff --git a/horde/login.php b/horde/login.php index bb65650fe..eecc58c23 100644 --- a/horde/login.php +++ b/horde/login.php @@ -81,7 +81,7 @@ try { } catch (Horde_Exception $e) {} $app = Horde_Util::getFormData('app'); -$is_auth = Horde_Auth::getAuth(); +$is_auth = Horde_Auth::isAuthenticated(); /* This ensures index.php doesn't pick up the 'url' parameter. */ $horde_login_url = ''; @@ -98,7 +98,7 @@ $auth = ($app && $is_auth) : Horde_Auth::singleton($conf['auth']['driver']); /* Check to see if any authentication is available. */ -if (!$auth->hasCapability('authenticate')) { +if (!$is_auth && !$auth->hasCapability('authenticate')) { throw new Horde_Exception(_("No authentication available.")); }