From: erik.kapfer Date: Thu, 22 Nov 2018 05:54:47 +0000 (+0100) Subject: Webinterface: Added Yes/No deletion query. X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fdelbox;p=people%2Fummeegge%2Fipfire-2.x.git Webinterface: Added Yes/No deletion query. WUI returns a yes/no confirmation via onclick from user before deletion. Deleted 'remove' from LANGs cause it is a double to 'delete'. Used 'delete' instead. Added new LANG string for deletion query currenty only in english and german. Development has been started with topic from here --> https://forum.ipfire.org/viewtopic.php?f=17&t=21882 and is currently not completed. --- diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi index 7c3ba91ae0..e7e1482262 100644 --- a/html/cgi-bin/aliases.cgi +++ b/html/cgi-bin/aliases.cgi @@ -242,7 +242,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'NAME'}=$temp[2]; } -if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +if ($settings{'ACTION'} eq $Lang::tr{'delete'}) { splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'Unable to open aliases file.'; print FILE @current; @@ -428,8 +428,8 @@ foreach my $line (@current) {
- - + +
@@ -455,8 +455,8 @@ print <$Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 90aae52fbe..a1bdda894c 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -449,7 +449,7 @@ print <
- +
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 73a41d903f..de3b72f78b 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -243,7 +243,7 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang:: # # Remove existing accounts. # -if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +if ($settings{'ACTION'} eq $Lang::tr{'delete'}) { # Open /var/ipfire/ddns/config for writing. open(FILE, ">$datafile") or die "Unable to open $datafile."; @@ -568,8 +568,8 @@ END
- - + +
END @@ -590,8 +590,8 @@ END $Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'}
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 3eb5349a9f..3eb4802bad 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -373,7 +373,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'edit'}.'1') { } } -if ($dhcpsettings{'ACTION'} eq $Lang::tr{'remove'}.'1') { +if ($dhcpsettings{'ACTION'} eq $Lang::tr{'delete'}.'1') { splice (@current1,$dhcpsettings{'KEY1'},1); open(FILE, ">$filename1") or die 'Unable to open dhcp advanced options file.'; print FILE @current1; @@ -494,7 +494,7 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'edit'}.'2') { $dhcpsettings{'FIX_REMARK'}=$temp[6]; } -if ($dhcpsettings{'ACTION'} eq $Lang::tr{'remove'}.'2') { +if ($dhcpsettings{'ACTION'} eq $Lang::tr{'delete'}.'2') { splice (@current2,$dhcpsettings{'KEY2'},1); open(FILE, ">$filename2") or die 'Unable to open fixed lease file.'; print FILE @current2; @@ -856,8 +856,8 @@ $global
- - + +
@@ -884,8 +884,8 @@ print <$Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'} END @@ -1078,8 +1078,8 @@ foreach my $line (@current2) {
- - + +
@@ -1106,8 +1106,8 @@ print <$Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'}   diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 314107df90..bf517cc7b9 100644 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -141,7 +141,7 @@ if ($dnssettings{'ACTION'} eq $Lang::tr{'save'} && $errormessage eq "") { print <      - +      END @@ -162,7 +162,7 @@ END print <      - + END ; } diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi index ee63c6dd75..092217f63b 100644 --- a/html/cgi-bin/dnsforward.cgi +++ b/html/cgi-bin/dnsforward.cgi @@ -113,7 +113,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'}) ### # Remove existing entries. # -if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) +if ($cgiparams{'ACTION'} eq $Lang::tr{'delete'}) { my $id = 0; open(FILE, ">$filename") or die 'Unable to open config file.'; @@ -322,9 +322,9 @@ print <
- + - +
@@ -348,8 +348,8 @@ print <$Lang::tr{'click to enable'}     $Lang::tr{ $Lang::tr{'edit'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 6144aca025..7d098ff331 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -246,7 +246,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { ## Remove entry from ignore list. # -} elsif ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +} elsif ($settings{'ACTION'} eq $Lang::tr{'delete'}) { my %ignored = (); # Read-in ignoredfile. @@ -699,9 +699,9 @@ END
- + - +
diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi index 41fe8a5b63..d685bf964c 100644 --- a/html/cgi-bin/hosts.cgi +++ b/html/cgi-bin/hosts.cgi @@ -152,7 +152,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { $settings{'DOM'}=$temp[3]; } -if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +if ($settings{'ACTION'} eq $Lang::tr{'delete'}) { splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'hosts datafile error'; print FILE @current; @@ -347,8 +347,8 @@ foreach my $line (@current) {
- - + +
@@ -374,8 +374,8 @@ print <$Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 976300fc72..8237c88724 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2449,7 +2449,7 @@ else ### -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) { +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'delete'}) { &General::readhash("${General::swroot}/ovpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); @@ -2994,7 +2994,7 @@ END - + END ; } @@ -5476,8 +5476,8 @@ END
- - + +
@@ -5501,8 +5501,8 @@ END $Lang::tr{'show certificate'}     $Lang::tr{ $Lang::tr{'edit'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'}   diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index e6f3cda94a..05f9d5e01b 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -273,7 +273,7 @@ print <
- + END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 738425b9ad..c5c956ba7b 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -325,7 +325,7 @@ if ($proxysettings{'ACTION'} eq $Lang::tr{'add'}) $proxysettings{'NCSA_PASS_CONFIRM'} = ''; } -if ($proxysettings{'ACTION'} eq $Lang::tr{'remove'}) +if ($proxysettings{'ACTION'} eq $Lang::tr{'delete'}) { $proxysettings{'NCSA_EDIT_MODE'} = 'yes'; &deluser($proxysettings{'ID'}); @@ -2402,9 +2402,9 @@ END
- + - +
@@ -2420,8 +2420,8 @@ print <  $Lang::tr{'legend'}:     $Lang::tr{ $Lang::tr{'edit'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'} END ; diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index f2014e2e12..c7f2a7cca0 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -188,7 +188,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) { &BuildConfiguration; } -if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +if ($settings{'ACTION'} eq $Lang::tr{'delete'}) { splice (@current,$settings{'KEY1'},1); # Delete line open(FILE, ">$datafile") or die 'route datafile error'; print FILE @current; @@ -347,8 +347,8 @@ foreach my $line (@current) {
- - + +
@@ -374,8 +374,8 @@ print <$Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index c3c327eec2..67776890f8 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -460,7 +460,7 @@ if (($tcsettings{'MODE'} eq 'TIMECONSTRAINT') && ($tcsettings{'ACTION'} eq $Lang $tcsettings{'TCMODE'}='on'; } -if (($tcsettings{'MODE'} eq 'TIMECONSTRAINT') && ($tcsettings{'ACTION'} eq $Lang::tr{'remove'})) +if (($tcsettings{'MODE'} eq 'TIMECONSTRAINT') && ($tcsettings{'ACTION'} eq $Lang::tr{'delete'})) { $id = 0; open(FILE, ">$tcfile"); @@ -617,7 +617,7 @@ if (($uqsettings{'MODE'} eq 'USERQUOTA') && ($uqsettings{'ACTION'} eq $Lang::tr{ } } -if (($uqsettings{'MODE'} eq 'USERQUOTA') && ($uqsettings{'ACTION'} eq $Lang::tr{'remove'})) +if (($uqsettings{'MODE'} eq 'USERQUOTA') && ($uqsettings{'ACTION'} eq $Lang::tr{'delete'})) { $id = 0; open(FILE, ">$uqfile"); @@ -1734,7 +1734,7 @@ print <
- +
@@ -1754,8 +1754,8 @@ print <   $Lang::tr{'legend'}: -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'} END @@ -2083,10 +2083,10 @@ print <
- + - +
@@ -2130,8 +2130,8 @@ print <$Lang::tr{'edit'}     $Lang::tr{ $Lang::tr{'urlfilter copy rule'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'} END @@ -2311,10 +2311,10 @@ print <
- + - +
@@ -2338,8 +2338,8 @@ print <$Lang::tr{'click to enable'}     $Lang::tr{ $Lang::tr{'edit'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 21fd1f4cd6..a34f269185 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1215,7 +1215,7 @@ END ### ### Remove connection ### -} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) { +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'delete'}) { &General::readhash("${General::swroot}/vpn/settings", \%vpnsettings); &General::readhasharray("${General::swroot}/vpn/config", \%confighash); @@ -2935,8 +2935,8 @@ END
- - + +
@@ -2959,8 +2959,8 @@ END $Lang::tr{'show certificate'}     $Lang::tr{ $Lang::tr{'edit'} -     $Lang::tr{ - $Lang::tr{'remove'} +     $Lang::tr{ + $Lang::tr{'delete'}   diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi index bb55add70f..d3999dcefe 100644 --- a/html/cgi-bin/wakeonlan.cgi +++ b/html/cgi-bin/wakeonlan.cgi @@ -361,7 +361,7 @@ END
- +
diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi index d4592a2a47..1c8b070815 100644 --- a/html/cgi-bin/wireless.cgi +++ b/html/cgi-bin/wireless.cgi @@ -369,7 +369,7 @@ print<
- +
diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 6978663cf3..2e94289cca 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -221,7 +221,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'update'}) { } } -if ($settings{'ACTION'} eq $Lang::tr{'remove'}) { +if ($settings{'ACTION'} eq $Lang::tr{'delete'}) { my @update; foreach my $line (@configs) { @@ -394,8 +394,8 @@ END
- - + +
@@ -420,8 +420,8 @@ END $Lang::tr{ $Lang::tr{'edit'}    - $Lang::tr{ - $Lang::tr{'remove'} + $Lang::tr{ + $Lang::tr{'delete'} END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 42eb141037..6099e680f1 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -711,6 +711,7 @@ 'defaultwarning' => 'ACHTUNG - Ihre Einstellungen gehen hiermit verloren und werden durch die Standarteinstellungen ersetzt.', 'delete' => 'Löschen', 'delete cron' => 'Cronjob löschen', +'delete item' => 'Möchten sie diese Datei wirklich löschen?', 'delete pc' => 'PC löschen', 'delete share' => 'Freigabe löschen', 'delete user' => 'Benutzer löschen', @@ -2006,7 +2007,6 @@ 'remote subnet' => 'Entferntes Subnetz:', 'remote subnet is invalid' => 'Entferntes Subnetz ist ungültig.', 'removable device advice' => 'Stecken Sie ein Gerät an, aktualisieren Sie und binden Sie es vor der Benutzung ein. Melden Sie das Gerät vorm Entfernen ab.', -'remove' => 'Löschen', 'remove ca certificate' => 'CA-Zertifikat entfernen', 'remove x509' => 'Lösche x509', 'repeat' => 'Wiederholen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index e9356407ac..aefaa2752a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -733,6 +733,7 @@ 'defaultwarning' => 'WARNING - Your settings will be lost and replaced by the default ones.', 'delete' => 'Delete', 'delete cron' => 'Delete cronjob', +'delete item' => 'Do you really want to delete this item?', 'delete pc' => 'Delete workstation', 'delete share' => 'Delete share', 'delete user' => 'Delete user', @@ -2040,7 +2041,6 @@ 'remote subnet' => 'Remote subnet:', 'remote subnet is invalid' => 'Remote subnet is invalid.', 'removable device advice' => 'Plug in a device, refresh, select and mount before usage. Umount before removal.', -'remove' => 'Remove', 'remove ca certificate' => 'Remove CA certificate', 'remove x509' => 'Remove x509', 'repeat' => 'Repeat', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index ede7b661db..cf81a33e9a 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1487,7 +1487,6 @@ 'remote subnet' => 'Subred remota:', 'remote subnet is invalid' => 'Subred remota no válida', 'removable device advice' => 'Conecte un dispositivo, refresque, seleccione y monte antes de hacer uso. Desmonte después de remover', -'remove' => 'Remover', 'remove ca certificate' => 'Remover certifiado CA', 'remove x509' => 'Remover x509', 'repeat' => 'Repetir', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index cc67251e12..87af818fec 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1493,7 +1493,6 @@ 'remote subnet' => 'Sous-réseau distant :', 'remote subnet is invalid' => 'Le sous-réseau distant est non valide.', 'removable device advice' => 'Branchez le périphérique, rafraîchissez, sélectionnez-le et montez-le avant de l\'utiliser. Démonter-le avant de l\'enlever.', -'remove' => 'Enlever', 'remove ca certificate' => 'Enlever certificat CA', 'remove x509' => 'enlever x509', 'repeat' => 'répéter', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 02e047bb3c..048f97455b 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1885,7 +1885,6 @@ 'remote subnet' => 'Remote subnet:', 'remote subnet is invalid' => 'Remote subnet is invalid.', 'removable device advice' => 'Plug in a device, refresh, select and mount before usage. Umount before removal.', -'remove' => 'Remove', 'remove ca certificate' => 'Remove CA certificate', 'remove x509' => 'Remove x509', 'repeat' => 'Repeat', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 49c0cced67..650c0f5626 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1837,7 +1837,6 @@ 'remote subnet' => 'Remote subnet:', 'remote subnet is invalid' => 'Remote subnet is ongeldig.', 'removable device advice' => 'Plug een apparaat in, ververs, selecteer en koppel voor gebruik. Ontkoppel voor verwijderen van apparaat.', -'remove' => 'Verwijderen', 'remove ca certificate' => 'Verwijder CA certificaten', 'remove x509' => 'Verwijder x509', 'repeat' => 'Herhaal', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index e2f9da5c0a..d5a90c3cc5 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1499,7 +1499,6 @@ 'remote subnet' => 'Zdalna podsieć:', 'remote subnet is invalid' => 'Zdalne podsieć jest nieprawidłowa.', 'removable device advice' => 'Podłącz urządzenie, odśwież, a następnie wciśnij montuj. Odmontuj zanim usuniesz urządzenie.', -'remove' => 'Usuń', 'remove ca certificate' => 'Usuń certyfikat CA', 'remove x509' => 'Usuń x509', 'repeat' => 'Powtórz', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 4b0edb5826..24654367e6 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1494,7 +1494,6 @@ 'remote subnet' => 'Remote subnet:', 'remote subnet is invalid' => 'Remote subnet is invalid.', 'removable device advice' => 'Plug in a device, refresh, select and mount before usage. Umount before removal.', -'remove' => 'Удалить', 'remove ca certificate' => 'Remove CA certificate', 'remove x509' => 'Удалить x509', 'repeat' => 'Repeat', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 53f0afc7af..cae876e48e 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -2034,7 +2034,6 @@ 'remote subnet' => 'Uzak alt ağ:', 'remote subnet is invalid' => 'Geçersiz uzak alt ağ.', 'removable device advice' => 'Bir aygıt takıp yenileyin. Aygıtı kullanmadan önce seçip bağlayın. Çıkarmadan önce de ayırın.', -'remove' => 'Kaldır', 'remove ca certificate' => 'CA sertifikasını kaldır', 'remove x509' => 'X509 Kaldır', 'repeat' => 'Tekrar',