Update of /cvsroot/tmda/tmda/bin
In directory usw-pr-cvs1:/tmp/cvs-serv18728/bin
Modified Files:
ChangeLog tmda-inject
Log Message:
Make the appearance of outgoing messages more flexible with
customizable `From' header styles. This is done by setting the
MESSAGE_FROM_STYLE variable.
Initially there are three choices:
"address"
Just the address - king@xxxxxxxxxxxxx
"parens"
king@xxxxxxxxxxxxx (Elvis Parsley)
"angles"
"Elvis Parsley" <king@xxxxxxxxxxxxx>
Previously, only the "angles" style was available. Corny example
shamelessly stolen from larsi's `message.texi'.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 2001/10/24 17:38:59 1.93
+++ ChangeLog 2001/10/25 16:49:57 1.94
@@ -1,3 +1,7 @@
+2001-10-25 Jason R. Mastaler <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
+
+ * tmda-inject (inject_message): Support MESSAGE_FROM_STYLE.
+
2001-10-24 Jason R. Mastaler <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
* tmda-filter (verify_confirm_cookie): Make sure the cookie
Index: tmda-inject
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-inject,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tmda-inject 2001/10/24 16:44:03 1.21
+++ tmda-inject 2001/10/25 16:49:58 1.22
@@ -105,19 +105,27 @@
elif cookie_type == 'ext':
# Send a message with a tagged (extension added) address.
(username, hostname) = string.split(from_address,'@')
- envelope_sender_address.append(username + Defaults.RECIPIENT_DELIMITER
+ envelope_sender_address.append(username + Defaults.RECIPIENT_DELIMITER
+ extension + '@' + hostname)
elif cookie_type == 'keyword':
# Send a message with a tagged (keyword) address.
envelope_sender_address.append(Cookie.make_keyword_address
(from_address, extension))
# Set From: to match the envelope sender address.
- message_headers['From'] = '"%s" <%s>' % (sender_full_name[0],
- envelope_sender_address[-1:][0])
+ final_sender_address = envelope_sender_address[-1:][0]
+ final_full_name = sender_full_name[0]
+ if Defaults.MESSAGE_FROM_STYLE == 'angles':
+ message_from_format = '"%s" <%s>' %
(final_full_name,final_sender_address)
+ elif Defaults.MESSAGE_FROM_STYLE == 'parens':
+ message_from_format = '%s (%s)' %
(final_sender_address,final_full_name)
+ elif Defaults.MESSAGE_FROM_STYLE == 'address':
+ message_from_format = '%s' % (final_sender_address)
+ message_headers['From'] = message_from_format
+ # Inject the message.
inject = []
inject.append(Defaults.SENDMAIL)
inject.append('-f')
- inject.append(envelope_sender_address[-1:][0])
+ inject.append(final_sender_address)
inject.append(to_address)
pipeline = popen2.popen2(inject)[1]
pipeline.write(str(message_headers))
_______________________________________________
tmda-cvs mailing list
http://libertine.org/lists/listinfo/tmda-cvs
|
