From de56ea1909d515d3e4807a04a6c4644b8226d08d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 08 Aug 2012 02:21:45 -0400
Subject: [PATCH] Merge branch 'pdo'
---
installer/config.php | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/installer/config.php b/installer/config.php
index bd676b1..905fb06 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -267,13 +267,8 @@
<p>Database settings for read/write operations:</p>
<?php
-require_once 'MDB2.php';
-
-$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
- 'PgSQL' => 'pgsql', 'SQLite' => 'sqlite');
-
$select_dbtype = new html_select(array('name' => '_dbtype', 'id' => "cfgdbtype"));
-foreach ($supported_dbs AS $database => $ext) {
+foreach ($RCI->supported_dbs as $database => $ext) {
if (extension_loaded($ext)) {
$select_dbtype->add($database, $ext);
}
@@ -284,7 +279,7 @@
$input_dbuser = new html_inputfield(array('name' => '_dbuser', 'size' => 20, 'id' => "cfgdbuser"));
$input_dbpass = new html_passwordfield(array('name' => '_dbpass', 'size' => 20, 'id' => "cfgdbpass"));
-$dsnw = MDB2::parseDSN($RCI->getprop('db_dsnw'));
+$dsnw = rcube_db::parse_dsn($RCI->getprop('db_dsnw'));
echo $select_dbtype->show($RCI->is_post ? $_POST['_dbtype'] : $dsnw['phptype']);
echo '<label for="cfgdbtype">Database type</label><br />';
--
Gitblit v1.9.1