Separate type_class

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

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index b8ef821e2bfbcb136f484aafcbae11151f300ef5..7bd2e960a9b9915eb69774c80b169d5ba3806b43 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -38,6 +38,18 @@ function process_type($field, $collate = "COLLATE") {
        ;
 }
 
+function type_class($type) {
+       if (ereg('char|text', $type)) {
+               return " class='char'";
+       } elseif (ereg('date|time|year', $type)) {
+               return " class='date'";
+       } elseif (ereg('binary|blob', $type)) {
+               return " class='binary'";
+       } elseif (ereg('enum|set', $type)) {
+               return " class='enum'";
+       }
+}
+
 function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $foreign_keys = array()) {
        global $inout;
        $column_comments = false;

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 6452561ac395e5ca9360ef5e347950ee029a60cb..bcc91dc6036c1b2b84a3076d6176b57cb8dea941 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -62,19 +62,7 @@ foreach ($schema as $name => $table) {
        echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schema_mousedown(this, event);'>";
        echo '<a href="' . htmlspecialchars($SELF) . 'table=' . urlencode($name) . '"><strong>' . htmlspecialchars($name) . "</strong></a><br>\n";
        foreach ($table["fields"] as $field) {
-               $val = htmlspecialchars($field["field"]);
-               $title = ' title="' . htmlspecialchars($field["full_type"] . ($field["null"] ? " " . lang('NULL') : '')) . '"';
-               if (ereg('char|text', $field["type"])) {
-                       $val = "<span class='char'$title>$val</span>";
-               } elseif (ereg('date|time|year', $field["type"])) {
-                       $val = "<span class='date'$title>$val</span>";
-               } elseif (ereg('binary|blob', $field["type"])) {
-                       $val = "<span class='binary'$title>$val</span>";
-               } elseif (ereg('enum|set', $field["type"])) {
-                       $val = "<span class='enum'$title>$val</span>";
-               } else {
-                       $val = "<span$title>$val</span>";
-               }
+               $val = '<span' . type_class($field["type"]) . ' title="' . htmlspecialchars($field["full_type"] . ($field["null"] ? " " . lang('NULL') : '')) . '">' . htmlspecialchars($field["field"]) . '</span>';
                echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br>\n";
        }
        foreach ((array) $table["references"] as $target_name => $refs) {