Add helper for <input type=hidden name=token>

diff --git a/adminer/call.inc.php b/adminer/call.inc.php
index b46eccd8820327c6545eedeea8465eec1f453333..a9df194d646afbeb05fec0e3593c56b831a117ef 100644 (file)
--- a/adminer/call.inc.php
+++ b/adminer/call.inc.php
@@ -85,7 +85,7 @@ if ($in) {
 ?>
 <p>
 <input type="submit" value="<?php echo lang('Call'); ?>">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>
 
 <pre>

diff --git a/adminer/check.inc.php b/adminer/check.inc.php
index 6dd64831cb3263fb69e2729189e46fa1f63ce022..05989ed622a24d615d0b329e353de434c7e94669 100644 (file)
--- a/adminer/check.inc.php
+++ b/adminer/check.inc.php
@@ -47,5 +47,5 @@ echo doc_link(array(
 <?php if ($name != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 84c4271d80174e832c08ce96f0e297c24d4109f0..f2e897bbca765971dcd2c746a660df80444acf8d 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -234,6 +234,6 @@ if (support("partitioning")) {
        }
        echo "</table>\n</div></fieldset>\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index fed0964e85ade305c36b1e922b992404a04008c3..04bc3f8e22eff0816b2b68a196f820190303563f 100644 (file)
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -76,6 +76,6 @@ if (DB != "") {
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
        echo "<input type='image' class='icon' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index d969733f3ccf416998eafeceacb55e7859132a5b..ee3695f16fe0a6ecd6864f1e83e4e318b528461a 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -157,7 +157,7 @@ if ($adminer->homepage()) {
                                }
                                echo "<input type='hidden' name='all' value=''>"; // used by trCheck()
                                echo script("qsl('input').onclick = function () { selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked(this, /^tables\[/) || $tables);" : "") . " }");
-                               echo "<input type='hidden' name='token' value='$token'>\n";
+                               echo input_token();
                                echo "</div></fieldset>\n";
                                echo "</div></div>\n";
                        }

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 366e1e66e03a80c6ea3fadef7844b37829d78097..16a3c8f3b6fe38ea469580f0f6995de01113989c 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -183,7 +183,7 @@ echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style,
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 
 <table>
 <?php

diff --git a/adminer/event.inc.php b/adminer/event.inc.php
index 73cea00dfb4dc358ff2ef8dfacfe4ec3479a1f69..1f08f5f897727319bda92a97538b605d5f4e6275 100644 (file)
--- a/adminer/event.inc.php
+++ b/adminer/event.inc.php
@@ -56,5 +56,5 @@ if (!$row && $EVENT != "") {
 <?php if ($EVENT != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php
index e371b762b8ba6440c21bb2b96e697fa5e43e54ea..c01856c20a56d6d1acba24b263283afc1d69b00a 100644 (file)
--- a/adminer/foreign.inc.php
+++ b/adminer/foreign.inc.php
@@ -116,5 +116,5 @@ foreach ($row["source"] as $key => $val) {
 <?php if ($name != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 474c19b04c02819d00f2f64152296987beb46e86..e69b51e86a4d305e3574002654534c1dd5e1c201 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -84,7 +84,7 @@ if (
                                        . "</div></div>\n"
                                : ""
                        );
-                       echo "<input type='hidden' name='token' value='$token'>\n";
+                       echo input_token();
                        echo "</form>\n";
                        echo script("tableCheck();");
                }

diff --git a/adminer/include/design.inc.php b/adminer/include/design.inc.php
index 97c5eafa54eae205e73d66b93e4571229e88ea8c..1d90e3089b2b44cdca2a3ac973931a1f819eca57 100644 (file)
--- a/adminer/include/design.inc.php
+++ b/adminer/include/design.inc.php
@@ -182,7 +182,7 @@ function page_messages($error) {
 * @return null
 */
 function page_footer($missing = "") {
-       global $adminer, $token;
+       global $adminer;
        ?>
 </div>
 
@@ -195,7 +195,7 @@ function page_footer($missing = "") {
 <p class="logout">
 <span><?php echo h($_GET["username"]) . "\n"; ?></span>
 <input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </p>
 </form>
 <?php } ?>

diff --git a/adminer/include/html.inc.php b/adminer/include/html.inc.php
index 58927e5668bd6d2eb9d586e5c1ea4ec1a91168e1..5fdfe56b7658f30aaa63be4d44a3f54b39ec9d2d 100644 (file)
--- a/adminer/include/html.inc.php
+++ b/adminer/include/html.inc.php
@@ -25,6 +25,15 @@ function nonce() {
        return ' nonce="' . get_nonce() . '"';
 }
 
+/** Get <input type="hidden" name="token">
+* @param string token to use instead of global $token
+* @return string HTML
+*/
+function input_token($special = "") {
+       global $token;
+       return "<input type='hidden' name='token' value='" . ($special ?: $token) . "'>\n";
+}
+
 /** Get a target="_blank" attribute
 * @return string
 */
@@ -414,7 +423,7 @@ function on_help($command, $side = 0) {
 * @return null
 */
 function edit_form($table, $fields, $row, $update) {
-       global $adminer, $token, $error;
+       global $adminer, $error;
        $table_name = $adminer->tableName(table_status1($table, true));
        page_header(
                ($update ? lang('Edit') : lang('Insert')),
@@ -514,7 +523,7 @@ function edit_form($table, $fields, $row, $update) {
        ?>
 <input type="hidden" name="referer" value="<?php echo h(isset($_POST["referer"]) ? $_POST["referer"] : $_SERVER["HTTP_REFERER"]); ?>">
 <input type="hidden" name="save" value="1">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>
 <?php
 }

diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index a7376386f761de537182f5566ae8d32749c1b8b7..7e01db726c74ce76d65c1f332b19323e4ef97a14 100644 (file)
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -95,7 +95,7 @@ function switch_lang() {
        echo "<form action='' method='post'>\n<div id='lang'>";
        echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
        echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
-       echo "<input type='hidden' name='token' value='" . get_token() . "'>\n"; // $token may be empty in auth.inc.php
+       echo input_token(get_token()); // $token may be empty in auth.inc.php
        echo "</div>\n</form>\n";
 }
 

diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
index e96d5a17775d32e44cf713911a04af40fcae7640..0e9542992af834c1322db59b61ba0b590b713c23 100644 (file)
--- a/adminer/indexes.inc.php
+++ b/adminer/indexes.inc.php
@@ -155,5 +155,5 @@ foreach ($row["indexes"] as $index) {
 </div>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 3feaffcd6135d6bd8b8bbbc19b7a6e6623710a35..79f348570c8c9373180f516b085785100eec3d43 100644 (file)
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -59,5 +59,5 @@ if (isset($_GET["function"])) {
 <?php if ($PROCEDURE != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index 1bf479b1ec239d7ec7616766e87dcd5c810d9972..dbef17b6363f2c24ec4aa4ffd17c49ed12ec77a0 100644 (file)
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -56,7 +56,7 @@ if (support("kill")) {
        echo ($i + 1) . "/" . lang('%d in total', max_connections());
        echo "<p><input type='submit' value='" . lang('Kill') . "'>\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>
 <?php echo script("tableCheck();"); ?>

diff --git a/adminer/scheme.inc.php b/adminer/scheme.inc.php
index 6c2c10ac8b6124d2234c09f94809759904b1836c..1f87c55428e2bd8c7ee2b439a277e29f2bbf15bc 100644 (file)
--- a/adminer/scheme.inc.php
+++ b/adminer/scheme.inc.php
@@ -34,6 +34,6 @@ if (!$row) {
 if ($_GET["ns"] != "") {
        echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $_GET["ns"])) . "\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index c5ad89d8fd1e6ddf85951b7a2ccabb62a6b86c4d..eebf3e5b347e63a060f6b9f1d232dad54a2ce1c8 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -594,7 +594,7 @@ if (!$columns && support("table")) {
                                echo "</div>";
                        }
 
-                       echo "<input type='hidden' name='token' value='$token'>\n";
+                       echo input_token();
                        echo "</form>\n";
                        echo (!$group && $select ? "" : script("tableCheck();"));
                }

diff --git a/adminer/sequence.inc.php b/adminer/sequence.inc.php
index c8bbb9fb6c218ef752e8242b1772037e6f19ac2d..4e49f1ec90eba142e78c88479f8042ef766a9b64 100644 (file)
--- a/adminer/sequence.inc.php
+++ b/adminer/sequence.inc.php
@@ -32,6 +32,6 @@ if (!$row) {
 if ($SEQUENCE != "") {
        echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $SEQUENCE)) . "\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index d2f401f3a0580cd825bb102e0868b00967d317cb..34b30e60d3f7a8304a51d9183026fb8d9f3733a9 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -169,7 +169,7 @@ if (!$error && $_POST) {
                                                                                                . html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
                                                                                                . html_select("format", $dump_format, $adminer_export["format"])
                                                                                                . "<input type='hidden' name='query' value='" . h($q) . "'>"
-                                                                                               . " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
+                                                                                               . " <input type='submit' name='export' value='" . lang('Export') . "'>" . input_token() . "</span>\n"
                                                                                                . "</form>\n"
                                                                                        ;
                                                                                }
@@ -258,7 +258,7 @@ if (!isset($_GET["import"])) {
 
 echo checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"]) || $_GET["error_stops"]), lang('Stop on error')) . "\n";
 echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"]) || $_GET["only_errors"]), lang('Show only errors')) . "\n";
-echo "<input type='hidden' name='token' value='$token'>\n";
+echo input_token();
 
 if (!isset($_GET["import"]) && $history) {
        print_fieldset("history", lang('History'), $_GET["history"] != "");

diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index 3b776940ee23dfee3e02480b1321d5064e328b3f..ed103d414bd0b26d4454c700a13f5f2ab137c1b7 100644 (file)
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -49,5 +49,5 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 <?php if ($name != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $name)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/type.inc.php b/adminer/type.inc.php
index da252cd84ff32d5887e4518169f80db6ec3d6d8f..8b2d839a455d53a4d89ea074aec55c9642180ec6 100644 (file)
--- a/adminer/type.inc.php
+++ b/adminer/type.inc.php
@@ -38,6 +38,6 @@ if ($TYPE != "") {
        textarea("as", $row["as"]);
        echo "<p><input type='submit' value='" . lang('Save') . "'>\n";
 }
+echo input_token();
 ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index 07e3d61ef145a45536d1528ef057ef4fec8e9e32..9b6b959463714064f1150796987650fc0938f8fc 100644 (file)
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -195,5 +195,5 @@ echo "</table>\n";
 <?php if (isset($_GET["host"])) { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', "$USER@$_GET[host]")); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>

diff --git a/adminer/view.inc.php b/adminer/view.inc.php
index ce44e65c642588666837112e7a5527aa5f6466ae..28bd40ecef84d6bc9325c3e1cf0b057fab1a088a 100644 (file)
--- a/adminer/view.inc.php
+++ b/adminer/view.inc.php
@@ -58,5 +58,5 @@ page_header(($TABLE != "" ? lang('Alter view') : lang('Create view')), $error, a
 <?php if ($TABLE != "") { ?>
 <input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?>
 <?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php echo input_token(); ?>
 </form>