Support for quick filter links
authorJamie Cameron <jcameron@webmin.com>
Tue, 4 Nov 2008 23:52:58 +0000 (23:52 +0000)
committerJamie Cameron <jcameron@webmin.com>
Tue, 4 Nov 2008 23:52:58 +0000 (23:52 +0000)
filter/edit.cgi
mailboxes/lang/en

index bc150b5..5e11ca4 100755 (executable)
@@ -8,6 +8,11 @@ require './filter-lib.pl';
 if ($in{'new'}) {
        &ui_print_header(undef, $text{'edit_title1'}, "");
        $filter = { 'actiondefault' => 1 };
+       if ($in{'header'}) {
+               # Initial filter is based on URL params
+               $filter->{'condheader'} = $in{'header'};
+               $filter->{'condvalue'} = $in{'value'};
+               }
        }
 else {
        &ui_print_header(undef, $text{'edit_title2'}, "");
@@ -60,7 +65,7 @@ print &ui_table_row(
                          $common ? "" : $filter->{'condheader'}, 20,
                          $cmode != 4 || $common),
              &ui_textbox("condvalue",
-                         $filter->{'condvalue'}, 20)),
+                         $filter->{'condvalue'}, 40)),
        undef, \@tds);
 
 # Smaller
index b43521c..fa5ecaa 100644 (file)
@@ -70,9 +70,12 @@ mail_black=Deny Senders
 mail_white=Allow Senders
 mail_whitemove=Allow Senders and Inbox
 mail_efile=Mail file does not exist
-mail_fromsrch=Same sender..
-mail_subsrch=Same subject..
-mail_tosrch=Same recipient..
+mail_fromsrch=Find email with same sender
+mail_subsrch=Find email with same subject
+mail_tosrch=Find email with recipient
+mail_fromfilter=Create filter by sender
+mail_tofilter=Create filter by recipient
+mail_subfilter=Create filter by subject
 mail_unknown=Unknown
 
 mail_sign=Sign with key