projects / webmin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c956c8)
Only show un-conditional forward and autoreply rules in quick links
authorJamie Cameron <jcameron@webmin.com>
Fri, 1 Jan 2010 19:28:59 +0000 (11:28 -0800)
committerJamie Cameron <jcameron@webmin.com>
Fri, 1 Jan 2010 19:28:59 +0000 (11:28 -0800)
filter/CHANGELOG patch | blob | history
filter/edit_auto.cgi patch | blob | history
filter/edit_forward.cgi patch | blob | history
filter/filter-lib.pl patch | blob | history
filter/save_auto.cgi patch | blob | history
filter/save_forward.cgi patch | blob | history

diff --git a/filter/CHANGELOG b/filter/CHANGELOG
index 7a1a09f..eba8a2a 100644 (file)
--- a/filter/CHANGELOG
+++ b/filter/CHANGELOG
@@ -26,3 +26,5 @@ Creation of filters that match headers is now less error-prone, due to a new men
 When an autoreply is deleted, the underlying message file is deleted too.
 ---- Changes since 1.420 ----
 Autoreply messages starting with <html> or <body> will now be sent using the text/html MIME type.
+---- Changes since 1.430 ----
+Quick autoreply and forward setup pages now only show un-conditional rules.
diff --git a/filter/edit_auto.cgi b/filter/edit_auto.cgi
index 8f83089..93ce969 100755 (executable)
--- a/filter/edit_auto.cgi
+++ b/filter/edit_auto.cgi
@@ -8,7 +8,7 @@ require './filter-lib.pl';
 
 # Get the autoreply filter, if any
 @filters = &list_filters();
-($filter) = grep { $_->{'actionreply'} } @filters;
+($filter) = grep { $_->{'actionreply'} && $_->{'nocond'} } @filters;
 $dis = !$filter;
 
 print &ui_form_start("save_auto.cgi", "post");
diff --git a/filter/edit_forward.cgi b/filter/edit_forward.cgi
index f1f64ce..80eec2e 100755 (executable)
--- a/filter/edit_forward.cgi
+++ b/filter/edit_forward.cgi
@@ -8,7 +8,7 @@ require './filter-lib.pl';
 
 # Get the forwarding filter, if any
 @filters = &list_filters();
-($filter) = grep { $_->{'actiontype'} eq '!' } @filters;
+($filter) = grep { $_->{'actiontype'} eq '!' && $_->{'nocond'} } @filters;
 $dis = !$filter;
 
 print &ui_form_start("save_forward.cgi", "post");
diff --git a/filter/filter-lib.pl b/filter/filter-lib.pl
index 344023e..96bafe8 100755 (executable)
--- a/filter/filter-lib.pl
+++ b/filter/filter-lib.pl
@@ -105,6 +105,7 @@ foreach my $r (@pmrc) {
        # Finally create the simple object
        local $simple = { 'condtype' => $condtype,
                          'cond' => $cond,
+                         'nocond' => !scalar(@{$r->{'conds'}}),
                          'body' => $flags{'B'},
                          'continue' => $flags{'c'},
                          'actiontype' => $r->{'type'},
diff --git a/filter/save_auto.cgi b/filter/save_auto.cgi
index d6b0ecb..4581274 100755 (executable)
--- a/filter/save_auto.cgi
+++ b/filter/save_auto.cgi
@@ -9,7 +9,7 @@ require './filter-lib.pl';
 # Find existing autoreply filter object
 &lock_file($procmail::procmailrc);
 @filters = &list_filters();
-($old) = grep { $_->{'actionreply'} } @filters;
+($old) = grep { $_->{'actionreply'} && $_->{'nocond'} } @filters;
 $filter = $old;
 
 if ($filter && !$in{'enabled'}) {
diff --git a/filter/save_forward.cgi b/filter/save_forward.cgi
index 8369f7e..a4828cf 100755 (executable)
--- a/filter/save_forward.cgi
+++ b/filter/save_forward.cgi
@@ -8,7 +8,7 @@ require './filter-lib.pl';
 # Find existing forwarding filter object
 &lock_file($procmail::procmailrc);
 @filters = &list_filters();
-($old) = grep { $_->{'actiontype'} eq '!' } @filters;
+($old) = grep { $_->{'actiontype'} eq '!' && $_->{'nocond'} } @filters;
 $filter = $old;
 
 if ($filter && !$in{'enabled'}) {
Webmin PERL server management