Remember drop result

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

diff --git a/createv.inc.php b/createv.inc.php
index 70387bececda705905ab1e5db7c973719c871ee4..4d584063f7df9f6ea4e0182be234b299b598f26f 100644 (file)
--- 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 0dbfed1aece799f9b9591e645c4c4943561e85f7..a63ea875860a8b8d7751bec08aff2de921ff3f7e 100644 (file)
--- 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 2ba47607dac2887ac6f454a630fcd98359c7eea8..459661726d852968da07b86a1aea03a08e04abdf 100644 (file)
--- 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>