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 7c3ba91ae02fc3a522ba86aa0aac1a0a993f4a15..e7e1482262596ba4d69fbe1f67008b7a8826e23f 100644 (file)
--- 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) {
 
 <td style='text-align:center; $col'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+<input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
 <input type='hidden' name='KEY1' value='$key' />
 </form>
 </td>
@@ -455,8 +455,8 @@ print <<END
     <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
     <td class='base'>$Lang::tr{'edit'}</td>
     <td>&nbsp;&nbsp;</td>
-    <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-    <td class='base'>$Lang::tr{'remove'}</td>
+    <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+    <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 </table>
 END

diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi
index 90aae52fbe0835421be74f51b091b1b52894fc2a..a1bdda894c7cd8bdd852a4a40e5eb5707e1964d5 100644 (file)
--- a/html/cgi-bin/connscheduler.cgi
+++ b/html/cgi-bin/connscheduler.cgi
@@ -449,7 +449,7 @@ print <<END
 <td align='center' $col>
   <form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
   <input type='hidden' name='ACTION' value='remove' />
-  <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+  <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
   <input type='hidden' name='ID' value='$id' />
   </form>
 </td>

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 73a41d903fae41b47024f38ce18237adca36556c..de3b72f78bda9f4ebb5b04dfe6540e5e43208952 100644 (file)
--- 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
 
        <td align='center' $col><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <input type='hidden' name='ID' value='$id'>
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
        </form></td>
 </tr>
 END
@@ -590,8 +590,8 @@ END
                <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                <td class='base'>$Lang::tr{'edit'}</td>
                <td>&nbsp;&nbsp;</td>
-               <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <td align='right' width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
                </form>

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 3eb5349a9f70ec7efee12ff0a40f2f5ae11041c7..3eb4802bada55550c174bf34607675f1a1f0e7f1 100644 (file)
--- 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</td>
 
 <td align='center'>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}1' />
-<input $disabledEditRemove type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}1' />
+<input $disabledEditRemove type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
 <input type='hidden' name='KEY1' value='$key' />
 </form>
 </td>
@@ -884,8 +884,8 @@ print <<END
        <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
        <td class='base'>$Lang::tr{'edit'}</td>
        <td>&nbsp;&nbsp;</td>
-       <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-       <td class='base'>$Lang::tr{'remove'}</td>
+       <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+       <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 </table>
 END
@@ -1078,8 +1078,8 @@ foreach my $line (@current2) {
 
 <td align='center' $col>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}2' />
-<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}2' />
+<input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
 <input type='hidden' name='KEY2' value='$key' />
 </form>
 </td>
@@ -1106,8 +1106,8 @@ print <<END
        <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
        <td class='base'>$Lang::tr{'edit'}</td>
        <td>&nbsp;&nbsp;</td>
-       <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-       <td class='base'>$Lang::tr{'remove'}</td>
+       <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+       <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 <tr>
        <td>&nbsp;</td>

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 314107df90f901573b46ca97391d269330335e02..bf517cc7b99b6cd55a8f9764640fbb92a424a72d 100644 (file)
--- 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      
         <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
+        <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
         &nbsp;&nbsp;&nbsp;&nbsp;
         <input type='submit' name='ACTION' value='$Lang::tr{'reconnect'}' />
 END
@@ -162,7 +162,7 @@ END
 print <<END
         <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' />
+        <input type='submit' name='ACTION' value='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
 END
 ;  
 } 

diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index ee63c6dd75853a1ed36b3baeaaf7802f9cf603cf..092217f63bcacba64419fd5f1a2663e073b88984 100644 (file)
--- 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 <<END
        </td>
        <td align='center' $col>
                <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
-                       <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
+                       <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
                        <input type='hidden' name='ID' value='$id' />
-                       <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
+                       <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
                </form>
        </td>
 </tr>
@@ -348,8 +348,8 @@ print <<END
                <td class='base'>$Lang::tr{'click to enable'}</td>
                <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                <td class='base'>$Lang::tr{'edit'}</td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
        </tr>
 </table>
 END

diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi
index 6144aca025a71dcf67673b80f9ac96992bfb749d..7d098ff3310afa2c888980b8f0d778d65577ea1b 100644 (file)
--- 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
 
                                                <td align='center' $col>
                                                        <form method='post' name='$key' action='$ENV{'SCRIPT_NAME'}'>
-                                                               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}'>
+                                                               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}'>
                                                                <input type='hidden' name='ID' value='$key'>
-                                                               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}'>
+                                                               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}'>
                                                        </form>
                                                </td>
                                        </tr>

diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi
index 41fe8a5b63dd568a4b261aafd1812e8087424e69..d685bf964c74223f3df42639703e25d3efa50dd4 100644 (file)
--- 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) {
 
 <td align='center' $col>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+<input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
 <input type='hidden' name='KEY1' value='$key' />
 </form>
 </td>
@@ -374,8 +374,8 @@ print <<END
     <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
     <td class='base'>$Lang::tr{'edit'}</td>
     <td>&nbsp;&nbsp;</td>
-    <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-    <td class='base'>$Lang::tr{'remove'}</td>
+    <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+    <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 </table>
 END

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 976300fc72e77dd3e23e26bca243dc61faaa4606..8237c88724b225286448ad019d08d197f780cdcd 100644 (file)
--- 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
                <td><input type='hidden' name='ACTION' value='kill'/>
                <input type='hidden' name='number' value='$count' />
                <input type='hidden' name='net' value='$ccdconf[0]' />
-               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr>
+               <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /></form></td></tr>
 END
 ;
        }       
@@ -5476,8 +5476,8 @@ END
            <input type='hidden' name='KEY' value='$key' />
        </td></form>
        <form method='post' name='frm${key}f'><td align='center' $col>
-           <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-           <input type='image'  name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' width='20' height='20' border='0' />
+           <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+           <input type='image'  name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" width='20' height='20' border='0' />
            <input type='hidden' name='KEY' value='$key' />
        </td></form>
        </tr>
@@ -5501,8 +5501,8 @@ END
                <td class='base'>$Lang::tr{'show certificate'}</td>
                <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                <td class='base'>$Lang::tr{'edit'}</td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
     </tr>
     <tr>
                <td>&nbsp; </td>

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index e6f3cda94aaa04f0377f2992bf2b50611b29b800..05f9d5e01b615682f94d66832d942470663c70a2 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -273,7 +273,7 @@ print <<END;
                        </select>
                        <br />
                        <input type='hidden' name='ACTION' value='remove' />
-                       <input type='image' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' src='/images/list-remove.png' />
+                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/list-remove.png' />
                </form>
        </table>
 END

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 738425b9ad7139ce003ee8da1904e8d3d68650f2..c5c956ba7b14ce12ea164753762f3513974bd996 100644 (file)
--- 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
 
                <td width='8%' align='center'>
                <form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
                <input type='hidden' name='ID' value='$temp[0]' />
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
+               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
                </form>
                </td>
        </tr>
@@ -2420,8 +2420,8 @@ print <<END
        <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
        <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
        <td class='base'>$Lang::tr{'edit'}</td>
-       <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-       <td class='base'>$Lang::tr{'remove'}</td>
+       <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+       <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 END
 ;

diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index f2014e2e12f917ecc31c56c7490534a52a420874..c7f2a7cca0f5f58962c3e9870f5b55cae050d701 100644 (file)
--- 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) {
 
 <td align='center' $col>
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+<input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+<input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />
 <input type='hidden' name='KEY1' value='$key' />
 </form>
 </td>
@@ -374,8 +374,8 @@ print <<END
     <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
     <td class='base'>$Lang::tr{'edit'}</td>
     <td>&nbsp;&nbsp;</td>
-    <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-    <td class='base'>$Lang::tr{'remove'}</td>
+    <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+    <td class='base'>$Lang::tr{'delete'}</td>
 </tr>
 </table>
 END

diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index c3c327eec2a40096a3cd01ac42fdd6bc645919ca..67776890f8dd9f3411557a0c8ffa23b8e336dd9a 100644 (file)
--- 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 <<END
 
                <td align='center'>
                <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}' />
                <input type='hidden' name='ID' value='$line' />
                <input type='hidden' name='ACTION' value='$Lang::tr{'urlfilter remove file'}' />
                </form>
@@ -1754,8 +1754,8 @@ print <<END
 <table>
        <tr>
                <td class='boldbase'>&nbsp; <b>$Lang::tr{'legend'}:</b></td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
        </tr>
 </table>
 END
@@ -2083,10 +2083,10 @@ print <<END
 
                <td align='center'>
                <form method='post' name='frmd$id' action='$ENV{'SCRIPT_NAME'}'>
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}' />
                <input type='hidden' name='MODE' value='TIMECONSTRAINT' />
                <input type='hidden' name='ID' value='$id' />
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
+               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
                </form>
                </td>
 
@@ -2130,8 +2130,8 @@ print <<END
                <td class='base'>$Lang::tr{'edit'}</td>
                <td>&nbsp; &nbsp; <img src='/images/urlfilter/copy.gif' alt='$Lang::tr{'urlfilter copy rule'}' /></td>
                <td class='base'>$Lang::tr{'urlfilter copy rule'}</td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
        </tr>
 </table>
 END
@@ -2311,10 +2311,10 @@ print <<END
 
                <td align='center'>
                <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' title='$Lang::tr{'delete'}' alt='$Lang::tr{'delete'}' />
                <input type='hidden' name='MODE' value='USERQUOTA' />
                <input type='hidden' name='ID' value='$id' />
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
+               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
                </form>
                </td>
 
