cvs: /php4/pear DB.php
| From: | Andrei Zmievski | Date: | Mon, 29 Nov 1999 18:10:37 +0000 |
| Subject: | cvs: /php4/pear DB.php | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-7059@lists.php.net to get a copy of this message | ||
andrei Mon Nov 29 13:10:37 1999 EDT
Modified files:
/php4/pear DB.php
Log:
Modified to use preg_* functions.
Index: php4/pear/DB.php
diff -u php4/pear/DB.php:1.2 php4/pear/DB.php:1.3
--- php4/pear/DB.php:1.2 Mon Nov 29 10:13:55 1999
+++ php4/pear/DB.php Mon Nov 29 13:10:05 1999
@@ -186,11 +186,11 @@
'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 @@
}
} 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 @@
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];
}