Change simple preg_match to ereg

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@812 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index c21fc753d61141fe5c0ef875058372edbd531657..40ca0081900d5196cce9c2432a1b13084ee55d26 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -3,7 +3,7 @@ $where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_
 $update = ($where && !$_POST["clone"]);
 $fields = fields($_GET["edit"]);
 foreach ($fields as $name => $field) {
-       if (isset($_GET["default"]) ? $field["auto_increment"] || preg_match('~text|blob~', $field["type"]) : !isset($field["privileges"][$update ? "update" : "insert"])) {
+       if (isset($_GET["default"]) ? $field["auto_increment"] || ereg('text|blob', $field["type"]) : !isset($field["privileges"][$update ? "update" : "insert"])) {
                unset($fields[$name]);
        }
 }

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index dc139569199930a4186fb6d11e3d0c0616b45741..b8ef821e2bfbcb136f484aafcbae11151f300ef5 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -32,9 +32,9 @@ echo ($unsigned ? " <select name=\"$key" . '[unsigned]"' . (!$field["type"] || e
 function process_type($field, $collate = "COLLATE") {
        global $dbh, $enum_length, $unsigned;
        return " $field[type]"
-               . ($field["length"] && !preg_match('~^date|time$~', $field["type"]) ? "(" . process_length($field["length"]) . ")" : "")
-               . (preg_match('~int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
-               . (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . $dbh->quote($field["collation"]) : "")
+               . ($field["length"] && !ereg('^date|time$', $field["type"]) ? "(" . process_length($field["length"]) . ")" : "")
+               . (ereg('int|float|double|decimal', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+               . (ereg('char|text|enum|set', $field["type"]) && $field["collation"] ? " $collate " . $dbh->quote($field["collation"]) : "")
        ;
 }
 

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index ec4f2571c86c46773d9d062e4a8b92031731701b..4b34ffe6bb8f311cee20039132c66b7f51acdc4e 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -280,19 +280,19 @@ function input($name, $field, $value) {
                $onchange = ($first ? ' onchange="var f = this.form[\'function[' . addcslashes($name, "\r\n'\\") . ']\']; if (' . $first . ' > f.selectedIndex) f.selectedIndex = ' . $first . ';"' : '');
                $options = array("");
                if (!isset($_GET["default"])) {
-                       if (preg_match('~char|date|time~', $field["type"])) {
-                               $options = (preg_match('~char~', $field["type"]) ? array("", "md5", "sha1", "password", "uuid") : array("", "now")); //! JavaScript for disabling maxlength
+                       if (ereg('char|date|time', $field["type"])) {
+                               $options = (ereg('char', $field["type"]) ? array("", "md5", "sha1", "password", "uuid") : array("", "now")); //! JavaScript for disabling maxlength
                        }
                        if (!isset($_GET["call"]) && (isset($_GET["select"]) || where($_GET))) {
                                // relative functions
-                               if (preg_match('~int|float|double|decimal~', $field["type"])) {
+                               if (ereg('int|float|double|decimal', $field["type"])) {
                                        $options = array("", "+", "-");
                                }
-                               if (preg_match('~date~', $field["type"])) {
+                               if (ereg('date', $field["type"])) {
                                        $options[] = "+ interval";
                                        $options[] = "- interval";
                                }
-                               if (preg_match('~time~', $field["type"])) {
+                               if (ereg('time', $field["type"])) {
                                        $options[] = "addtime";
                                        $options[] = "subtime";
                                }
@@ -311,7 +311,7 @@ function input($name, $field, $value) {
                        }
                } elseif (strpos($field["type"], "text") !== false) {
                        echo '<textarea name="fields[' . $name . ']" cols="50" rows="12"' . $onchange . '>' . htmlspecialchars($value) . '</textarea>';
-               } elseif (preg_match('~binary|blob~', $field["type"])) {
+               } elseif (ereg('binary|blob', $field["type"])) {
                        echo (ini_get("file_uploads") ? '<input type="file" name="' . $name . '"' . $onchange . '>' : lang('File uploads are disabled.') . ' ');
                } else {
                        // int(3) is only a display hint
@@ -334,7 +334,7 @@ function process_input($name, $field) {
                return (isset($_GET["default"]) ? $dbh->quote($value) : intval($value));
        } elseif ($field["type"] == "set") {
                return (isset($_GET["default"]) ? "'" . implode(",", array_map('escape_string', (array) $value)) . "'" : array_sum((array) $value));
-       } elseif (preg_match('~binary|blob~', $field["type"])) {
+       } elseif (ereg('binary|blob', $field["type"])) {
                $file = get_file($idf);
                if (!is_string($file)) {
                        return false; //! report errors

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index fed0eacf084b2939b3c44be32a9174c3a7485e7c..6452561ac395e5ca9360ef5e347950ee029a60cb 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -64,13 +64,13 @@ foreach ($schema as $name => $table) {
        foreach ($table["fields"] as $field) {
                $val = htmlspecialchars($field["field"]);
                $title = ' title="' . htmlspecialchars($field["full_type"] . ($field["null"] ? " " . lang('NULL') : '')) . '"';
-               if (preg_match('~char|text~', $field["type"])) {
+               if (ereg('char|text', $field["type"])) {
                        $val = "<span class='char'$title>$val</span>";
-               } elseif (preg_match('~date|time|year~', $field["type"])) {
+               } elseif (ereg('date|time|year', $field["type"])) {
                        $val = "<span class='date'$title>$val</span>";
-               } elseif (preg_match('~binary|blob~', $field["type"])) {
+               } elseif (ereg('binary|blob', $field["type"])) {
                        $val = "<span class='binary'$title>$val</span>";
-               } elseif (preg_match('~enum|set~', $field["type"])) {
+               } elseif (ereg('enum|set', $field["type"])) {
                        $val = "<span class='enum'$title>$val</span>";
                } else {
                        $val = "<span$title>$val</span>";

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index cd86f32aa15f385415f32a51fecc4f3f3d1f0ce2..8fda8ecb40d269bc81746a785d333cf7ef4f09c4 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -14,7 +14,7 @@ unset($text_length);
 foreach ($fields as $key => $field) {
        if (isset($field["privileges"]["select"])) {
                $columns[$key] = strip_tags(adminer_field_name($fields, $key)); //! numeric $key is problematic in optionlist()
-               if (preg_match('~text|blob~', $field["type"])) {
+               if (ereg('text|blob', $field["type"])) {
                        $text_length = (isset($_GET["text_length"]) ? $_GET["text_length"] : "100");
                }
        }
@@ -273,12 +273,12 @@ if (!$columns) {
                                        }
                                        if (!isset($val)) {
                                                $val = "<i>NULL</i>";
-                                       } elseif (preg_match('~blob|binary~', $fields[$key]["type"]) && !is_utf8($val)) { //! download link may be printed even with is_utf8
+                                       } elseif (ereg('blob|binary', $fields[$key]["type"]) && !is_utf8($val)) { //! download link may be printed even with is_utf8
                                                $val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&amp;field=' . urlencode($key) . '&amp;' . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>';
                                        } else {
                                                if (!strlen(trim($val, " \t"))) {
                                                        $val = "&nbsp;";
-                                               } elseif (intval($text_length) > 0 && preg_match('~blob|text~', $fields[$key]["type"])) {
+                                               } elseif (intval($text_length) > 0 && ereg('blob|text', $fields[$key]["type"])) {
                                                        $val = nl2br(shorten_utf8($val, intval($text_length))); // usage of LEFT() would reduce traffic but complicates query
                                                } else {
                                                        $val = nl2br(htmlspecialchars($val));

diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 891aa6636bac1089eda5582d30cc59fcddb5033d..6fee3bf5ad01827f9e603924b462676effb79add 100644 (file)
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -40,7 +40,7 @@ if (isset($_GET["host"]) && ($result = $dbh->query("SHOW GRANTS FOR " . $dbh->qu
                if (preg_match('~GRANT (.*) ON (.*) TO ~', $row[0], $match) && preg_match_all('~ *([^(,]*[^ ,(])( *\\([^)]+\\))?~', $match[1], $matches, PREG_SET_ORDER)) { //! escape the part between ON and TO
                        foreach ($matches as $val) {
                                $grants["$match[2]$val[2]"][$val[1]] = true;
-                               if (preg_match('~ WITH GRANT OPTION~', $row[0])) { //! don't check inside strings and identifiers
+                               if (ereg(' WITH GRANT OPTION', $row[0])) { //! don't check inside strings and identifiers
                                        $grants["$match[2]$val[2]"]["GRANT OPTION"] = true;
                                }
                        }