Update of /cvsroot/tmda/tmda/templates
In directory usw-pr-cvs1:/tmp/cvs-serv32476/templates
Modified Files:
bounce_dated.txt bounce_sender.txt
Added Files:
bounce_confirm_dated.txt bounce_confirm_sender.txt
confirm_accept.txt
Log Message:
First pass at confirmation mode.
--- NEW FILE ---
From: TMDA AutoResponder <%(USERNAME)s-dated@%(HOSTNAME)s>
Subject: Confirmation request for your message to %(envelope_recipient)s
This notice was generated by TMDA v%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
an automated SPAM/UCE reduction system.
Your e-mail message with the subject of "%(subject)s"
is being held pending confirmation because:
1) Your address is not on the recipient's "whitelist", OR
2) The `dated' address you sent to was invalid or expired.
To release your message for delivery, please send an empty reply to
this address:
<mailto:%(confirm_accept_address)s>
Your mailer should have a "Reply" feature that uses this address
automatically. If this does not work, simply copy the address and
paste it into the "To:" field of a new message.
This confirmation verifies that your message is legitimate and not
junk-mail. Shortly after it is verified, you will be notified by
e-mail that your original message was delivered.
Until the recipient adds you to their "whitelist", you can contact
them by sending e-mail to the following special address:
<mailto:%(dated_cookie_address)s>
which will expire in exactly %(timeout)s (%(utc_expire_date)s UTC).
--- NEW FILE ---
From: TMDA AutoResponder <%(USERNAME)s-sender@%(HOSTNAME)s>
Subject: Confirmation request for your message to %(envelope_recipient)s
This notice was generated by TMDA v%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
an automated SPAM/UCE reduction system.
Your e-mail message with the subject of "%(subject)s"
is being held pending confirmation because:
1) Your address is not on the recipient's "whitelist", OR
2) The `sender' address you sent to was invalid.
To release your message for delivery, please send an empty reply to
this address:
<mailto:%(confirm_accept_address)s>
Your mailer should have a "Reply" feature that uses this address
automatically. If this does not work, simply copy the address and
paste it into the "To:" field of a new message.
This confirmation verifies that your message is legitimate and not
junk-mail. Shortly after it is verified, you will be notified by
e-mail that your original message was delivered.
Until the recipient adds you to their "whitelist", you can contact
them by sending e-mail to the following special address:
<mailto:%(sender_cookie_address)s>
which will only work when you are sending e-mail from:
<%(envelope_sender)s>
--- NEW FILE ---
From: TMDA AutoResponder <%(default_from_address)s>
Subject: Confirmation accepted
This notice was generated by TMDA v%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
an automated SPAM/UCE reduction system.
Your confirmation (shown below) was accepted, and as a result, your
original message has been successfully delivered.
Index: bounce_dated.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/bounce_dated.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bounce_dated.txt 2001/06/06 18:20:17 1.4
+++ bounce_dated.txt 2001/07/16 20:52:20 1.5
@@ -1,20 +1,18 @@
-From: %(USERNAME)s-dated-%(dated_cookie)s@%(HOSTNAME)s
+From: %(dated_cookie_address)s
Subject: Auto-response for your message to %(envelope_recipient)s
This notice was generated by TMDA v%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
an automated SPAM/UCE reduction system.
-Your e-mail message was not accepted either because:
+Your e-mail message with the subject of "%(subject)s"
+was not accepted because:
- 1) The recipient didn't recognize your address, OR
+ 1) Your address is not on the recipient's "whitelist", OR
2) The `dated' address you sent to was invalid or expired.
-You can contact me by replying to this message or by sending e-mail to
-the following address:
+Until the recipient adds you to their "whitelist", you can contact
+them by sending e-mail to the following special address:
- <mailto:%(USERNAME)s-dated-%(dated_cookie)s@%(HOSTNAME)s>
+ <mailto:%(dated_cookie_address)s>
-which will expire in %(timeout)s (%(utc_expire_date)s UTC).
-
-Regards,
-%(FULLNAME)s
\ No newline at end of file
+which will expire in exactly %(timeout)s (%(utc_expire_date)s UTC).
\ No newline at end of file
Index: bounce_sender.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/bounce_sender.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bounce_sender.txt 2001/06/06 18:20:17 1.4
+++ bounce_sender.txt 2001/07/16 20:52:20 1.5
@@ -1,22 +1,20 @@
-From: %(USERNAME)s-sender-%(sender_address_cookie)s@%(HOSTNAME)s
+From: %(sender_cookie_address)s
Subject: Auto-response for your message to %(envelope_recipient)s
This notice was generated by TMDA v%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
an automated SPAM/UCE reduction system.
-Your e-mail message was not accepted either because:
+Your e-mail message with the subject of "%(subject)s"
+was not accepted because:
- 1) The recipient didn't recognize your address, OR
+ 1) Your address is not on the recipient's "whitelist", OR
2) The `sender' address you sent to was invalid.
-You can contact me by replying to this message or by sending e-mail to
-the following address:
+Until the recipient adds you to their "whitelist", you can contact
+them by sending e-mail to the following special address:
- <mailto:%(USERNAME)s-sender-%(sender_address_cookie)s@%(HOSTNAME)s>
+ <mailto:%(sender_cookie_address)s>
-which will only work when you are sending me e-mail from:
+which will only work when you are sending e-mail from:
- <%(sender_address)s>
-
-Regards,
-%(FULLNAME)s
\ No newline at end of file
+ <%(envelope_sender)s>
\ No newline at end of file
|
