Update of /cvsroot/serverfilters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4664
Modified Files:
ChangeLog README config.php options.php recipie_functions.php
Log Message:
Fixed bug in spam filter generation.
Index: README
===================================================================
RCS file: /cvsroot/serverfilters/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** README 22 Feb 2004 21:20:16 -0000 1.6
--- README 24 Feb 2004 15:19:56 -0000 1.7
***************
*** 14,17 ****
--- 14,18 ----
dot-qmail files for delivery.
+ Dot-forward files can also be generated to invoke the filter app.
Requirements
Index: config.php
===================================================================
RCS file: /cvsroot/serverfilters/config.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** config.php 24 Feb 2004 06:15:16 -0000 1.12
--- config.php 24 Feb 2004 15:19:56 -0000 1.13
***************
*** 3,7 ****
/*
* ServersideFilter - Serverside filter plugin for SquirrelMail
! * By Patrick Swieskowski, Rick Sheaffer, and Jon Stroud
*/
--- 3,14 ----
/*
* ServersideFilter - Serverside filter plugin for SquirrelMail
! * By Jon Stroud and Tony Lownds
! *
! * This config file controls how your filter files will be generated
! * All variables that ask for a path can use the following constructs:
! * [USERNAME] = will get replaced with the actual username of the person logged in
! * [DOMAIN] = will get replaced with the email domain name
! * [DOMUSER] = in a virtual domain setting, this gets replaced with the system user
! * that owns the virtual domain.
*/
***************
*** 24,31 ****
/*
* This is the directory where the filter files will be stored
- * you may put [DOMAIN] and [USERNAME] in this entry
- * and the appropriate domain name and username will be entered.
- * Additionally for virtual domains you can use [DOMUSER] which will be replaced
- * with the username that owns the domain.
*/
$FILTER_FILE_PATH = '/home/email/[DOMUSER]/users/[USERNAME]/.mailfilter';
--- 31,34 ----
***************
*** 57,61 ****
* ALLOW_UNSUBSCRIBED
* Uncomment the following line to allow filtering to unsubscribed mailboxes
! * Comment line out to disable to only allow filtering to subscribed mailboxes.
*/
$ALLOW_UNSUBSCRIBED = true;
--- 60,64 ----
* ALLOW_UNSUBSCRIBED
* Uncomment the following line to allow filtering to unsubscribed mailboxes
! * Comment line out to disable and only allow filtering to subscribed mailboxes.
*/
$ALLOW_UNSUBSCRIBED = true;
***************
*** 86,91 ****
* LOCAL_MAILDIR
* Set the path to the Maildir here. This is used in the filter
! * file itself. add [USERNAME] if the username is part of the
! * path, and this will get replaced with the correct username.
*/
//$LOCAL_MAILDIR = '$HOME/Maildir/'; // This would be a good example for a
--- 89,93 ----
* LOCAL_MAILDIR
* Set the path to the Maildir here. This is used in the filter
! * file itself.
*/
//$LOCAL_MAILDIR = '$HOME/Maildir/'; // This would be a good example for a
Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/options.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** options.php 24 Feb 2004 05:44:24 -0000 1.13
--- options.php 24 Feb 2004 15:19:56 -0000 1.14
***************
*** 231,234 ****
--- 231,235 ----
.'<input type=hidden name=field value="' . $SPAMHEADER . '">'
.'<input type=hidden name=string value="' . $SPAMVALUE . '">'
+ .'<input type=hidden name=matching vaule="0">'
._("if message is marked as").' <b>'._("SPAM").'</b> '._("then")
.' <select name=action>'
Index: recipie_functions.php
===================================================================
RCS file: /cvsroot/serverfilters/recipie_functions.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** recipie_functions.php 24 Feb 2004 05:44:24 -0000 1.8
--- recipie_functions.php 24 Feb 2004 15:19:56 -0000 1.9
***************
*** 236,239 ****
--- 236,240 ----
if ($recipies[$i]['field'] == $SPAMHEADER) {
print('<input type=hidden name=field value="' . $SPAMHEADER . '">');
+ print('<input type=hidden name=matching value="0">');
if ($recipies[$i]['string'] == $UNSUREVALUE) {
print('<input type=hidden name=string value="'.$UNSUREVALUE.'">');
|