CVS: tmda/TMDA ChangeLog,1.284,1.285 FilterParser.py,1.60,1.61

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1:/tmp/cvs-serv20607/TMDA

Modified Files:
	ChangeLog FilterParser.py 
Log Message:
aNew feature.  The `confirm' FILTER_INCOMING action now takes an
optional 'template' argument which directs a specific template to be
used rather than the default template (confirm_request.txt).

The argument can either be an absolute pathname (including tilde
expansion) or a relative (to TEMPLATE_DIR) pathname.  Assuming
TEMPLATE_DIR is set to ~/.tmda/templates, each of the following
instructions are equivalent:

 from johndoe* bounce = /users/jasonrm/.tmda/templates/confirm_johndoe.txt
 from johndoe* bounce = ~/.tmda/templates/confirm_johndoe.txt
 from johndoe* bounce = ~jasonrm/.tmda/templates/confirm_johndoe.txt
 from johndoe* bounce = confirm_johndoe.txt


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- ChangeLog	1 Aug 2003 07:22:53 -0000	1.284
+++ ChangeLog	20 Aug 2003 00:28:03 -0000	1.285
@@ -1,3 +1,8 @@
+2003-08-19  Jason R. Mastaler  <[email protected]>
+
+	* FilterParser.py (_FilterFile.__init__): confirm can now take an
+	option, which is the path to a specific template.
+
 2003-08-01  Tim Legant  <[email protected]>
 
 	* Util.py (msg_from_file): When parsing a message with the

Index: FilterParser.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/FilterParser.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- FilterParser.py	19 Aug 2003 23:55:38 -0000	1.60
+++ FilterParser.py	20 Aug 2003 00:28:03 -0000	1.61
@@ -246,8 +246,8 @@
 
     in_action = re.compile(r"""
     ( drop | exit | stop
-    | confirm | hold
-    | (?: bounce | reject | deliver | ok | accept)(?:\s*=.*$)? )
+    | hold
+    | (?: confirm | bounce | reject | deliver | ok | accept)(?:\s*=.*$)? )
     """, re.VERBOSE | re.IGNORECASE)
     
     out_action = re.compile(r"""

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs