From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 11 Feb 2009 22:27:57 +0000 (+0000)
Subject: The old way of configuring the Kolab Server driver has been
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6021b3d6789ec0cb31ecec81cbf72c0e5f3b003b;p=horde.git

The old way of configuring the Kolab Server driver has been
deprecated.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index 93f57670f..bb5bc0029 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -124,19 +124,8 @@ abstract class Horde_Kolab_Server
             } else {
                 $server_params = array();
             }
-        } else if (isset($conf['kolab']['ldap']['server'])
-                   && isset($conf['kolab']['ldap']['basedn'])
-                   && isset($conf['kolab']['ldap']['phpdn'])
-                   && isset($conf['kolab']['ldap']['phppw'])) {
-            $driver = 'ldap';
-
-            $server_params = array('server'  => $conf['kolab']['ldap']['server'],
-                                  'base_dn' => $conf['kolab']['ldap']['basedn'],
-                                  'uid'     => $conf['kolab']['ldap']['phpdn'],
-                                  'pass'    => $conf['kolab']['ldap']['phppw']);
         } else {
-            $driver        = null;
-            $server_params = array();
+            return PEAR::raiseError('The configuration for the Kolab server driver is missing!');
         }
 
         if (!empty($params)) {