Aleksander Machniak
2012-06-19 91f2271fac29340b5eee3bb6657456bd5d161548
Replace rcube_mdb2 with rcube_db
4 files modified
12 ■■■■ changed files
bin/update.sh 2 ●●● patch | view | raw | blame | history
installer/test.php 2 ●●● patch | view | raw | blame | history
plugins/password/drivers/sql.php 2 ●●● patch | view | raw | blame | history
plugins/squirrelmail_usercopy/squirrelmail_usercopy.php 6 ●●●● patch | view | raw | blame | history
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";
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())) {
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');
        }
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');