Add Delete button to Edit page (revert r887)

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

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index a231e183e11552a39967fd86adc4465c5bc5d5cf..8b67ebc2417e5d505015a321b5d6b9e158e7851b 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -19,22 +19,26 @@ if ($_POST && !$error && !isset($_GET["select"])) {
                        }
                }
        }
-       $set = array();
-       foreach ($fields as $name => $field) {
-               $val = process_input($field);
-               if (!$update) {
-                       $set[idf_escape($name)] = ($val !== false ? $val : "''");
-               } elseif ($val !== false) {
-                       $set[] = "\n" . idf_escape($name) . " = $val";
-               }
-       }
-       if (!$set) {
-               redirect($location);
-       }
-       if ($update) {
-               query_redirect("UPDATE " . idf_escape($TABLE) . " SET" . implode(",", $set) . "\nWHERE $where\nLIMIT 1", $location, lang('Item has been updated.'));
+       if (isset($_POST["delete"])) {
+               query_redirect("DELETE FROM " . idf_escape($_GET["edit"]) . " WHERE $where LIMIT 1", $location, lang('Item has been deleted.'));
        } else {
-               query_redirect("INSERT INTO " . idf_escape($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")", $location, lang('Item has been inserted.'));
+               $set = array();
+               foreach ($fields as $name => $field) {
+                       $val = process_input($field);
+                       if (!$update) {
+                               $set[idf_escape($name)] = ($val !== false ? $val : "''");
+                       } elseif ($val !== false) {
+                               $set[] = "\n" . idf_escape($name) . " = $val";
+                       }
+               }
+               if (!$set) {
+                       redirect($location);
+               }
+               if ($update) {
+                       query_redirect("UPDATE " . idf_escape($TABLE) . " SET" . implode(",", $set) . "\nWHERE $where\nLIMIT 1", $location, lang('Item has been updated.'));
+               } else {
+                       query_redirect("INSERT INTO " . idf_escape($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")", $location, lang('Item has been inserted.'));
+               }
        }
 }
 
@@ -103,5 +107,8 @@ if ($fields) {
                echo "<input type='submit' name='insert' value='" . ($update ? lang('Save and continue edit') : lang('Save and insert next')) . "'>\n";
        }
 }
+if ($update) {
+       echo "<input type='submit' name='delete' value='" . lang('Delete') . "'$confirm>\n";
+}
 ?>
 </form>

diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 491b84f9b397c06acd6b03909eea55c5e16fd7cf..3bfebe43d4117fc919617198690d1543b9a9aeb1 100644 (file)
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Žádné tabulky.',
        'select' => 'vypsat',
        'Create new table' => 'Vytvořit novou tabulku',
+       'Item has been deleted.' => 'Položka byla smazána.',
        'Item has been updated.' => 'Položka byla aktualizována.',
        'Item has been inserted.' => 'Položka byla vložena.',
        'Edit' => 'Upravit',

diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 05f2a3584413fb1979236e1d31108c73c4d3dc43..6a761af15abd1e169079a998cc4d01560895ad87 100644 (file)
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Keine Tabellen.',
        'select' => 'zeigen',
        'Create new table' => 'Neue Tabelle',
+       'Item has been deleted.' => 'Datensatz gelöscht.',
        'Item has been updated.' => 'Datensatz geändert.',
        'Item has been inserted.' => 'Datensatz hinzugefügt.',
        'Edit' => 'Ändern',

diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index d3dadc6152c1509a39dd0c810c9e4eca4e487f8a..ffd271bfeedb4a0bfedf5e1896b7b1e1378c0c12 100644 (file)
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'No existen tablas.',
        'select' => 'registros',
        'Create new table' => 'Nueva tabla',
+       'Item has been deleted.' => 'Registro eliminado.',
        'Item has been updated.' => 'Registro modificado.',
        'Item has been inserted.' => 'Registro insertado.',
        'Edit' => 'Modificar',

diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 0120a52a8b3c2d521c1249f404630409f1ca5b86..326f325dcbbb2d90853a19c3f9700b1bacd6bfdb 100644 (file)
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Tabeleid ei leitud.',
        'select' => 'kuva',
        'Create new table' => 'Loo uus tabel',
+       'Item has been deleted.' => 'Kustutamine õnnestus.',
        'Item has been updated.' => 'Uuendamine õnnestus.',
        'Item has been inserted.' => 'Lisamine õnnestus.',
        'Edit' => 'Muuda',

diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index f2f43f8463c4eef5c42b5540b33248ad4705f2a1..8b743bc41f0d8be0eb657ac1c95cf2688ee4d72c 100644 (file)
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Aucunes tables.',
        'select' => 'select',
        'Create new table' => 'Créer une table',
+       'Item has been deleted.' => 'Élément supprimé.',
        'Item has been updated.' => 'Élément modifié.',
        'Item has been inserted.' => 'Élément inseré.',
        'Edit' => 'Modifier',

diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index c5608745abf70b38978b44380362759bc926a10e..78dcca34b25acbebce8ced2b32e4c110b8fe2ff1 100644 (file)
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'No tabelle.',
        'select' => 'seleziona',
        'Create new table' => 'Crea nuova tabella',
+       'Item has been deleted.' => 'Elemento eliminato.',
        'Item has been updated.' => 'Elemento aggiornato.',
        'Item has been inserted.' => 'Elemento inserito.',
        'Edit' => 'Modifica',

diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 75448894ca240d1a2ba4c3c1a2d2b72bea1dadff..d688ea6a2232da420961e9663c331c584085cc23 100644 (file)
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Geen tabellen.',
        'select' => 'kies',
        'Create new table' => 'Nieuwe tabel',
+       'Item has been deleted.' => 'Item verwijderd.',
        'Item has been updated.' => 'Item aangepast.',
        'Item has been inserted.' => 'Item toegevoegd.',
        'Edit' => 'Bewerk',

diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index 36b3f2da16911f2c7ed7874f8a514c326b50a8aa..c27a2bf35519c896d7a1b46a34ca91f01b209e4d 100644 (file)
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'В базе данных нет таблиц.',
        'select' => 'выбрать',
        'Create new table' => 'Создать новую таблицу',
+       'Item has been deleted.' => 'Запись удалена.',
        'Item has been updated.' => 'Запись обновлена.',
        'Item has been inserted.' => 'Запись вставлена.',
        'Edit' => 'Редактировать',

diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 2700f4b2907277bf1479b817f496106a8596c4c1..7b468b01a39955e0b3ad9ed6eb21de6eb19f1531 100644 (file)
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => 'Žiadne tabuľky.',
        'select' => 'vypísať',
        'Create new table' => 'Vytvoriť novú tabuľku',
+       'Item has been deleted.' => 'Položka bola vymazaná.',
        'Item has been updated.' => 'Položka bola aktualizovaná.',
        'Item has been inserted.' => 'Položka bola vložená.',
        'Edit' => 'Upraviť',

diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index 0a46e0958e0617467f3380ba09f95852052826e7..4582befc6a72874218d36aea5adbbac4f1a996c1 100644 (file)
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -37,6 +37,7 @@ $translations = array(
        'No tables.' => '没有表。',
        'select' => '选择',
        'Create new table' => '创建新表',
+       'Item has been deleted.' => '已删除项目。',
        'Item has been updated.' => '已更新项目。',
        'Item has been inserted.' => '已插入项目。',
        'Edit' => '编辑',

diff --git a/changes.txt b/changes.txt
index 1a6af19312d6d921d710ec400eaa8d3959045b0d..503d14b206d41610f7cdd8c9ac1eb251c86e0d24 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 2.2.2-dev:
+Add Delete button to Edit page (regression from 2.0.0)
+
 Adminer 2.2.1 (released 2009-11-26):
 Highlight current links
 Improve concurrency