From e2544b299868f9cf488b74cc1d635f9eb2af9a98 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Sat, 4 Aug 2007 19:39:18 +0000
Subject: [PATCH] Remember drop result

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@298 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 createv.inc.php   | 9 +++++++--
 procedure.inc.php | 9 +++++++--
 trigger.inc.php   | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/createv.inc.php b/createv.inc.php
index 70387bec..4d584063 100644
--- a/createv.inc.php
+++ b/createv.inc.php
@@ -1,7 +1,11 @@
 <?php
+$dropped = false;
 if ($_POST && !$error) {
-	if (strlen($_GET["createv"]) && $mysql->query("DROP VIEW " . idf_escape($_GET["createv"])) && $_POST["drop"]) {
-		redirect(substr($SELF, 0, -1), lang('View has been dropped.'));
+	if ($_POST["dropped"] || $mysql->query("DROP VIEW " . idf_escape($_GET["createv"]))) {
+		if ($_POST["drop"]) {
+			redirect(substr($SELF, 0, -1), lang('View has been dropped.'));
+		}
+		$dropped = true;
 	}
 	if (!$_POST["drop"] && $mysql->query("CREATE VIEW " . idf_escape($_POST["name"]) . " AS " . $_POST["select"])) {
 		redirect($SELF . "view=" . urlencode($_POST["name"]), (strlen($_GET["createv"]) ? lang('View has been altered.') : lang('View has been created.')));
@@ -26,6 +30,7 @@ if ($_POST) {
 <p><textarea name="select" rows="10" cols="80" style="width: 98%;"><?php echo htmlspecialchars($row["select"]); ?></textarea></p>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
+<?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 } ?>
diff --git a/procedure.inc.php b/procedure.inc.php
index 0dbfed1a..a63ea875 100644
--- a/procedure.inc.php
+++ b/procedure.inc.php
@@ -1,9 +1,13 @@
 <?php
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 
+$dropped = false;
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
-	if (strlen($_GET["procedure"]) && $mysql->query("DROP $routine " . idf_escape($_GET["procedure"])) && $_POST["drop"]) {
-		redirect(substr($SELF, 0, -1), lang('Routine has been dropped.'));
+	if ($_POST["dropped"] || $mysql->query("DROP $routine " . idf_escape($_GET["procedure"]))) {
+		if ($_POST["drop"]) {
+			redirect(substr($SELF, 0, -1), lang('Routine has been dropped.'));
+		}
+		$dropped = true;
 	}
 	if (!$_POST["drop"]) {
 		$set = array();
@@ -62,6 +66,7 @@ document.getElementById('form')['returns[type]'].onchange();
 <p><textarea name="definition" rows="10" cols="80" style="width: 98%;"><?php echo htmlspecialchars($row["definition"]); ?></textarea></p>
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
+<?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 } ?>
diff --git a/trigger.inc.php b/trigger.inc.php
index 2ba47607..45966172 100644
--- a/trigger.inc.php
+++ b/trigger.inc.php
@@ -2,9 +2,13 @@
 $trigger_time = array("BEFORE", "AFTER");
 $trigger_event = array("INSERT", "UPDATE", "DELETE");
 
+$dropped = false;
 if ($_POST && !$error) {
-	if (strlen($_GET["name"]) && $mysql->query("DROP TRIGGER " . idf_escape($_GET["name"])) && $_POST["drop"]) {
-		redirect($SELF . "table=" . urlencode($_GET["trigger"]), lang('Trigger has been dropped.'));
+	if ($_POST["dropped"] || $mysql->query("DROP TRIGGER " . idf_escape($_GET["name"]))) {
+		if ($_POST["drop"]) {
+			redirect($SELF . "table=" . urlencode($_GET["trigger"]), lang('Trigger has been dropped.'));
+		}
+		$dropped = true;
 	}
 	if (!$_POST["drop"]) {
 		if (in_array($_POST["Timing"], $trigger_time) && in_array($_POST["Event"], $trigger_event) && $mysql->query(
@@ -43,6 +47,7 @@ if ($_POST) {
 <p><textarea name="Statement" rows="10" cols="80" style="width: 98%;"><?php echo htmlspecialchars($row["Statement"]); ?></textarea></p>
 <p>
 <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 } ?>
 </p>