From 398bff59254590cbaebec7d62b1f000f271648aa Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 19 Jun 2012 11:33:23 +0200 Subject: Replace rcube_mdb2/PEAR::MDB2 with rcube_db --- installer/test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'installer/test.php') diff --git a/installer/test.php b/installer/test.php index 2dd330531..87896009c 100644 --- a/installer/test.php +++ b/installer/test.php @@ -125,9 +125,9 @@ else { $db_working = false; if ($RCI->configured) { if (!empty($RCI->config['db_dsnw'])) { - - $DB = new rcube_mdb2($RCI->config['db_dsnw'], '', false); + $DB = new rcube_db::factory($RCI->config['db_dsnw'], '', false); $DB->db_connect('w'); + if (!($db_error_msg = $DB->is_error())) { $RCI->pass('DSN (write)'); echo '
'; -- cgit v1.2.3 From 91f2271fac29340b5eee3bb6657456bd5d161548 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 19 Jun 2012 12:00:07 +0200 Subject: Replace rcube_mdb2 with rcube_db --- bin/update.sh | 2 +- installer/test.php | 2 +- plugins/password/drivers/sql.php | 2 +- plugins/squirrelmail_usercopy/squirrelmail_usercopy.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'installer/test.php') diff --git a/bin/update.sh b/bin/update.sh index 83dd4a196..aa10c2fd7 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -137,7 +137,7 @@ if ($RCI->configured) { // 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 87896009c..f09b2f7c7 100644 --- a/installer/test.php +++ b/installer/test.php @@ -125,7 +125,7 @@ else { $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 e9207300e..449e2df5b 100644 --- a/plugins/password/drivers/sql.php +++ b/plugins/password/drivers/sql.php @@ -26,7 +26,7 @@ class rcube_sql_password 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 ee6bcc04b..bfa489ae5 100644 --- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php +++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php @@ -151,10 +151,10 @@ class squirrelmail_usercopy extends rcube_plugin $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'); -- cgit v1.2.3 From 159691e7b1174146fc1c839288e5dd0162d3e6f9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 19 Jun 2012 12:20:27 +0200 Subject: Don't use protected property rcube_db::$db_error --- installer/test.php | 2 +- program/include/rcube_contacts.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'installer/test.php') diff --git a/installer/test.php b/installer/test.php index f09b2f7c7..28eb76940 100644 --- a/installer/test.php +++ b/installer/test.php @@ -167,7 +167,7 @@ else if ($db_working && $_POST['updatedb']) { // test database if ($db_working) { $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}"); - if ($DB->db_error) { + if ($DB->is_error()) { $RCI->fail('DB Schema', "Database not initialized"); echo '

'; $db_working = false; diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 6984b49cc..534a65cb9 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -934,8 +934,8 @@ class rcube_contacts extends rcube_addressbook $contact_id ); - if ($this->db->db_error) - $this->set_error(self::ERROR_SAVING, $this->db->db_error_msg); + if ($error = $this->db->is_error()) + $this->set_error(self::ERROR_SAVING, $error); else $added++; } -- cgit v1.2.3