Use helper function

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 4e4e933b8fee11e6d2b5af42dc7cd8f2380bf63d..f4baef5b21bef681235f3e414b7f96318662872e 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -182,7 +182,7 @@ foreach ($engines as $engine) {
 <p>
 <?php if (support("columns") || $TABLE == "") { ?>
 <?php echo lang('Table name'); ?>: <input name="name"<?php echo ($TABLE == "" && !$_POST ? " autofocus" : ""); ?> data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
+<?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
  <?php echo ($collations && !preg_match("~sqlite|mssql~", JUSH) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
@@ -223,7 +223,7 @@ if (support("partitioning")) {
        print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
        ?>
 <p>
-<?php echo "<select name='partition_by'>" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
+<?php echo html_select("partition_by", array("" => "") + $partition_by, $row["partition_by"]) . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
 <table id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index e7125daf46ac988b1f4101d4e8033154ae9d7068..17c8706f6517cb73c05b60111851df5b456fff00 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -374,8 +374,7 @@ class Adminer {
                                $val["col"],
                                ($key !== "" ? "selectFieldChange" : "selectAddRow")
                        );
-                       echo "<div>" . ($driver->functions || $driver->grouping ? "<select name='columns[$i][fun]'>"
-                               . optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $driver->functions, lang('Aggregation') => $driver->grouping)), $val["fun"]) . "</select>"
+                       echo "<div>" . ($driver->functions || $driver->grouping ? html_select("columns[$i][fun]", array(-1 => "") + array_filter(array(lang('Functions') => $driver->functions, lang('Aggregation') => $driver->grouping)), $val["fun"])
                                . on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
                                . script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
                                . "($column)" : $column) . "</div>\n";
@@ -1065,13 +1064,13 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
                hidden_fields_get();
                $db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
                echo "<span title='" . lang('Database') . "'>" . lang('DB') . "</span>: " . ($databases
-                       ? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
+                       ? html_select("db", array("" => "") + $databases, DB) . $db_events
                        : "<input name='db' value='" . h(DB) . "' autocapitalize='off' size='19'>\n"
                );
                echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
                if (support("scheme")) {
                        if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-                               echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
+                               echo "<br>" . lang('Schema') . ": " . html_select("ns", array("" => "") + $adminer->schemas(), $_GET["ns"]) . $db_events;
                                if ($_GET["ns"] != "") {
                                        set_schema($_GET["ns"]);
                                }

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 334835d83e175b70b67d7ce1eaf34c50c17e96e5..56629c1419dba222f9f8d725c8b884fd890eb01d 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -386,7 +386,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 <td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"); ?>
 <td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php echo ($field["auto_increment"] ? " checked" : ""); ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?php
                        echo ($driver->generated
-                               ? "<select name='fields[$i][generated]'>" . optionlist(array_merge(array("", "DEFAULT"), $driver->generated), $field["generated"]) . "</select> "
+                               ? html_select("fields[$i][generated]", array_merge(array("", "DEFAULT"), $driver->generated), $field["generated"]) . " "
                                : checkbox("fields[$i][generated]", 1, $field["generated"], "", "", "", "label-default")
                        );
                        ?>

diff --git a/plugins/login-servers.php b/plugins/login-servers.php
index 42b94224b2963f18cd1e5a537803b4caba09eec8..c992a693e31c77a5973df82d111dd106d3e0691a 100644 (file)
--- a/plugins/login-servers.php
+++ b/plugins/login-servers.php
@@ -35,7 +35,7 @@ class AdminerLoginServers {
                if ($name == 'driver') {
                        return '';
                } elseif ($name == 'server') {
-                       return $heading . "<select name='auth[server]'>" . Adminer\optionlist(array_keys($this->servers), Adminer\SERVER) . "</select>\n";
+                       return $heading . Adminer\html_select("auth[server]", array_keys($this->servers), Adminer\SERVER) . "\n";
                }
        }
 }