Module config to control deletion prompt

diff --git a/postfix/CHANGELOG b/postfix/CHANGELOG
index 1116885..750483f 100644 (file)
--- a/postfix/CHANGELOG
+++ b/postfix/CHANGELOG
@@ -60,4 +60,5 @@ Properly handle multiple reject_rbl_client DNS domains on the SMTP Client Restri
 ---- Changes since 1.430 ----
 Converted all pages to use the new Webmin UI library, for a more consistent and themable look.
 Autoreply messages containing non-ASCII characters are now properly quoted-printable encoded.
+---- Changes since 1.440 ----
 Added a module config option to control if the user is prompted for confirmation before deleting queued messages.

diff --git a/sendmail/CHANGELOG b/sendmail/CHANGELOG
index b50c42f..24fe9e0 100644 (file)
--- a/sendmail/CHANGELOG
+++ b/sendmail/CHANGELOG
@@ -37,3 +37,5 @@ Network ports and addresses used by Sendmail can now be more easily edited on th
 Added an access control page option to prevent creation and editing of catchall address mappings.
 ---- Changes since 1.430 ----
 Autoreply messages containing non-ASCII characters are now properly quoted-printable encoded.
+---- Changes since 1.440 ----
+Added a module config option to control if the user is prompted for confirmation before deleting queued messages.

