From 31b2c396edcaca6d1470fd189360cea37d9c5c55 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 26 May 2010 13:35:43 -0600
Subject: [PATCH] Removed support for dBase, Frontbase, and mSQL database
 servers.

At a minimum, none of these are supported by PDO drivers.
---
 framework/Core/lib/Horde/Config.php | 62 +------------------------------------
 horde/docs/UPGRADING                |  2 ++
 2 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index c2f67344f..4cb897320 100644
--- a/framework/Core/lib/Horde/Config.php
+++ b/framework/Core/lib/Horde/Config.php
@@ -951,26 +951,6 @@ class Horde_Config
                     'desc' => '[None]',
                     'fields' => array()
                 ),
-                'dbase' => array(
-                    'desc' => 'dBase',
-                    'fields' => array(
-                        'database' => array(
-                            '_type' => 'text',
-                            'required' => true,
-                            'desc' => 'Absolute path to the database file',
-                            'default' => $this->_default($ctx . '|database', '')
-                        ),
-                        'mode' => array(
-                            '_type' => 'enum',
-                            'desc' => 'The mode to open the file with',
-                            'values' => array(
-                                0 => 'Read Only',
-                                2 => 'Read Write'),
-                            'default' => $this->_default($ctx . '|mode', 2)
-                        ),
-                        'charset' => $charset
-                    )
-                ),
                 'ibase' => array(
                     'desc' => 'Firebird/InterBase',
                     'fields' => array(
@@ -1009,17 +989,6 @@ class Horde_Config
                         'charset' => $charset
                     )
                 ),
-                'fbsql' => array(
-                    'desc' => 'Frontbase',
-                    'fields' => array(
-                        'persistent' => $persistent,
-                        'hostspec' => $hostspec,
-                        'username' => $username,
-                        'password' => $password,
-                        'database' => $database,
-                        'charset' => $charset
-                    )
-                ),
                 'ifx' => array(
                     'desc' => 'Informix',
                     'fields' => array(
@@ -1030,20 +999,8 @@ class Horde_Config
                         'charset' => $charset
                     )
                 ),
-                'msql' => array(
-                    'desc' => 'mSQL',
-                    'fields' => array(
-                        'persistent' => $persistent,
-                        'hostspec' => $hostspec,
-                        'username' => $username,
-                        'password' => $password,
-                        'port' => $port,
-                        'database' => $database,
-                        'charset' => $charset
-                    )
-                ),
                 'mssql' => array(
-                    'desc' => 'MS SQL Server',
+                    'desc' => 'MS SQL/Sybase Server',
                     'fields' => array(
                         'persistent' => $persistent,
                         'hostspec' => $hostspec,
@@ -1156,23 +1113,6 @@ class Horde_Config
                         ),
                         'charset' => $charset
                     )
-                ),
-                'sybase' => array(
-                    'desc' => 'Sybase',
-                    'fields' => array(
-                        'persistent' => $persistent,
-                        'hostspec' => $hostspec,
-                        'username' => $username,
-                        'password' => $password,
-                        'database' => $database,
-                        'appname' => array(
-                            '_type' => 'text',
-                            'desc' => 'Application Name',
-                            'required' => false,
-                            'default' => $this->_default($ctx . '|appname', '')
-                        ),
-                        'charset' => $charset
-                    )
                 )
             )
         );
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index 541da148a..f664aa9ca 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -43,6 +43,8 @@ Horde_Alarm is using UTC dates now.
 
 Crypt_Blowfish is required.
 
+Removed support for dBase, Frontbase, and mSQL database servers.
+
 
 Upgrading Horde from 3.3.x to 3.3.5
 ===================================
-- 
2.11.0