From 76ed4545744129585e307713a372e577d09bc881 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 3 Mar 2009 22:48:49 +0000
Subject: [PATCH] Indicate if an object is missing.

---
 framework/Kolab_Server/lib/Horde/Kolab/Server.php                     | 4 ++++
 .../Kolab/Server/{ObjectMissing.php => MissingObjectException.php}    | 2 +-
 framework/Kolab_Server/lib/Horde/Kolab/Server/test.php                | 4 ++--
 framework/Kolab_Server/package.xml                                    | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)
 rename framework/Kolab_Server/lib/Horde/Kolab/Server/{ObjectMissing.php => MissingObjectException.php} (90%)

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index 74feb4a33..b9d5db681 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -144,6 +144,10 @@ abstract class Horde_Kolab_Server
                                                                    $params['user'],
                                                                    $e->getMessage()));
                 }
+                if ($uid === false) {
+                    throw new Horde_Kolab_Server_MissingObjectException(sprintf(_("Failed identifying the UID of the Kolab user %s."),
+                                                                                $params['user']));
+                }
                 $params['uid'] = $uid;
             }
             $server_params = array_merge($server_params, $params);
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ObjectMissing.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/MissingObjectException.php
similarity index 90%
rename from framework/Kolab_Server/lib/Horde/Kolab/Server/ObjectMissing.php
rename to framework/Kolab_Server/lib/Horde/Kolab/Server/MissingObjectException.php
index c0c2e6de1..dac9f3b42 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ObjectMissing.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/MissingObjectException.php
@@ -25,6 +25,6 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @link     http://pear.horde.org/index.php?package=Kolab_Server
  */
-class Horde_Kolab_Server_ObjectMissing extends Exception
+class Horde_Kolab_Server_MissingObjectException extends Horde_Kolab_Server_Exception
 {
 }
diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
index 5eebcf235..03be354fc 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php
@@ -440,8 +440,8 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap
         }
 
         if (!isset($this->_data[$dn])) {
-            throw new Horde_Kolab_Server_Exception(sprintf("LDAP Error: No such object: %s: No such object",
-                                                           $dn));
+            throw new Horde_Kolab_Server_MissingObjectException(sprintf("No such object: %s",
+                                                                        $dn));
         }
         if (empty($attrs)) {
             return $this->_data[$dn]['data'];
diff --git a/framework/Kolab_Server/package.xml b/framework/Kolab_Server/package.xml
index b4356b6cc..91bc82b60 100644
--- a/framework/Kolab_Server/package.xml
+++ b/framework/Kolab_Server/package.xml
@@ -51,6 +51,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <file name="Exception.php" role="php" />
        <file name="file.php" role="php" />
        <file name="ldap.php" role="php" />
+       <file name="MissingObjectException.php" role="php" />
        <file name="Object.php" role="php" />
        <file name="test.php" role="php" />
        <dir name="Object">
@@ -132,6 +133,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Kolab/Server/Exception.php" as="Horde/Kolab/Server/Exception.php" />
    <install name="lib/Horde/Kolab/Server/file.php" as="Horde/Kolab/Server/file.php" />
    <install name="lib/Horde/Kolab/Server/ldap.php" as="Horde/Kolab/Server/ldap.php" />
+   <install name="lib/Horde/Kolab/Server/MissingObjectException.php" as="Horde/Kolab/Server/MissingObjectException.php" />
    <install name="lib/Horde/Kolab/Server/test.php" as="Horde/Kolab/Server/test.php" />
    <install name="lib/Horde/Kolab/Server/Object.php" as="Horde/Kolab/Server/Object.php" />
    <install name="lib/Horde/Kolab/Server/Object/address.php" as="Horde/Kolab/Server/Object/address.php" />
-- 
2.11.0