From 91f2271fac29340b5eee3bb6657456bd5d161548 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 Jun 2012 06:00:07 -0400
Subject: [PATCH] Replace rcube_mdb2 with rcube_db
---
plugins/password/drivers/sql.php | 2 +-
bin/update.sh | 2 +-
installer/test.php | 2 +-
plugins/squirrelmail_usercopy/squirrelmail_usercopy.php | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/update.sh b/bin/update.sh
index 83dd4a1..aa10c2f 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -137,7 +137,7 @@
// check database schema
if ($RCI->config['db_dsnw']) {
- $DB = new rcube_db::factory($RCI->config['db_dsnw'], '', false);
+ $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
$DB->db_connect('w');
if ($db_error_msg = $DB->is_error()) {
echo "Error connecting to database: $db_error_msg\n";
diff --git a/installer/test.php b/installer/test.php
index 8789600..f09b2f7 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -125,7 +125,7 @@
$db_working = false;
if ($RCI->configured) {
if (!empty($RCI->config['db_dsnw'])) {
- $DB = new rcube_db::factory($RCI->config['db_dsnw'], '', false);
+ $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
$DB->db_connect('w');
if (!($db_error_msg = $DB->is_error())) {
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index e920730..449e2df 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -26,7 +26,7 @@
else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
$dsn .= '?new_link=true';
- $db = new rcube_mdb2($dsn, '', FALSE);
+ $db = rcube_db::factory($dsn, '', false);
$db->set_debug((bool)$rcmail->config->get('sql_debug'));
$db->db_connect('w');
}
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index ee6bcc0..bfa489a 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -151,10 +151,10 @@
$this->prefs = array();
/* connect to squirrelmail database */
- $db = new rcube_mdb2($rcmail->config->get('squirrelmail_dsn'));
- $db->db_connect('r'); // connect in read mode
+ $db = rcube_db::factory($rcmail->config->get('squirrelmail_dsn'));
- // $db->set_debug(true);
+ $db->set_debug($rcmail->config->get('sql_debug'));
+ $db->db_connect('r'); // connect in read mode
/* retrieve prefs */
$userprefs_table = $rcmail->config->get('squirrelmail_userprefs_table');
--
Gitblit v1.9.1