@@ -2338,8 +2338,8 @@ print <<END
                <td class='base'>$Lang::tr{'click to enable'}</td>
                <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                <td class='base'>$Lang::tr{'edit'}</td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
        </tr>
 </table>
 END

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 21fd1f4cd6061c80ddb2067527427122c7e348d1..a34f26918548b88549d925f526cc44987c299259 100644 (file)
--- 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
        </td>
        <td align='center' $col>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
                <input type='hidden' name='KEY' value='$key' />
                </form>
        </td>
@@ -2959,8 +2959,8 @@ END
                <td class='base'>$Lang::tr{'show certificate'}</td>
                <td>&nbsp; &nbsp; <img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                <td class='base'>$Lang::tr{'edit'}</td>
-               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-               <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" /></td>
+               <td class='base'>$Lang::tr{'delete'}</td>
                </tr>
                <tr>
                <td>&nbsp; </td>

diff --git a/html/cgi-bin/wakeonlan.cgi b/html/cgi-bin/wakeonlan.cgi
index bb55add70f640e2ce390229db9559393bbd24878..d3999dcefe3edada4b37d659cceea57691150ccb 100644 (file)
--- a/html/cgi-bin/wakeonlan.cgi
+++ b/html/cgi-bin/wakeonlan.cgi
@@ -361,7 +361,7 @@ END
 <td align='center' $col>
   <form method='post' name='frmc$i' action='$ENV{'SCRIPT_NAME'}'>
   <input type='hidden' name='ACTION' value='remove' />
-  <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+  <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'are you sure'}');" />
   <input type='hidden' name='ID' value='$i' />
   </form>
 </td>

diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi
index d4592a2a479165f53cba5315ee463effb5f6c2af..1c8b070815e1488e7d1a6ed83ccd580b3a851d26 100644 (file)
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -369,7 +369,7 @@ print<<END
 <td align='center' $col>
        <form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
        <input type='hidden' name='ACTION' value='remove' />
-       <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+       <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' onclick="return confirm('$Lang::tr{'delete item'}');" />
        <input type='hidden' name='ID' value='$id' />
        </form>
 </td>

diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi
index 6978663cf39d4d7aaa9c7eea8634ccfc435162e7..2e94289ccabf2a8166570abde58179036d3541b6 100644 (file)
--- 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
                                </td>
                                <td align='center' width='5%' $col>
                                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                               <input type='hidden' name='ACTION' value='$Lang::tr{'remove'}' />
-                                               <input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' />
+                                               <input type='hidden' name='ACTION' value='$Lang::tr{'delete'}' />
+                                               <input type='image' name='$Lang::tr{'delete'}' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />
                                                <input type='hidden' name='ID' value='$config[0]' />
                                        </form>
                                </td>
@@ -420,8 +420,8 @@ END
                                        <td><img src='/images/edit.gif' alt='$Lang::tr{'edit'}' /></td>
                                        <td class='base'>$Lang::tr{'edit'}</td>
                                        <td>&nbsp;&nbsp;</td>
-                                       <td><img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
-                                       <td class='base'>$Lang::tr{'remove'}</td>
+                                       <td><img src='/images/delete.gif' alt='$Lang::tr{'delete'}' /></td>
+                                       <td class='base'>$Lang::tr{'delete'}</td>
                                </tr>
                        </table>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 42eb141037cc0acae68f33a6e1b3545709ebb800..6099e680f198d597a35d8a5da9ac1121ea9e2384 100644 (file)
--- 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 e9356407ac58abfe48e5d82fd15e90c1de0621bc..aefaa2752a389451846ed2615e6bfc329614bcde 100644 (file)
--- 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 ede7b661db56325be2036408bc1000ecab521815..cf81a33e9aebb1a567af585bcc168e511be827db 100644 (file)
--- 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 cc67251e127870486ebfb50597bdca9a6b003cef..87af818fec9615a9e1a3a6b13fc511d5821d1810 100644 (file)
--- 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 02e047bb3cb0a4e78271523bfd8bdacbd09fc0e9..048f97455b8101c908ebf84b9a0bc62eb024d7a2 100644 (file)
--- 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 49c0cced67a2f150d9fb2b6815581c9f4f0bd6b2..650c0f562678ecbe9ae16e8a575b643a1c8d3112 100644 (file)
--- 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 e2f9da5c0a8bd31f2679d8272329d954e2dbab17..d5a90c3cc51a7eea6df78548e3adf080286739af 100644 (file)
--- 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 4b0edb58261c28cf277b138049971594cee04524..24654367e6b9ef1d503e5fbc5e295882f9948215 100644 (file)
--- 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 53f0afc7af6adece86feb3010aabe132f4240de4..cae876e48e8dcaafafba277e1ad9b5c024459478 100644 (file)
--- 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',