Menu
▾
▴
serverfilters-commit — CVS Commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(2) |
Feb
(21) |
Mar
(34) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(12) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
(4) |
Dec
(11) |
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2011 |
Jan
(18) |
Feb
|
Mar
|
Apr
(2) |
May
(8) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Update of /cvsroot/serverfilters/server_side_filters_procmail In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29349 Modified Files: config_default.php config_example.php functions.php index.php make_release.sh setup.php Log Message: Add more negative test types (matching methods) and update copyright dates Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/make_release.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** make_release.sh 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- make_release.sh 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 4,8 **** # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # --- 4,8 ---- # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # Index: functions.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/functions.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** functions.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- functions.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. *************** *** 18,30 **** * Initialize this plugin (load config values) * * @return boolean FALSE if no configuration file could be loaded, TRUE otherwise * */ ! function server_side_filters_procmail_init() { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters_procmail.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_procmail/config.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_procmail/config_default.php')) ! return FALSE; } --- 18,44 ---- * Initialize this plugin (load config values) * + * @param boolean $debug When TRUE, do not suppress errors when including + * configuration files (OPTIONAL; default FALSE) + * * @return boolean FALSE if no configuration file could be loaded, TRUE otherwise * */ ! function server_side_filters_procmail_init($debug=FALSE) { ! if ($debug) ! { ! if (!include_once(SM_PATH . 'config/config_server_side_filters_procmail.php')) ! if (!include_once(SM_PATH . 'plugins/server_side_filters_procmail/config.php')) ! if (!include_once(SM_PATH . 'plugins/server_side_filters_procmail/config_default.php')) ! return FALSE; ! } ! else ! { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters_procmail.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_procmail/config.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_procmail/config_default.php')) ! return FALSE; ! } ! return TRUE; } *************** *** 47,52 **** * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "ENDS_WITH", ! * "EXACT_MATCH", or "REGEX", * indicating how the MATCH_STRING * should be compared with the --- 61,68 ---- * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! * "ENDS_WITH", "DOESNT_END_WITH", ! * "IS_EXACTLY", "ISNT_EXACTLY", ! * "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" * indicating how the MATCH_STRING * should be compared with the *************** *** 290,297 **** break; case 'BODY': ! if ($rule['MATCHING_METHOD'] == 'BEGINS_WITH') $rule['HEADER_FIELD'] = '^^'; else if ($rule['MATCHING_METHOD'] == 'ENDS_WITH' || $rule['MATCHING_METHOD'] == 'IS_EXACTLY' || $rule['MATCHING_METHOD'] == 'MATCHES_REGEX') // the double-dollars is converted to an ending ^^ below --- 306,318 ---- break; case 'BODY': ! $location = 'B'; ! if ($rule['MATCHING_METHOD'] == 'BEGINS_WITH' ! || $rule['MATCHING_METHOD'] == 'DOESNT_BEGIN_WITH') $rule['HEADER_FIELD'] = '^^'; else if ($rule['MATCHING_METHOD'] == 'ENDS_WITH' + || $rule['MATCHING_METHOD'] == 'DOESNT_END_WITH' || $rule['MATCHING_METHOD'] == 'IS_EXACTLY' + || $rule['MATCHING_METHOD'] == 'ISNT_EXACTLY' + || $rule['MATCHING_METHOD'] == 'DOESNT_MATCH_REGEX' || $rule['MATCHING_METHOD'] == 'MATCHES_REGEX') // the double-dollars is converted to an ending ^^ below *************** *** 299,303 **** else $rule['HEADER_FIELD'] = ''; - $location = 'B'; break; case 'ANY_HEADER': --- 320,323 ---- *************** *** 379,404 **** { case 'CONTAINS': - $expression_prefix = ''; - $prefix = '.*'; - $suffix = ''; - $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); - break; case 'NOT_CONTAINS': - // if using TO_OR_CC with NOT_CONTAINS, technically, it behaves - // as TO_AND_CC, which makes more sense, but is not portrayed in - // the interface by "AND"... just so you know in case a user asks - // - $expression_prefix = '! '; $prefix = '.*'; $suffix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); break; case 'BEGINS_WITH': ! $expression_prefix = ''; $prefix = ''; $suffix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); break; case 'ENDS_WITH': // double-dollar in the header field is just a flag // to tell us to use ^^ at the end of the pattern --- 399,429 ---- { case 'CONTAINS': case 'NOT_CONTAINS': $prefix = '.*'; $suffix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'NOT_CONTAINS') + $expression_prefix = '! '; + else + $expression_prefix = ''; + break; + case 'BEGINS_WITH': ! case 'DOESNT_BEGIN_WITH': $prefix = ''; $suffix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'DOESNT_BEGIN_WITH') + $expression_prefix = '! '; + else + $expression_prefix = ''; + break; + case 'ENDS_WITH': + case 'DOESNT_END_WITH': // double-dollar in the header field is just a flag // to tell us to use ^^ at the end of the pattern *************** *** 421,428 **** $suffix = '$'; } - $expression_prefix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); break; case 'IS_EXACTLY': // double-dollar in the header field is just a flag // to tell us to use ^^ at the beginning AND end of --- 446,460 ---- $suffix = '$'; } $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'DOESNT_END_WITH') + $expression_prefix = '! '; + else + $expression_prefix = ''; + break; + case 'IS_EXACTLY': + case 'ISNT_EXACTLY': // double-dollar in the header field is just a flag // to tell us to use ^^ at the beginning AND end of *************** *** 441,450 **** else $suffix = '$'; - $expression_prefix = ''; $prefix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); break; case 'MATCHES_REGEX': ! $expression_prefix = ''; $prefix = ''; $suffix = ''; --- 473,488 ---- else $suffix = '$'; $prefix = ''; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'ISNT_EXACTLY') + $expression_prefix = '! '; + else + $expression_prefix = ''; + break; + case 'MATCHES_REGEX': ! case 'DOESNT_MATCH_REGEX': $prefix = ''; $suffix = ''; *************** *** 471,475 **** --- 509,519 ---- } + if ($rule['MATCHING_METHOD'] == 'DOESNT_MATCH_REGEX') + $expression_prefix = '! '; + else + $expression_prefix = ''; + break; + default : // same as CONTAINS $expression_prefix = ''; *************** *** 507,514 **** break; case 'BODY': ! if ($criteria['MATCHING_METHOD'] == 'BEGINS_WITH') $criteria['HEADER_FIELD'] = '^^'; else if ($criteria['MATCHING_METHOD'] == 'ENDS_WITH' || $criteria['MATCHING_METHOD'] == 'IS_EXACTLY' || $criteria['MATCHING_METHOD'] == 'MATCHES_REGEX') // the double-dollars is converted to an ending ^^ below --- 551,563 ---- break; case 'BODY': ! $criteria_location = 'B'; ! if ($criteria['MATCHING_METHOD'] == 'BEGINS_WITH' ! || $criteria['MATCHING_METHOD'] == 'DOESNT_BEGIN_WITH') $criteria['HEADER_FIELD'] = '^^'; else if ($criteria['MATCHING_METHOD'] == 'ENDS_WITH' + || $criteria['MATCHING_METHOD'] == 'DOESNT_END_WITH' || $criteria['MATCHING_METHOD'] == 'IS_EXACTLY' + || $criteria['MATCHING_METHOD'] == 'ISNT_EXACTLY' + || $criteria['MATCHING_METHOD'] == 'DOESNT_MATCH_REGEX' || $criteria['MATCHING_METHOD'] == 'MATCHES_REGEX') // the double-dollars is converted to an ending ^^ below *************** *** 516,520 **** else $criteria['HEADER_FIELD'] = ''; - $criteria_location = 'B'; break; case 'ANY_HEADER': --- 565,568 ---- *************** *** 546,571 **** { case 'CONTAINS': - $criteria_expression_prefix = ''; - $criteria_prefix = '.*'; - $criteria_suffix = ''; - $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); - break; case 'NOT_CONTAINS': - // if using TO_OR_CC with NOT_CONTAINS, technically, it behaves - // as TO_AND_CC, which makes more sense, but is not portrayed in - // the interface by "AND"... just so you know in case a user asks - // - $criteria_expression_prefix = '! '; $criteria_prefix = '.*'; $criteria_suffix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); break; case 'BEGINS_WITH': ! $criteria_expression_prefix = ''; $criteria_prefix = ''; $criteria_suffix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); break; case 'ENDS_WITH': // double-dollar in the header field is just a flag // to tell us to use ^^ at the end of the pattern --- 594,624 ---- { case 'CONTAINS': case 'NOT_CONTAINS': $criteria_prefix = '.*'; $criteria_suffix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'NOT_CONTAINS') + $criteria_expression_prefix = '! '; + else + $criteria_expression_prefix = ''; + break; + case 'BEGINS_WITH': ! case 'DOESNT_BEGIN_WITH': $criteria_prefix = ''; $criteria_suffix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'DOESNT_BEGIN_WITH') + $criteria_expression_prefix = '! '; + else + $criteria_expression_prefix = ''; + break; + case 'ENDS_WITH': + case 'DOESNT_END_WITH': // double-dollar in the header field is just a flag // to tell us to use ^^ at the end of the pattern *************** *** 582,589 **** $criteria_prefix = '.*'; } - $criteria_expression_prefix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); break; case 'IS_EXACTLY': // double-dollar in the header field is just a flag // to tell us to use ^^ at the beginning AND end of --- 635,649 ---- $criteria_prefix = '.*'; } $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'DOESNT_END_WITH') + $criteria_expression_prefix = '! '; + else + $criteria_expression_prefix = ''; + break; + case 'IS_EXACTLY': + case 'ISNT_EXACTLY': // double-dollar in the header field is just a flag // to tell us to use ^^ at the beginning AND end of *************** *** 597,606 **** else $criteria_suffix = '$'; - $criteria_expression_prefix = ''; $criteria_prefix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); break; case 'MATCHES_REGEX': ! $criteria_expression_prefix = ''; $criteria_prefix = ''; $criteria_suffix = ''; --- 657,672 ---- else $criteria_suffix = '$'; $criteria_prefix = ''; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING']); + + if ($rule['MATCHING_METHOD'] == 'ISNT_EXACTLY') + $criteria_expression_prefix = '! '; + else + $criteria_expression_prefix = ''; + break; + case 'MATCHES_REGEX': ! case 'DOESNT_MATCH_REGEX': $criteria_prefix = ''; $criteria_suffix = ''; *************** *** 627,631 **** --- 693,703 ---- } + if ($rule['MATCHING_METHOD'] == 'ISNT_EXACTLY') + $criteria_expression_prefix = '! '; + else + $criteria_expression_prefix = ''; + break; + default : // same as CONTAINS $criteria_expression_prefix = ''; Index: config_default.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/config_default.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config_default.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- config_default.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- index.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ --- 8,12 ---- * person is logged in or not. * ! * @copyright 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/setup.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** setup.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- setup.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/config_example.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config_example.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- config_example.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Procmail Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. |
|
From: Paul L. <pdo...@us...> - 2011-01-11 02:00:40
|
Update of /cvsroot/serverfilters/server_side_filters_procmail/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29349/docs Modified Files: README index.php Log Message: Add more negative test types (matching methods) and update copyright dates Index: README =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/docs/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- README 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 1,8 **** Server Side Filters Procmail plugin for SquirrelMail ==================================================== ! Ver 1.0, 2010/09/11 ! Copyright (c) 2010- Paul Lesniewski <pa...@sq...> --- 1,8 ---- Server Side Filters Procmail plugin for SquirrelMail ==================================================== ! Ver 1.1, 2011/01/11 ! Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> *************** *** 95,98 **** --- 95,101 ---- ========== + v1.1 2011/01/11 Paul Lesniewski <pa...@sq...> + * Added more negative test types (matching methods) + v1.0 2010/09/11 Paul Lesniewski <pa...@sq...> * Initial release Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/docs/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:54:30 -0000 1.1.1.1 --- index.php 11 Jan 2011 02:00:29 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ --- 8,12 ---- * person is logged in or not. * ! * @copyright 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ |
|
From: Paul L. <pdo...@us...> - 2011-01-11 01:36:50
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23119 Modified Files: config_example.php Log Message: Add infomration about how to use Sieve spamtest and virustest extensions in predefined rules Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config_example.php 10 Jan 2011 21:40:12 -0000 1.3 --- config_example.php 11 Jan 2011 01:36:42 -0000 1.4 *************** *** 327,336 **** // (beside normal header field names, the special // values "TO_OR_CC", "BODY", "ANY_HEADER", and ! // "ANYWHERE" are accepted) // MATCHING_METHOD -- How to "search" the header - this value MUST // be one of the following: "CONTAINS", "NOT_CONTAINS", // "BEGINS_WITH", "DOESNT_BEGIN_WITH", "ENDS_WITH", // "DOESNT_END_WITH", "IS_EXACTLY", "ISNT_EXACTLY", ! // "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" // MATCH_STRING -- The value to search in the header for // ACTION -- What to do with matching messages - this value --- 327,350 ---- // (beside normal header field names, the special // values "TO_OR_CC", "BODY", "ANY_HEADER", and ! // "ANYWHERE" are accepted) (the Sieve backend ! // (Server Side Filters Sieve plugin) also supports ! // "VIRUSTEST", "NOT_VIRUSTEST", "SPAMTEST", ! // "NOT_SPAMTEST", "SPAMTEST_PERCENT", ! // "NOT_SPAMTEST_PERCENT" as long as your Sieve ! // server provides the spamtest, spamtestplus or ! // virustest extensions; any of these should be ! // used in conjunction with the Sieve-specific ! // values for MATCHING_METHOD as explained below) // MATCHING_METHOD -- How to "search" the header - this value MUST // be one of the following: "CONTAINS", "NOT_CONTAINS", // "BEGINS_WITH", "DOESNT_BEGIN_WITH", "ENDS_WITH", // "DOESNT_END_WITH", "IS_EXACTLY", "ISNT_EXACTLY", ! // "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" (the Sieve ! // backend (Server Side Filters Sieve plugin) also ! // supports "GT" (greater than), "GE" (greater than or ! // equal to), "LT" (less than), "LE" (less than or equal ! // to), "EQ" (equal), or "NE" (not equal), which are to ! // be used with the "SPAMTEST" and "VIRUSTEST" values ! // for the "HEADER_FIELD" (see above)) // MATCH_STRING -- The value to search in the header for // ACTION -- What to do with matching messages - this value *************** *** 498,501 **** --- 512,531 ---- // ); // + // Here is a "spam" rule that makes use of the special values + // for "HEADER_FIELD" and "MATCHING_METHOD" that the Sieve + // backend (Server Side Filters Sieve plugin) provides: + // + // $predefined_filter_rules = array( + // 'Spam Filter' => array( + // 'HEADER_FIELD' => 'SPAMTEST', + // 'MATCHING_METHOD' => 'GT', + // 'MATCH_STRING' => '3', + // 'CRITERIA_TEXT' => 'If message is marked as <strong>spam</strong>%s%s%s,', + // 'ACTION_TEXT' => 'then %s to', + // 'FOLDER_TEXT' => '%sFolder', + // 'EMAIL_TEXT' => '%sEmail', + // ), + // ); + // // WARNING: If you remove or change one of these rules after users have // started using them, there is a chance of users losing those |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:21
|
Update of /cvsroot/serverfilters/server_side_filters/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/docs Modified Files: README index.php Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: README =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/docs/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- README 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 1,8 **** Server Side Filters plugin for SquirrelMail =========================================== ! Ver 2.0, 2010/09/11 ! Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> Copyright (c) 2002-2004 Tony Lownds <ton...@us...> --- 1,8 ---- Server Side Filters plugin for SquirrelMail =========================================== ! Ver 2.1, 2011/01/11 ! Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> Copyright (c) 2002-2004 Tony Lownds <ton...@us...> *************** *** 21,30 **** Most any method of filter access is supported (local files, FTP, ! database, LDAP, etc.) via the Server Settings Backend plugin ! (which is required to use this plugin). A secondary plugin is also required to provide the syntax rules for the needed filtering solution, such as the Server Side ! Filters Maildrop plugin or the Server Side Filters Procmail plugin. --- 21,31 ---- Most any method of filter access is supported (local files, FTP, ! database, LDAP, socket, etc.) via the Server Settings Backend ! plugin (which is required to use this plugin). A secondary plugin is also required to provide the syntax rules for the needed filtering solution, such as the Server Side ! Filters Maildrop plugin, the Server Side Filters Procmail or the ! Server Side Filters Sieve plugin. *************** *** 51,54 **** --- 52,64 ---- + Usage Notes + =========== + + Note that if "To or Cc" is used with a negative matching type ("Does + Not Contain", "Doesn't Begin With", etc.), technically, the test + changes to "To AND Cc" due to the boolean logic of the negative test. + + + Requirements ============ *************** *** 225,234 **** folder, action ("MOVE", "COPY", or "DELETE"), copy to folder ("ON" or "OFF"), send to address ("ON" or "OFF"), email address, matching ! method ("CONTAINS", "NOT_CONTAINS", "BEGINS_WITH", "ENDS_WITH", ! "EXACT_MATCH", or "REGEX"), pre-defined rule name (if any). All ! these fields must be separated by a set string, which is given as ! $filter_field_delimiter (the fifth hook argument) and everything ! should be escaped using the function ssf_escape(), which is provided ! by this plugin. An example of one such rule description line is: ####RULE#### Subject-''-[SM-USERS]-''-INBOX.SM-USERS-''-MOVE-''-ON-''-OFF-''--''-CONTAINS-''- --- 235,246 ---- folder, action ("MOVE", "COPY", or "DELETE"), copy to folder ("ON" or "OFF"), send to address ("ON" or "OFF"), email address, matching ! method ("CONTAINS", "NOT_CONTAINS", "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! "ENDS_WITH", "DOESNT_END_WITH", "IS_EXACTLY", "ISNT_EXACTLY", ! "MATCHES_REGEX" or "DOESNT_MATCH_REGEX"), pre-defined rule name (if ! any). All these fields must be separated by a set string, which is ! given as $filter_field_delimiter (the fifth hook argument) and ! everything should be escaped using the function ssf_escape(), which ! is provided by this plugin. An example of one such rule description ! line is: ####RULE#### Subject-''-[SM-USERS]-''-INBOX.SM-USERS-''-MOVE-''-ON-''-OFF-''--''-CONTAINS-''- *************** *** 269,272 **** --- 281,292 ---- ========== + v2.1 2011/01/11 Paul Lesniewski <pa...@sq...> + * Added ability to add more header selections + * Added ability to remove any filter location, matching + method selections or filter actions + * Added more negative test types (matching methods) + * Added Sieve filter retrieval example + * Fixed broken sanitize hook + v2.0 2010/09/11 Paul Lesniewski <pa...@sq...> * Complete re-write; all new code Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/docs/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140 Modified Files: config_example.php functions.php index.php make_release.sh options.php setup.php version Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/make_release.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** make_release.sh 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- make_release.sh 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 4,8 **** # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # --- 4,8 ---- # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> # Licensed under the GNU GPL. For full terms see the file COPYING. # Index: functions.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/functions.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** functions.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- functions.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> *************** *** 53,57 **** global $ssf_header_fields, $ssf_matching_methods, $ssf_filter_actions, $ssf_folder_list, $delimiter, $allow_unsubscribed_folders, ! $imapConnection, $key; $close_imap_connection = FALSE; --- 53,60 ---- global $ssf_header_fields, $ssf_matching_methods, $ssf_filter_actions, $ssf_folder_list, $delimiter, $allow_unsubscribed_folders, ! $imapConnection, $key, $unsupported_matching_methods, ! $unsupported_matching_locations, $unsupported_actions, ! $additional_headers; ! server_side_filters_init(); $close_imap_connection = FALSE; *************** *** 63,79 **** 'To' => _("To"), 'Cc' => _("Cc"), ! 'TO_OR_CC' => _("To or Cc"), ! 'BODY' => _("Body"), ! 'ANY_HEADER' => _("Any Header"), ! 'ANYWHERE' => _("Anywhere")); ! $ssf_matching_methods = array('CONTAINS' => _("Contains"), ! 'NOT_CONTAINS' => _("Does Not Contain"), ! 'BEGINS_WITH' => _("Begins With"), ! 'ENDS_WITH' => _("Ends With"), ! 'IS_EXACTLY' => _("Is Exactly"), ! 'MATCHES_REGEX' => _("Matches Regex")); $ssf_filter_actions = array('MOVE' => _("Move"), 'COPY' => _("Copy"), 'DELETE' => _("Delete")); --- 66,98 ---- 'To' => _("To"), 'Cc' => _("Cc"), ! 'TO_OR_CC' => _("To or Cc")); ! foreach ($additional_headers as $header) ! $ssf_header_fields[$header] = $header; ! $ssf_header_fields['BODY'] = _("Body"); ! $ssf_header_fields['ANY_HEADER'] = _("Any Header"); ! $ssf_header_fields['ANYWHERE'] = _("Anywhere"); ! foreach ($unsupported_matching_locations as $location) ! unset($ssf_header_fields[$location]); ! ! ! $ssf_matching_methods = array('CONTAINS' => _("Contains"), ! 'NOT_CONTAINS' => _("Does Not Contain"), ! 'BEGINS_WITH' => _("Begins With"), ! 'DOESNT_BEGIN_WITH' => _("Doesn't Begin With"), ! 'ENDS_WITH' => _("Ends With"), ! 'DOESNT_END_WITH' => _("Doesn't End With"), ! 'IS_EXACTLY' => _("Is Exactly"), ! 'ISNT_EXACTLY' => _("Is Not Exactly"), ! 'MATCHES_REGEX' => _("Matches Regex"), ! 'DOESNT_MATCH_REGEX' => _("Doesn't Match Regex")); ! foreach ($unsupported_matching_methods as $method) ! unset($ssf_matching_methods[$method]); ! ! $ssf_filter_actions = array('MOVE' => _("Move"), 'COPY' => _("Copy"), 'DELETE' => _("Delete")); + foreach ($unsupported_actions as $action) + unset($ssf_filter_actions[$action]); *************** *** 138,150 **** * Initialize this plugin (load config values) * * @return boolean FALSE if no configuration file could be loaded, TRUE otherwise * */ ! function server_side_filters_init() { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters/config.php')) ! return FALSE; --- 157,181 ---- * Initialize this plugin (load config values) * + * @param boolean $debug When TRUE, do not suppress errors when including + * configuration files (OPTIONAL; default FALSE) + * * @return boolean FALSE if no configuration file could be loaded, TRUE otherwise * */ ! function server_side_filters_init($debug=FALSE) { ! if ($debug) ! { ! if (!include_once(SM_PATH . 'config/config_server_side_filters.php')) ! if (!include_once(SM_PATH . 'plugins/server_side_filters/config.php')) ! return FALSE; ! } ! else ! { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters/config.php')) ! return FALSE; ! } *************** *** 396,401 **** * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "ENDS_WITH", ! * "EXACT_MATCH", or "REGEX", * indicating how the MATCH_STRING * should be compared with the --- 427,434 ---- * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! * "ENDS_WITH", "DOESNT_END_WITH", ! * "IS_EXACTLY", "ISNT_EXACTLY", ! * "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" * indicating how the MATCH_STRING * should be compared with the *************** *** 630,635 **** * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "ENDS_WITH", ! * "EXACT_MATCH", or "REGEX", * indicating how the MATCH_STRING * should be compared with the --- 663,670 ---- * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! * "ENDS_WITH", "DOESNT_END_WITH", ! * "IS_EXACTLY", "ISNT_EXACTLY", ! * "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" * indicating how the MATCH_STRING * should be compared with the *************** *** 757,763 **** // if the string was not handled by a plugin, do it ourselves // ! if (!is_array($sanitized_string)) { // remove newlines for email addresses and match strings --- 792,806 ---- + // string sanitized by a plugin? + // + if (is_array($sanitized_string) + && isset($sanitized_string[0]) + && is_string($sanitized_string[0])) + $string = $sanitized_string[0]; + + // if the string was not handled by a plugin, do it ourselves // ! else { // remove newlines for email addresses and match strings *************** *** 793,798 **** * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "ENDS_WITH", ! * "EXACT_MATCH", or "REGEX", * indicating how the MATCH_STRING * should be compared with the --- 836,843 ---- * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! * "ENDS_WITH", "DOESNT_END_WITH", ! * "IS_EXACTLY", "ISNT_EXACTLY", ! * "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" * indicating how the MATCH_STRING * should be compared with the *************** *** 987,992 **** * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "ENDS_WITH", ! * "EXACT_MATCH", or "REGEX", * indicating how the MATCH_STRING * should be compared with the --- 1032,1039 ---- * filterable messages * MATCHING_METHOD -- "CONTAINS", "NOT_CONTAINS", ! * "BEGINS_WITH", "DOESNT_BEGIN_WITH", ! * "ENDS_WITH", "DOESNT_END_WITH", ! * "IS_EXACTLY", "ISNT_EXACTLY", ! * "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" * indicating how the MATCH_STRING * should be compared with the Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/options.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** options.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- options.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/setup.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** setup.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- setup.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> *************** *** 98,102 **** ), ), ! 'version' => '2.0', 'required_sm_version' => '1.4.0', 'requires_configuration' => 1, --- 98,102 ---- ), ), ! 'version' => '2.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 1, Index: version =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/version,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** version 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- version 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 1,2 **** Server Side Filters ! 2.0 --- 1,2 ---- Server Side Filters ! 2.1 Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config_example.php 29 Dec 2010 06:20:10 -0000 1.2 --- config_example.php 10 Jan 2011 21:40:12 -0000 1.3 *************** *** 4,8 **** * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2010 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2011 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> *************** *** 23,27 **** $predefined_filter_rules, $message_based_header_fields, $skip_predefined_rule_validation, $add_filters_to_top, ! $filtering_kickoff_file, $ssf_debug, $new_folder_select_location; --- 23,29 ---- $predefined_filter_rules, $message_based_header_fields, $skip_predefined_rule_validation, $add_filters_to_top, ! $filtering_kickoff_file, $ssf_debug, $new_folder_select_location, ! $unsupported_matching_methods, $unsupported_matching_locations, ! $unsupported_actions, $additional_headers; *************** *** 144,147 **** --- 146,191 ---- // // + // This example shows how to retrieve filter rules stored on a Sieve server. + // + // $filter_rules_storage_info = array( + // 'BACKEND' => 'socket', + // 'ADDRESS' => array('VALUE' => 'localhost'), + // 'PORT' => array('VALUE' => 4190), + // 'CHARACTER_SET' => array('VALUE' => 'utf-8'), // mandated by Sieve RFC 5228 + // 'CONNECT_TIMEOUT' => array('VALUE' => 5), + // 'PARSE_PATTERN' => array('VALUE' => '/^(.*)$/s'), + // 'PATTERN_GROUP_NUMBER' => array('VALUE' => 1), + // 'NEW_SETTING_TEMPLATE' => array('VALUE' => '%n'), + // 'TREAT_AS_EMPTY_WHEN_NOT_FOUND' => array('VALUE' => 1), + // //'DEBUG_CONNECTION' => array('VALUE' => 1), + // 'AUTHENTICATION_COMMANDS' => array('VALUE' => array( + // array( + // 'SEND' => 'AUTHENTICATE "PLAIN"', + // 'QUOTE_CREDENTIALS' => 1, + // //'DEBUG' => 1, + // ), + // )), + // 'RETRIEVE_SETTING_COMMANDS' => array('VALUE' => array( + // array( + // 'SEND' => "GETSCRIPT \"created_by_squirrelmail\"\r\n", + // 'PARSE_RESPONSE_PATTERN' => "/^(\{\d+}\s*){0,1}(.*)\s*\nOK [^\n]*\n{0,1}$/s", + // 'PARSE_RESPONSE_PATTERN_GROUP_NUMBER' => 2, + // //'DEBUG' => 1, + // ), + // )), + // 'STORE_SETTING_COMMANDS' => array('VALUE' => array( + // array( + // 'SEND' => "PUTSCRIPT \"created_by_squirrelmail\" {%e+}\r\n%n\r\n", + // //'DEBUG' => 1, + // ), + // array( + // 'SEND' => "SETACTIVE \"created_by_squirrelmail\"\r\n", + // //'DEBUG' => 1, + // ), + // )), + // ); + // + // + // $filter_rules_storage_info = array( 'BACKEND' => 'local_file', *************** *** 164,168 **** // This setting uses the Server Settings Backend plugin to determine // where that file is and what it should contain. Both its location ! // and its contents can be looked up from various locations and may // contain the user name, domain, or related dynamic data. Please // refer to the Server Settings Backend plugin for details about the --- 208,212 ---- // This setting uses the Server Settings Backend plugin to determine // where that file is and what it should contain. Both its location ! // and its contents can be looked up from various sources and may // contain the user name, domain, or related dynamic data. Please // refer to the Server Settings Backend plugin for details about the *************** *** 280,289 **** // Other optional entries are: // ! // HEADER_FIELD -- What header field this rule will always look at // MATCHING_METHOD -- How to "search" the header - this value MUST ! // be one of the following: "CONTAINS", ! // "NOT_CONTAINS", ! // "BEGINS_WITH", "ENDS_WITH", "IS_EXACTLY", or ! // "MATCHES_REGEX" // MATCH_STRING -- The value to search in the header for // ACTION -- What to do with matching messages - this value --- 324,336 ---- // Other optional entries are: // ! // HEADER_FIELD -- The header field this rule will filter against ! // (beside normal header field names, the special ! // values "TO_OR_CC", "BODY", "ANY_HEADER", and ! // "ANYWHERE" are accepted) // MATCHING_METHOD -- How to "search" the header - this value MUST ! // be one of the following: "CONTAINS", "NOT_CONTAINS", ! // "BEGINS_WITH", "DOESNT_BEGIN_WITH", "ENDS_WITH", ! // "DOESNT_END_WITH", "IS_EXACTLY", "ISNT_EXACTLY", ! // "MATCHES_REGEX" or "DOESNT_MATCH_REGEX" // MATCH_STRING -- The value to search in the header for // ACTION -- What to do with matching messages - this value *************** *** 495,498 **** --- 542,597 ---- + // If you'd like to add any headers to the list of those the user + // can choose from, place them in this setting. Any valid header + // names are acceptable. + // + // $additional_headers = array('List-Id', 'User-Agent'); + // + $additional_headers = array(); + + + + // Some filtering systems don't support certain features, or you + // may simply want to reduce the complexity of the user interface. + // These settings allow you to specify which matching method, filtering + // locations and/or filter actions are NOT to be supported. If you + // wish to enable all features, these settings should be EMPTY arrays. + // + // $unsupported_matching_methods may contain any of the following: + // + // CONTAINS + // NOT_CONTAINS + // BEGINS_WITH + // DOESNT_BEGIN_WITH + // ENDS_WITH + // DOESNT_END_WITH + // IS_EXACTLY + // ISNT_EXACTLY + // MATCHES_REGEX + // DOESNT_MATCH_REGEX + // + // $unsupported_matching_locations may contain any of the following: + // + // From + // Subject + // To + // Cc + // TO_OR_CC + // BODY + // ANY_HEADER + // ANYWHERE + // + // $unsupported_actions may contain any of the following: + // + // MOVE + // COPY + // DELETE + // + $unsupported_matching_methods = array(); + $unsupported_matching_locations = array(); + $unsupported_actions = array(); + + + // When loading user filter files, all rules are safety-checked and // validated. Normally, this is a good safety mechanism to keep in |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:20
|
Update of /cvsroot/serverfilters/server_side_filters/skeleton In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/skeleton Modified Files: index.php Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/skeleton/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:20
|
Update of /cvsroot/serverfilters/server_side_filters/images In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/images Modified Files: index.php Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/images/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:20
|
Update of /cvsroot/serverfilters/server_side_filters/locale In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/locale Modified Files: index.php server_side_filters.pot Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: server_side_filters.pot =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/locale/server_side_filters.pot,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** server_side_filters.pot 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- server_side_filters.pot 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 1,4 **** # LANGUAGE (xx_XX) SquirrelMail Server Side Filters Plugin Translation ! # Copyright (c) 2000-2010 The Squirrelmail Project Team # This file is distributed under the same license as the SquirrelMail package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. --- 1,4 ---- # LANGUAGE (xx_XX) SquirrelMail Server Side Filters Plugin Translation ! # Copyright (c) 2000-2011 The Squirrelmail Project Team # This file is distributed under the same license as the SquirrelMail package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. *************** *** 9,13 **** "Project-Id-Version: server_side_filters 2.0\n" "Report-Msgid-Bugs-To: Paul Lesniewski <pa...@sq...>\n" ! "POT-Creation-Date: 2010-09-11 05:37-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" --- 9,13 ---- "Project-Id-Version: server_side_filters 2.0\n" "Report-Msgid-Bugs-To: Paul Lesniewski <pa...@sq...>\n" ! "POT-Creation-Date: 2011-01-11 20:46-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 17,169 **** "Content-Transfer-Encoding: 8bit\n" ! #: functions.php:61 msgid "From" msgstr "" ! #: functions.php:62 msgid "Subject" msgstr "" ! #: functions.php:63 msgid "To" msgstr "" ! #: functions.php:64 msgid "Cc" msgstr "" ! #: functions.php:65 msgid "To or Cc" msgstr "" ! #: functions.php:66 msgid "Body" msgstr "" ! #: functions.php:67 msgid "Any Header" msgstr "" ! #: functions.php:68 msgid "Anywhere" msgstr "" ! #: functions.php:69 msgid "Contains" msgstr "" ! #: functions.php:70 msgid "Does Not Contain" msgstr "" ! #: functions.php:71 msgid "Begins With" msgstr "" ! #: functions.php:72 msgid "Ends With" msgstr "" ! #: functions.php:73 msgid "Is Exactly" msgstr "" ! #: functions.php:74 msgid "Matches Regex" msgstr "" ! #: functions.php:75 msgid "Move" msgstr "" ! #: functions.php:76 msgid "Copy" msgstr "" ! #: functions.php:77 templates/default/options.tpl:749 #: templates/default/options.tpl:827 msgid "Delete" msgstr "" ! #: functions.php:193 msgid "ERROR: Could not save filter file" msgstr "" ! #: functions.php:360 msgid "Message Filters" msgstr "" ! #: functions.php:362 msgid "Create filtering rules that use various criteria to sort incoming messages into designated folders." msgstr "" ! #: functions.php:946 msgid "Unable to save filter rules" msgstr "" ! #: functions.php:947 msgid "filtering_kickoff_file is missing the NEW_SETTING_TEMPLATE entry" msgstr "" ! #: functions.php:948 msgid "Could not save filtering_kickoff_file" msgstr "" ! #: functions.php:1305 msgid "Some fields were missing" msgstr "" ! #: functions.php:1333 functions.php:1394 msgid "Unknown filter location" msgstr "" ! #: functions.php:1344 functions.php:1405 msgid "Unknown matching type" msgstr "" ! #: functions.php:1355 functions.php:1416 msgid "Missing criteria text" msgstr "" ! #: functions.php:1372 msgid "Missing one of the criteria fields" msgstr "" ! #: functions.php:1427 msgid "Bad format for extra criteria" msgstr "" ! #: functions.php:1439 msgid "Unknown filter action" msgstr "" ! #: functions.php:1451 msgid "Unknown folder" msgstr "" ! #: functions.php:1463 msgid "Bad folder checkbox value" msgstr "" ! #: functions.php:1474 msgid "Invalid email address" msgstr "" ! #: functions.php:1486 msgid "Bad email checkbox value" msgstr "" ! #: functions.php:1504 msgid "No email address was given" msgstr "" ! #: functions.php:1517 msgid "No action was selected" msgstr "" ! #: functions.php:1666 functions.php:1683 msgid "----- New Folder -----" msgstr "" #: options.php:380 options.php:704 msgid "Note: because filtered messages are to be deleted, the folder and email options have been disabled" --- 17,189 ---- "Content-Transfer-Encoding: 8bit\n" ! #: functions.php:64 msgid "From" msgstr "" ! #: functions.php:65 msgid "Subject" msgstr "" ! #: functions.php:66 msgid "To" msgstr "" ! #: functions.php:67 msgid "Cc" msgstr "" ! #: functions.php:68 msgid "To or Cc" msgstr "" ! #: functions.php:71 msgid "Body" msgstr "" ! #: functions.php:72 msgid "Any Header" msgstr "" ! #: functions.php:73 msgid "Anywhere" msgstr "" ! #: functions.php:78 msgid "Contains" msgstr "" ! #: functions.php:79 msgid "Does Not Contain" msgstr "" ! #: functions.php:80 msgid "Begins With" msgstr "" ! #: functions.php:81 ! msgid "Doesn't Begin With" ! msgstr "" ! ! #: functions.php:82 msgid "Ends With" msgstr "" ! #: functions.php:83 ! msgid "Doesn't End With" ! msgstr "" ! ! #: functions.php:84 msgid "Is Exactly" msgstr "" ! #: functions.php:85 ! msgid "Is Not Exactly" ! msgstr "" ! ! #: functions.php:86 msgid "Matches Regex" msgstr "" ! #: functions.php:87 ! msgid "Doesn't Match Regex" ! msgstr "" ! ! #: functions.php:92 msgid "Move" msgstr "" ! #: functions.php:93 msgid "Copy" msgstr "" ! #: functions.php:94 templates/default/options.tpl:749 #: templates/default/options.tpl:827 msgid "Delete" msgstr "" ! #: functions.php:224 msgid "ERROR: Could not save filter file" msgstr "" ! #: functions.php:391 msgid "Message Filters" msgstr "" ! #: functions.php:393 msgid "Create filtering rules that use various criteria to sort incoming messages into designated folders." msgstr "" ! #: functions.php:991 msgid "Unable to save filter rules" msgstr "" ! #: functions.php:992 msgid "filtering_kickoff_file is missing the NEW_SETTING_TEMPLATE entry" msgstr "" ! #: functions.php:993 msgid "Could not save filtering_kickoff_file" msgstr "" ! #: functions.php:1352 msgid "Some fields were missing" msgstr "" ! #: functions.php:1380 functions.php:1441 msgid "Unknown filter location" msgstr "" ! #: functions.php:1391 functions.php:1452 msgid "Unknown matching type" msgstr "" ! #: functions.php:1402 functions.php:1463 msgid "Missing criteria text" msgstr "" ! #: functions.php:1419 msgid "Missing one of the criteria fields" msgstr "" ! #: functions.php:1474 msgid "Bad format for extra criteria" msgstr "" ! #: functions.php:1486 msgid "Unknown filter action" msgstr "" ! #: functions.php:1498 msgid "Unknown folder" msgstr "" ! #: functions.php:1510 msgid "Bad folder checkbox value" msgstr "" ! #: functions.php:1521 msgid "Invalid email address" msgstr "" ! #: functions.php:1533 msgid "Bad email checkbox value" msgstr "" ! #: functions.php:1551 msgid "No email address was given" msgstr "" ! #: functions.php:1564 msgid "No action was selected" msgstr "" ! #: functions.php:1713 functions.php:1730 msgid "----- New Folder -----" msgstr "" + #: functions.php:1796 + msgid "Illegal folder name. Please select a different name." + msgstr "" + #: options.php:380 options.php:704 msgid "Note: because filtered messages are to be deleted, the folder and email options have been disabled" Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/locale/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:20
|
Update of /cvsroot/serverfilters/server_side_filters/templates/default In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/templates/default Modified Files: index.php options.tpl Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: options.tpl =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/templates/default/options.tpl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** options.tpl 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- options.tpl 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 173,177 **** * * ! * Copyright (c) 2010 Paul Lesniewski <pa...@sq...>, * Licensed under the GNU GPL. For full terms see the file COPYING. * --- 173,177 ---- * * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...>, * Licensed under the GNU GPL. For full terms see the file COPYING. * Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/templates/default/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2011-01-10 21:40:20
|
Update of /cvsroot/serverfilters/server_side_filters/templates In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5140/templates Modified Files: index.php Log Message: Added ability to add more header selections; Added ability to remove any filter location, matching method selections or filter actions; Added more negative test types (matching methods); Added Sieve filter retrieval example; Fixed broken sanitize hook Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/templates/index.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- index.php 10 Jan 2011 21:40:12 -0000 1.2 *************** *** 8,12 **** * person is logged in or not. * ! * @copyright (c) 1999-2010 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2011 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2010-12-29 06:20:18
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17605 Modified Files: config_example.php Log Message: Fix configuration example Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** config_example.php 1 Oct 2010 02:35:24 -0000 1.1.1.1 --- config_example.php 29 Dec 2010 06:20:10 -0000 1.2 *************** *** 118,122 **** // 'BACKEND' => 'local_file', // 'ACCESS_TYPE' => array('VALUE' => 'PHP'), ! // 'FILE' => array('VALUE_REPLACE' => '/home/%u/users/%u/.mailfilter'), // 'PARSE_PATTERN' => array('VALUE' => "/^(.*)$/s"), // 'PATTERN_GROUP_NUMBER' => array('VALUE' => 1), --- 118,122 ---- // 'BACKEND' => 'local_file', // 'ACCESS_TYPE' => array('VALUE' => 'PHP'), ! // 'FILE' => array('VALUE_REPLACE' => '/home/%1/users/%u/.mailfilter'), // 'PARSE_PATTERN' => array('VALUE' => "/^(.*)$/s"), // 'PATTERN_GROUP_NUMBER' => array('VALUE' => 1), |
|
From: Paul L. <pdo...@us...> - 2010-10-02 20:27:17
|
Update of /cvsroot/serverfilters/server_side_filters_procmail In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24544 Removed Files: config.php Log Message: config.php does not belong here --- config.php DELETED --- |
|
From: Paul L. <pdo...@us...> - 2010-10-02 20:26:48
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24424 Removed Files: config.php Log Message: config.php does not belong here --- config.php DELETED --- |
|
From: Paul L. <pdo...@us...> - 2010-10-02 20:24:58
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23783 Removed Files: config.php Log Message: config.php does not belong here --- config.php DELETED --- |
|
From: Paul L. <pdo...@us...> - 2010-10-01 03:13:04
|
Update of /cvsroot/serverfilters/serversidefilter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1002 Modified Files: version setup.php Log Message: Update version Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/setup.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** setup.php 21 Jul 2005 09:52:20 -0000 1.6 --- setup.php 1 Oct 2010 03:12:56 -0000 1.7 *************** *** 44,48 **** { ! return '1.5-1.2.7-RC2'; } --- 44,48 ---- { ! return '1.5-1.2.7'; } Index: version =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/version,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** version 21 Jul 2005 09:52:20 -0000 1.5 --- version 1 Oct 2010 03:12:56 -0000 1.6 *************** *** 1,2 **** Server Side Filter ! 1.5-1.2.7-RC2 --- 1,2 ---- Server Side Filter ! 1.5-1.2.7 |
|
From: Paul L. <pdo...@us...> - 2010-10-01 03:11:02
|
Update of /cvsroot/serverfilters/serversidefilter In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv824 Modified Files: README Log Message: Add warning about outdated code Index: README =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 21 Jul 2005 09:52:20 -0000 1.3 --- README 1 Oct 2010 03:10:52 -0000 1.4 *************** *** 10,13 **** --- 10,20 ---- + WARNING! THIS CODE HAS BEEN SUPERCEDED AND IS NO LONGER MAINTAINED + This plugin has been re-written and the source code moved to a different + module in the same project/code repository. Please see the Server Side + Filters plugin and repository for version 2.0 (and above) of this plugin. + + + Description =========== |
|
From: Paul L. <pdo...@us...> - 2010-10-01 02:59:51
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32318 Removed Files: server_side_filters_maildrop-1.0-1.4.0.tar.gz Log Message: Reverse mistaken import of release tarball --- server_side_filters_maildrop-1.0-1.4.0.tar.gz DELETED --- |
|
From: Paul L. <pdo...@us...> - 2010-10-01 02:58:58
|
Update of /cvsroot/serverfilters/server_side_filters_procmail In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32104 Removed Files: server_side_filters_procmail-1.0-1.4.0.tar.gz Log Message: Reverse mistaken import of release tarball --- server_side_filters_procmail-1.0-1.4.0.tar.gz DELETED --- |
|
From: Paul L. <pdo...@us...> - 2009-02-07 01:13:05
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20953 Modified Files: README Log Message: Add a troubleshooting tip Index: README =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 21 May 2005 19:46:19 -0000 1.2 --- README 7 Feb 2009 01:12:57 -0000 1.3 *************** *** 12,17 **** ! Compilation Prerequisites ! ========================= * A C compiler --- 12,17 ---- ! Requirements ! ============ * A C compiler *************** *** 142,143 **** --- 142,150 ---- serversidefilter. + * When compiling, I get an error such as "mail.h: No such file or directory" + + You probably are trying to use the UW-IMAP c-client library for checking + credentials (CHECKCREDS=checkcreds_cclient.o in the Makefile) but you don't + have the UW-IMAP c-client library on your system. Please read the Requirements + section herein before continuing. + |
|
From: Paul L. <pdo...@us...> - 2005-12-10 12:14:57
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12931 Modified Files: test.sh Log Message: Index: test.sh =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/test.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** test.sh 21 May 2005 09:13:19 -0000 1.1.1.1 --- test.sh 10 Dec 2005 12:14:46 -0000 1.2 *************** *** 52,57 **** echo If you do not need to perform additional tests, remove the file 'test_creds' REMOVE=x ! while [ $REMOVE != 'y' ] && [ $REMOVE != 'Y' ] && ! [ $REMOVE != 'n' ] && [ $REMOVE != 'N' ] ; do read -p "Remove now? (Y/n): " REMOVE done; --- 52,57 ---- echo If you do not need to perform additional tests, remove the file 'test_creds' REMOVE=x ! while [ "$REMOVE" != 'y' ] && [ "$REMOVE" != 'Y' ] && ! [ "$REMOVE" != 'n' ] && [ "$REMOVE" != 'N' ] ; do read -p "Remove now? (Y/n): " REMOVE done; |
|
From: Paul L. <pdo...@us...> - 2005-12-10 12:08:58
|
Update of /cvsroot/serverfilters/serversidefilter/script In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11693 Modified Files: Makefile Makefile.ldap Makefile.mysql Log Message: Typos Index: Makefile.ldap =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.ldap,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.ldap 1 Dec 2005 06:12:37 -0000 1.5 --- Makefile.ldap 10 Dec 2005 12:08:50 -0000 1.6 *************** *** 183,187 **** filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) --- 183,187 ---- filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) Index: Makefile.mysql =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile.mysql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.mysql 1 Dec 2005 06:12:37 -0000 1.4 --- Makefile.mysql 10 Dec 2005 12:08:50 -0000 1.5 *************** *** 183,187 **** filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) --- 183,187 ---- filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) Index: Makefile =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/script/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 1 Dec 2005 06:12:37 -0000 1.4 --- Makefile 10 Dec 2005 12:08:50 -0000 1.5 *************** *** 183,187 **** filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) --- 183,187 ---- filtercmd.o: filtercmd.c Makefile $(CHECKCREDS) $(MYSQL) $(LDAP) ! gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(MYSQL_FLAGS) $(LDAP_CFLAGS) $(LDAP_FLAGS) #filtercmd.o: filtercmd.c Makefile # gcc -c filtercmd.c $(CFLAGS) $(FILTERCMD_CFLAGS) $(MYSQL_CFLAGS) $(LDAP_CFLAGS) |
|
From: Paul L. <pdo...@us...> - 2005-12-02 10:17:55
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9899 Modified Files: functions.php Log Message: Someone forgot this Index: functions.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 21 Jul 2005 09:52:20 -0000 1.3 --- functions.php 2 Dec 2005 10:17:44 -0000 1.4 *************** *** 50,53 **** --- 50,54 ---- include_once(SM_PATH . 'plugins/serversidefilter/recipie_functions.php'); + set_filter_app(); if ($ALWAYS_CREATE) |
|
From: Paul L. <pdo...@us...> - 2005-12-01 08:58:12
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21072 Modified Files: make_release.sh Log Message: Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/make_release.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make_release.sh 21 Jul 2005 09:52:20 -0000 1.2 --- make_release.sh 1 Dec 2005 08:58:03 -0000 1.3 *************** *** 33,37 **** # CONFIG_FILES=( config.php ) # ! CONFIG_FILES=( config.php script/imap-2004a script/imap.tar.Z script/serversidefilter_mysql.conf script/serversidefilter_ldap.conf script/filtercmd script/Makefile.orig script/Makefile.paul ) --- 33,37 ---- # CONFIG_FILES=( config.php ) # ! CONFIG_FILES=( config.php script/imap-2004g script/imap.tar.Z script/serversidefilter_mysql.conf script/serversidefilter_ldap.conf script/filtercmd script/Makefile.orig script/Makefile.paul ) |
|
From: Paul L. <pdo...@us...> - 2005-12-01 08:55:24
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20529 Modified Files: CHANGELOG Log Message: Index: CHANGELOG =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/CHANGELOG,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CHANGELOG 21 Jul 2005 09:52:20 -0000 1.4 --- CHANGELOG 1 Dec 2005 08:55:17 -0000 1.5 *************** *** 32,35 **** --- 32,36 ---- - Removed requirement for Compatibility plugin - Reimplemented FTP backend functionality + - Fixes for Maildrop filter rules that reference non-existing folders Version 1.41 |
|
From: Paul L. <pdo...@us...> - 2005-12-01 08:47:33
|
Update of /cvsroot/serverfilters/serversidefilter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19245 Modified Files: backend.php Log Message: No more path munging I hope Index: backend.php =================================================================== RCS file: /cvsroot/serverfilters/serversidefilter/backend.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** backend.php 1 Dec 2005 08:37:15 -0000 1.4 --- backend.php 1 Dec 2005 08:47:24 -0000 1.5 *************** *** 502,505 **** --- 502,507 ---- } + if (strpos($folder, '/') !== 0) $folder = '/' . $folder; + $folder = '$MAILDIR'.$folder; *************** *** 630,634 **** $df = preg_replace("/\./",'',$default_folder_prefix); $folder = preg_replace("/$df/",'',$folder); ! $folder = '$MAILDIR/' . $folder . ($USE_MAILDIRS ? '/' : ''); --- 632,639 ---- $df = preg_replace("/\./",'',$default_folder_prefix); $folder = preg_replace("/$df/",'',$folder); ! ! if (strpos($folder, '/') !== 0) $folder = '/' . $folder; ! ! $folder = '$MAILDIR' . $folder . ($USE_MAILDIRS ? '/' : ''); |