diff --git a/sendmail/config-aix b/sendmail/config-aix
index 0fe2373..dc8629b 100644 (file)
--- a/sendmail/config-aix
+++ b/sendmail/config-aix
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-cobalt-linux b/sendmail/config-cobalt-linux
index c35307b..4f0a5b8 100644 (file)
--- a/sendmail/config-cobalt-linux
+++ b/sendmail/config-cobalt-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-coherent-linux b/sendmail/config-coherent-linux
index 0537479..28fa906 100644 (file)
--- a/sendmail/config-coherent-linux
+++ b/sendmail/config-coherent-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-corel-linux b/sendmail/config-corel-linux
index e205ec5..954244c 100644 (file)
--- a/sendmail/config-corel-linux
+++ b/sendmail/config-corel-linux
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-debian-linux b/sendmail/config-debian-linux
index 1256a00..5cbf3e1 100644 (file)
--- a/sendmail/config-debian-linux
+++ b/sendmail/config-debian-linux
@@ -29,3 +29,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-debian-linux-2.1-2.2 b/sendmail/config-debian-linux-2.1-2.2
index 76bd28a..af46433 100644 (file)
--- a/sendmail/config-debian-linux-2.1-2.2
+++ b/sendmail/config-debian-linux-2.1-2.2
@@ -29,3 +29,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-debian-linux-3.0-* b/sendmail/config-debian-linux-3.0-*
index e27025c..c658e88 100644 (file)
--- a/sendmail/config-debian-linux-3.0-*
+++ b/sendmail/config-debian-linux-3.0-*
@@ -29,3 +29,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-freebsd b/sendmail/config-freebsd
index 96409e1..ca67f30 100644 (file)
--- a/sendmail/config-freebsd
+++ b/sendmail/config-freebsd
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-freebsd-4.0-* b/sendmail/config-freebsd-4.0-*
index 5aada62..e5ebcb8 100644 (file)
--- a/sendmail/config-freebsd-4.0-*
+++ b/sendmail/config-freebsd-4.0-*
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-generic-linux b/sendmail/config-generic-linux
index 59a4665..c9d1fdd 100755 (executable)
--- a/sendmail/config-generic-linux
+++ b/sendmail/config-generic-linux
@@ -37,3 +37,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-gentoo-linux b/sendmail/config-gentoo-linux
index 4a07949..b448e17 100755 (executable)
--- a/sendmail/config-gentoo-linux
+++ b/sendmail/config-gentoo-linux
@@ -37,3 +37,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-hpux b/sendmail/config-hpux
index 27a3904..85077a2 100644 (file)
--- a/sendmail/config-hpux
+++ b/sendmail/config-hpux
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-irix b/sendmail/config-irix
index 481013d..b59bbfb 100644 (file)
--- a/sendmail/config-irix
+++ b/sendmail/config-irix
@@ -35,3 +35,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-macos b/sendmail/config-macos
index 712b49b..dbbfd48 100644 (file)
--- a/sendmail/config-macos
+++ b/sendmail/config-macos
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-macos-1.3-* b/sendmail/config-macos-1.3-*
index 6ff73ca..efbbf0c 100644 (file)
--- a/sendmail/config-macos-1.3-*
+++ b/sendmail/config-macos-1.3-*
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-mandrake-linux b/sendmail/config-mandrake-linux
index c63ce83..9b684eb 100644 (file)
--- a/sendmail/config-mandrake-linux
+++ b/sendmail/config-mandrake-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-mandrake-linux-8.2 b/sendmail/config-mandrake-linux-8.2
index f51ff52..7d52a5a 100644 (file)
--- a/sendmail/config-mandrake-linux-8.2
+++ b/sendmail/config-mandrake-linux-8.2
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-mandrake-linux-9.0-* b/sendmail/config-mandrake-linux-9.0-*
index 715ae44..01df627 100644 (file)
--- a/sendmail/config-mandrake-linux-9.0-*
+++ b/sendmail/config-mandrake-linux-9.0-*
@@ -31,3 +31,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-msc-linux b/sendmail/config-msc-linux
index 2ba7a45..9d96f76 100644 (file)
--- a/sendmail/config-msc-linux
+++ b/sendmail/config-msc-linux
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-netbsd b/sendmail/config-netbsd
index 102becf..4e3f72c 100644 (file)
--- a/sendmail/config-netbsd
+++ b/sendmail/config-netbsd
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-open-linux b/sendmail/config-open-linux
index 2741769..b022aec 100644 (file)
--- a/sendmail/config-open-linux
+++ b/sendmail/config-open-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-open-linux-2.5 b/sendmail/config-open-linux-2.5
index 452b3e4..80f6733 100644 (file)
--- a/sendmail/config-open-linux-2.5
+++ b/sendmail/config-open-linux-2.5
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-open-linux-3.1e b/sendmail/config-open-linux-3.1e
index 452b3e4..80f6733 100644 (file)
--- a/sendmail/config-open-linux-3.1e
+++ b/sendmail/config-open-linux-3.1e
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-openbsd b/sendmail/config-openbsd
index a06ff50..e9a7ce5 100644 (file)
--- a/sendmail/config-openbsd
+++ b/sendmail/config-openbsd
@@ -31,3 +31,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-openserver b/sendmail/config-openserver
index 28636ff..fc7a7b7 100644 (file)
--- a/sendmail/config-openserver
+++ b/sendmail/config-openserver
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-osf1 b/sendmail/config-osf1
index 315fb28..68ce6db 100644 (file)
--- a/sendmail/config-osf1
+++ b/sendmail/config-osf1
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-redhat-linux b/sendmail/config-redhat-linux
index 303538e..dd31ad4 100644 (file)
--- a/sendmail/config-redhat-linux
+++ b/sendmail/config-redhat-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-redhat-linux-10.0-* b/sendmail/config-redhat-linux-10.0-*
index 0f21957..badb8d5 100644 (file)
--- a/sendmail/config-redhat-linux-10.0-*
+++ b/sendmail/config-redhat-linux-10.0-*
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-redhat-linux-7.1-7.3 b/sendmail/config-redhat-linux-7.1-7.3
index 1a685f0..b2c495a 100644 (file)
--- a/sendmail/config-redhat-linux-7.1-7.3
+++ b/sendmail/config-redhat-linux-7.1-7.3
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-redhat-linux-7.4-9.0 b/sendmail/config-redhat-linux-7.4-9.0
index 0537479..28fa906 100644 (file)
--- a/sendmail/config-redhat-linux-7.4-9.0
+++ b/sendmail/config-redhat-linux-7.4-9.0
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-slackware-linux b/sendmail/config-slackware-linux
index 0a6061d..240abeb 100644 (file)
--- a/sendmail/config-slackware-linux
+++ b/sendmail/config-slackware-linux
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-slackware-linux-8.0 b/sendmail/config-slackware-linux-8.0
index 59a4665..c9d1fdd 100755 (executable)
--- a/sendmail/config-slackware-linux-8.0
+++ b/sendmail/config-slackware-linux-8.0
@@ -37,3 +37,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-slackware-linux-8.1-* b/sendmail/config-slackware-linux-8.1-*
index 1fce53d..fc74c56 100755 (executable)
--- a/sendmail/config-slackware-linux-8.1-*
+++ b/sendmail/config-slackware-linux-8.1-*
@@ -37,3 +37,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-sol-linux b/sendmail/config-sol-linux
index b99b00a..d50fd24 100644 (file)
--- a/sendmail/config-sol-linux
+++ b/sendmail/config-sol-linux
@@ -37,3 +37,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-solaris b/sendmail/config-solaris
index 1ac9bad..cdf57f7 100644 (file)
--- a/sendmail/config-solaris
+++ b/sendmail/config-solaris
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-solaris-10-* b/sendmail/config-solaris-10-*
index 5d62fc6..a3b6303 100755 (executable)
--- a/sendmail/config-solaris-10-*
+++ b/sendmail/config-solaris-10-*
@@ -35,3 +35,4 @@ show_cmts=0
 prefix_cmts=0
 sendmail_smf=network/smtp:sendmail
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-solaris-7 b/sendmail/config-solaris-7
index 5d326c8..b747ff5 100644 (file)
--- a/sendmail/config-solaris-7
+++ b/sendmail/config-solaris-7
@@ -36,3 +36,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-solaris-8-9 b/sendmail/config-solaris-8-9
index 3168fa6..697a7fb 100644 (file)
--- a/sendmail/config-solaris-8-9
+++ b/sendmail/config-solaris-8-9
@@ -36,3 +36,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-suse-linux b/sendmail/config-suse-linux
index c5fb158..9a8232a 100644 (file)
--- a/sendmail/config-suse-linux
+++ b/sendmail/config-suse-linux
@@ -29,3 +29,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-suse-linux-8.2-* b/sendmail/config-suse-linux-8.2-*
index 21d01c1..4f9001c 100644 (file)
--- a/sendmail/config-suse-linux-8.2-*
+++ b/sendmail/config-suse-linux-8.2-*
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-turbo-linux b/sendmail/config-turbo-linux
index 3aa6f51..7d1449c 100644 (file)
--- a/sendmail/config-turbo-linux
+++ b/sendmail/config-turbo-linux
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-united-linux b/sendmail/config-united-linux
index c5fb158..9a8232a 100644 (file)
--- a/sendmail/config-united-linux
+++ b/sendmail/config-united-linux
@@ -29,3 +29,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config-unixware b/sendmail/config-unixware
index 8109588..4156ec5 100644 (file)
--- a/sendmail/config-unixware
+++ b/sendmail/config-unixware
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0
 
 mail_type=0
