From 0584fe84b460694ec6d66bbd44a8f1d12f5b810e Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 26 Oct 2010 17:30:20 -0600
Subject: [PATCH] Remove Horde_Prefs_Storage_Kolab driver

---
 framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php | 40 -----------------------
 framework/Prefs/package.xml                       |  6 ++--
 horde/config/conf.xml                             |  1 -
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php

diff --git a/framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php b/framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php
deleted file mode 100644
index 8b1fcd6b3..000000000
--- a/framework/Prefs/lib/Horde/Prefs/Storage/Kolab.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Kolab implementation of the Horde preference system. Derives from the
- * Prefs LDAP authentication object, and simply provides parameters to it
- * based on the global Kolab configuration.
- *
- * Copyright 2004-2007 Stuart Binge <s.binge@codefusion.co.za>
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author   Stuart Binge <s.binge@codefusion.co.za>
- * @category Horde
- * @package  Prefs
- */
-class Horde_Prefs_Storage_Kolab extends Horde_Prefs_Storage_Ldap
-{
-   /**
-     * Constructor.
-     *
-     * @param array $params  Configuration parameters.
-     */
-    public function __construct(array $params = array())
-    {
-        require_once 'Horde/Kolab.php';
-        $params = array(
-            'hostspec' => Kolab::getServer('ldap'),
-            'port' => $GLOBALS['conf']['kolab']['ldap']['port'],
-            'version' => '3',
-            'basedn' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
-            'writedn' => 'user',
-            'searchdn' => $GLOBALS['conf']['kolab']['ldap']['phpdn'],
-            'searchpw' => $GLOBALS['conf']['kolab']['ldap']['phppw'],
-            'uid' => 'mail'
-        );
-
-        parent::__construct($params);
-    }
-
-}
diff --git a/framework/Prefs/package.xml b/framework/Prefs/package.xml
index b3c451c5e..d0330ee77 100644
--- a/framework/Prefs/package.xml
+++ b/framework/Prefs/package.xml
@@ -21,8 +21,8 @@
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>
-* Abstract storage code into Horde_Prefs_Storage.
+ <notes> * Removed Horde_Prefs_Storage_Kolab driver.
+ * Abstract storage code into Horde_Prefs_Storage.
  * Add array access API to Horde_Prefs.
  * Remove dependency on horde/Core.
  * Use Horde_Db as backend for Sql driver.
@@ -37,7 +37,6 @@
       <dir name="Storage">
        <file name="File.php" role="php" />
        <file name="Imsp.php" role="php" />
-       <file name="Kolab.php" role="php" />
        <file name="KolabImap.php" role="php" />
        <file name="Ldap.php" role="php" />
        <file name="Null.php" role="php" />
@@ -360,7 +359,6 @@
    <install as="Horde/Prefs/Translation.php" name="lib/Horde/Prefs/Translation.php" />
    <install as="Horde/Prefs/Storage/File.php" name="lib/Horde/Prefs/Storage/File.php" />
    <install as="Horde/Prefs/Storage/Imsp.php" name="lib/Horde/Prefs/Storage/Imsp.php" />
-   <install as="Horde/Prefs/Storage/Kolab.php" name="lib/Horde/Prefs/Storage/Kolab.php" />
    <install as="Horde/Prefs/Storage/KolabImap.php" name="lib/Horde/Prefs/Storage/KolabImap.php" />
    <install as="Horde/Prefs/Storage/Ldap.php" name="lib/Horde/Prefs/Storage/Ldap.php" />
    <install as="Horde/Prefs/Storage/Null.php" name="lib/Horde/Prefs/Storage/Null.php" />
diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 51dc33ed3..50aaf9b1a 100644
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -823,7 +823,6 @@
       </configsection>
      </case>
      <case name="Session" desc="PHP Sessions"/>
-     <case name="Kolab" desc="Kolab (LDAP)" />
      <case name="KolabImap" desc="Kolab (IMAP)" />
      <case name="Imsp" desc="IMSP Server" />
    </configswitch>
-- 
2.11.0