Confirm in variable

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

diff --git a/create.inc.php b/create.inc.php
index a76b50e46183ce04fcf169113350eb57465dc995..b751cd682a9ce1cfdb82c3ac304d25e52acfac52 100644 (file)
--- a/create.inc.php
+++ b/create.inc.php
@@ -108,6 +108,6 @@ function column_comments_click(checked) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/createv.inc.php b/createv.inc.php
index 43fe31bb24b67d0fee66008b5e80bb34b0f54479..c6a4e65c18540d94d2f87b6b12f532dba84b3c28 100644 (file)
--- a/createv.inc.php
+++ b/createv.inc.php
@@ -27,6 +27,6 @@ if ($_POST) {
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1" /><?php } ?>
 <?php echo lang('Name'); ?>: <input name="name" value="<?php echo htmlspecialchars($row["name"]); ?>" maxlength="64" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["createv"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["createv"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/database.inc.php b/database.inc.php
index 2775968549220025d76af4c398678658cad14bde..a9206a50a421917b57da4ac363c41f3239f6975c 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -61,6 +61,6 @@ if ($_POST) {
 <select name="collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $collate); ?></select>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["db"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["db"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/edit.inc.php b/edit.inc.php
index 09a92644f75bbad240b96a1c4b1604e6e8828976..7b1446797ecd91b9f3dff1825ba94f17e94dfb2d 100644 (file)
--- a/edit.inc.php
+++ b/edit.inc.php
@@ -96,6 +96,6 @@ if ($fields) {
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 <?php if (!isset($_GET["default"]) && !isset($_GET["select"])) { ?><input type="submit" name="insert" value="<?php echo ($update ? lang('Save and continue edit') : lang('Save and insert next')); ?>" /><?php } ?>
 <?php } ?>
-<?php if ($update) { ?> <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if ($update) { ?> <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/event.inc.php b/event.inc.php
index 35586c508cfb4990e82c86d6f95a557bb37ab699..23b2596fee3e2b55ce86423a5193ac3c003a6882 100644 (file)
--- a/event.inc.php
+++ b/event.inc.php
@@ -49,6 +49,6 @@ if ($_POST) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["event"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["event"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/foreign.inc.php b/foreign.inc.php
index c187c73d9387db3cae4f1480aebd70a74d1882e5..f160c87382088795ed8a1e5382e99699236d0f6b 100644 (file)
--- a/foreign.inc.php
+++ b/foreign.inc.php
@@ -88,7 +88,7 @@ foreach ($row["source"] as $key => $val) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>" /></p></noscript>
 </form>

diff --git a/index.php b/index.php
index e9a06c4006e4a94fdf538c6cbc0a61615f4d5969..12f3ef1050c00de5b3b3fafbec9955b879679702 100644 (file)
--- a/index.php
+++ b/index.php
@@ -75,6 +75,7 @@ if (isset($_GET["download"])) {
        $inout = array("IN", "OUT", "INOUT");
        $functions = array("char_length", "from_unixtime", "hex", "lower", "round", "sec_to_time", "time_to_sec", "unix_timestamp", "upper");
        $grouping = array("avg", "count", "distinct", "group_concat", "max", "min", "sum");
+       $confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
        
        $error = "";
        if (isset($_GET["table"])) {
@@ -192,7 +193,7 @@ if (isset($_GET["download"])) {
                                        echo "</td></tr>\n";
                                }
                                echo "</table>\n";
-                               echo "<p><input type='hidden' name='token' value='$token' /><input type='submit' value='" . lang('Analyze') . "' /> <input type='submit' name='optimize' value='" . lang('Optimize') . "' /> <input type='submit' name='check' value='" . lang('Check') . "' /> <input type='submit' name='repair' value='" . lang('Repair') . "' /> <input type='submit' name='truncate' value='" . lang('Truncate') . "' onclick=\"return confirm('" . lang('Are you sure?') . "');\" /> <input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . "');\" /></p>\n";
+                               echo "<p><input type='hidden' name='token' value='$token' /><input type='submit' value='" . lang('Analyze') . "' /> <input type='submit' name='optimize' value='" . lang('Optimize') . "' /> <input type='submit' name='check' value='" . lang('Check') . "' /> <input type='submit' name='repair' value='" . lang('Repair') . "' /> <input type='submit' name='truncate' value='" . lang('Truncate') . "'$confirm /> <input type='submit' name='drop' value='" . lang('Drop') . "'$confirm /></p>\n";
                                $db = (isset($_POST["target"]) ? $_POST["target"] : $_GET["db"]);
                                echo "<p>" . lang('Move to other database') . (get_databases() ? ": <select name='target'>" . optionlist(get_databases(), $db) . "</select>" : ': <input name="target" value="' . htmlspecialchars($db) . '" />') . " <input type='submit' name='move' value='" . lang('Move') . "' /></p>\n";
                                echo "</form>\n";

diff --git a/procedure.inc.php b/procedure.inc.php
index 26d5e11447354d395047ffafed81ce7475b710fe..050d3b8280f1bcdea65174e9a5272a32ba1af06d 100644 (file)
--- a/procedure.inc.php
+++ b/procedure.inc.php
@@ -53,6 +53,6 @@ document.getElementById('form')['returns[type]'].onchange();
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1" /><?php } ?>
 <?php echo lang('Name'); ?>: <input name="name" value="<?php echo htmlspecialchars($row["name"]); ?>" maxlength="64" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["procedure"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["procedure"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/select.inc.php b/select.inc.php
index 68951cbf5d082dcc48024e20f1eb07095bfbe035..39ed1d5fc348aea543d6d3b541d07702eabc7a15 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -300,7 +300,7 @@ for (var i=0; <?php echo $i; ?> > i; i++) {
                        }
                        echo " (" . lang('%d row(s)', $found_rows) . ")</p>\n";
                        
-                       echo "<fieldset><legend>" . lang('Edit') . "</legend><input type='hidden' name='token' value='$token' /><input type='submit' value='" . lang('Edit') . "' /> <input type='submit' name='clone' value='" . lang('Clone') . "' /> <input type='submit' name='delete' value='" . lang('Delete') . "' onclick=\"return !this.form['all'].checked || confirm('" . lang('Are you sure?') . "');\" /></fieldset>\n";
+                       echo "<fieldset><legend>" . lang('Edit') . "</legend><input type='hidden' name='token' value='$token' /><input type='submit' value='" . lang('Edit') . "' /> <input type='submit' name='clone' value='" . lang('Clone') . "' /> <input type='submit' name='delete' value='" . lang('Delete') . "'$confirm /></fieldset>\n";
                        echo "<fieldset><legend>" . lang('Export') . "</legend>$dump_options <input type='submit' name='export' value='" . lang('Export') . "' /></fieldset>\n";
                        echo "</form>\n";
                }

diff --git a/trigger.inc.php b/trigger.inc.php
index 425ecffa4ef962588225105a28ccc2a152de68c3..b880db81d42052d6a60ff0d84a051911395a047f 100644 (file)
--- a/trigger.inc.php
+++ b/trigger.inc.php
@@ -40,6 +40,6 @@ if ($_POST) {
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <?php if ($dropped) { ?><input type="hidden" name="dropped" value="1" /><?php } ?>
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (strlen($_GET["name"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>

diff --git a/user.inc.php b/user.inc.php
index 2c24a9f6e820f43071eadfa41dfca168e56fe035..a48cbfc0fabe92744fe4b4191909961b889c1c36 100644 (file)
--- a/user.inc.php
+++ b/user.inc.php
@@ -178,6 +178,6 @@ echo "</table>\n";
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Save'); ?>" />
-<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?>');" /><?php } ?>
+<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?> /><?php } ?>
 </p>
 </form>