+delete_confirm=1

diff --git a/sendmail/config.info b/sendmail/config.info
index 699c50b..39165fd 100644 (file)
--- a/sendmail/config.info
+++ b/sendmail/config.info
@@ -12,6 +12,8 @@ mailq_show=Headers to show in mail queue,2,Date-Date,From-From,To-To,Subject-Sub
 mailq_sort=Sort mail queue by,1,0-Queue ID,1-From address,2-To address,3-Subject,4-Status,5-Size
 mailq_count=Show size of mail queue on main page?,1,0-Yes,1-No
 mailq_order=Ordering when flushing mail queue,1,-Default,priority-Priority,host-Hostname,time-Date received
+delete_confirm=Prompt for confirmation before deleting?,1,1-Yes,0-No
+
 line2=System configuration,11
 sendmail_cf=Full path to sendmail.cf,8
 sendmail_features=Sendmail M4 base directory,7

diff --git a/sendmail/del_mailqs.cgi b/sendmail/del_mailqs.cgi
index bea482d..644cffd 100755 (executable)
--- a/sendmail/del_mailqs.cgi
+++ b/sendmail/del_mailqs.cgi
@@ -36,7 +36,7 @@ else {
        @files || &error($text{'delq_enone'});
        &ui_print_header(undef, $text{'delq_titles'}, "");
 
-       if ($in{'confirm'}) {
+       if ($in{'confirm'} || !$config{'delete_confirm'}) {
                # Do it!
                $count = 0;
                $conf = &get_sendmailcf();