From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 18 Oct 2010 21:57:39 +0000 (+0200)
Subject: Create confirm function
X-Git-Tag: v3.1.0~68
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=a93bc19108c3b8eed4199309d0fcd5210f2fc46e;p=adminer.git

Create confirm function
---

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index f7a23ea1..fcce1e28 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -164,7 +164,7 @@ document.write('<label><input type="checkbox" onclick="columnShow(this.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'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);
diff --git a/adminer/database.inc.php b/adminer/database.inc.php
index 87f31dd7..83e7ffb3 100644
--- a/adminer/database.inc.php
+++ b/adminer/database.inc.php
@@ -65,7 +65,7 @@ echo ($_POST["add_x"] || strpos($name, "\n")
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (DB != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }
diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index b433c49f..56bc19f4 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -73,7 +73,7 @@ if ($_GET["ns"] !== "") {
 		}
 		echo "</table>\n";
 		if (!information_schema(DB)) {
-			echo "<p><input type='hidden' name='token' value='$token'>" . ($jush == "sql" ? "<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?') . " (' + formChecked(this, /tables/) + ')');\"> <input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /tables|views/) + ')');\">\n";
+			echo "<p><input type='hidden' name='token' value='$token'>" . ($jush == "sql" ? "<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("formChecked(this, /tables/)") . "> <input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /tables|views/)") . ">\n";
 			$databases = (support("scheme") ? schemas() : get_databases());
 			if (count($databases) != 1 && $jush != "sqlite") {
 				$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 5a7c73e7..298725ed 100644
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -104,7 +104,7 @@ if ($fields) {
 	}
 }
 if ($update) {
-	echo "<input type='submit' name='delete' value='" . lang('Delete') . "'$confirm>\n";
+	echo "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n";
 }
 ?>
 </form>
diff --git a/adminer/event.inc.php b/adminer/event.inc.php
index fe17ef5d..62eaf7ad 100644
--- a/adminer/event.inc.php
+++ b/adminer/event.inc.php
@@ -49,5 +49,5 @@ if ($_POST) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 </form>
diff --git a/adminer/foreign.inc.php b/adminer/foreign.inc.php
index 5b1f813c..801586ef 100644
--- a/adminer/foreign.inc.php
+++ b/adminer/foreign.inc.php
@@ -73,6 +73,6 @@ foreach ($row["source"] as $key => $val) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
 <?php } ?>
-<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>
diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index e50b79f1..fc3ae784 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -78,4 +78,3 @@ if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !
 }
 
 $on_actions = array("RESTRICT", "CASCADE", "SET NULL", "NO ACTION"); ///< @var array used in foreign_keys()
-$confirm = " onclick=\"return confirm('" . lang('Are you sure?') . "');\""; ///< @var string
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 1f58a6ef..63a40ae7 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -39,7 +39,7 @@ function connect_error() {
 				echo "\n";
 			}
 			echo "</table>\n";
-			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /db/) + ')');\">\n";
+			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)") . ">\n";
 			echo "</form>\n";
 		}
 	}
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 88e51ad2..9450ef08 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -135,6 +135,14 @@ function html_select($name, $options, $value = "", $onchange = true) {
 	return $return;
 }
 
+/** Get onclick confirmation
+* @param string JavaScript expression
+* @return string
+*/
+function confirm($count = "") {
+	return " onclick=\"return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
+}
+
 /** Get INI boolean value
 * @param string
 * @return bool
diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index e9f5b3e3..1fab8605 100644
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -54,5 +54,5 @@ if (isset($_GET["function"])) {
 <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 ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 </form>
diff --git a/adminer/scheme.inc.php b/adminer/scheme.inc.php
index 0bdd3f03..980bca42 100644
--- a/adminer/scheme.inc.php
+++ b/adminer/scheme.inc.php
@@ -29,7 +29,7 @@ if ($_POST) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 }
 ?>
 </form>
diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 80aec73e..9edc14cc 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -383,7 +383,7 @@ if (!$columns) {
 <input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>">
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
-<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">
+<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"<?php echo confirm("(this.form['all'].checked ? $found_rows : formChecked(this, /check/))"); ?>>
 </div></fieldset>
 <?php
 			}
diff --git a/adminer/sequence.inc.php b/adminer/sequence.inc.php
index 97b6f227..502eabff 100644
--- a/adminer/sequence.inc.php
+++ b/adminer/sequence.inc.php
@@ -28,7 +28,7 @@ if ($_POST) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($SEQUENCE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 }
 ?>
 </form>
diff --git a/adminer/trigger.inc.php b/adminer/trigger.inc.php
index 1f45a1be..d07607b3 100644
--- a/adminer/trigger.inc.php
+++ b/adminer/trigger.inc.php
@@ -40,5 +40,5 @@ 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 ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 </form>
diff --git a/adminer/type.inc.php b/adminer/type.inc.php
index f8b2ba13..4f30550d 100644
--- a/adminer/type.inc.php
+++ b/adminer/type.inc.php
@@ -23,7 +23,7 @@ if ($_POST) {
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php
 if ($TYPE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'$confirm>\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 } else {
 	echo "<input name='name' value='" . h($row['name']) . "'>\n";
 	textarea("as", $row["as"]);
diff --git a/adminer/user.inc.php b/adminer/user.inc.php
index b79a99a4..677e6736 100644
--- a/adminer/user.inc.php
+++ b/adminer/user.inc.php
@@ -164,5 +164,5 @@ 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'); ?>"<?php echo $confirm; ?>><?php } ?>
+<?php if (isset($_GET["host"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 </form>