diff options
| author | Philip Weir <roundcube@tehinterweb.co.uk> | 2022-10-29 18:06:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-29 18:06:21 +0300 |
| commit | 901b1bb8f14517655c203cd79b20548e60ffad20 (patch) | |
| tree | 2565de10724721cabf3f4d55785df1b0d938f3b4 | |
| parent | 32ddb7b8d1fdad57352f712725fdf438e3877128 (diff) | |
Remove remaining references to dropped db engines (#8767)
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | config/config.inc.php.sample | 2 | ||||
| -rw-r--r-- | config/defaults.inc.php | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_db.php | 14 |
4 files changed, 4 insertions, 16 deletions
@@ -13,7 +13,7 @@ REQUIREMENTS * .htaccess support allowing overrides for DirectoryIndex * PHP Version 7.3 or greater including: - PCRE, DOM, JSON, Session, Sockets, OpenSSL, Mbstring, Filter, Ctype, Intl (required) - - PHP PDO with driver for either MySQL, PostgreSQL, SQL Server, Oracle or SQLite (required) + - PHP PDO with driver for either MySQL, PostgreSQL or SQLite (required) - Iconv, Zip, Fileinfo, Exif (recommended) - LDAP for LDAP addressbook support (optional) - GD, Imagick, XMLWriter (optional: thumbnails generation, QR-code) diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample index 4f00ef84a..cf38d238b 100644 --- a/config/config.inc.php.sample +++ b/config/config.inc.php.sample @@ -21,7 +21,7 @@ $config = []; // Database connection string (DSN) for read+write operations // Format (compatible with PEAR MDB2): db_provider://user:password@host/database -// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle +// Currently supported db_providers: mysql, pgsql, sqlite // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php // NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646' // or (Windows): 'sqlite:///C:/full/path/to/sqlite.db' diff --git a/config/defaults.inc.php b/config/defaults.inc.php index afdeda6f3..bc5a58215 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -25,7 +25,7 @@ $config = []; // Database connection string (DSN) for read+write operations // Format (compatible with PEAR MDB2): db_provider://user:password@host/database -// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle +// Currently supported db_providers: mysql, pgsql, sqlite // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php // Note: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646' // or (Windows): 'sqlite:///C:/full/path/to/sqlite.db' diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php index cab70eeb9..6f90cf04f 100644 --- a/program/lib/Roundcube/rcube_db.php +++ b/program/lib/Roundcube/rcube_db.php @@ -1260,19 +1260,7 @@ class rcube_db 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) { + if (strpos($dsn, '/') !== false) { list($proto_opts, $dsn) = explode('/', $dsn, 2); } else { |