Update of /cvsroot/tmda/tmda/TMDA
In directory usw-pr-cvs1:/tmp/cvs-serv7321/TMDA
Modified Files:
ChangeLog Defaults.py
Log Message:
Make confirmation mode the only option.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 2001/07/20 19:06:58 1.38
+++ ChangeLog 2001/07/23 02:20:59 1.39
@@ -1,3 +1,8 @@
+2001-07-22 Jason R. Mastaler <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
+
+ * Defaults.py: Remove CONFIRMATION_MODE, BOUNCE_DATED_TEMPLATE,
+ BOUNCE_SENDER_TEMPLATE, and add CONFIRM_REQUEST_TEMPLATE.
+
2001-07-20 Jason R. Mastaler <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
* Defaults.py: Change default location of former dot-tmda files to
Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Defaults.py 2001/07/20 19:06:58 1.32
+++ Defaults.py 2001/07/23 02:20:59 1.33
@@ -79,13 +79,6 @@
if not vars().has_key('DATADIR'):
DATADIR = os.path.expanduser("~/.tmda/")
-# CONFIRMATION_MODE
-# Set this variable to 0 if you do not want bounces confirmed for
-# validity.
-# Default is 1 (turned on)
-if not vars().has_key('CONFIRMATION_MODE'):
- CONFIRMATION_MODE = 1
-
# CONFIRM_ACCEPT_NOTIFY
# Set this variable to 0 if you do not want to generate confirmation
# acceptance notices.
@@ -128,32 +121,6 @@
if not vars().has_key('BOUNCE_ENV_SENDER'):
BOUNCE_ENV_SENDER = ''
-# BOUNCE_DATED_TEMPLATE
-# Full path to a custom template for 'dated' bounces.
-# Default is bounce_confirm_dated.txt or bounce_dated.txt in
-# ../templates/ depending on CONFIRMATION_MODE.
-if not vars().has_key('BOUNCE_DATED_TEMPLATE'):
- if CONFIRMATION_MODE:
- d_template = '/templates/bounce_confirm_dated.txt'
- else:
- d_template = '/templates/bounce_dated.txt'
- BOUNCE_DATED_TEMPLATE = os.path.split(os.path.dirname
- (os.path.abspath
- (sys.argv[0])))[0] + d_template
-
-# BOUNCE_SENDER_TEMPLATE
-# Full path to a custom template for 'sender' bounces.
-# Default is bounce_confirm_sender.txt or bounce_sender.txt in
-# ../templates/ depending on CONFIRMATION_MODE.
-if not vars().has_key('BOUNCE_SENDER_TEMPLATE'):
- if CONFIRMATION_MODE:
- s_template = '/templates/bounce_confirm_sender.txt'
- else:
- s_template = '/templates/bounce_sender.txt'
- BOUNCE_SENDER_TEMPLATE = os.path.split(os.path.dirname
- (os.path.abspath
- (sys.argv[0])))[0] + s_template
-
# CONFIRM_ACCEPT_TEMPLATE
# Full path to a custom template for confirmation acceptance notices.
# Default is confirm_accept.txt in ../templates/.
@@ -162,6 +129,15 @@
CONFIRM_ACCEPT_TEMPLATE = os.path.split(os.path.dirname
(os.path.abspath
(sys.argv[0])))[0] + ca_template
+
+# CONFIRM_REQUEST_TEMPLATE
+# Full path to a custom template for confirmation requests.
+# Default is confirm_request.txt in ../templates/.
+if not vars().has_key('CONFIRM_REQUEST_TEMPLATE'):
+ cr_template = '/templates/confirm_request.txt'
+ CONFIRM_REQUEST_TEMPLATE = os.path.split(os.path.dirname
+ (os.path.abspath
+ (sys.argv[0])))[0] + cr_template
# COOKIE_TYPE
# The default cookie type is dated. It could be:
|
