X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Foptions.php;h=0fde042ad636b77ef8e60fec887ea512fa7b6c87;hb=5cc0b70e9e4f72b5ebcc3e3cea1b3ca510a92718;hp=b53ef1a137671c750df037f757f9fa6bed15e970;hpb=849bdf42ed7bd7cca68909d2b46869742dfd210e;p=squirrelmail.git diff --git a/plugins/filters/options.php b/plugins/filters/options.php index b53ef1a1..0fde042a 100644 --- a/plugins/filters/options.php +++ b/plugins/filters/options.php @@ -1,37 +1,39 @@ - * Tyler Akins - * Brent Bice - * (c) 2000 (GNU GPL - see ../../COPYING) - * - * This plugin filters your inbox into different folders based upon given - * criteria. It is most useful for people who are subscibed to mailing lists - * to help organize their messages. The argument stands that filtering is - * not the place of the client, which is why this has been made a plugin for - * SquirrelMail. You may be better off using products such as Sieve or - * Procmail to do your filtering so it happens even when SquirrelMail isn't - * running. - * - * If you need help with this, or see improvements that can be made, please - * email me directly at the address above. I definately welcome suggestions - * and comments. This plugin, as is the case with all SquirrelMail plugins, - * is not directly supported by the developers. Please come to me off the - * mailing list if you have trouble with it. - * - * Also view plugins/README.plugins for more information. - * - */ - chdir (".."); + +/** + * Message and Spam Filter Plugin + * + * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Licensed under the GNU GPL. For full terms see the file COPYING. + * + * This plugin filters your inbox into different folders based upon given + * criteria. It is most useful for people who are subscibed to mailing lists + * to help organize their messages. The argument stands that filtering is + * not the place of the client, which is why this has been made a plugin for + * SquirrelMail. You may be better off using products such as Sieve or + * Procmail to do your filtering so it happens even when SquirrelMail isn't + * running. + * + * If you need help with this, or see improvements that can be made, please + * email me directly at the address above. I definately welcome suggestions + * and comments. This plugin, as is the case with all SquirrelMail plugins, + * is not directly supported by the developers. Please come to me off the + * mailing list if you have trouble with it. + * + * Also view plugins/README.plugins for more information. + * + * $Id$ + */ + + chdir ('..'); require_once('../src/validate.php'); - require_once ("../functions/page_header.php"); - require_once ("../functions/imap.php"); - require_once ("../src/load_prefs.php"); + require_once('../functions/page_header.php'); + require_once('../functions/imap.php'); + require_once('../src/load_prefs.php'); global $AllowSpamFilters; - displayPageHeader($color, "None"); + displayPageHeader($color, 'None'); if (isset($filter_submit)) { if (!isset($theid)) $theid = 0; @@ -44,306 +46,131 @@ $filters[$theid]["where"] = $filter_where; $filters[$theid]["what"] = $filter_what; $filters[$theid]["folder"] = $filter_folder; - } elseif (isset($spam_submit) && $AllowSpamFilters) { - $spam_filters = load_spam_filters(); - setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set); - setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set); - foreach ($spam_filters as $Key => $Value) - { - $input = $spam_filters[$Key]['prefname'] . '_set'; - setPref($data_dir, $username, $spam_filters[$Key]['prefname'], - $$input); - } - } elseif (isset($action) && $action == "delete") { + } elseif (isset($action) && $action == 'delete') { remove_filter($theid); - } elseif (isset($action) && $action == "move_up") { + } elseif (isset($action) && $action == 'move_up') { filter_swap($theid, $theid - 1); - } elseif (isset($action) && $action == "move_down") { + } elseif (isset($action) && $action == 'move_down') { filter_swap($theid, $theid + 1); } - if ($AllowSpamFilters) { - $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder'); - $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan'); - } $filters = load_filters(); - ?> -
-
-
- Message Filtering
-
-
[New] - [Done]

- - ' . + '
'. + "
". + '
' . _("Options") . ' - ' . _("Message Filtering") . '
'. + '
'. + '
[' . _("New") . + '] - [' . _("Done") . ']

'; - $fdr = ($folder_prefix)?str_replace($folder_prefix, "", $filters[$i]["folder"]):$filters[$i]["folder"]; + if (isset($action) && ($action == 'add' || $action == 'edit')) { + $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + $boxes = sqimap_mailbox_list($imapConnection); + sqimap_logout($imapConnection); + if ( !isset($theid) ) { + $theid = count($filters); + } + echo '
'. + '
'. + ''. + ''. + ''. + ' -" . _ ("From") . ''; + + $sel = (($L && $filters[$theid]['where'] == 'To')?'selected':''); + echo "'; + $sel = (($L && $filters[$theid]['where'] == 'Cc')?'selected':''); + echo "'; + + $sel = (($L && $filters[$theid]['where'] == 'To or Cc')?'selected':''); + echo "'; + + $sel = (($L && $filters[$theid]['where'] == 'Subject')?'selected':''); + echo "'; + + echo ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + ''. + '
' . _("Match:") . ''. + '
-[Edit] - -[Delete] - -[Down 0) echo ' | '; -} -if ($i > 0) { -?>Up] -- If contains then move to -
'. + _("Contains:"). + ''. + ''. + '
'. + _("Move to:"). + ''. + ''. + '
- - - -
 
- - - - - -
Spam Filtering
- -

[Edit]
- Spam is sent to not set yet]'; - } - ?>
Spam scan is limited to

- - - $Value) - { - echo '\n"; - } - - ?> -
'; - - if ($spam_filters[$Key]['enabled']) - { - echo 'ON'; - } - else - { - echo 'OFF'; - } - - echo ' - '; - - if ($spam_filters[$Key]['link']) - { - echo ''; - } - - echo $spam_filters[$Key]['name']; - if ($spam_filters[$Key]['link']) - { - echo ''; - } - echo "
- '. + ''. + ''. + ''. + ''. + ''. + "". + '
'. + '
'; - ?> -
-
-
- - - '; + + } + echo '
-   - - '; - if ($L && $filters[$theid]["where"] == "Cc") echo " - - - - - - - - - -
". + "[" . _("Edit") . ']'. + ''. + "[" . _("Delete") . ']'. + '['; - if ($L && $filters[$theid]["where"] == "Subject") echo "
- Contains: - - "> -
- Move to: - - - -
- - > - - -
-
- - - - - - - - - - - - - - $Value) - { - echo "\n"; - echo '\n"; - } - ?> - -
Move spam to: -
Moving spam directly to the trash may not be a good idea at first, - since messages from friends and mailing lists might accidentally be marked as spam. - Whatever folder you set this to, make sure that it gets cleaned out periodically, - so that you don't have an excessively large mailbox hanging around. -
What to Scan: -
The more messages you scan, the longer it takes. I would suggest - that you scan only new messages. If you make a change to your filters, I - would set it to scan all messages, then go view my INBOX, then come back and - set it to scan only new messages. That way, your new spam filters will be - applied and you'll scan even the spam you read with the new filters.
$Key - '; - if ($spam_filters[$Key]['link']) - { - echo ''; - } - echo $spam_filters[$Key]['name']; - if ($spam_filters[$Key]['link']) - { - echo ''; - } - echo '
'; - echo $spam_filters[$Key]['comment']; - echo "
-
-
- 0) { + echo "" . _("Up") . ''; + } + echo ']		-'; + printf( _("If %s contains %s then move to %s"), _($filters[$i]['where']), $filters[$i]['what'], $fdr ); + echo '
'. + ''. + ''. + '
 
'; + ?>