Module config to control deletion prompt

2026-02-03 06:03:28 +00:00 · 2008-11-01 18:21:42 +00:00
parent 381b7358d0
commit 249895add6
47 changed files with 49 additions and 1 deletions
--- 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.
--- 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.
--- a/sendmail/config-aix
+++ b/sendmail/config-aix
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-freebsd
+++ b/sendmail/config-freebsd
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- a/sendmail/config-hpux
+++ b/sendmail/config-hpux
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- a/sendmail/config-irix
+++ b/sendmail/config-irix
@@ -35,3 +35,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- a/sendmail/config-macos
+++ b/sendmail/config-macos
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-netbsd
+++ b/sendmail/config-netbsd
@@ -32,3 +32,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- a/sendmail/config-openbsd
+++ b/sendmail/config-openbsd
@@ -31,3 +31,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- a/sendmail/config-openserver
+++ b/sendmail/config-openserver
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- a/sendmail/config-osf1
+++ b/sendmail/config-osf1
@@ -27,3 +27,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-solaris
+++ b/sendmail/config-solaris
@@ -30,3 +30,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/sendmail/config-unixware
+++ b/sendmail/config-unixware
@@ -28,3 +28,4 @@ show_cmts=0
 prefix_cmts=0

 mail_type=0
+delete_confirm=1
--- 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
--- 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();