Modified to use preg_* functions.

diff --git a/pear/DB.php b/pear/DB.php
index fee3db5236f2d52fd29a57dff68a80fc15aeda6b..e3c177443d286c77aa4db3cbf3c28266da7d8401 100644 (file)
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -186,11 +186,11 @@ class DB {
                        'username' => false,
                        'password' => false
                );
-               if (ereg('^([^:]+)://', $dsn, &$arr)) {
+               if (preg_match('|^([^:]+)://|', $dsn, &$arr)) {
                        $dbtype = $arr[1];
-                       $dsn = ereg_replace('^[^:]+://', '', $dsn);
+                       $dsn = preg_replace('|^[^:]+://|', '', $dsn);
                        // match "phptype(dbsyntax)"
-                       if (ereg('^([^\(]+)\((.+)\)$', $dbtype, &$arr)) {
+                       if (preg_match('|^([^\(]+)\((.+)\)$|', $dbtype, &$arr)) {
                                $parsed['phptype'] = $arr[1];
                                $parsed['dbsyntax'] = $arr[2];
                        } else {
@@ -198,7 +198,7 @@ class DB {
                        }
                } else {
                        // match "phptype(dbsyntax)"
-                       if (ereg('^([^\(]+)\((.+)\)$', $dsn, &$arr)) {
+                       if (preg_match('|^([^\(]+)\((.+)\)$|', $dsn, &$arr)) {
                                $parsed['phptype'] = $arr[1];
                                $parsed['dbsyntax'] = $arr[2];
                        } else {
@@ -207,21 +207,21 @@ class DB {
                        return $parsed; // XXX ADDREF
                }
 
-               if (ereg('^(.*)/([^/]+)$', $dsn, &$arr)) {
+               if (preg_match('|^(.*)/([^/]+)$|', $dsn, &$arr)) {
                        $parsed['database'] = $arr[2];
                        $dsn = $arr[1];
                }
 
-               if (ereg('^([^:]+):([^@]+)@?(.*)$', $dsn, &$arr)) {
+               if (preg_match('|^([^:]+):([^@]+)@?(.*)$|', $dsn, &$arr)) {
                        $parsed['username'] = $arr[1];
                        $parsed['password'] = $arr[2];
                        $dsn = $arr[3];
-               } elseif (ereg('^([^:]+)@(.*)$', $dsn, &$arr)) {
+               } elseif (preg_match('|^([^:]+)@(.*)$|', $dsn, &$arr)) {
                        $parsed['username'] = $arr[1];
                        $dsn = $arr[3];
                }
 
-               if (ereg('^([^\+]+)\+(.*)$', $dsn, &$arr)) {
+               if (preg_match('|^([^\+]+)\+(.*)$|', $dsn, &$arr)) {
                        $parsed['protocol'] = $arr[1];
                        $dsn = $arr[2];
                }