diff --git a/postfix/CHANGELOG b/postfix/CHANGELOG index 111688525..750483f2b 100644 --- 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 b50c42f1a..24fe9e092 100644 --- 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 0fe237362..dc8629b2c 100644 --- 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 c35307b1b..4f0a5b8e1 100644 --- 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 05374799c..28fa90663 100644 --- 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 e205ec547..954244cc7 100644 --- 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 1256a00ff..5cbf3e192 100644 --- 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 76bd28a2c..af4643383 100644 --- 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 e27025c99..c658e889a 100644 --- 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 96409e1e9..ca67f3043 100644 --- 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 5aada6292..e5ebcb8fe 100644 --- 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 59a466541..c9d1fdd72 100755 --- 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 4a0794945..b448e17b3 100755 --- 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 27a390486..85077a239 100644 --- 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 481013d19..b59bbfb5c 100644 --- 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 712b49bb7..dbbfd4868 100644 --- 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 6ff73ca65..efbbf0cc5 100644 --- 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 c63ce83ea..9b684ebcb 100644 --- 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 f51ff52b5..7d52a5a03 100644 --- 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 715ae44bb..01df62790 100644 --- 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 2ba7a451c..9d96f763d 100644 --- 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 102becf93..4e3f72c64 100644 --- 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 27417695e..b022aecef 100644 --- 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 452b3e4aa..80f673339 100644 --- 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 452b3e4aa..80f673339 100644 --- 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 a06ff50ad..e9a7ce535 100644 --- 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 28636ff49..fc7a7b756 100644 --- 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 315fb28a2..68ce6db2e 100644 --- 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 303538e0c..dd31ad4a9 100644 --- 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 0f21957c1..badb8d5eb 100644 --- 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 1a685f0a9..b2c495a8f 100644 --- 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 05374799c..28fa90663 100644 --- 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 0a6061db1..240abeb2a 100644 --- 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 59a466541..c9d1fdd72 100755 --- 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 1fce53de5..fc74c562d 100755 --- 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 b99b00adb..d50fd24dc 100644 --- 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 1ac9bada5..cdf57f72c 100644 --- 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 5d62fc67f..a3b630310 100755 --- 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 5d326c8be..b747ff52e 100644 --- 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 3168fa6f9..697a7fb3a 100644 --- 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 c5fb158bc..9a8232acd 100644 --- 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 21d01c1b1..4f9001c3a 100644 --- 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 3aa6f51c0..7d1449c34 100644 --- 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 c5fb158bc..9a8232acd 100644 --- 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 81095883a..4156ec533 100644 --- 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 699c50b80..39165fd5c 100644 --- 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 bea482de0..644cffd82 100755 --- 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();