CHANGELOG
@@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== - Add new DB abstraction layer based on PHP PDO, supporting SQLite3 (#1488332) - Removed PEAR::MDB2 package - Removed users.alias column, added option ('user_aliases') to use email address from identities as username (#1488581) - Removed redundant cache.cache_id column (#1488528) @@ -1387,7 +1389,3 @@ Now based on the message structure delivered by the IMAP server. - Fixed some XSS and SQL injection issues - Fixed charset problems with folder renaming
@@ -12,11 +12,10 @@ * The Apache, Lighttpd, Cherokee or Hiawatha web server * .htaccess support allowing overrides for DirectoryIndex * PHP Version 5.2.1 or greater including - PCRE, DOM, JSON, XML, Session, Sockets (required) - PDO, PCRE, DOM, JSON, XML, Session, Sockets (required) - libiconv (recommended) - mbstring, fileinfo, mcrypt (optional) * PEAR packages distributed with Roundcube or external: - MDB2 2.5.0 or newer - Mail_Mime 1.8.1 or newer - Mail_mimeDecode 1.5.5 or newer - Net_SMTP 1.4.2 or newer @@ -34,7 +33,7 @@ - magic_quotes_sybase disabled * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker * A MySQL (4.0.8 or newer), PostgreSQL, MSSQL database engine or the SQLite extension for PHP or SQLite support in PHP * One of the above databases with permission to create tables * An SMTP server (recommended) or PHP configured for mail delivery
@@ -143,7 +143,7 @@ // check database schema if ($RCI->config['db_dsnw']) { $DB = new rcube_mdb2($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/check.php
@@ -6,7 +6,8 @@ 'DOM' => 'dom', 'Session' => 'session', 'XML' => 'xml', 'JSON' => 'json' 'JSON' => 'json', 'PDO' => 'PDO', ); $optional_php_exts = array( @@ -21,17 +22,9 @@ $required_libs = array( 'PEAR' => 'PEAR.php', 'MDB2' => 'MDB2.php', 'Net_SMTP' => 'Net/SMTP.php', 'Net_IDNA2' => 'Net/IDNA2.php', 'Mail_mime' => 'Mail/mime.php', ); $supported_dbs = array( 'MySQL' => 'mysql', 'MySQLi' => 'mysqli', 'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite', ); $ini_checks = array( @@ -63,8 +56,14 @@ 'DOM' => 'http://www.php.net/manual/en/book.dom.php', 'Intl' => 'http://www.php.net/manual/en/book.intl.php', 'Exif' => 'http://www.php.net/manual/en/book.exif.php', 'PDO' => 'http://www.php.net/manual/en/book.pdo.php', 'pdo_mysql' => 'http://www.php.net/manual/en/book.pdo-mysql.php', 'pdo_pgsql' => 'http://www.php.net/manual/en/book.pdo-pgsql.php', 'pdo_sqlite' => 'http://www.php.net/manual/en/book.pdo-sqlite.php', 'pdo_sqlite2' => 'http://www.php.net/manual/en/book.pdo-sqlite.php', 'pdo_sqlsrv' => 'http://www.php.net/manual/en/book.pdo-sqlsrv.php', 'pdo_dblib' => 'http://www.php.net/manual/en/book.pdo-dblib.php', 'PEAR' => 'http://pear.php.net', 'MDB2' => 'http://pear.php.net/package/MDB2', 'Net_SMTP' => 'http://pear.php.net/package/Net_SMTP', 'Mail_mime' => 'http://pear.php.net/package/Mail_mime', 'Net_IDNA2' => 'http://pear.php.net/package/Net_IDNA2', @@ -129,14 +128,14 @@ <?php $prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : ''; foreach ($supported_dbs as $database => $ext) { foreach ($RCI->supported_dbs as $database => $ext) { if (extension_loaded($ext)) { $RCI->pass($database); } else { $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX; $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : 'Not installed'; $RCI->na($database, $msg, $source_urls[$database]); $msg = @is_readable($_ext) ? 'Could be loaded. Please add in php.ini' : ''; $RCI->na($database, $msg, $source_urls[$ext]); } echo '<br />'; } 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 />'; installer/rcube_install.php
@@ -50,6 +50,17 @@ 'des_key', 'session_lifetime', 'support_url', ); // list of supported database drivers var $supported_dbs = array( 'MySQL' => 'pdo_mysql', 'PostgreSQL' => 'pdo_pgsql', 'SQLite' => 'pdo_sqlite', 'SQLite (v2)' => 'pdo_sqlite2', 'SQL Server (SQLSRV)' => 'pdo_sqlsrv', 'SQL Server (DBLIB)' => 'pdo_dblib', ); /** * Constructor */ @@ -371,7 +382,7 @@ $errors[] = "Missing columns in table '$table': " . join(',', $diff); } } return !empty($errors) ? $errors : false; } @@ -394,87 +405,8 @@ } } } return $schema; } /** * Compare the local database schema with the reference schema * required for this version of Roundcube * * @param boolean True if the schema schould be updated * @return boolean True if the schema is up-to-date, false if not or an error occured */ function mdb2_schema_check($update = false) { if (!$this->configured) return false; $options = array( 'use_transactions' => false, 'log_line_break' => "\n", 'idxname_format' => '%s', 'debug' => false, 'quote_identifier' => true, 'force_defaults' => false, 'portability' => true ); $dsnw = $this->config['db_dsnw']; $schema = MDB2_Schema::factory($dsnw, $options); $schema->db->supported['transactions'] = false; if (PEAR::isError($schema)) { $this->raise_error(array('code' => $schema->getCode(), 'message' => $schema->getMessage() . ' ' . $schema->getUserInfo())); return false; } else { $definition = $schema->getDefinitionFromDatabase(); $definition['charset'] = 'utf8'; if (PEAR::isError($definition)) { $this->raise_error(array('code' => $definition->getCode(), 'message' => $definition->getMessage() . ' ' . $definition->getUserInfo())); return false; } // load reference schema $dsn_arr = MDB2::parseDSN($this->config['db_dsnw']); $ref_schema = INSTALL_PATH . 'SQL/' . $dsn_arr['phptype'] . '.schema.xml'; if (is_readable($ref_schema)) { $reference = $schema->parseDatabaseDefinition($ref_schema, false, array(), $schema->options['fail_on_invalid_names']); if (PEAR::isError($reference)) { $this->raise_error(array('code' => $reference->getCode(), 'message' => $reference->getMessage() . ' ' . $reference->getUserInfo())); } else { $diff = $schema->compareDefinitions($reference, $definition); if (empty($diff)) { return true; } else if ($update) { // update database schema with the diff from the above check $success = $schema->alterDatabase($reference, $definition, $diff); if (PEAR::isError($success)) { $this->raise_error(array('code' => $success->getCode(), 'message' => $success->getMessage() . ' ' . $success->getUserInfo())); } else return true; } echo '<pre>'; var_dump($diff); echo '</pre>'; return false; } } else $this->raise_error(array('message' => "Could not find reference schema file ($ref_schema)")); return false; } return false; }
@@ -125,9 +125,9 @@ $db_working = false; if ($RCI->configured) { if (!empty($RCI->config['db_dsnw'])) { $DB = new rcube_mdb2($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())) { $RCI->pass('DSN (write)'); echo '<br />'; @@ -167,7 +167,7 @@ // 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 '<p><input type="submit" name="initdb" value="Initialize database" /></p>'; $db_working = false; installer/utils.php
@@ -23,7 +23,6 @@ { $filename = preg_replace( array( '/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', '/Auth_(.+)/', @@ -31,7 +30,6 @@ '/^utf8$/' ), array( 'MDB2/\\1', 'Mail/\\1', 'Net/\\1', 'Auth/\\1', 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'); program/include/rcube.php
@@ -49,14 +49,14 @@ /** * Instace of database class. * * @var rcube_mdb2 * @var rcube_pdo */ public $db; /** * Instace of Memcache class. * * @var rcube_mdb2 * @var Memcache */ public $memcache; @@ -160,15 +160,13 @@ /** * Get the current database connection * * @return rcube_mdb2 Database connection object * @return rcube_pdo Database connection object */ public function get_dbh() { if (!$this->db) { $config_all = $this->config->all(); $this->db = new rcube_mdb2($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']); $this->db->sqlite_initials = INSTALL_PATH . 'SQL/sqlite.initial.sql'; $this->db = rcube_db::factory($config_all['db_dsnw'], $config_all['db_dsnr'], $config_all['db_persistent']); $this->db->set_debug((bool)$config_all['sql_debug']); }
@@ -33,9 +33,9 @@ class rcube_cache { /** * Instance of rcube_mdb2 or Memcache class * Instance of database handler * * @var rcube_mdb2/Memcache * @var rcube_db|Memcache|bool */ private $db; private $type; program/include/rcube_contacts.php
@@ -36,7 +36,7 @@ /** * Store database connection. * * @var rcube_mdb2 * @var rcube_db */ private $db = null; private $user_id = 0; @@ -934,8 +934,8 @@ $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++; } @@ -990,9 +990,10 @@ $checkname); // append number to make name unique if ($hit = $this->db->num_rows($sql_result)) if ($hit = $this->db->fetch_array($sql_result)) { $checkname = $name . ' ' . $num++; } while ($hit > 0); } } while ($hit); return $checkname; } program/include/rcube_db.php
New file @@ -0,0 +1,992 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db { protected $db_dsnw; // DSN for write operations protected $db_dsnr; // DSN for read operations protected $db_connected = false; // Already connected ? protected $db_mode; // Connection mode protected $dbh; // Connection handle protected $db_error = false; protected $db_error_msg = ''; protected $conn_failure = false; protected $a_query_results = array('dummy'); protected $last_res_id = 0; protected $db_index = 0; protected $tables; protected $variables; protected $options = array( // column/table quotes 'identifier_start' => '"', 'identifier_end' => '"', ); /** * Factory, returns driver-specific instance of the class * * @param string $db_dsnw DSN for read/write operations * @param string $db_dsnr Optional DSN for read only operations * @param bool $pconn Enables persistent connections * * @return rcube_db Object instance */ public static function factory($db_dsnw, $db_dsnr = '', $pconn = false) { $driver = strtolower(substr($db_dsnw, 0, strpos($db_dsnw, ':'))); $driver_map = array( 'sqlite2' => 'sqlite', 'sybase' => 'mssql', 'dblib' => 'mssql', 'mysqli' => 'mysql', ); $driver = isset($driver_map[$driver]) ? $driver_map[$driver] : $driver; $class = "rcube_db_$driver"; if (!class_exists($class)) { rcube::raise_error(array('code' => 600, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 'message' => "Configuration error. Unsupported database driver: $driver"), true, true); } return new $class($db_dsnw, $db_dsnr, $pconn); } /** * Object constructor * * @param string $db_dsnw DSN for read/write operations * @param string $db_dsnr Optional DSN for read only operations * @param bool $pconn Enables persistent connections */ public function __construct($db_dsnw, $db_dsnr = '', $pconn = false) { if (empty($db_dsnr)) { $db_dsnr = $db_dsnw; } $this->db_dsnw = $db_dsnw; $this->db_dsnr = $db_dsnr; $this->db_pconn = $pconn; $this->db_dsnw_array = self::parse_dsn($db_dsnw); $this->db_dsnr_array = self::parse_dsn($db_dsnr); // Initialize driver class $this->init(); } /** * Initialization of the object with driver specific code */ protected function init() { // To be used by driver classes } /** * Connect to specific database * * @param array $dsn DSN for DB connections * * @return PDO database handle */ protected function dsn_connect($dsn) { $this->db_error = false; $this->db_error_msg = null; // Get database specific connection options $dsn_string = $this->dsn_string($dsn); $dsn_options = $this->dsn_options($dsn); if ($db_pconn) { $dsn_options[PDO::ATTR_PERSISTENT] = true; } // Connect try { // with this check we skip fatal error on PDO object creation if (!class_exists('PDO', false)) { throw new Exception('PDO extension not loaded. See http://php.net/manual/en/intro.pdo.php'); } $this->conn_prepare($dsn); $dbh = new PDO($dsn_string, $dsn['username'], $dsn['password'], $dsn_options); // don't throw exceptions or warnings $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT); } catch (Exception $e) { $this->db_error = true; $this->db_error_msg = $e->getMessage(); rcube::raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 'message' => $this->db_error_msg), true, false); return null; } $this->conn_configure($dsn, $dbh); return $dbh; } /** * Driver-specific preparation of database connection * * @param array $dsn DSN for DB connections */ protected function conn_prepare($dsn) { } /** * Driver-specific configuration of database connection * * @param array $dsn DSN for DB connections * @param PDO $dbh Connection handler */ protected function conn_configure($dsn, $dbh) { } /** * Driver-specific database character set setting * * @param string $charset Character set name */ protected function set_charset($charset) { $this->query("SET NAMES 'utf8'"); } /** * Connect to appropiate database depending on the operation * * @param string $mode Connection mode (r|w) */ public function db_connect($mode) { // previous connection failed, don't attempt to connect again if ($this->conn_failure) { return; } // no replication if ($this->db_dsnw == $this->db_dsnr) { $mode = 'w'; } // Already connected if ($this->db_connected) { // connected to db with the same or "higher" mode if ($this->db_mode == 'w' || $this->db_mode == $mode) { return; } } $dsn = ($mode == 'r') ? $this->db_dsnr_array : $this->db_dsnw_array; $this->dbh = $this->dsn_connect($dsn); $this->db_connected = is_object($this->dbh); // use write-master when read-only fails if (!$this->db_connected && $mode == 'r') { $mode = 'w'; $this->dbh = $this->dsn_connect($this->db_dsnw_array); $this->db_connected = is_object($this->dbh); } if ($this->db_connected) { $this->db_mode = $mode; $this->set_charset('utf8'); } else { $this->conn_failure = true; } } /** * Activate/deactivate debug mode * * @param boolean $dbg True if SQL queries should be logged */ public function set_debug($dbg = true) { $this->options['debug_mode'] = $dbg; } /** * Writes debug information/query to 'sql' log file * * @param string $query SQL query */ protected function debug($query) { if ($this->options['debug_mode']) { rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';'); } } /** * Getter for error state * * @return boolean True on error */ public function is_error() { return $this->db_error ? $this->db_error_msg : false; } /** * Connection state checker * * @return boolean True if in connected state */ public function is_connected() { return !is_object($this->dbh) ? false : $this->db_connected; } /** * Is database replication configured? * * @return bool Returns true if dsnw != dsnr */ public function is_replicated() { return !empty($this->db_dsnr) && $this->db_dsnw != $this->db_dsnr; } /** * Get database runtime variables * * @param string $varname Variable name * @param mixed $default Default value if variable is not set * * @return mixed Variable value or default */ public function get_variable($varname, $default = null) { // to be implemented by driver class return $default; } /** * Execute a SQL query * * @param string SQL query to execute * @param mixed Values to be inserted in query * * @return number Query handle identifier */ public function query() { $params = func_get_args(); $query = array_shift($params); // Support one argument of type array, instead of n arguments if (count($params) == 1 && is_array($params[0])) { $params = $params[0]; } return $this->_query($query, 0, 0, $params); } /** * Execute a SQL query with limits * * @param string SQL query to execute * @param int Offset for LIMIT statement * @param int Number of rows for LIMIT statement * @param mixed Values to be inserted in query * * @return int Query handle identifier */ public function limitquery() { $params = func_get_args(); $query = array_shift($params); $offset = array_shift($params); $numrows = array_shift($params); return $this->_query($query, $offset, $numrows, $params); } /** * Execute a SQL query with limits * * @param string $query SQL query to execute * @param int $offset Offset for LIMIT statement * @param int $numrows Number of rows for LIMIT statement * @param array $params Values to be inserted in query * * @return int Query handle identifier */ protected function _query($query, $offset, $numrows, $params) { // Read or write ? $mode = preg_match('/^(select|show)/i', ltrim($query)) ? 'r' : 'w'; $this->db_connect($mode); // check connection before proceeding if (!$this->is_connected()) { return null; } if ($numrows || $offset) { $query = $this->set_limit($query, $numrows, $offset); } $params = (array) $params; // Because in Roundcube we mostly use queries that are // executed only once, we will not use prepared queries $pos = 0; $idx = 0; while ($pos = strpos($query, '?', $pos)) { $val = $this->quote($params[$idx++]); unset($params[$idx-1]); $query = substr_replace($query, $val, $pos, 1); $pos += strlen($val); } $query = rtrim($query, ';'); $this->debug($query); $query = $this->dbh->query($query); if ($query === false) { $error = $this->dbh->errorInfo(); $this->db_error = true; $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]); rcube::raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 'message' => $this->db_error_msg), true, false); } // add result, even if it's an error return $this->_add_result($query); } /** * Get number of affected rows for the last query * * @param number $res_id Optional query handle identifier * * @return int Number of rows or false on failure */ public function affected_rows($res_id = null) { if ($result = $this->_get_result($res_id)) { return $result->rowCount(); } return 0; } /** * Get last inserted record ID * * @param string $table Table name (to find the incremented sequence) * * @return mixed ID or false on failure */ public function insert_id($table = '') { if (!$this->db_connected || $this->db_mode == 'r') { return false; } if ($table) { // resolve table name $table = $this->table_name($table); } $id = $this->dbh->lastInsertId($table); return $id; } /** * Get an associative array for one row * If no query handle is specified, the last query will be taken as reference * * @param int $res_id Optional query handle identifier * * @return mixed Array with col values or false on failure */ public function fetch_assoc($res_id = null) { $result = $this->_get_result($res_id); return $this->_fetch_row($result, PDO::FETCH_ASSOC); } /** * Get an index array for one row * If no query handle is specified, the last query will be taken as reference * * @param int $res_id Optional query handle identifier * * @return mixed Array with col values or false on failure */ public function fetch_array($res_id = null) { $result = $this->_get_result($res_id); return $this->_fetch_row($result, PDO::FETCH_NUM); } /** * Get col values for a result row * * @param PDOStatement $result Result handle * @param int $mode Fetch mode identifier * * @return mixed Array with col values or false on failure */ protected function _fetch_row($result, $mode) { if (!is_object($result) || !$this->is_connected()) { return false; } return $result->fetch($mode); } /** * Adds LIMIT,OFFSET clauses to the query * * @param string $query SQL query * @param int $limit Number of rows * @param int $offset Offset * * @return string SQL query */ protected function set_limit($query, $limit = 0, $offset = 0) { if ($limit) { $query .= ' LIMIT ' . intval($limit); } if ($offset) { $query .= ' OFFSET ' . intval($offset); } return $query; } /** * Returns list of tables in a database * * @return array List of all tables of the current database */ public function list_tables() { // get tables if not cached if ($this->tables === null) { $q = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES ORDER BY TABLE_NAME'); if ($res = $this->_get_result($q)) { $this->tables = $res->fetchAll(PDO::FETCH_COLUMN, 0); } else { $this->tables = array(); } } return $this->tables; } /** * Returns list of columns in database table * * @param string $table Table name * * @return array List of table cols */ public function list_cols($table) { $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ?', array($table)); if ($res = $this->_get_result($q)) { return $res->fetchAll(PDO::FETCH_COLUMN, 0); } return array(); } /** * Formats input so it can be safely used in a query * * @param mixed $input Value to quote * @param string $type Type of data * * @return string Quoted/converted string for use in query */ public function quote($input, $type = null) { // handle int directly for better performance if ($type == 'integer' || $type == 'int') { return intval($input); } // create DB handle if not available if (!$this->dbh) { $this->db_connect('r'); } if ($this->dbh) { $map = array( 'bool' => PDO::PARAM_BOOL, 'integer' => PDO::PARAM_INT, ); $type = isset($map[$type]) ? $map[$type] : PDO::PARAM_STR; return $this->dbh->quote($input, $type); } return 'NULL'; } /** * Quotes a string so it can be safely used as a table or column name * * @param string $str Value to quote * * @return string Quoted string for use in query * @deprecated Replaced by rcube_db::quote_identifier * @see rcube_db::quote_identifier */ public function quoteIdentifier($str) { return $this->quote_identifier($str); } /** * Quotes a string so it can be safely used as a table or column name * * @param string $str Value to quote * * @return string Quoted string for use in query */ public function quote_identifier($str) { $start = $this->options['identifier_start']; $end = $this->options['identifier_end']; $name = array(); foreach (explode('.', $str) as $elem) { $elem = str_replace(array($start, $end), '', $elem); $name[] = $start . $elem . $end; } return implode($name, '.'); } /** * Return SQL function for current time and date * * @return string SQL function to use in query */ public function now() { return "now()"; } /** * Return list of elements for use with SQL's IN clause * * @param array $arr Input array * @param string $type Type of data * * @return string Comma-separated list of quoted values for use in query */ public function array2list($arr, $type = null) { if (!is_array($arr)) { return $this->quote($arr, $type); } foreach ($arr as $idx => $item) { $arr[$idx] = $this->quote($item, $type); } return implode(',', $arr); } /** * Return SQL statement to convert a field value into a unix timestamp * * This method is deprecated and should not be used anymore due to limitations * of timestamp functions in Mysql (year 2038 problem) * * @param string $field Field name * * @return string SQL statement to use in query * @deprecated */ public function unixtimestamp($field) { return "UNIX_TIMESTAMP($field)"; } /** * Return SQL statement to convert from a unix timestamp * * @param int $timestamp Unix timestamp * * @return string Date string in db-specific format */ public function fromunixtime($timestamp) { return date("'Y-m-d H:i:s'", $timestamp); } /** * Return SQL statement for case insensitive LIKE * * @param string $column Field name * @param string $value Search value * * @return string SQL statement to use in query */ public function ilike($column, $value) { return $this->quote_identifier($column).' LIKE '.$this->quote($value); } /** * Abstract SQL statement for value concatenation * * @return string SQL statement to be used in query */ public function concat(/* col1, col2, ... */) { $args = func_get_args(); if (is_array($args[0])) { $args = $args[0]; } return '(' . join(' || ', $args) . ')'; } /** * Encodes non-UTF-8 characters in string/array/object (recursive) * * @param mixed $input Data to fix * * @return mixed Properly UTF-8 encoded data */ public static function encode($input) { if (is_object($input)) { foreach (get_object_vars($input) as $idx => $value) { $input->$idx = self::encode($value); } return $input; } else if (is_array($input)) { foreach ($input as $idx => $value) { $input[$idx] = self::encode($value); } return $input; } return utf8_encode($input); } /** * Decodes encoded UTF-8 string/object/array (recursive) * * @param mixed $input Input data * * @return mixed Decoded data */ public static function decode($input) { if (is_object($input)) { foreach (get_object_vars($input) as $idx => $value) { $input->$idx = self::decode($value); } return $input; } else if (is_array($input)) { foreach ($input as $idx => $value) { $input[$idx] = self::decode($value); } return $input; } return utf8_decode($input); } /** * Adds a query result and returns a handle ID * * @param object $res Query handle * * @return int Handle ID */ protected function _add_result($res) { $this->last_res_id = sizeof($this->a_query_results); $this->a_query_results[$this->last_res_id] = $res; return $this->last_res_id; } /** * Resolves a given handle ID and returns the according query handle * If no ID is specified, the last resource handle will be returned * * @param int $res_id Handle ID * * @return mixed Resource handle or false on failure */ protected function _get_result($res_id = null) { if ($res_id == null) { $res_id = $this->last_res_id; } if (!empty($this->a_query_results[$res_id])) { return $this->a_query_results[$res_id]; } return false; } /** * Return correct name for a specific database table * * @param string $table Table name * * @return string Translated table name */ public function table_name($table) { $rcube = rcube::get_instance(); // return table name if configured $config_key = 'db_table_'.$table; if ($name = $rcube->config->get($config_key)) { return $name; } return $table; } /** * MDB2 DSN string parser * * @param string $sequence Secuence name * * @return array DSN parameters */ public static function parse_dsn($dsn) { if (empty($dsn)) { return null; } // Find phptype and dbsyntax if (($pos = strpos($dsn, '://')) !== false) { $str = substr($dsn, 0, $pos); $dsn = substr($dsn, $pos + 3); } else { $str = $dsn; $dsn = null; } // Get phptype and dbsyntax // $str => phptype(dbsyntax) if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) { $parsed['phptype'] = $arr[1]; $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2]; } else { $parsed['phptype'] = $str; $parsed['dbsyntax'] = $str; } if (empty($dsn)) { return $parsed; } // Get (if found): username and password // $dsn => username:password@protocol+hostspec/database if (($at = strrpos($dsn,'@')) !== false) { $str = substr($dsn, 0, $at); $dsn = substr($dsn, $at + 1); if (($pos = strpos($str, ':')) !== false) { $parsed['username'] = rawurldecode(substr($str, 0, $pos)); $parsed['password'] = rawurldecode(substr($str, $pos + 1)); } else { $parsed['username'] = rawurldecode($str); } } // Find protocol and hostspec // $dsn => proto(proto_opts)/database if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) { $proto = $match[1]; $proto_opts = $match[2] ? $match[2] : false; $dsn = $match[3]; } // $dsn => protocol+hostspec/database (old format) else { if (strpos($dsn, '+') !== false) { list($proto, $dsn) = explode('+', $dsn, 2); } if ( strpos($dsn, '//') === 0 && strpos($dsn, '/', 2) !== false && $parsed['phptype'] == 'oci8' ) { //oracle's "Easy Connect" syntax: //"username/password@[//]host[:port][/service_name]" //e.g. "scott/tiger@//mymachine:1521/oracle" $proto_opts = $dsn; $pos = strrpos($proto_opts, '/'); $dsn = substr($proto_opts, $pos + 1); $proto_opts = substr($proto_opts, 0, $pos); } else if (strpos($dsn, '/') !== false) { list($proto_opts, $dsn) = explode('/', $dsn, 2); } else { $proto_opts = $dsn; $dsn = null; } } // process the different protocol options $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp'; $proto_opts = rawurldecode($proto_opts); if (strpos($proto_opts, ':') !== false) { list($proto_opts, $parsed['port']) = explode(':', $proto_opts); } if ($parsed['protocol'] == 'tcp') { $parsed['hostspec'] = $proto_opts; } else if ($parsed['protocol'] == 'unix') { $parsed['socket'] = $proto_opts; } // Get dabase if any // $dsn => database if ($dsn) { // /database if (($pos = strpos($dsn, '?')) === false) { $parsed['database'] = rawurldecode($dsn); // /database?param1=value1¶m2=value2 } else { $parsed['database'] = rawurldecode(substr($dsn, 0, $pos)); $dsn = substr($dsn, $pos + 1); if (strpos($dsn, '&') !== false) { $opts = explode('&', $dsn); } else { // database?param1=value1 $opts = array($dsn); } foreach ($opts as $opt) { list($key, $value) = explode('=', $opt); if (!array_key_exists($key, $parsed) || false === $parsed[$key]) { // don't allow params overwrite $parsed[$key] = rawurldecode($value); } } } } return $parsed; } /** * Returns PDO DSN string from DSN array * * @param array $dsn DSN parameters * * @return string DSN string */ protected function dsn_string($dsn) { $params = array(); $result = $dsn['phptype'] . ':'; if ($dsn['hostspec']) { $params[] = 'host=' . $dsn['hostspec']; } if ($dsn['port']) { $params[] = 'port=' . $dsn['port']; } if ($dsn['database']) { $params[] = 'dbname=' . $dsn['database']; } if (!empty($params)) { $result .= implode(';', $params); } return $result; } /** * Returns driver-specific connection options * * @param array $dsn DSN parameters * * @return array Connection options */ protected function dsn_options($dsn) { $result = array(); return $result; } } program/include/rcube_db_mssql.php
New file @@ -0,0 +1,155 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db_mssql.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | for MS SQL Server database | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db_mssql extends rcube_db { /** * Driver initialization */ protected function init() { $this->options['identifier_start'] = '['; $this->options['identifier_end'] = ']'; } /** * Character setting */ protected function set_charset($charset) { // UTF-8 is default } /** * Return SQL function for current time and date * * @return string SQL function to use in query */ public function now() { return "getdate()"; } /** * Return SQL statement to convert a field value into a unix timestamp * * This method is deprecated and should not be used anymore due to limitations * of timestamp functions in Mysql (year 2038 problem) * * @param string $field Field name * * @return string SQL statement to use in query * @deprecated */ public function unixtimestamp($field) { return "DATEDIFF(second, '19700101', $field) + DATEDIFF(second, GETDATE(), GETUTCDATE())"; } /** * Abstract SQL statement for value concatenation * * @return string SQL statement to be used in query */ public function concat(/* col1, col2, ... */) { $args = func_get_args(); if (is_array($args[0])) { $args = $args[0]; } return '(' . join('+', $args) . ')'; } /** * Adds TOP (LIMIT,OFFSET) clause to the query * * @param string $query SQL query * @param int $limit Number of rows * @param int $offset Offset * * @return string SQL query */ protected function set_limit($query, $limit = 0, $offset = 0) { $limit = intval($limit); $offset = intval($offset); $orderby = stristr($query, 'ORDER BY'); if ($orderby !== false) { $sort = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc'; $order = str_ireplace('ORDER BY', '', $orderby); $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order)); } $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($limit + $offset) . ' ', $query); $query = 'SELECT * FROM (SELECT TOP ' . $limit . ' * FROM (' . $query . ') AS inner_tbl'; if ($orderby !== false) { $query .= ' ORDER BY ' . $order . ' '; $query .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC'; } $query .= ') AS outer_tbl'; if ($orderby !== false) { $query .= ' ORDER BY ' . $order . ' ' . $sort; } return $query; } /** * Returns PDO DSN string from DSN array */ protected function dsn_string($dsn) { $params = array(); $result = $dsn['phptype'] . ':'; if ($dsn['hostspec']) { $host = $dsn['hostspec']; if ($dsn['port']) { $host .= ',' . $dsn['port']; } $params[] = 'host=' . $host; } if ($dsn['database']) { $params[] = 'dbname=' . $dsn['database']; } if (!empty($params)) { $result .= implode(';', $params); } return $result; } } program/include/rcube_db_mysql.php
New file @@ -0,0 +1,154 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db_mysql.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | for MySQL database | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db_mysql extends rcube_db { /** * Driver initialization/configuration */ protected function init() { // SQL identifiers quoting $this->options['identifier_start'] = '`'; $this->options['identifier_end'] = '`'; } /** * Abstract SQL statement for value concatenation * * @return string SQL statement to be used in query */ public function concat(/* col1, col2, ... */) { $args = func_get_args(); if (is_array($args[0])) { $args = $args[0]; } return 'CONCAT(' . join(', ', $args) . ')'; } /** * Returns PDO DSN string from DSN array * * @param array $dsn DSN parameters * * @return string Connection string */ protected function dsn_string($dsn) { $params = array(); $result = 'mysql:'; if ($dsn['database']) { $params[] = 'dbname=' . $dsn['database']; } if ($dsn['hostspec']) { $params[] = 'host=' . $dsn['hostspec']; } if ($dsn['port']) { $params[] = 'port=' . $dsn['port']; } if ($dsn['socket']) { $params[] = 'unix_socket=' . $dsn['socket']; } $params[] = 'charset=utf8'; if (!empty($params)) { $result .= implode(';', $params); } return $result; } /** * Returns driver-specific connection options * * @param array $dsn DSN parameters * * @return array Connection options */ protected function dsn_options($dsn) { $result = array(); if (!empty($dsn['key'])) { $result[PDO::MYSQL_ATTR_KEY] = $dsn['key']; } if (!empty($dsn['cipher'])) { $result[PDO::MYSQL_ATTR_CIPHER] = $dsn['cipher']; } if (!empty($dsn['cert'])) { $result[PDO::MYSQL_ATTR_SSL_CERT] = $dsn['cert']; } if (!empty($dsn['capath'])) { $result[PDO::MYSQL_ATTR_SSL_CAPATH] = $dsn['capath']; } if (!empty($dsn['ca'])) { $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca']; } return $result; } /** * Get database runtime variables * * @param string $varname Variable name * @param mixed $default Default value if variable is not set * * @return mixed Variable value or default */ public function get_variable($varname, $default = null) { if (!isset($this->variables)) { $this->variables = array(); $result = $this->query('SHOW VARIABLES'); while ($sql_arr = $this->fetch_array($result)) { $this->variables[$row[0]] = $row[1]; } } return isset($this->variables[$varname]) ? $this->variables[$varname] : $default; } } program/include/rcube_db_pgsql.php
New file @@ -0,0 +1,135 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db_pgsql.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | for PostgreSQL database | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db_pgsql extends rcube_db { /** * Get last inserted record ID * * @param string $table Table name (to find the incremented sequence) * * @return mixed ID or false on failure */ public function insert_id($table = null) { if (!$this->db_connected || $this->db_mode == 'r') { return false; } if ($table) { $table = $this->sequence_name($table); } $id = $this->dbh->lastInsertId($table); return $id; } /** * Return correct name for a specific database sequence * * @param string $sequence Secuence name * * @return string Translated sequence name */ protected function sequence_name($sequence) { $rcube = rcube::get_instance(); // return sequence name if configured $config_key = 'db_sequence_'.$sequence; if ($name = $rcube->config->get($config_key)) { return $name; } return $sequence; } /** * Return SQL statement to convert a field value into a unix timestamp * * This method is deprecated and should not be used anymore due to limitations * of timestamp functions in Mysql (year 2038 problem) * * @param string $field Field name * * @return string SQL statement to use in query * @deprecated */ public function unixtimestamp($field) { return "EXTRACT (EPOCH FROM $field)"; } /** * Return SQL statement for case insensitive LIKE * * @param string $column Field name * @param string $value Search value * * @return string SQL statement to use in query */ public function ilike($column, $value) { return $this->quote_identifier($column) . ' ILIKE ' . $this->quote($value); } /** * Get database runtime variables * * @param string $varname Variable name * @param mixed $default Default value if variable is not set * * @return mixed Variable value or default */ public function get_variable($varname, $default = null) { // There's a known case when max_allowed_packet is queried // PostgreSQL doesn't have such limit, return immediately if ($varname == 'max_allowed_packet') { return $default; } if (!isset($this->variables)) { $this->variables = array(); $result = $this->query('SHOW ALL'); while ($row = $this->fetch_array($result)) { $this->variables[$row[0]] = $row[1]; } } return isset($this->variables[$varname]) ? $this->variables[$varname] : $default; } } program/include/rcube_db_sqlite.php
New file @@ -0,0 +1,178 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db_sqlite.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | for SQLite database | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db_sqlite extends rcube_db { /** * Database character set */ protected function set_charset($charset) { } /** * Prepare connection */ protected function conn_prepare($dsn) { // Create database file, required by PDO to exist on connection if (!empty($dsn['database']) && !file_exists($dsn['database'])) { $created = touch($dsn['database']); // File mode setting, for compat. with MDB2 if (!empty($dsn['mode']) && $created) { chmod($dsn['database'], octdec($dsn['mode'])); } } } /** * Configure connection, create database if not exists */ protected function conn_configure($dsn, $dbh) { // we emulate via callback some missing functions $dbh->sqliteCreateFunction('unix_timestamp', array('rcube_db_sqlite', 'sqlite_unix_timestamp'), 1); $dbh->sqliteCreateFunction('now', array('rcube_db_sqlite', 'sqlite_now'), 0); // Initialize database structure in file is empty if (!empty($dsn['database']) && !filesize($dsn['database'])) { $data = file_get_contents(INSTALL_PATH . 'SQL/sqlite.initial.sql'); if (strlen($data)) { $this->debug('INITIALIZE DATABASE'); $q = $dbh->exec($data); if ($q === false) { $error = $dbh->errorInfo(); $this->db_error = true; $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]); rcube::raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 'message' => $this->db_error_msg), true, false); } } } } /** * Callback for sqlite: unix_timestamp() */ public static function sqlite_unix_timestamp($timestamp = '') { $timestamp = trim($timestamp); if (!$timestamp) { $ret = time(); } else if (!preg_match('/^[0-9]+$/s', $timestamp)) { $ret = strtotime($timestamp); } else { $ret = $timestamp; } return $ret; } /** * Callback for sqlite: now() */ public static function sqlite_now() { return date("Y-m-d H:i:s"); } /** * Returns list of tables in database * * @return array List of all tables of the current database */ public function list_tables() { if ($this->tables === null) { $q = $this->query('SELECT name FROM sqlite_master' .' WHERE type = \'table\' ORDER BY name'); if ($res = $this->_get_result($q)) { $this->tables = $res->fetchAll(PDO::FETCH_COLUMN, 0); } else { $this->tables = array(); } } return $this->tables; } /** * Returns list of columns in database table * * @param string $table Table name * * @return array List of table cols */ public function list_cols($table) { $q = $this->query('SELECT sql FROM sqlite_master WHERE type = ? AND name = ?', array('table', $table)); $columns = array(); if ($sql = $this->fetch_array($q)) { $sql = $sql[0]; $start_pos = strpos($sql, '('); $end_pos = strrpos($sql, ')'); $sql = substr($sql, $start_pos+1, $end_pos-$start_pos-1); $lines = explode(',', $sql); foreach ($lines as $line) { $line = explode(' ', trim($line)); if ($line[0] && strpos($line[0], '--') !== 0) { $column = $line[0]; $columns[] = trim($column, '"'); } } } return $columns; } /** * Build DSN string for PDO constructor */ protected function dsn_string($dsn) { return $dsn['phptype'] . ':' . $dsn['database']; } } program/include/rcube_db_sqlsrv.php
New file @@ -0,0 +1,156 @@ <?php /** +-----------------------------------------------------------------------+ | program/include/rcube_db_sqlsrv.php | | | | This file is part of the Roundcube Webmail client | | Copyright (C) 2005-2012, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | | See the README file for a full license statement. | | | | PURPOSE: | | Database wrapper class that implements PHP PDO functions | | for MS SQL Server database | | | +-----------------------------------------------------------------------+ | Author: Aleksander Machniak <alec@alec.pl> | +-----------------------------------------------------------------------+ */ /** * Database independent query interface * * This is a wrapper for the PHP PDO * * @package Database * @version 1.0 */ class rcube_db_sqlsrv extends rcube_db { /** * Driver initialization */ protected function init() { $this->options['identifier_start'] = '['; $this->options['identifier_end'] = ']'; } /** * Database character set setting */ protected function set_charset($charset) { // UTF-8 is default } /** * Return SQL function for current time and date * * @return string SQL function to use in query */ public function now() { return "getdate()"; } /** * Return SQL statement to convert a field value into a unix timestamp * * This method is deprecated and should not be used anymore due to limitations * of timestamp functions in Mysql (year 2038 problem) * * @param string $field Field name * * @return string SQL statement to use in query * @deprecated */ public function unixtimestamp($field) { return "DATEDIFF(second, '19700101', $field) + DATEDIFF(second, GETDATE(), GETUTCDATE())"; } /** * Abstract SQL statement for value concatenation * * @return string SQL statement to be used in query */ public function concat(/* col1, col2, ... */) { $args = func_get_args(); if (is_array($args[0])) { $args = $args[0]; } return '(' . join('+', $args) . ')'; } /** * Adds TOP (LIMIT,OFFSET) clause to the query * * @param string $query SQL query * @param int $limit Number of rows * @param int $offset Offset * * @return string SQL query */ protected function set_limit($query, $limit = 0, $offset = 0) { $limit = intval($limit); $offset = intval($offset); $orderby = stristr($query, 'ORDER BY'); if ($orderby !== false) { $sort = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc'; $order = str_ireplace('ORDER BY', '', $orderby); $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order)); } $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($limit + $offset) . ' ', $query); $query = 'SELECT * FROM (SELECT TOP ' . $limit . ' * FROM (' . $query . ') AS inner_tbl'; if ($orderby !== false) { $query .= ' ORDER BY ' . $order . ' '; $query .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC'; } $query .= ') AS outer_tbl'; if ($orderby !== false) { $query .= ' ORDER BY ' . $order . ' ' . $sort; } return $query; } /** * Returns PDO DSN string from DSN array */ protected function dsn_string($dsn) { $params = array(); $result = 'sqlsrv:'; if ($dsn['hostspec']) { $host = $dsn['hostspec']; if ($dsn['port']) { $host .= ',' . $dsn['port']; } $params[] = 'Server=' . $host; } if ($dsn['database']) { $params[] = 'Database=' . $dsn['database']; } if (!empty($params)) { $result .= implode(';', $params); } return $result; } } program/include/rcube_imap_cache.php
@@ -39,9 +39,9 @@ private $imap; /** * Instance of rcube_mdb2 * Instance of rcube_db * * @var rcube_mdb2 * @var rcube_db */ private $db;
File was deleted program/include/rcube_shared.inc
@@ -407,7 +407,7 @@ '/^utf8$/', ), array( 'MDB2/\\1', 'Mail/\\1', 'Mail/\\1', 'Net/\\1', 'Auth/\\1', program/include/rcube_user.php
@@ -36,7 +36,7 @@ /** * Holds database connection. * * @var rcube_mdb2 * @var rcube_db */ private $db;
File was deleted program/lib/MDB2/Date.php
File was deleted program/lib/MDB2/Driver/Datatype/Common.php
File was deleted program/lib/MDB2/Driver/Datatype/mssql.php
File was deleted program/lib/MDB2/Driver/Datatype/mysql.php
File was deleted program/lib/MDB2/Driver/Datatype/mysqli.php
File was deleted program/lib/MDB2/Driver/Datatype/pgsql.php
File was deleted program/lib/MDB2/Driver/Datatype/sqlite.php
File was deleted program/lib/MDB2/Driver/Datatype/sqlsrv.php
File was deleted program/lib/MDB2/Driver/Function/Common.php
File was deleted program/lib/MDB2/Driver/Function/mssql.php
File was deleted program/lib/MDB2/Driver/Function/mysql.php
File was deleted program/lib/MDB2/Driver/Function/mysqli.php
File was deleted program/lib/MDB2/Driver/Function/pgsql.php
File was deleted program/lib/MDB2/Driver/Function/sqlite.php
File was deleted program/lib/MDB2/Driver/Function/sqlsrv.php
File was deleted program/lib/MDB2/Driver/Manager/Common.php
File was deleted program/lib/MDB2/Driver/Manager/mssql.php
File was deleted program/lib/MDB2/Driver/Manager/mysql.php
File was deleted program/lib/MDB2/Driver/Manager/mysqli.php
File was deleted program/lib/MDB2/Driver/Manager/pgsql.php
File was deleted program/lib/MDB2/Driver/Manager/sqlite.php
File was deleted program/lib/MDB2/Driver/Manager/sqlsrv.php
File was deleted program/lib/MDB2/Driver/Native/Common.php
File was deleted program/lib/MDB2/Driver/Native/mssql.php
File was deleted program/lib/MDB2/Driver/Native/mysql.php
File was deleted program/lib/MDB2/Driver/Native/mysqli.php
File was deleted program/lib/MDB2/Driver/Native/pgsql.php
File was deleted program/lib/MDB2/Driver/Native/sqlite.php
File was deleted program/lib/MDB2/Driver/Native/sqlsrv.php
File was deleted program/lib/MDB2/Driver/Reverse/Common.php
File was deleted program/lib/MDB2/Driver/Reverse/mssql.php
File was deleted program/lib/MDB2/Driver/Reverse/mysql.php
File was deleted program/lib/MDB2/Driver/Reverse/mysqli.php
File was deleted program/lib/MDB2/Driver/Reverse/pgsql.php
File was deleted program/lib/MDB2/Driver/Reverse/sqlite.php
File was deleted program/lib/MDB2/Driver/Reverse/sqlsrv.php
File was deleted program/lib/MDB2/Driver/mssql.php
File was deleted program/lib/MDB2/Driver/mysql.php
File was deleted program/lib/MDB2/Driver/mysqli.php
File was deleted program/lib/MDB2/Driver/pgsql.php
File was deleted program/lib/MDB2/Driver/sqlite.php
File was deleted program/lib/MDB2/Driver/sqlsrv.php
File was deleted program/lib/MDB2/Extended.php
File was deleted program/lib/MDB2/Iterator.php
File was deleted program/lib/MDB2/LOB.php
File was deleted
