X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdb_prefs.php;h=a5123ddaf4d15ab0097b824a5ec8b50e542ba7cb;hb=77a1e3d10b0fe8a81bd645e3797d425839592954;hp=7b76d5da15067dfad21c000b25ce33d0ec73984f;hpb=21ddfbc314c30618856faae057806a95993f3030;p=squirrelmail.git

diff --git a/functions/db_prefs.php b/functions/db_prefs.php
index 7b76d5da..a5123dda 100644
--- a/functions/db_prefs.php
+++ b/functions/db_prefs.php
@@ -47,7 +47,7 @@
  *                                      NOT to quote identifiers by setting
  *                                      this to "none"
  *
- * @copyright 1999-2015 The SquirrelMail Project Team
+ * @copyright 1999-2022 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -208,10 +208,11 @@ class dbPrefs {
 
 
     /**
+     * Constructor (PHP5 style, required in some future version of PHP)
      * initialize the default preferences array.
      *
      */
-    function dbPrefs() {
+    function __construct() {
         // Try and read the default preferences file.
         $default_pref = SM_PATH . 'config/default_pref';
         if (@file_exists($default_pref)) {
@@ -228,6 +229,15 @@ class dbPrefs {
         }
     }
 
+    /**
+     * Constructor (PHP4 style, kept for compatibility reasons)
+     * initialize the default preferences array.
+     *
+     */
+    function dbPrefs() {
+       self::__construct();
+    }
+
     /**
      * initialize DB connection object
      *
@@ -303,23 +313,48 @@ class dbPrefs {
         //
         if ($use_pdo) {
             // parse and convert DSN to PDO style
+            // Pear's full DSN syntax is one of the following:
+            //    phptype(dbsyntax)://username:password@protocol+hostspec/database?option=value
+            //    phptype(syntax)://user:pass@protocol(proto_opts)/database
+            //
             // $matches will contain:
             // 1: database type
             // 2: username
             // 3: password
-            // 4: hostname
-            // 5: database name
-//TODO: add support for unix_socket and charset
+            // 4: hostname (and possible port number) OR protocol (and possible protocol options)
+            // 5: database name (and possible options)
+            // 6: port number (moved from match number 4)
+            // 7: options (moved from match number 5)
+            // 8: protocol (instead of hostname)
+            // 9: protocol options (moved from match number 4/8)
+//TODO: do we care about supporting cases where no password is given? (this is a legal DSN, but causes an error below)
             if (!preg_match('|^(.+)://(.+):(.+)@(.+)/(.+)$|i', $prefs_dsn, $matches)) {
                 $this->error = _("Could not parse prefs DSN");
                 return false;
             }
+            $matches[6] = NULL;
+            $matches[7] = NULL;
+            $matches[8] = NULL;
+            $matches[9] = NULL;
             if (preg_match('|^(.+):(\d+)$|', $matches[4], $host_port_matches)) {
                 $matches[4] = $host_port_matches[1];
                 $matches[6] = $host_port_matches[2];
-            } else
+            } 
+            if (preg_match('|^(.+?)\((.+)\)$|', $matches[4], $protocol_matches)) {
+                $matches[8] = $protocol_matches[1];
+                $matches[9] = $protocol_matches[2];
+                $matches[4] = NULL;
                 $matches[6] = NULL;
-            $pdo_prefs_dsn = $matches[1] . ':host=' . $matches[4] . (!empty($matches[6]) ? ';port=' . $matches[6] : '') . ';dbname=' . $matches[5];
+            } 
+//TODO: currently we just ignore options specified on the end of the DSN
+            if (preg_match('|^(.+?)\?(.+)$|', $matches[5], $database_name_options_matches)) {
+                $matches[5] = $database_name_options_matches[1];
+                $matches[7] = $database_name_options_matches[2];
+            } 
+            if ($matches[8] === 'unix' && !empty($matches[9]))
+                $pdo_prefs_dsn = $matches[1] . ':unix_socket=' . $matches[9] . ';dbname=' . $matches[5];
+            else
+                $pdo_prefs_dsn = $matches[1] . ':host=' . $matches[4] . (!empty($matches[6]) ? ';port=' . $matches[6] : '') . ';dbname=' . $matches[5];
             try {
                 $dbh = new PDO($pdo_prefs_dsn, $matches[2], $matches[3]);
             } catch (Exception $e) {