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
|
|
From: Paul L. <pdo...@us...> - 2013-06-18 04:47:17
|
Update of /cvsroot/serverfilters/server_side_filters/locale In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16549/locale Modified Files: index.php server_side_filters.pot Log Message: Update copyright Index: server_side_filters.pot =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/locale/server_side_filters.pot,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** server_side_filters.pot 13 Nov 2011 00:27:22 -0000 1.6 --- server_side_filters.pot 18 Jun 2013 04:47:14 -0000 1.7 *************** *** 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. --- 1,4 ---- # LANGUAGE (xx_XX) SquirrelMail Server Side Filters Plugin Translation ! # Copyright (c) 2000-2013 The Squirrelmail Project Team # This file is distributed under the same license as the SquirrelMail package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Index: index.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/locale/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 10 Jan 2011 21:40:12 -0000 1.2 --- index.php 18 Jun 2013 04:47:14 -0000 1.3 *************** *** 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 */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2013 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License */ |
|
From: Paul L. <pdo...@us...> - 2013-06-18 04:47:16
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16549 Modified Files: config_example.php functions.php index.php make_release.sh options.php setup.php Log Message: Update copyright Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/make_release.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make_release.sh 10 Jan 2011 21:40:12 -0000 1.2 --- make_release.sh 18 Jun 2013 04:47:14 -0000 1.3 *************** *** 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. # --- 4,8 ---- # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2013 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.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions.php 13 Nov 2011 00:27:22 -0000 1.4 --- functions.php 18 Jun 2013 04:47:14 -0000 1.5 *************** *** 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...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2013 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 10 Jan 2011 21:40:12 -0000 1.2 --- index.php 18 Jun 2013 04:47:14 -0000 1.3 *************** *** 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 */ --- 8,12 ---- * person is logged in or not. * ! * @copyright (c) 1999-2013 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.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** setup.php 13 Nov 2011 00:39:16 -0000 1.6 --- setup.php 18 Jun 2013 04:47:14 -0000 1.7 *************** *** 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...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2013 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/options.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** options.php 18 Jun 2013 04:37:44 -0000 1.5 --- options.php 18 Jun 2013 04:47:14 -0000 1.6 *************** *** 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...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2013 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config_example.php 13 Nov 2011 00:27:22 -0000 1.8 --- config_example.php 18 Jun 2013 04:47:14 -0000 1.9 *************** *** 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...> --- 4,8 ---- * SquirrelMail Server Side Filters Plugin * ! * Copyright (c) 2004-2013 Paul Lesniewski <pa...@sq...> * Copyright (c) 2002-2004 Jon Stroud <acc...@bs...> * Copyright (c) 2002-2004 Tony Lownds <ton...@us...> |
|
From: Paul L. <pdo...@us...> - 2013-06-18 04:37:47
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16220 Modified Files: options.php Log Message: Synchronize token handling with changes in SquirrelMail core Index: options.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/options.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** options.php 9 May 2011 20:12:26 -0000 1.4 --- options.php 18 Jun 2013 04:37:44 -0000 1.5 *************** *** 350,354 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 350,354 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 684,688 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 684,688 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 1022,1026 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 1022,1026 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 1143,1147 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 1143,1147 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 1279,1283 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 1279,1283 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 1407,1411 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 1407,1411 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); *************** *** 1482,1486 **** // validate security token // ! sm_validate_security_token($submitted_token, 3600, TRUE); --- 1482,1486 ---- // validate security token // ! sm_validate_security_token($submitted_token, -1, TRUE); |
|
From: Paul L. <pdo...@us...> - 2013-06-07 20:02:25
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19630 Modified Files: config_default.php config_example.php functions.php make_release.sh setup.php version Log Message: Minor bug fix for sites with an empty $default_folder_prefix Index: make_release.sh =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/make_release.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** make_release.sh 11 Jan 2011 02:00:50 -0000 1.2 --- make_release.sh 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 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. # --- 4,8 ---- # Generic shell script for building SquirrelMail plugin release # ! # Copyright (c) 2004-2013 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_maildrop/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 7 May 2011 06:49:16 -0000 1.3 --- functions.php 7 Jun 2013 20:02:23 -0000 1.4 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. *************** *** 404,412 **** // $rule['TARGET_FOLDER'] = preg_replace('/' . str_replace('.', '', $default_folder_prefix) . '/', '', $rule['TARGET_FOLDER']); // ! $test_folder_prefix = $default_folder_prefix; ! if ($test_folder_prefix{strlen($test_folder_prefix) - 1} == $delimiter) ! $test_folder_prefix = substr($test_folder_prefix, 0, -1); ! if (strpos($rule['TARGET_FOLDER'], $test_folder_prefix) === 0) ! $rule['TARGET_FOLDER'] = substr($rule['TARGET_FOLDER'], strlen($test_folder_prefix)); --- 404,415 ---- // $rule['TARGET_FOLDER'] = preg_replace('/' . str_replace('.', '', $default_folder_prefix) . '/', '', $rule['TARGET_FOLDER']); // ! if (!empty($default_folder_prefix)) ! { ! $test_folder_prefix = $default_folder_prefix; ! if ($test_folder_prefix{strlen($test_folder_prefix) - 1} == $delimiter) ! $test_folder_prefix = substr($test_folder_prefix, 0, -1); ! if (strpos($rule['TARGET_FOLDER'], $test_folder_prefix) === 0) ! $rule['TARGET_FOLDER'] = substr($rule['TARGET_FOLDER'], strlen($test_folder_prefix)); ! } Index: config_default.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/config_default.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config_default.php 11 Jan 2011 02:00:50 -0000 1.2 --- config_default.php 7 Jun 2013 20:02:22 -0000 1.3 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/setup.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.php 11 Jan 2011 02:02:22 -0000 1.3 --- setup.php 7 Jun 2013 20:02:23 -0000 1.4 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. *************** *** 61,65 **** ), ), ! 'version' => '1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, --- 61,65 ---- ), ), ! 'version' => '1.1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, Index: version =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/version,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** version 11 Jan 2011 02:02:22 -0000 1.2 --- version 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 1,2 **** Server Side Filters Maildrop ! 1.1 --- 1,2 ---- Server Side Filters Maildrop ! 1.1.1 Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/config_example.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** config_example.php 11 Jan 2011 02:00:50 -0000 1.2 --- config_example.php 7 Jun 2013 20:02:23 -0000 1.3 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. --- 4,8 ---- * SquirrelMail Server Side Filters Maildrop Plugin * ! * Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> * * Licensed under the GNU GPL. For full terms see the file COPYING. |
|
From: Paul L. <pdo...@us...> - 2013-06-07 19:58:51
|
Update of /cvsroot/serverfilters/server_side_filters_procmail/docs In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19376/docs Modified Files: README Log Message: Minor bug fix for sites with an empty $default_folder_prefix Index: README =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/docs/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README 11 Jan 2011 02:00:29 -0000 1.2 --- README 7 Jun 2013 19:58:49 -0000 1.3 *************** *** 1,8 **** Server Side Filters Procmail plugin for SquirrelMail ==================================================== ! Ver 1.1, 2011/01/11 ! Copyright (c) 2010-2011 Paul Lesniewski <pa...@sq...> --- 1,8 ---- Server Side Filters Procmail plugin for SquirrelMail ==================================================== ! Ver 1.1.1, 2013/06/07 ! Copyright (c) 2010-2013 Paul Lesniewski <pa...@sq...> *************** *** 95,98 **** --- 95,101 ---- ========== + v1.1.1 2013/06/07 Paul Lesniewski <pa...@sq...> + * Minor bug fix for sites with an empty $default_folder_prefix + v1.1 2011/01/11 Paul Lesniewski <pa...@sq...> * Added more negative test types (matching methods) |
|
From: Paul L. <pdo...@us...> - 2011-11-13 00:39:19
|
Update of /cvsroot/serverfilters/server_side_filters/docs
In directory vz-cvs-3.sog:/tmp/cvs-serv3700/docs
Modified Files:
README
Log Message:
Roll back version - 2.1 hasn't been released yet
Index: README
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/docs/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** README 13 Nov 2011 00:27:22 -0000 1.5
--- README 13 Nov 2011 00:39:16 -0000 1.6
***************
*** 1,5 ****
Server Side Filters plugin for SquirrelMail
===========================================
! Ver 2.1.1, 2011/11/11
--- 1,5 ----
Server Side Filters plugin for SquirrelMail
===========================================
! Ver 2.1, 2011/04/21
***************
*** 281,289 ****
==========
- v2.1.1 2011/11/11 Paul Lesniewski <pa...@sq...>
- * Added the "server_side_filters_init" hook that allows
- third party plugins to add to or tweak this plugin's
- configuration settings
-
v2.1 2011/04/21 Paul Lesniewski <pa...@sq...>
* Added ability to add more header selections
--- 281,284 ----
***************
*** 295,298 ****
--- 290,296 ----
* Fixed broken sanitize hook
* Fixed badly formed HTML
+ * Added the "server_side_filters_init" hook that allows
+ third party plugins to add to or tweak this plugin's
+ configuration settings
v2.0 2010/09/11 Paul Lesniewski <pa...@sq...>
|
|
From: Paul L. <pdo...@us...> - 2011-11-13 00:27:24
|
Update of /cvsroot/serverfilters/server_side_filters/docs
In directory vz-cvs-3.sog:/tmp/cvs-serv1870/docs
Modified Files:
README
Log Message:
Add the server_side_filters_init hook that allows third party plugins to add to or tweak this plugin's configuration settings. Also fix a couple minor strings and documentation issues
Index: README
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/docs/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** README 7 May 2011 07:45:55 -0000 1.4
--- README 13 Nov 2011 00:27:22 -0000 1.5
***************
*** 1,5 ****
Server Side Filters plugin for SquirrelMail
===========================================
! Ver 2.1, 2011/04/21
--- 1,5 ----
Server Side Filters plugin for SquirrelMail
===========================================
! Ver 2.1.1, 2011/11/11
***************
*** 281,284 ****
--- 281,289 ----
==========
+ v2.1.1 2011/11/11 Paul Lesniewski <pa...@sq...>
+ * Added the "server_side_filters_init" hook that allows
+ third party plugins to add to or tweak this plugin's
+ configuration settings
+
v2.1 2011/04/21 Paul Lesniewski <pa...@sq...>
* Added ability to add more header selections
|
|
From: Paul L. <pdo...@us...> - 2011-05-12 02:00:35
|
Update of /cvsroot/serverfilters/server_side_filters
In directory vz-cvs-3.sog:/tmp/cvs-serv17447
Modified Files:
config_example.php setup.php
Log Message:
Add another string to be translated
Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/setup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.php 7 May 2011 07:45:55 -0000 1.3
--- setup.php 12 May 2011 02:00:33 -0000 1.4
***************
*** 81,84 ****
--- 81,85 ----
$ignore = _("Flag");
$ignore = _("Flag for follow-up");
+ $ignore = _("Flag/Important");
$ignore = _("Important");
$ignore = _("Mark as important");
Index: config_example.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config_example.php 7 May 2011 07:45:55 -0000 1.6
--- config_example.php 12 May 2011 02:00:33 -0000 1.7
***************
*** 670,673 ****
--- 670,674 ----
// Flag
// Flag for follow-up
+ // Flag/Important
// Important
// Mark as important
|
|
From: Paul L. <pdo...@us...> - 2011-05-09 20:12:28
|
Update of /cvsroot/serverfilters/server_side_filters
In directory vz-cvs-3.sog:/tmp/cvs-serv15864
Modified Files:
options.php
Log Message:
Some browsers not sending submit image button coordinates consistently - this fixes that in most cases
Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/options.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.php 7 May 2011 07:45:55 -0000 1.3
--- options.php 9 May 2011 20:12:26 -0000 1.4
***************
*** 113,116 ****
--- 113,142 ----
+ // Under some rather anomalous situations, the submit button coordinates
+ // are not being included with form submits, rendering user actions moot.
+ // As a half-ass fix for this, we have JavaScript on each of those buttons
+ // that sets a hidden input called "ssf_action" to the correct action name.
+ // We look for that here and force the needed coordinate POST variable if
+ // found. Users who don't have JavaScript just have to hope the browser
+ // does what it should in regard to sending input button coordinates.
+ //
+ if (sqGetGlobalVar('ssf_action', $ssf_action, SQ_POST) && !empty($ssf_action))
+ {
+ switch ($ssf_action)
+ {
+ case 'add': $_POST['add_x'] = 1; break;
+ case 'create': $_POST['create_x'] = 1; break;
+ case 'modify': $_POST['modify_x'] = 1; break;
+ case 'delete': $_POST['delete_x'] = 1; break;
+ case 'up': $_POST['up_x'] = 1; break;
+ case 'up_num': $_POST['up_num_x'] = 1; break;
+ case 'up_top': $_POST['up_top_x'] = 1; break;
+ case 'down': $_POST['down_x'] = 1; break;
+ case 'down_num': $_POST['down_num_x'] = 1; break;
+ case 'down_bottom': $_POST['down_bottom_x'] = 1; break;
+ }
+ }
+
+
// detect if this is being used in a minimal/popup window
//
***************
*** 1108,1112 ****
|| (sqGetGlobalVar('up_num_x', $up_num_x, SQ_POST)
&& sqGetGlobalVar('up_target', $up_target, SQ_POST)
! && is_numeric($up_target) && $move_up_x = TRUE)
|| (sqGetGlobalVar('up_top_x', $up_top_x, SQ_POST) && $move_up_top = TRUE))
&& sqGetGlobalVar('rule_number', $rule_number, SQ_POST)
--- 1134,1138 ----
|| (sqGetGlobalVar('up_num_x', $up_num_x, SQ_POST)
&& sqGetGlobalVar('up_target', $up_target, SQ_POST)
! && is_numeric($up_target) && $move_up_x = TRUE) // intentional *assignment*
|| (sqGetGlobalVar('up_top_x', $up_top_x, SQ_POST) && $move_up_top = TRUE))
&& sqGetGlobalVar('rule_number', $rule_number, SQ_POST)
***************
*** 1244,1248 ****
|| (sqGetGlobalVar('down_num_x', $down_num_x, SQ_POST)
&& sqGetGlobalVar('down_target', $down_target, SQ_POST)
! && is_numeric($down_target) && $move_down_x = TRUE)
|| (sqGetGlobalVar('down_bottom_x', $down_bottom_x, SQ_POST) && $move_down_bottom = TRUE))
&& sqGetGlobalVar('rule_number', $rule_number, SQ_POST)
--- 1270,1274 ----
|| (sqGetGlobalVar('down_num_x', $down_num_x, SQ_POST)
&& sqGetGlobalVar('down_target', $down_target, SQ_POST)
! && is_numeric($down_target) && $move_down_x = TRUE) // intentional *assignment*
|| (sqGetGlobalVar('down_bottom_x', $down_bottom_x, SQ_POST) && $move_down_bottom = TRUE))
&& sqGetGlobalVar('rule_number', $rule_number, SQ_POST)
|
|
From: Paul L. <pdo...@us...> - 2011-05-07 07:45:58
|
Update of /cvsroot/serverfilters/server_side_filters/locale In directory vz-cvs-3.sog:/tmp/cvs-serv11916/locale Modified Files: server_side_filters.pot Log Message: Add custom action capability Index: server_side_filters.pot =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/locale/server_side_filters.pot,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** server_side_filters.pot 10 Jan 2011 21:40:12 -0000 1.2 --- server_side_filters.pot 7 May 2011 07:45:55 -0000 1.3 *************** *** 7,13 **** msgid "" msgstr "" ! "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" --- 7,13 ---- msgid "" msgstr "" ! "Project-Id-Version: server_side_filters 2.1\n" "Report-Msgid-Bugs-To: Paul Lesniewski <pa...@sq...>\n" ! "POT-Creation-Date: 2011-04-21 18:02-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" *************** *** 97,239 **** 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" msgstr "" ! #: options.php:382 options.php:706 ! msgid "Note: because filtered messages are to be deleted, the folder option has been disabled" msgstr "" ! #: options.php:384 options.php:708 ! msgid "Note: because filtered messages are to be deleted, the email option has been disabled" msgstr "" ! #: options.php:404 options.php:728 msgid "New folder could not be created" msgstr "" ! #: options.php:454 options.php:627 options.php:778 options.php:959 ! #: options.php:1076 options.php:1212 options.php:1346 msgid "There were problems with your input:" msgstr "" ! #: options.php:555 options.php:894 msgid "Error: An identical filter already exists" msgstr "" ! #: options.php:595 msgid "There was a problem creating this filter" msgstr "" ! #: options.php:603 msgid "New filter has been created" msgstr "" ! #: options.php:934 msgid "There was a problem saving this filter" msgstr "" ! #: options.php:942 msgid "Filter has been updated" msgstr "" ! #: options.php:1056 msgid "There was a problem deleting this filter" msgstr "" ! #: options.php:1063 msgid "Filter has been deleted" msgstr "" ! #: options.php:1198 options.php:1332 msgid "There was a problem reordering filters" msgstr "" --- 97,250 ---- msgstr "" ! #: functions.php:94 templates/default/options.tpl:769 ! #: templates/default/options.tpl:850 msgid "Delete" msgstr "" ! #: functions.php:96 options.php:388 options.php:722 ! msgid "SHORT_DESCRIPTION" ! msgstr "" ! ! #: functions.php:226 msgid "ERROR: Could not save filter file" msgstr "" ! #: functions.php:417 msgid "Message Filters" msgstr "" ! #: functions.php:419 msgid "Create filtering rules that use various criteria to sort incoming messages into designated folders." msgstr "" ! #: functions.php:1023 msgid "Unable to save filter rules" msgstr "" ! #: functions.php:1024 msgid "filtering_kickoff_file is missing the NEW_SETTING_TEMPLATE entry" msgstr "" ! #: functions.php:1025 msgid "Could not save filtering_kickoff_file" msgstr "" ! #: functions.php:1387 msgid "Some fields were missing" msgstr "" ! #: functions.php:1415 functions.php:1476 msgid "Unknown filter location" msgstr "" ! #: functions.php:1426 functions.php:1487 msgid "Unknown matching type" msgstr "" ! #: functions.php:1437 functions.php:1498 msgid "Missing criteria text" msgstr "" ! #: functions.php:1454 msgid "Missing one of the criteria fields" msgstr "" ! #: functions.php:1509 msgid "Bad format for extra criteria" msgstr "" ! #: functions.php:1521 msgid "Unknown filter action" msgstr "" ! #: functions.php:1533 msgid "Unknown folder" msgstr "" ! #: functions.php:1545 msgid "Bad folder checkbox value" msgstr "" ! #: functions.php:1556 msgid "Invalid email address" msgstr "" ! #: functions.php:1568 msgid "Bad email checkbox value" msgstr "" ! #: functions.php:1586 msgid "No email address was given" msgstr "" ! #: functions.php:1605 msgid "No action was selected" msgstr "" ! #: functions.php:1754 functions.php:1771 msgid "----- New Folder -----" msgstr "" ! #: functions.php:1837 msgid "Illegal folder name. Please select a different name." msgstr "" ! #: options.php:386 options.php:720 ! msgid "deletion" msgstr "" ! #: options.php:390 options.php:724 ! #, php-format ! msgid "Note: because filtered messages will only be subject to %s, the folder and email options have been disabled" msgstr "" ! #: options.php:392 options.php:726 ! #, php-format ! msgid "Note: because filtered messages will only be subject to %s, the folder option has been disabled" msgstr "" ! #: options.php:394 options.php:728 ! #, php-format ! msgid "Note: because filtered messages will only be subject to %s, the email option has been disabled" ! msgstr "" ! ! #: options.php:414 options.php:748 msgid "New folder could not be created" msgstr "" ! #: options.php:464 options.php:637 options.php:798 options.php:979 ! #: options.php:1096 options.php:1232 options.php:1366 msgid "There were problems with your input:" msgstr "" ! #: options.php:565 options.php:914 msgid "Error: An identical filter already exists" msgstr "" ! #: options.php:605 msgid "There was a problem creating this filter" msgstr "" ! #: options.php:613 msgid "New filter has been created" msgstr "" ! #: options.php:954 msgid "There was a problem saving this filter" msgstr "" ! #: options.php:962 msgid "Filter has been updated" msgstr "" ! #: options.php:1076 msgid "There was a problem deleting this filter" msgstr "" ! #: options.php:1083 msgid "Filter has been deleted" msgstr "" ! #: options.php:1218 options.php:1352 msgid "There was a problem reordering filters" msgstr "" *************** *** 319,324 **** msgstr "" ! #: setup.php:78 templates/default/options.tpl:360 ! #: templates/default/options.tpl:574 templates/default/options.tpl:808 #, php-format msgid "then %s to" --- 330,335 ---- msgstr "" ! #: setup.php:78 templates/default/options.tpl:367 ! #: templates/default/options.tpl:589 templates/default/options.tpl:831 #, php-format msgid "then %s to" *************** *** 335,456 **** msgstr "" ! #: templates/default/options.tpl:242 msgid "Please enter the new folder name:" msgstr "" ! #: templates/default/options.tpl:264 msgid "Options" msgstr "" ! #: templates/default/options.tpl:264 msgid "Mail Filters" msgstr "" ! #: templates/default/options.tpl:301 msgid "Create New Filter:" msgstr "" ! #: templates/default/options.tpl:343 templates/default/options.tpl:552 ! #: templates/default/options.tpl:789 msgid "Add More Criteria" msgstr "" ! #: templates/default/options.tpl:345 templates/default/options.tpl:554 ! #: templates/default/options.tpl:789 #, php-format msgid "If %s %s %s" msgstr "" ! #: templates/default/options.tpl:352 templates/default/options.tpl:564 ! #: templates/default/options.tpl:798 #, php-format msgid "and %s %s %s" msgstr "" ! #: templates/default/options.tpl:371 templates/default/options.tpl:585 ! #: templates/default/options.tpl:815 msgid "Folder" msgstr "" ! #: templates/default/options.tpl:377 templates/default/options.tpl:591 ! #: templates/default/options.tpl:820 msgid "Email" msgstr "" ! #: templates/default/options.tpl:386 templates/default/options.tpl:497 ! #: templates/default/options.tpl:600 msgid "Save New Filter" msgstr "" ! #: templates/default/options.tpl:448 templates/default/options.tpl:479 ! #: templates/default/options.tpl:723 templates/default/options.tpl:730 #, php-format msgid "CRITERIA_TEXT" msgstr "" ! #: templates/default/options.tpl:482 templates/default/options.tpl:733 #, php-format msgid "ACTION_TEXT" msgstr "" ! #: templates/default/options.tpl:487 templates/default/options.tpl:738 #, php-format msgid "FOLDER_TEXT" msgstr "" ! #: templates/default/options.tpl:491 templates/default/options.tpl:742 #, php-format msgid "EMAIL_TEXT" msgstr "" ! #: templates/default/options.tpl:615 msgid "Existing Filters:" msgstr "" ! #: templates/default/options.tpl:617 msgid "Filers are evaluated in the order shown below." msgstr "" ! #: templates/default/options.tpl:723 templates/default/options.tpl:730 ! #: templates/default/options.tpl:733 templates/default/options.tpl:738 ! #: templates/default/options.tpl:742 #, php-format msgid "PREDEFINED_RULE" msgstr "" ! #: templates/default/options.tpl:723 #, php-format msgid "ADDITIONAL_CRITERIA" msgstr "" ! #: templates/default/options.tpl:747 templates/default/options.tpl:825 msgid "Save" msgstr "" ! #: templates/default/options.tpl:749 templates/default/options.tpl:827 msgid "Are you sure you want to delete this filter?" msgstr "" ! #: templates/default/options.tpl:760 templates/default/options.tpl:774 ! #: templates/default/options.tpl:838 templates/default/options.tpl:852 msgid "Move Down" msgstr "" ! #: templates/default/options.tpl:760 templates/default/options.tpl:774 ! #: templates/default/options.tpl:838 templates/default/options.tpl:852 msgid "Move To Bottom" msgstr "" ! #: templates/default/options.tpl:765 templates/default/options.tpl:772 ! #: templates/default/options.tpl:843 templates/default/options.tpl:850 msgid "Move To Top" msgstr "" ! #: templates/default/options.tpl:765 templates/default/options.tpl:772 ! #: templates/default/options.tpl:843 templates/default/options.tpl:850 msgid "Move Up" msgstr "" ! #: templates/default/options.tpl:862 #, php-format msgid "%sNotice:%s Use of these filters may prevent the reading of mail in non-IMAP (e.g., POP) mail clients." --- 346,511 ---- msgstr "" ! #: setup.php:81 ! msgid "Flag" ! msgstr "" ! ! #: setup.php:82 ! msgid "Flag for follow-up" ! msgstr "" ! ! #: setup.php:83 ! msgid "Important" ! msgstr "" ! ! #: setup.php:84 ! msgid "Mark as important" ! msgstr "" ! ! #: setup.php:85 ! msgid "Work" ! msgstr "" ! ! #: setup.php:86 ! msgid "Private" ! msgstr "" ! ! #: setup.php:87 ! msgid "Mark as private" ! msgstr "" ! ! #: setup.php:88 ! msgid "TODO" ! msgstr "" ! ! #: setup.php:89 ! msgid "ToDo" ! msgstr "" ! ! #: setup.php:90 ! msgid "Later" ! msgstr "" ! ! #: setup.php:91 ! msgid "Follow-up" ! msgstr "" ! ! #: templates/default/options.tpl:246 msgid "Please enter the new folder name:" msgstr "" ! #: templates/default/options.tpl:268 msgid "Options" msgstr "" ! #: templates/default/options.tpl:268 msgid "Mail Filters" msgstr "" ! #: templates/default/options.tpl:305 msgid "Create New Filter:" msgstr "" ! #: templates/default/options.tpl:350 templates/default/options.tpl:567 ! #: templates/default/options.tpl:812 msgid "Add More Criteria" msgstr "" ! #: templates/default/options.tpl:352 templates/default/options.tpl:569 ! #: templates/default/options.tpl:812 #, php-format msgid "If %s %s %s" msgstr "" ! #: templates/default/options.tpl:359 templates/default/options.tpl:579 ! #: templates/default/options.tpl:821 #, php-format msgid "and %s %s %s" msgstr "" ! #: templates/default/options.tpl:378 templates/default/options.tpl:600 ! #: templates/default/options.tpl:838 msgid "Folder" msgstr "" ! #: templates/default/options.tpl:384 templates/default/options.tpl:606 ! #: templates/default/options.tpl:843 msgid "Email" msgstr "" ! #: templates/default/options.tpl:393 templates/default/options.tpl:509 ! #: templates/default/options.tpl:615 msgid "Save New Filter" msgstr "" ! #: templates/default/options.tpl:458 templates/default/options.tpl:491 ! #: templates/default/options.tpl:743 templates/default/options.tpl:750 #, php-format msgid "CRITERIA_TEXT" msgstr "" ! #: templates/default/options.tpl:494 templates/default/options.tpl:753 #, php-format msgid "ACTION_TEXT" msgstr "" ! #: templates/default/options.tpl:499 templates/default/options.tpl:758 #, php-format msgid "FOLDER_TEXT" msgstr "" ! #: templates/default/options.tpl:503 templates/default/options.tpl:762 #, php-format msgid "EMAIL_TEXT" msgstr "" ! #: templates/default/options.tpl:633 msgid "Existing Filters:" msgstr "" ! #: templates/default/options.tpl:635 msgid "Filers are evaluated in the order shown below." msgstr "" ! #: templates/default/options.tpl:743 templates/default/options.tpl:750 ! #: templates/default/options.tpl:753 templates/default/options.tpl:758 ! #: templates/default/options.tpl:762 #, php-format msgid "PREDEFINED_RULE" msgstr "" ! #: templates/default/options.tpl:743 #, php-format msgid "ADDITIONAL_CRITERIA" msgstr "" ! #: templates/default/options.tpl:767 templates/default/options.tpl:848 msgid "Save" msgstr "" ! #: templates/default/options.tpl:769 templates/default/options.tpl:850 msgid "Are you sure you want to delete this filter?" msgstr "" ! #: templates/default/options.tpl:781 templates/default/options.tpl:797 ! #: templates/default/options.tpl:862 templates/default/options.tpl:878 msgid "Move Down" msgstr "" ! #: templates/default/options.tpl:781 templates/default/options.tpl:797 ! #: templates/default/options.tpl:862 templates/default/options.tpl:878 msgid "Move To Bottom" msgstr "" ! #: templates/default/options.tpl:787 templates/default/options.tpl:795 ! #: templates/default/options.tpl:868 templates/default/options.tpl:876 msgid "Move To Top" msgstr "" ! #: templates/default/options.tpl:787 templates/default/options.tpl:795 ! #: templates/default/options.tpl:868 templates/default/options.tpl:876 msgid "Move Up" msgstr "" ! #: templates/default/options.tpl:888 #, php-format msgid "%sNotice:%s Use of these filters may prevent the reading of mail in non-IMAP (e.g., POP) mail clients." |
|
From: Paul L. <pdo...@us...> - 2011-05-07 07:45:57
|
Update of /cvsroot/serverfilters/server_side_filters
In directory vz-cvs-3.sog:/tmp/cvs-serv11916
Modified Files:
config_example.php functions.php options.php setup.php
Log Message:
Add custom action capability
Index: setup.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.php 10 Jan 2011 21:40:12 -0000 1.2
--- setup.php 7 May 2011 07:45:55 -0000 1.3
***************
*** 79,82 ****
--- 79,93 ----
$ignore = _("%sFolder");
$ignore = _("%sEmail");
+ $ignore = _("Flag");
+ $ignore = _("Flag for follow-up");
+ $ignore = _("Important");
+ $ignore = _("Mark as important");
+ $ignore = _("Work");
+ $ignore = _("Private");
+ $ignore = _("Mark as private");
+ $ignore = _("TODO");
+ $ignore = _("ToDo");
+ $ignore = _("Later");
+ $ignore = _("Follow-up");
}
Index: functions.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions.php 10 Jan 2011 21:40:12 -0000 1.2
--- functions.php 7 May 2011 07:45:55 -0000 1.3
***************
*** 55,59 ****
$imapConnection, $key, $unsupported_matching_methods,
$unsupported_matching_locations, $unsupported_actions,
! $additional_headers;
server_side_filters_init();
$close_imap_connection = FALSE;
--- 55,59 ----
$imapConnection, $key, $unsupported_matching_methods,
$unsupported_matching_locations, $unsupported_actions,
! $additional_headers, $custom_actions;
server_side_filters_init();
$close_imap_connection = FALSE;
***************
*** 93,96 ****
--- 93,98 ----
'COPY' => _("Copy"),
'DELETE' => _("Delete"));
+ foreach ($custom_actions as $action => $action_details)
+ $ssf_filter_actions[$action] = _($action_details['SHORT_DESCRIPTION']);
foreach ($unsupported_actions as $action)
unset($ssf_filter_actions[$action]);
***************
*** 336,340 ****
// make sure plugin is correctly configured
//
! global $server_side_filters_configtest, $predefined_filter_rules;
$server_side_filters_configtest = TRUE;
if (!server_side_filters_init())
--- 338,343 ----
// make sure plugin is correctly configured
//
! global $server_side_filters_configtest, $predefined_filter_rules,
! $custom_actions;
$server_side_filters_configtest = TRUE;
if (!server_side_filters_init())
***************
*** 372,375 ****
--- 375,401 ----
+ if (!empty($custom_actions))
+ {
+ if (!is_array($custom_actions))
+ {
+ do_err('Server Side Filters plugin\'s $custom_actions is not configured correctly', FALSE);
+ return TRUE;
+ }
+ foreach ($custom_actions as $action => $action_details)
+ {
+ if (empty($action_details['SHORT_DESCRIPTION']))
+ {
+ do_err('Server Side Filters plugin\'s $custom_actions is not configured correctly - the "' . $action . '" action is missing its SHORT_DESCRIPTION', FALSE);
+ return TRUE;
+ }
+ if (empty($action_details['FILTER_ACTION']))
+ {
+ do_err('Server Side Filters plugin\'s $custom_actions is not configured correctly - the "' . $action . '" action is missing its FILTER_ACTION', FALSE);
+ return TRUE;
+ }
+ }
+ }
+
+
return FALSE;
***************
*** 437,443 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
! * indicating how to handle a
! * filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
--- 463,471 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the main
! * configuration file, indicating
! * how to handle a filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
***************
*** 673,679 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
! * indicating how to handle a
! * filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
--- 701,709 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the main
! * configuration file, indicating
! * how to handle a filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
***************
*** 846,852 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
! * indicating how to handle a
! * filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
--- 876,884 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the main
! * configuration file, indicating
! * how to handle a filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
***************
*** 1042,1048 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
! * indicating how to handle a
! * filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
--- 1074,1082 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the main
! * configuration file, indicating
! * how to handle a filtered message
* COPY_TO_FOLDER -- "OFF" or "ON", indicating if a
* message should be copied to
***************
*** 1238,1242 ****
global $ssf_header_fields, $ssf_matching_methods, $ssf_filter_actions,
! $ssf_folder_list, $predefined_filter_rules;
define_server_side_filter_constants($configtest);
$errors = array();
--- 1272,1277 ----
global $ssf_header_fields, $ssf_matching_methods, $ssf_filter_actions,
! $ssf_folder_list, $predefined_filter_rules, $custom_actions;
! server_side_filters_init();
define_server_side_filter_constants($configtest);
$errors = array();
***************
*** 1553,1560 ****
}
! // if the action isn't to delete, then we must
! // either put it in a folder or send it elsewhere
//
! if (isset($rule['ACTION']) && $rule['ACTION'] != 'DELETE'
&& isset($rule['SEND_TO_ADDRESS']) && $rule['SEND_TO_ADDRESS'] == 'OFF'
&& isset($rule['COPY_TO_FOLDER']) && $rule['COPY_TO_FOLDER'] == 'OFF')
--- 1588,1601 ----
}
! // if the action isn't to delete (and isn't some custom
! // action that forbids additional message movement), then
! // we must either put it in a folder or send it elsewhere
//
! $transport_actions = array('MOVE', 'COPY');
! foreach ($custom_actions as $action => $action_details)
! if (!empty($action_details['SECONDARY_TRANSPORT'])
! && $action_details['SECONDARY_TRANSPORT'] == 'REQUIRED')
! $transport_actions[] = $action;
! if (isset($rule['ACTION']) && in_array($rule['ACTION'], $transport_actions)
&& isset($rule['SEND_TO_ADDRESS']) && $rule['SEND_TO_ADDRESS'] == 'OFF'
&& isset($rule['COPY_TO_FOLDER']) && $rule['COPY_TO_FOLDER'] == 'OFF')
Index: options.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/options.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.php 10 Jan 2011 21:40:12 -0000 1.2
--- options.php 7 May 2011 07:45:55 -0000 1.3
***************
*** 72,76 ****
$rule_number, $messages, $errors, $general_errors, $ssf_debug,
$min_create_only, $org_title, $min_create_only_close_self,
! $min_create_only_onload, $min_create_only_finished;
$errors = array();
--- 72,76 ----
$rule_number, $messages, $errors, $general_errors, $ssf_debug,
$min_create_only, $org_title, $min_create_only_close_self,
! $min_create_only_onload, $min_create_only_finished, $custom_actions;
$errors = array();
***************
*** 369,386 ****
! // we could produce an error in the case that DELETE was
! // chosen but a folder or email was selected, but instead
! // let's just auto-correct it and let the user know
//
$tentative_messages = array();
! if ($filter_action == 'DELETE')
{
$original_text_domain = sq_change_text_domain('server_side_filters');
if ($copy_to_folder == 'ON' && $send_to_address == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the folder and email options have been disabled");
else if ($copy_to_folder == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the folder option has been disabled");
else if ($send_to_address == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the email option has been disabled");
sq_change_text_domain($original_text_domain);
--- 369,396 ----
! // we could produce an error in the case that DELETE or some other
! // non-transport-related custom action was chosen but a folder or
! // email was selected, but instead let's just auto-correct it and
! // let the user know
//
$tentative_messages = array();
! $no_transport_actions = array('DELETE');
! foreach ($custom_actions as $action => $action_details)
! if (!empty($action_details['SECONDARY_TRANSPORT'])
! && $action_details['SECONDARY_TRANSPORT'] == 'FORBIDDEN')
! $no_transport_actions[] = $action;
! if (in_array($filter_action, $no_transport_actions))
{
$original_text_domain = sq_change_text_domain('server_side_filters');
+ if ($filter_action == 'DELETE')
+ $filter_text = _("deletion");
+ else
+ $filter_text = '"' . _($custom_actions[$filter_action]['SHORT_DESCRIPTION']) . '"';
if ($copy_to_folder == 'ON' && $send_to_address == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the folder and email options have been disabled"), $filter_text);
else if ($copy_to_folder == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the folder option has been disabled"), $filter_text);
else if ($send_to_address == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the email option has been disabled"), $filter_text);
sq_change_text_domain($original_text_domain);
***************
*** 693,710 ****
! // we could produce an error in the case that DELETE was
! // chosen but a folder or email was selected, but instead
! // let's just auto-correct it and let the user know
//
$tentative_messages = array();
! if ($filter_action == 'DELETE')
{
$original_text_domain = sq_change_text_domain('server_side_filters');
if ($copy_to_folder == 'ON' && $send_to_address == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the folder and email options have been disabled");
else if ($copy_to_folder == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the folder option has been disabled");
else if ($send_to_address == 'ON')
! $tentative_messages[] = _("Note: because filtered messages are to be deleted, the email option has been disabled");
sq_change_text_domain($original_text_domain);
--- 703,730 ----
! // we could produce an error in the case that DELETE or some other
! // non-transport-related custom action was chosen but a folder or
! // email was selected, but instead let's just auto-correct it and
! // let the user know
//
$tentative_messages = array();
! $no_transport_actions = array('DELETE');
! foreach ($custom_actions as $action => $action_details)
! if (!empty($action_details['SECONDARY_TRANSPORT'])
! && $action_details['SECONDARY_TRANSPORT'] == 'FORBIDDEN')
! $no_transport_actions[] = $action;
! if (in_array($filter_action, $no_transport_actions))
{
$original_text_domain = sq_change_text_domain('server_side_filters');
+ if ($filter_action == 'DELETE')
+ $filter_text = _("deletion");
+ else
+ $filter_text = '"' . _($custom_actions[$filter_action]['SHORT_DESCRIPTION']) . '"';
if ($copy_to_folder == 'ON' && $send_to_address == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the folder and email options have been disabled"), $filter_text);
else if ($copy_to_folder == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the folder option has been disabled"), $filter_text);
else if ($send_to_address == 'ON')
! $tentative_messages[] = sprintf(_("Note: because filtered messages will only be subject to %s, the email option has been disabled"), $filter_text);
sq_change_text_domain($original_text_domain);
Index: config_example.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** config_example.php 15 Jan 2011 20:02:14 -0000 1.5
--- config_example.php 7 May 2011 07:45:55 -0000 1.6
***************
*** 25,29 ****
$filtering_kickoff_file, $ssf_debug, $new_folder_select_location,
$unsupported_matching_methods, $unsupported_matching_locations,
! $unsupported_actions, $additional_headers;
--- 25,29 ----
$filtering_kickoff_file, $ssf_debug, $new_folder_select_location,
$unsupported_matching_methods, $unsupported_matching_locations,
! $unsupported_actions, $additional_headers, $custom_actions;
***************
*** 350,354 ****
// ACTION -- What to do with matching messages - this value
// MUST be one of the following: "MOVE", "COPY",
! // or "DELETE"
// COPY_TO_FOLDER -- Whether or not to move or copy matching messages
// to a folder - this value MUST be either "ON" or
--- 350,355 ----
// ACTION -- What to do with matching messages - this value
// MUST be one of the following: "MOVE", "COPY",
! // "DELETE" or any custom action that is defined
! // in $custom_actions in the main configuration file
// COPY_TO_FOLDER -- Whether or not to move or copy matching messages
// to a folder - this value MUST be either "ON" or
***************
*** 624,627 ****
--- 625,713 ----
+ // On the other hand, some filtering systems might support custom
+ // features not included in this plugin by default. You can add
+ // your own filter actions using these settings. Note that the
+ // action will need to be supported by the plugin that builds your
+ // filter rules (such as Server Side Filters Maildrop, Server Side
+ // Filters Sieve or Server Side Filters Procmail, the last of which
+ // does not currently support this feature).
+ //
+ // $custom_actions should be a list of custom actions where keys
+ // are internal action names (never shown to users) and values
+ // are a nested list of items, which must include the following
+ // attributes (but can include more attributes if the filter rules
+ // plugin being used requires such):
+ //
+ // SHORT_DESCRIPTION -- A brief textual description of each
+ // action that will be shown to users
+ // in the action selection list.
+ // FILTER_ACTION -- Text that is for use by the filter
+ // rules plugin when building the action
+ // filter syntax
+ // SECONDARY_TRANSPORT -- Indicates how a secondary action of
+ // either moving the message to a folder
+ // and/or forwarding via email is handled:
+ // "FORBIDDEN" = Additional (transport)
+ // action(s) are forbidden
+ // "REQUIRED" = Additional (transport)
+ // action(s) are required
+ // "OPTIONAL" = Additional (transport)
+ // action(s) are optional
+ // If not given, "OPTIONAL" is assumed.
+ // SECONDARY_TRANSPORT_COPY -- Indicates, when secondary (transport)
+ // actions are allowed, if those should
+ // be executed as MOVE or COPY actions.
+ // This should be set to 1 if they should
+ // be COPY actions. Otherwise (including
+ // if this item is left out), such actions
+ // will be executed as MOVE actions.
+ //
+ // Note that if possible, the SHORT_DESCRIPTION text will be translated.
+ // Currenlty, these values are known to this plugin and will be
+ // translated (if you have other suggestions, please contact the plugin
+ // authors):
+ //
+ // Flag
+ // Flag for follow-up
+ // Important
+ // Mark as important
+ // Work
+ // Private
+ // Mark as private
+ // TODO
+ // ToDo
+ // Later
+ // Follow-up
+ //
+ // Here is an example of how to offer your users the ability to add
+ // the "Important" IMAP KEYWORD (compatible with Thunderbird) when
+ // using the Maildrop filtering backend:
+ //
+ // $custom_actions = array(
+ // 'IMPORTANT' => array(
+ // 'SHORT_DESCRIPTION' => 'Important',
+ // 'FILTER_ACTION' => "if (\"\$KEYWORDS\" ne \"\")\n {\n KEYWORDS=\$KEYWORDS','\n }\n KEYWORDS=$KEYWORDS'\$label1'",
+ // 'SECONDARY_TRANSPORT' => 'OPTIONAL',
+ // ),
+ // );
+ //
+ // Here is an example of how to offer your users the ability to flag
+ // incoming messages when using the Sieve filtering backend:
+ //
+ // $custom_actions = array(
+ // 'FLAG' => array(
+ // 'SHORT_DESCRIPTION' => 'Flag',
+ // 'FILTER_ACTION' => 'addflag "\\\\Flagged";',
+ // 'SECONDARY_TRANSPORT' => 'OPTIONAL',
+ // ),
+ // );
+ //
+ // Change "\\\\Flagged" to "$label1" to make the Sieve example
+ // do the same thing the Maildrop example does.
+ //
+ $custom_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-05-07 06:56:07
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop/docs
In directory vz-cvs-3.sog:/tmp/cvs-serv30600/docs
Modified Files:
README
Log Message:
Index: README
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/docs/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** README 7 May 2011 06:52:27 -0000 1.3
--- README 7 May 2011 06:56:05 -0000 1.4
***************
*** 97,102 ****
v1.1 2011/01/11 Paul Lesniewski <pa...@sq...>
* Added more negative test types (matching methods)
! * Added ability to handle custom commands (which are defined
! in the Server Side Filters main configuration file)
v1.0 2010/09/11 Paul Lesniewski <pa...@sq...>
--- 97,103 ----
v1.1 2011/01/11 Paul Lesniewski <pa...@sq...>
* Added more negative test types (matching methods)
! * Added ability to handle custom filter actions (which
! are defined in the Server Side Filters main configuration
! file)
v1.0 2010/09/11 Paul Lesniewski <pa...@sq...>
|
|
From: Paul L. <pdo...@us...> - 2011-05-07 06:52:29
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop/docs
In directory vz-cvs-3.sog:/tmp/cvs-serv30009/docs
Modified Files:
README
Log Message:
Add custom action capability
Index: README
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/docs/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README 11 Jan 2011 02:00:50 -0000 1.2
--- README 7 May 2011 06:52:27 -0000 1.3
***************
*** 97,100 ****
--- 97,102 ----
v1.1 2011/01/11 Paul Lesniewski <pa...@sq...>
* Added more negative test types (matching methods)
+ * Added ability to handle custom commands (which are defined
+ in the Server Side Filters main configuration file)
v1.0 2010/09/11 Paul Lesniewski <pa...@sq...>
|
|
From: Paul L. <pdo...@us...> - 2011-05-07 06:49:46
|
Update of /cvsroot/serverfilters/server_side_filters_sieve
In directory vz-cvs-3.sog:/tmp/cvs-serv28480
Modified Files:
functions.php
Log Message:
Add custom action capability
Index: functions.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters_sieve/functions.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** functions.php 11 Jan 2011 02:32:58 -0000 1.1.1.1
--- functions.php 7 May 2011 06:49:44 -0000 1.2
***************
*** 83,87 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
* indicating how to handle a
* filtered message
--- 83,90 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the Server
! * Side Filters main configuration,
* indicating how to handle a
* filtered message
***************
*** 203,207 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
* indicating how to handle a
* filtered message
--- 206,213 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the Server
! * Side Filters main configuration,
* indicating how to handle a
* filtered message
***************
*** 298,305 ****
global $stop_after_move_or_delete,
! $default_sieve_action;
server_side_filters_sieve_init();
$raw_filter_rules = '';
--- 304,315 ----
global $stop_after_move_or_delete,
! $default_sieve_action, $custom_actions;
+ // retrieve configuration settings for this plugin
+ // AND for parent plugin (custom actions)
+ //
server_side_filters_sieve_init();
+ server_side_filters_init();
$raw_filter_rules = '';
***************
*** 344,348 ****
// build this filter's action
//
! if ($rule['ACTION'] == 'DELETE')
{
$action = 'discard;';
--- 354,410 ----
// build this filter's action
//
! $custom_action_move_is_possible = FALSE;
! $custom_action_moved = FALSE;
! if (!empty($custom_actions[$rule['ACTION']])
! && is_array($custom_actions[$rule['ACTION']]))
! {
! $action = $custom_actions[$rule['ACTION']]['FILTER_ACTION'];
!
! // make sure imap4flags extension is required if using
! // flag actions (this is a little loose, but should suffice)
! //
! if (strpos($action, 'addflag') !== FALSE
! || strpos($action, 'removeflag') !== FALSE
! || strpos($action, 'setflag') !== FALSE
! || strpos($action, 'hasflag') !== FALSE)
! $required_extensions['imap4flags'] = TRUE;
!
! if (!empty($custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT'])
! && $custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT'] == 'FORBIDDEN')
! {
! $parsed_filter_rules[$index]['COPY_TO_FOLDER'] = 'OFF';
! $parsed_filter_rules[$index]['SEND_TO_ADDRESS'] = 'OFF';
! }
! else
! {
! if (!empty($custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT_COPY']))
! {
! $copy = ':copy ';
! $required_extensions['copy'] = TRUE;
! }
! else
! {
! $copy = '';
! $custom_action_move_is_possible = TRUE;
! }
!
! if ($rule['COPY_TO_FOLDER'] == 'ON' && $rule['SEND_TO_ADDRESS'] == 'ON')
! {
! $action .= "\n fileinto $copy\"" . $rule['TARGET_FOLDER']
! . "\";\n redirect $copy\"" . $rule['EMAIL_ADDRESS'] . '";';
! $required_extensions['fileinto'] = TRUE;
! if ($custom_action_move_is_possible) $custom_action_moved = TRUE;
! }
! else if ($rule['COPY_TO_FOLDER'] == 'ON')
! {
! $action .= "\n fileinto $copy\"" . $rule['TARGET_FOLDER'] . '";';
! $required_extensions['fileinto'] = TRUE;
! if ($custom_action_move_is_possible) $custom_action_moved = TRUE;
! }
! else if ($rule['SEND_TO_ADDRESS'] == 'ON')
! $action .= "\n redirect $copy\"" . $rule['EMAIL_ADDRESS'] . '";';
! }
! }
! else if ($rule['ACTION'] == 'DELETE')
{
$action = 'discard;';
***************
*** 370,374 ****
//
if ($stop_after_move_or_delete
! && ($rule['ACTION'] == 'MOVE' || $rule['ACTION'] == 'DELETE'))
$action .= "\n stop;";
--- 432,436 ----
//
if ($stop_after_move_or_delete
! && ($rule['ACTION'] == 'MOVE' || $rule['ACTION'] == 'DELETE' || $custom_action_moved))
$action .= "\n stop;";
|
|
From: Paul L. <pdo...@us...> - 2011-05-07 06:49:19
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop
In directory vz-cvs-3.sog:/tmp/cvs-serv28410
Modified Files:
functions.php
Log Message:
Add custom action capability
Index: functions.php
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions.php 11 Jan 2011 02:00:50 -0000 1.2
--- functions.php 7 May 2011 06:49:16 -0000 1.3
***************
*** 83,87 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
* indicating how to handle a
* filtered message
--- 83,90 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the Server
! * Side Filters main configuration,
* indicating how to handle a
* filtered message
***************
*** 190,194 ****
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", or "DELETE",
* indicating how to handle a
* filtered message
--- 193,200 ----
* folder for moving or copying
* filtered message
! * ACTION -- "MOVE", "COPY", "DELETE" or any
! * custom action that is defined in
! * $custom_actions in the Server
! * Side Filters main configuration,
* indicating how to handle a
* filtered message
***************
*** 287,295 ****
$use_maildirs, $custom_mail_location,
$use_maildrop_1x, $default_maildrop_action,
! $spam_filter_command,
$spam_filter_maximum_message_size_in_kilobytes;
server_side_filters_maildrop_init();
--- 293,305 ----
$use_maildirs, $custom_mail_location,
$use_maildrop_1x, $default_maildrop_action,
! $spam_filter_command, $custom_actions,
$spam_filter_maximum_message_size_in_kilobytes;
+ // retrieve configuration settings for this plugin
+ // AND for parent plugin (custom actions)
+ //
server_side_filters_maildrop_init();
+ server_side_filters_init();
***************
*** 434,438 ****
// build this filter's action
//
! if ($rule['ACTION'] == 'DELETE')
{
$action = 'to /dev/null';
--- 444,474 ----
// build this filter's action
//
! if (!empty($custom_actions[$rule['ACTION']])
! && is_array($custom_actions[$rule['ACTION']]))
! {
! $action = $custom_actions[$rule['ACTION']]['FILTER_ACTION'];
! if (!empty($custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT'])
! && $custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT'] == 'FORBIDDEN')
! {
! $parsed_filter_rules[$index]['COPY_TO_FOLDER'] = 'OFF';
! $parsed_filter_rules[$index]['SEND_TO_ADDRESS'] = 'OFF';
! }
! else
! {
! if (!empty($custom_actions[$rule['ACTION']]['SECONDARY_TRANSPORT_COPY']))
! $deliver_action = 'cc';
! else
! $deliver_action = 'to';
!
! if ($rule['COPY_TO_FOLDER'] == 'ON' && $rule['SEND_TO_ADDRESS'] == 'ON')
! $action .= "\n" . ' cc "' . $rule['TARGET_FOLDER']
! . "\"\n $deliver_action \"!" . $rule['EMAIL_ADDRESS'] . '"';
! else if ($rule['COPY_TO_FOLDER'] == 'ON')
! $action .= "\n $deliver_action \"" . $rule['TARGET_FOLDER'] . '"';
! else if ($rule['SEND_TO_ADDRESS'] == 'ON')
! $action .= "\n $deliver_action \"!" . $rule['EMAIL_ADDRESS'] . '"';
! }
! }
! else if ($rule['ACTION'] == 'DELETE')
{
$action = 'to /dev/null';
|
|
From: Paul L. <pdo...@us...> - 2011-04-30 04:03:23
|
Update of /cvsroot/serverfilters/server_side_filters/templates/default
In directory vz-cvs-3.sog:/tmp/cvs-serv11534
Modified Files:
options.tpl
Log Message:
Don't let the up/down buttons wrap
Index: options.tpl
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/templates/default/options.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** options.tpl 29 Apr 2011 14:10:58 -0000 1.3
--- options.tpl 30 Apr 2011 04:03:20 -0000 1.4
***************
*** 778,782 ****
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
--- 778,782 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center" style="white-space: nowrap;">' : '<td style="white-space: nowrap;"><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td style="white-space: nowrap;">')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
***************
*** 784,790 ****
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
--- 784,790 ----
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center" style="white-space: nowrap;">' : '<td style="white-space: nowrap;">')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td style="white-space: nowrap;"><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
***************
*** 792,798 ****
else
{
! echo '<td>'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
! . '</td><td>'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 792,798 ----
else
{
! echo '<td style="white-space: nowrap;">'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
! . '</td><td style="white-space: nowrap;">'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
***************
*** 859,863 ****
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
--- 859,863 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center" style="white-space: nowrap;">' : '<td style="white-space: nowrap;"><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td style="white-space: nowrap;">')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
***************
*** 865,871 ****
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
--- 865,871 ----
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center" style="white-space: nowrap;">' : '<td style="white-space: nowrap;">')
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td style="white-space: nowrap;"><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
***************
*** 873,879 ****
else
{
! echo '<td>'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
! . '</td><td>'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 873,879 ----
else
{
! echo '<td style="white-space: nowrap;">'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
! . '</td><td style="white-space: nowrap;">'
. '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
|
|
From: Paul L. <pdo...@us...> - 2011-04-29 14:11:00
|
Update of /cvsroot/serverfilters/server_side_filters/templates/default
In directory vz-cvs-3.sog:/tmp/cvs-serv3810/templates/default
Modified Files:
options.tpl
Log Message:
Fix poorly formed HTML (form tags in middle of table rows - argh)
Index: options.tpl
===================================================================
RCS file: /cvsroot/serverfilters/server_side_filters/templates/default/options.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** options.tpl 10 Jan 2011 21:40:12 -0000 1.2
--- options.tpl 29 Apr 2011 14:10:58 -0000 1.3
***************
*** 190,196 ****
--- 190,200 ----
$rule_count = sizeof($filter_rules);
$show_move_controls = $rule_count > 3; // account for 'PRECEDING_TEXT' and 'SUCCEEDING_TEXT'
+ $show_all_move_controls = $rule_count > 4; // account for 'PRECEDING_TEXT' and 'SUCCEEDING_TEXT'
$suggested_rule_count = 0;
+ $base_uri = sqm_baseuri();
+
+
$token = sm_generate_security_token();
***************
*** 314,318 ****
{
?>
! <form method="post" action="<?php echo $form_action . '"'; if ($javascript_on) echo ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"'; ?>>
<?php
--- 318,325 ----
{
?>
! <tr>
! <td style="padding:0px" colspan="6">
! <form method="post" action="<?php echo $form_action . '"'; if ($javascript_on) echo ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"'; ?> style="display:inline; margin:0px">
! <table border="0" rules="rows" noshade="0" bordercolor="<?php echo $color[0]; ?>" cellpadding="5" cellspacing="0">
<?php
***************
*** 332,336 ****
?>
<tr>
! <td align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
--- 339,343 ----
?>
<tr>
! <td width="100%" align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
***************
*** 341,345 ****
<input type="hidden" name="min_create_only_success_call" value="<?php echo $min_create_only_success_call; ?>" />
<input type="hidden" name="min_create_only_close_self" value="<?php echo $min_create_only_close_self; ?>" />
! <input type="image" src="images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
--- 348,352 ----
<input type="hidden" name="min_create_only_success_call" value="<?php echo $min_create_only_success_call; ?>" />
<input type="hidden" name="min_create_only_close_self" value="<?php echo $min_create_only_close_self; ?>" />
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
***************
*** 384,390 ****
</td>
<td align="center">
! <input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </form>
<?php
--- 391,400 ----
</td>
<td align="center">
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </table>
! </form>
! </td>
! </tr>
<?php
***************
*** 466,472 ****
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>'
! . '<tr><td align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
--- 476,484 ----
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">'
! . '<table border="0" rules="rows" noshade="0" bordercolor="' . $color[0] . '" cellpadding="5" cellspacing="0">'
! . '<tr><td width="100%" align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
***************
*** 494,500 ****
. '</td></tr></table>'
. '</td><td colspan="4" align="center">'
! . '<input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule_' . $rule_name . '" alt="'
. _("Save New Filter")
! . '" /></td></tr></form>';
}
} // END if (empty($message_headers))
--- 506,513 ----
. '</td></tr></table>'
. '</td><td colspan="4" align="center">'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule_' . $rule_name . '" alt="'
. _("Save New Filter")
! . '" /></td></tr></table>'
! . '</form></td></tr>';
}
} // END if (empty($message_headers))
***************
*** 533,541 ****
}
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>';
?>
<tr>
! <td align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
--- 546,556 ----
}
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">';
?>
+ <table border="0" rules="rows" noshade="0" bordercolor="<?php echo $color[0]; ?>" cellpadding="5" cellspacing="0">
<tr>
! <td width="100%" align="right" valign="top">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
***************
*** 550,554 ****
<input type="hidden" name="passed_id" value="<?php echo $passed_id; ?>" />
<input type="hidden" name="passed_ent_id" value="<?php echo $passed_ent_id; ?>" />
! <input type="image" src="images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
--- 565,569 ----
<input type="hidden" name="passed_id" value="<?php echo $passed_id; ?>" />
<input type="hidden" name="passed_ent_id" value="<?php echo $passed_ent_id; ?>" />
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/add.png" border="0" name="add" alt="<?php echo _("Add More Criteria"); ?>" />
<?php
echo sprintf(_("If %s %s %s"),
***************
*** 598,604 ****
</td>
<td align="center">
! <input type="image" src="images/save_new.png" border="0" name="create" id="create_new_rule_<?php echo $index; ?>" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </form>
<?php
}
--- 613,622 ----
</td>
<td align="center">
! <input type="image" src="<?php echo $base_uri; ?>plugins/server_side_filters/images/save_new.png" border="0" name="create" id="create_new_rule_<?php echo $index; ?>" alt="<?php echo _("Save New Filter"); ?>" /></td>
</tr>
! </table>
! </form>
! </td>
! </tr>
<?php
}
***************
*** 645,651 ****
! echo '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . '>'
! . '<tr><td align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
--- 663,671 ----
! echo '<tr><td style="padding:0px" colspan="6">'
! . '<form method="post" action="' . $form_action . '"'
! . ($javascript_on ? ' onSubmit="return check_for_new_folder(this.elements[\'target_folder\'], this.elements[\'new_folder_name\'])"' : '') . ' style="display:inline; margin:0px">'
! . '<table border="0" rules="rows" noshade="0" bordercolor="' . $color[0] . '" cellpadding="5" cellspacing="0">'
! . '<tr><td width="100%" align="right" valign="top">'
. '<table border="0" cellspacing="0" cellpadding="0">'
. '<tr><td style="white-space: nowrap;">'
***************
*** 745,751 ****
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 765,771 ----
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
***************
*** 758,780 ****
//
else if ($index == 0)
! echo '<td colspan="2" align="center"><input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo '<td colspan="2" align="center"><input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// show both arrows
//
else
! {
echo '<td>'
! . '<input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></form>';
}
--- 778,803 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
//
else
! {
echo '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></table></form></td></tr>';
}
***************
*** 787,791 ****
// languages, but the whole hard-coded table thing ruins that anyway...
//
! echo '<input type="image" src="images/add.png" border="0" name="add" alt="' . _("Add More Criteria") . '" /> ' . sprintf(_("If %s %s %s"),
create_header_field_dropdown_list($ssf_header_fields, ($rule_number == $index && !is_null($repopulate_header_field) ? $repopulate_header_field : $rule['HEADER_FIELD'])),
create_matching_method_dropdown_list($ssf_matching_methods, ($rule_number == $index && !is_null($repopulate_matching_method) ? $repopulate_matching_method : $rule['MATCHING_METHOD'])),
--- 810,814 ----
// languages, but the whole hard-coded table thing ruins that anyway...
//
! echo '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/add.png" border="0" name="add" alt="' . _("Add More Criteria") . '" /> ' . sprintf(_("If %s %s %s"),
create_header_field_dropdown_list($ssf_header_fields, ($rule_number == $index && !is_null($repopulate_header_field) ? $repopulate_header_field : $rule['HEADER_FIELD'])),
create_matching_method_dropdown_list($ssf_matching_methods, ($rule_number == $index && !is_null($repopulate_matching_method) ? $repopulate_matching_method : $rule['MATCHING_METHOD'])),
***************
*** 823,829 ****
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
--- 846,852 ----
. '</td></tr></table></td>'
. '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/save.png" border="0" name="modify" id="save_rule_' . $index . '" alt="' . _("Save") . '" />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/delete.png" border="0" name="delete" alt="' . _("Delete") . '"' . ($javascript_on ? ' onClick="if (!confirm(\'' . _("Are you sure you want to delete this filter?") . '\')) return false; else no_new_folder = true;"' : '') . ' />'
. '</td>';
***************
*** 836,845 ****
//
else if ($index == 0)
! echo '<td colspan="2" align="center"><input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo '<td colspan="2" align="center"><input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// show both arrows
--- 859,871 ----
//
else if ($index == 0)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td><td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>';
// last rule doesn't get down arrow
//
else if ($index == $rule_count - 3)
! echo (!$show_all_move_controls ? '<td colspan="2" align="center">' : '<td>')
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /></td>'
! . (!$show_all_move_controls ? '' : '<td><img src="' . $base_uri . 'images/blank.png" width="16px"> <img src="' . $base_uri . 'images/blank.png" width="16px"></td>');
// show both arrows
***************
*** 848,858 ****
{
echo '<td>'
! . '<input type="image" src="images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></form>';
}
}
--- 874,884 ----
{
echo '<td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up_top.png" border="0" name="up_top" alt="' . _("Move To Top") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/up.png" border="0" name="up" alt="' . _("Move Up") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td><td>'
! . '<input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down.png" border="0" name="down" alt="' . _("Move Down") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' /> <input type="image" src="' . $base_uri . 'plugins/server_side_filters/images/down_bottom.png" border="0" name="down_bottom" alt="' . _("Move To Bottom") . '"' . ($javascript_on ? ' onClick="no_new_folder = true;"' : '') . ' />'
. '</td>';
}
! echo '</tr></table></form></td></tr>';
}
}
|
|
From: Paul L. <pdo...@us...> - 2011-01-15 20:02:23
|
Update of /cvsroot/serverfilters/server_side_filters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32402 Modified Files: config_example.php Log Message: Index: config_example.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters/config_example.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config_example.php 11 Jan 2011 01:36:42 -0000 1.4 --- config_example.php 15 Jan 2011 20:02:14 -0000 1.5 *************** *** 149,162 **** // // $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( --- 149,162 ---- // // $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( |
|
From: Paul L. <pdo...@us...> - 2011-01-15 19:01:58
|
Update of /cvsroot/serverfilters/server_side_filters_sieve/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18170/docs Modified Files: README Log Message: Index: README =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_sieve/docs/README,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** README 11 Jan 2011 02:32:59 -0000 1.1.1.1 --- README 15 Jan 2011 19:01:49 -0000 1.2 *************** *** 43,47 **** * SquirrelMail version 1.4.0 or above ! * Server Side Filters plugin version 3.0 or above --- 43,47 ---- * SquirrelMail version 1.4.0 or above ! * Server Side Filters plugin version 4.0 or above |
|
From: Paul L. <pdo...@us...> - 2011-01-11 02:41:19
|
Update of /cvsroot/serverfilters/server_side_filters_sieve In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9041 Removed Files: config.php Log Message: --- config.php DELETED --- |
|
From: Paul L. <pdo...@us...> - 2011-01-11 02:40:26
|
Update of /cvsroot/serverfilters/server_side_filters_sieve In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8809 Removed Files: server_side_filters_sieve-1.0-1.4.0.tar.gz Log Message: --- server_side_filters_sieve-1.0-1.4.0.tar.gz DELETED --- |
|
From: Paul L. <pdo...@us...> - 2011-01-11 02:03:25
|
Update of /cvsroot/serverfilters/server_side_filters_procmail In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30087 Modified Files: setup.php version Log Message: Update version number Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/setup.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setup.php 11 Jan 2011 02:00:29 -0000 1.2 --- setup.php 11 Jan 2011 02:03:16 -0000 1.3 *************** *** 49,53 **** ), ), ! 'version' => '1.0', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, --- 49,53 ---- ), ), ! 'version' => '1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, Index: version =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_procmail/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:54:30 -0000 1.1.1.1 --- version 11 Jan 2011 02:03:16 -0000 1.2 *************** *** 1,2 **** Server Side Filters Procmail ! 1.0 --- 1,2 ---- Server Side Filters Procmail ! 1.1 |
|
From: Paul L. <pdo...@us...> - 2011-01-11 02:02:30
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29786 Modified Files: setup.php version Log Message: Update version number Index: setup.php =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/setup.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** setup.php 11 Jan 2011 02:00:50 -0000 1.2 --- setup.php 11 Jan 2011 02:02:22 -0000 1.3 *************** *** 61,65 **** ), ), ! 'version' => '1.0', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, --- 61,65 ---- ), ), ! 'version' => '1.1', 'required_sm_version' => '1.4.0', 'requires_configuration' => 0, Index: version =================================================================== RCS file: /cvsroot/serverfilters/server_side_filters_maildrop/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:55:14 -0000 1.1.1.1 --- version 11 Jan 2011 02:02:22 -0000 1.2 *************** *** 1,2 **** Server Side Filters Maildrop ! 1.0 --- 1,2 ---- Server Side Filters Maildrop ! 1.1 |
Update of /cvsroot/serverfilters/server_side_filters_maildrop In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29419 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_maildrop/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:55:14 -0000 1.1.1.1 --- make_release.sh 11 Jan 2011 02:00:50 -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_maildrop/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:55:14 -0000 1.1.1.1 --- functions.php 11 Jan 2011 02:00:50 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop 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 Maildrop 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_maildrop_init() { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters_maildrop.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_maildrop/config.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_maildrop/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_maildrop_init($debug=FALSE) { ! if ($debug) ! { ! if (!include_once(SM_PATH . 'config/config_server_side_filters_maildrop.php')) ! if (!include_once(SM_PATH . 'plugins/server_side_filters_maildrop/config.php')) ! if (!include_once(SM_PATH . 'plugins/server_side_filters_maildrop/config_default.php')) ! return FALSE; ! } ! else ! { ! if (!@include_once(SM_PATH . 'config/config_server_side_filters_maildrop.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_maildrop/config.php')) ! if (!@include_once(SM_PATH . 'plugins/server_side_filters_maildrop/config_default.php')) ! return FALSE; ! } ! return TRUE; } *************** *** 59,64 **** * 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 --- 73,80 ---- * 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 *************** *** 164,169 **** * 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 --- 180,187 ---- * 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 *************** *** 473,511 **** { 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': ! $expression_prefix = ''; $prefix = '.*'; $suffix = '$'; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING'], '/'); break; case 'IS_EXACTLY': ! $expression_prefix = ''; $prefix = ''; $suffix = '$'; $rule['MATCH_STRING'] = preg_quote($rule['MATCH_STRING'], '/'); break; case 'MATCHES_REGEX': ! $expression_prefix = ''; $prefix = ''; $suffix = ''; --- 491,547 ---- { 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': $prefix = '.*'; $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': $prefix = ''; $suffix = '$'; $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 = ''; *************** *** 523,527 **** --- 559,569 ---- $rule['MATCH_STRING'] = '.*' . $rule['MATCH_STRING']; + if ($rule['MATCHING_METHOD'] == 'DOESNT_MATCH_REGEX') + $expression_prefix = '!'; + else + $expression_prefix = ''; + break; + default : // same as CONTAINS $expression_prefix = ''; *************** *** 589,627 **** { 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': ! $criteria_expression_prefix = ''; $criteria_prefix = '.*'; $criteria_suffix = '$'; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING'], '/'); break; case 'IS_EXACTLY': ! $criteria_expression_prefix = ''; $criteria_prefix = ''; $criteria_suffix = '$'; $criteria['MATCH_STRING'] = preg_quote($criteria['MATCH_STRING'], '/'); break; case 'MATCHES_REGEX': ! $criteria_expression_prefix = ''; $criteria_prefix = ''; $criteria_suffix = ''; --- 631,687 ---- { 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': $criteria_prefix = '.*'; $criteria_suffix = '$'; $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': $criteria_prefix = ''; $criteria_suffix = '$'; $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 = ''; *************** *** 639,643 **** --- 699,709 ---- $criteria['MATCH_STRING'] = '.*' . $criteria['MATCH_STRING']; + if ($rule['MATCHING_METHOD'] == 'DOESNT_MATCH_REGEX') + $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_maildrop/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:55:14 -0000 1.1.1.1 --- config_default.php 11 Jan 2011 02:00:50 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop 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 Maildrop 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_maildrop/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:55:14 -0000 1.1.1.1 --- index.php 11 Jan 2011 02:00:50 -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_maildrop/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:55:14 -0000 1.1.1.1 --- setup.php 11 Jan 2011 02:00:50 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop 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 Maildrop 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_maildrop/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:55:14 -0000 1.1.1.1 --- config_example.php 11 Jan 2011 02:00:50 -0000 1.2 *************** *** 4,8 **** * SquirrelMail Server Side Filters Maildrop 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 Maildrop 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:58
|
Update of /cvsroot/serverfilters/server_side_filters_maildrop/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29419/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_maildrop/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:55:14 -0000 1.1.1.1 --- README 11 Jan 2011 02:00:50 -0000 1.2 *************** *** 1,8 **** Server Side Filters Maildrop plugin for SquirrelMail ==================================================== ! Ver 1.0, 2010/09/11 ! Copyright (c) 2010- Paul Lesniewski <pa...@sq...> --- 1,8 ---- Server Side Filters Maildrop 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_maildrop/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:55:14 -0000 1.1.1.1 --- index.php 11 Jan 2011 02:00:50 -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$ |
