From 9e8e5fa634ace418e6b34280133685485b97a9c0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 26 Aug 2008 07:21:50 +0000
Subject: - Removed support for PEAR::DB driver

---
 installer/check.php  |  2 +-
 installer/config.php | 68 ++++++++++++++++++----------------------------------
 installer/test.php   | 11 ++-------
 3 files changed, 26 insertions(+), 55 deletions(-)

(limited to 'installer')

diff --git a/installer/check.php b/installer/check.php
index 8054eb0f9..4ede85c95 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -7,7 +7,7 @@ $optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv',
     'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt',
     'GD' => 'gd');
 
-$required_libs = array('PEAR' => 'PEAR.php', 'DB' => 'DB.php', 'MDB2' => 'MDB2.php',
+$required_libs = array('PEAR' => 'PEAR.php', 'MDB2' => 'MDB2.php',
     'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php',
     'iilConnection' => 'lib/imap.inc');
 
diff --git a/installer/config.php b/installer/config.php
index f1829b4bb..f6916406e 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -78,17 +78,6 @@ echo $input_prodname->show($RCI->getprop('product_name'));
 <div>The name of your service (used to compose page titles)</div>
 </dd>
 
-<dt class="propname">skin</dt>
-<dd>
-<?php
-
-$input_skin = new html_inputfield(array('name' => '_skin', 'size' => 30, 'id' => "cfgskin"));
-echo $input_skin->show($RCI->getprop('skin'));
-
-?>
-<div>Name of interface skin (folder in /skins)</div>
-</dd>
-
 <dt class="propname">temp_dir</dt>
 <dd>
 <?php
@@ -161,18 +150,6 @@ echo $check_caching->show(intval($RCI->getprop('enable_spellcheck')), array('val
 <p class="hint">It is based on GoogieSpell what implies that the message content will be sent to Google in order to check the spelling.</p>
 </dd>
 
-<dt class="propname">mdn_requests</dt>
-<dd>
-<?php
-
-$select_mdnreq = new html_select(array('name' => '_mdn_requests', 'id' => "cfgmdnreq"));
-$select_mdnreq->add(array('ask the user', 'send automatically', 'ignore'), array(0, 1, 2));
-echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));
-
-?>
-<div>Behavior if a received message requests a message delivery notification (read receipt)</div>
-</dd>
-
 </dl>
 </fieldset>
 
@@ -216,28 +193,6 @@ echo '<label for="cfgdbpass">Database password</label><br />';
 
 ?>
 </dd>
-
-<dt class="propname">db_backend</dt>
-<dd>
-<?php
-
-// check for existing PEAR classes
-@include_once 'DB.php';
-@include_once 'MDB2.php';
-
-$select_dbba = new html_select(array('name' => '_db_backend', 'id' => "cfgdbba"));
-
-if (class_exists('DB'))
-  $select_dbba->add('DB', 'db');
-if (class_exists('MDB2'))
-  $select_dbba->add('MDB2', 'mdb2');
-
-echo $select_dbba->show($RCI->getprop('db_backend'));
-
-?>
-<div>PEAR Database backend to use</div>
-</dd>
-
 </dl>
 </fieldset>
 
@@ -446,6 +401,17 @@ echo $input_locale->show($RCI->getprop('language'));
 <p class="hint">Enter a <a href="http://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR</p>
 </dd>
 
+<dt class="propname">skin <span class="userconf">*</span></dt>
+<dd>
+<?php
+
+$input_skin = new html_inputfield(array('name' => '_skin', 'size' => 30, 'id' => "cfgskin"));
+echo $input_skin->show($RCI->getprop('skin'));
+
+?>
+<div>Name of interface skin (folder in /skins)</div>
+</dd>
+
 <dt class="propname">pagesize <span class="userconf">*</span></dt>
 <dd>
 <?php
@@ -505,6 +471,18 @@ echo $select_autosave->show(intval($RCI->getprop('draft_autosave')));
 ?>
 </dd>
 
+<dt class="propname">mdn_requests <span class="userconf">*</span></dt>
+<dd>
+<?php
+
+$select_mdnreq = new html_select(array('name' => '_mdn_requests', 'id' => "cfgmdnreq"));
+$select_mdnreq->add(array('ask the user', 'send automatically', 'ignore'), array(0, 1, 2));
+echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));
+
+?>
+<div>Behavior if a received message requests a message delivery notification (read receipt)</div>
+</dd>
+
 </dl>
 
 <p class="hint"><span class="userconf">*</span>&nbsp; These settings are defaults for the user preferences</p>
diff --git a/installer/test.php b/installer/test.php
index bdaf3ee52..0f38da059 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -61,14 +61,9 @@ else {
 
 $db_working = false;
 if ($RCI->configured) {
-    if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) {
+    if (!empty($RCI->config['db_dsnw'])) {
 
-        echo 'Backend: ';
-        echo 'PEAR::' . strtoupper($RCI->config['db_backend']) . '<br />';
-
-        $dbclass = 'rcube_' . strtolower($RCI->config['db_backend']);
-
-        $DB = new $dbclass($RCI->config['db_dsnw'], '', false);
+        $DB = new rcube_mdb2($RCI->config['db_dsnw'], '', false);
         $DB->db_connect('w');
         if (!($db_error_msg = $DB->is_error())) {
             $RCI->pass('DSN (write)');
@@ -79,8 +74,6 @@ if ($RCI->configured) {
             $RCI->fail('DSN (write)', $db_error_msg);
             echo '<p class="hint">Make sure that the configured database exists and that the user has write privileges<br />';
             echo 'DSN: ' . $RCI->config['db_dsnw'] . '</p>';
-            if ($RCI->config['db_backend'] == 'mdb2')
-              echo '<p class="hint">There are known problems with MDB2 running on PHP 4. Try setting <tt>db_backend</tt> to \'db\' instead</p>';
         }
     }
     else {
-- 
cgit v1.2.3