Move getServer() into Kolabinetorgperson.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/User.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/User.php
index 68aa858..a9cfa33 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/User.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolab/User.php
@@ -98,14 +98,11 @@ class Horde_Kolab_Server_Object_Kolab_User extends Horde_Kolab_Server_Object_Kol
     {
         $criteria = array('AND' => array(
                               array('field' => self::ATTRIBUTE_SN,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_MAIL,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_SID,
-                                    'op'    => '=',
-                                    'test'  => '*'),
+                                    'op'    => 'any'),
                               array('field' => self::ATTRIBUTE_OC,
                                     'op'    => '=',
                                     'test'  => self::OBJECTCLASS_KOLABINETORGPERSON),
@@ -198,53 +195,6 @@ class Horde_Kolab_Server_Object_Kolab_User extends Horde_Kolab_Server_Object_Kol
     }
 
     /**
-     * Returns the server url of the given type for this user.
-     *
-     * This method is used to encapsulate multidomain support.
-     *
-     * @param string $server_type The type of server URL that should be returned.
-     *
-     * @return string The server url or empty on error.
-     */
-    public function getServer($server_type)
-    {
-        global $conf;
-
-        switch ($server_type) {
-        case 'freebusy':
-            $server = $this->get(self::ATTRIBUTE_FREEBUSYHOST);
-            if (!empty($server)) {
-                return $server;
-            }
-            if (isset($conf['kolab']['freebusy']['server'])) {
-                return $conf['kolab']['freebusy']['server'];
-            }
-            $server = $this->getServer('homeserver');
-            if (empty($server)) {
-                $server = $_SERVER['SERVER_NAME'];
-            }
-            if (isset($conf['kolab']['server']['freebusy_url_format'])) {
-                return sprintf($conf['kolab']['server']['freebusy_url_format'],
-                               $server);
-            } else {
-                return 'https://' . $server . '/freebusy';
-            }
-        case 'imap':
-            $server = $this->get(self::ATTRIBUTE_IMAPHOST);
-            if (!empty($server)) {
-                return $server;
-            }
-        case 'homeserver':
-        default:
-            $server = $this->get(self::ATTRIBUTE_HOMESERVER);
-            if (empty($server)) {
-                $server = $_SERVER['SERVER_NAME'];
-            }
-            return $server;
-        }
-    }
-
-    /**
      * Generates an ID for the given information.
      *
      * @param array $info The data of the object.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabinetorgperson.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabinetorgperson.php
index c022412..f9d7e2c 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabinetorgperson.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Kolabinetorgperson.php
@@ -527,4 +527,50 @@ class Horde_Kolab_Server_Object_Kolabinetorgperson extends Horde_Kolab_Server_Ob
         return $addrs;
     }
 
+    /**
+     * Returns the server url of the given type for this user.
+     *
+     * This method is used to encapsulate multidomain support.
+     *
+     * @param string $server_type The type of server URL that should be returned.
+     *
+     * @return string The server url or empty on error.
+     */
+    public function getServer($server_type)
+    {
+        global $conf;
+
+        switch ($server_type) {
+        case 'freebusy':
+            $server = $this->get(self::ATTRIBUTE_FREEBUSYHOST);
+            if (!empty($server)) {
+                return $server;
+            }
+            if (isset($conf['kolab']['freebusy']['server'])) {
+                return $conf['kolab']['freebusy']['server'];
+            }
+            $server = $this->getServer('homeserver');
+            if (empty($server)) {
+                $server = $_SERVER['SERVER_NAME'];
+            }
+            if (isset($conf['kolab']['server']['freebusy_url_format'])) {
+                return sprintf($conf['kolab']['server']['freebusy_url_format'],
+                               $server);
+            } else {
+                return 'https://' . $server . '/freebusy';
+            }
+        case 'imap':
+            $server = $this->get(self::ATTRIBUTE_IMAPHOST);
+            if (!empty($server)) {
+                return $server;
+            }
+        case 'homeserver':
+        default:
+            $server = $this->get(self::ATTRIBUTE_HOMESERVER);
+            if (empty($server)) {
+                $server = $_SERVER['SERVER_NAME'];
+            }
+            return $server;
+        }
+    }
 }
\ No newline at end of file