CVS: tmda/TMDA ChangeLog,1.173,1.174 Defaults.py,1.111,1.112

Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv12038/TMDA

Modified Files:
        ChangeLog Defaults.py 
Log Message:
TMDA now generates its own failure notices, rather than relying on
the MTA to do it.  This offers several benefits:

- Users who drive TMDA with procmail will now produce useful (to the
  recipient) failure notices.

- Easier customization of failure notices for users who desire this.

- MTA-independent failure notices (consistent look and feel).

templates/bounce.txt is introduced which is based on QSBMF (qmail-send
Bounce Message Format).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ChangeLog   6 Mar 2002 19:58:42 -0000       1.173
+++ ChangeLog   7 Mar 2002 00:25:14 -0000       1.174
@@ -1,5 +1,8 @@
 2002-03-06  Jason R. Mastaler  <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
 
+       * Defaults.py (BOUNCE_TEXT_*): New variables containing the text
+       used in TMDA's various failure notices.
+
        * Util.py (maketext): Search for the templatefile in a series of
        directories.  First match wins.
        

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Defaults.py 6 Mar 2002 19:58:42 -0000       1.111
+++ Defaults.py 7 Mar 2002 00:25:15 -0000       1.112
@@ -176,6 +176,31 @@
         BOUNCE_ENV_SENDER = '<>'
     else:
         BOUNCE_ENV_SENDER = ''
+
+# BOUNCE_TEXT_ALREADY_CONFIRMED
+# Text for the failure notice returned to the sender when a
+# confirmation response arrives for a message which has already been
+# confirmed.
+if not vars().has_key('BOUNCE_TEXT_ALREADY_CONFIRMED'):
+    BOUNCE_TEXT_ALREADY_CONFIRMED = """This message has already been 
confirmed."""
+
+# BOUNCE_TEXT_FILTER_INCOMING
+# Text for the failure notice returned to the sender when a 'bounce'
+# or 'reject' rule is matched in the incoming filter file.
+if not vars().has_key('BOUNCE_TEXT_FILTER_INCOMING'):
+    BOUNCE_TEXT_FILTER_INCOMING = """Message rejected by recipient."""
+
+# BOUNCE_TEXT_INVALID_CONFIRMATION
+# Text for the failure notice returned to the sender when a message is
+# sent to an invalid confirmation address.
+if not vars().has_key('BOUNCE_TEXT_INVALID_CONFIRMATION'):
+    BOUNCE_TEXT_INVALID_CONFIRMATION = """This confirmation address is 
invalid."""
+
+# BOUNCE_TEXT_NONEXISTENT_PENDING
+# Text for the failure notice returned to the sender when a
+# confirmation response arrives for a message which could not be located.
+if not vars().has_key('BOUNCE_TEXT_NONEXISTENT_PENDING'):
+    BOUNCE_TEXT_NONEXISTENT_PENDING = """Your original message could not be 
located."""
         
 # BARE_APPEND
 # Filename to which a recipient's e-mail address should be

_______________________________________________
tmda-cvs mailing list
http://libertine.org/lists/listinfo/tmda-cvs