Adapt Kolab_Session to the recent changes in Kolab_Server.

diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session.php b/framework/Kolab_Session/lib/Horde/Kolab/Session.php
index f49e21a..719b583 100644 (file)
--- a/framework/Kolab_Session/lib/Horde/Kolab/Session.php
+++ b/framework/Kolab_Session/lib/Horde/Kolab/Session.php
@@ -130,7 +130,7 @@ class Horde_Kolab_Session
             $user_object    = $server->fetch();
 
             if (empty($conf['kolab']['imap']['allow_special_users'])
-                && !is_a($user_object, 'Horde_Kolab_Server_Object_user')) {
+                && !is_a($user_object, 'Horde_Kolab_Server_Object_Kolab_User')) {
                 throw new Horde_Kolab_Server_Exception(_('Access to special Kolab users is denied.'));
             }
             if (isset($conf['kolab']['server']['deny_group'])) {
@@ -154,17 +154,17 @@ class Horde_Kolab_Session
 
            $this->auth = true;
                 
-            $result = $user_object->get(Horde_Kolab_Server_Object_user::ATTRIBUTE_MAIL);
+            $result = $user_object->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_MAIL);
             if (!empty($result) && !is_a($result, 'PEAR_Error')) {
                 $this->user_mail = $result;
             }
 
-            $result = $user_object->get(Horde_Kolab_Server_Object_user::ATTRIBUTE_SID);
+            $result = $user_object->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_SID);
             if (!empty($result) && !is_a($result, 'PEAR_Error')) {
                 $this->user_id = $result;
             }
 
-            $result = $user_object->get(Horde_Kolab_Server_Object_user::ATTRIBUTE_FNLN);
+            $result = $user_object->get(Horde_Kolab_Server_Object_Kolab_User::ATTRIBUTE_FNLN);
             if (!empty($result) && !is_a($result, 'PEAR_Error')) {
                 $this->user_name = $result;
             }

diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
index eecc197..7345848 100644 (file)
--- a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
+++ b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTest.php
@@ -16,6 +16,8 @@
  */
 require_once 'Horde/Autoloader.php';
 
+require_once 'Horde/Util.php';
+
 /**
  * Test the Kolab session handler.
  *
@@ -30,7 +32,7 @@ require_once 'Horde/Autoloader.php';
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Session
  */
-class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session
+class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Server
 {
     /**
      * Test class construction.
@@ -80,7 +82,7 @@ class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session
      */
     public function testGetSession()
     {
-        $server = &$this->prepareEmptyKolabSession();
+        $server = &$this->prepareEmptyKolabServer();
         $result = $server->add($this->provideBasicUserTwo());
         $this->assertNoError($result);
         $this->assertEquals(1, count($GLOBALS['KOLAB_SERVER_TEST_DATA']));
@@ -118,7 +120,7 @@ class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session
      */
     public function testGetFreeBusySession()
     {
-        $server = &$this->prepareEmptyKolabSession();
+        $server = &$this->prepareEmptyKolabServer();
         $result = $server->add($this->provideBasicUserTwo());
         $this->assertNoError($result);
         $session = &Horde_Kolab_Session::singleton();
@@ -136,7 +138,7 @@ class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session
         $conf['kolab']['server']['allow_group'] = 'group2@example.org';
         $conf['kolab']['server']['deny_group'] = null;
 
-        $server = &$this->prepareEmptyKolabSession();
+        $server = &$this->prepareEmptyKolabServer();
         $result = $server->add($this->provideBasicUserOne());
         $this->assertNoError($result);
         $result = $server->add($this->provideBasicUserTwo());
@@ -176,7 +178,7 @@ class Horde_Kolab_Session_SessionTest extends Horde_Kolab_Test_Session
         $conf['kolab']['server']['deny_group'] = 'group2@example.org';
         unset($conf['kolab']['server']['allow_group']);
 
-        $server = &$this->prepareEmptyKolabSession();
+        $server = &$this->prepareEmptyKolabServer();
         $result = $server->add($this->provideBasicUserOne());
         $this->assertNoError($result);
         $result = $server->add($this->provideBasicUserTwo());