From d732e6e50649ca34a334500cfcedd5cda4e5f781 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 16 Mar 2009 06:06:44 +0000 Subject: [PATCH] Provide the authentication status within Kolab_Session to be compatible with the old library. --- framework/Kolab_Session/lib/Horde/Kolab/Session.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session.php b/framework/Kolab_Session/lib/Horde/Kolab/Session.php index 7f2c1318f..64c251855 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session.php @@ -136,7 +136,7 @@ class Horde_Kolab_Session if (isset($conf['kolab']['server']['deny_group'])) { $dn = $server->gidForMail($conf['kolab']['server']['deny_group']); if (empty($dn)) { - Horde::logMessage('The Kolab configuratin setting $conf[\'kolab\'][\'server\'][\'deny_group\'] holds a non-existing group!', + Horde::logMessage('The Kolab configuration setting $conf[\'kolab\'][\'server\'][\'deny_group\'] holds a non-existing group!', __FILE__, __LINE__, PEAR_LOG_WARNING); } else if (in_array($dn, $user_object->getGroups())) { throw new Horde_Kolab_Server_Exception(_('You are member of a group that may not login on this server.')); @@ -145,12 +145,14 @@ class Horde_Kolab_Session if (isset($conf['kolab']['server']['allow_group'])) { $dn = $server->gidForMail($conf['kolab']['server']['allow_group']); if (empty($dn)) { - Horde::logMessage('The Kolab configuratin setting $conf[\'kolab\'][\'server\'][\'allow_group\'] holds a non-existing group!', + Horde::logMessage('The Kolab configuration setting $conf[\'kolab\'][\'server\'][\'allow_group\'] holds a non-existing group!', __FILE__, __LINE__, PEAR_LOG_WARNING); } else if (!in_array($dn, $user_object->getGroups())) { throw new Horde_Kolab_Server_Exception(_('You are no member of a group that may login on this server.')); } } + + $this->auth = true; $result = $user_object->get(KOLAB_ATTR_MAIL); if (!empty($result) && !is_a($result, 'PEAR_Error')) { -- 2.11.0