CVS: tmda/TMDA ChangeLog, 1.314, 1.315 Defaults.py, 1.202, 1.203 Pending.py, 1.30, 1.31

Update of /cvsroot/tmda/tmda/TMDA
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7068/TMDA

Modified Files:
	ChangeLog Defaults.py Pending.py 
Log Message:
No longer distinguish between 'released', 'confirmed', and 'still
pending' messages in the pending queue.  Messages are simply unlinked
once confirmed or released rather than being renamed with a '3,R' or
'3,C' suffix.

The behavior was somewhat nice in that it allowed for a more
intelligent auto-response in the event that someone tried to confirm
their message by e-mail after it was hand-released by the recipient.

As it turned out, this slight convenience was not worth all the extra
costs (substantially increased code complexity, increased storage
requirements, and user confusion among others).

Senders who try to confirm by e-mail will now get back an
auto-response controlled by bounce_missing_pending.txt if their
message no longer exists on disk.  TMDA users who don't like the
default wording can either customize it this template, or change
ACTION_MISSING_PENDING to something other than 'bounce'.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- ChangeLog	1 Mar 2004 19:02:10 -0000	1.314
+++ ChangeLog	2 Mar 2004 02:26:42 -0000	1.315
@@ -1,5 +1,19 @@
 2004-03-01  Jason R. Mastaler  <[email protected]>
 
+	* Pending.py (Queue.listDeliveredIds): Removed.
+	(Queue.listConfirmedIds): Ditto.
+	(Queue.listReleasedIds): Ditto.
+	(Queue.checkDelivered): Ditto.
+	(Message.wasDelivered): Ditto.
+	
+2004-03-01  Jason R. Mastaler  <[email protected]>
+
+	* Defaults.py: Removed CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY,
+	CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY
+	CONFIRM_ACCEPT_INITIAL_NOTIFY.  Restored CONFIRM_ACCEPT_NOTIFY.
+
+2004-03-01  Jason R. Mastaler  <[email protected]>
+
 	* Defaults.py (TMDARC): Allow TMDARC to be specified by
 	GLOBAL_TMDARC if $TMDARC is not set.
 

Index: Defaults.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Defaults.py,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- Defaults.py	1 Mar 2004 19:02:11 -0000	1.202
+++ Defaults.py	2 Mar 2004 02:26:42 -0000	1.203
@@ -82,7 +82,7 @@
     TMDARC = _tmdarc
 elif not vars().has_key('TMDARC'):
     TMDARC = os.path.expanduser('~/.tmda/config')
-    
+
 # CONFIG_EXEC
 # If set to False in GLOBAL_TMDARC, the user's TMDARC file will be parsed
 # using ConfigParser, otherwise it will evaluated as a sequence of
@@ -420,46 +420,15 @@
     CONFIRM_CC = None
 
 # CONFIRM_ACCEPT_NOTIFY
-# Set this variable to False if you do not want to generate any confirmation
-# acceptance notices at all.
+# Set this variable to False if you do not want to generate any
+# confirmation acceptance notices.  These are the notices returned to
+# senders when they confirm their original message by e-mail.  Their
+# content is based on the confirm_accept.txt template.
 #
 # Default is True (turned on)
 if not vars().has_key('CONFIRM_ACCEPT_NOTIFY'):
     CONFIRM_ACCEPT_NOTIFY = True
 
-# CONFIRM_ACCEPT_INITIAL_NOTIFY
-# Set this variable to False if you do not want to generate initial
-# confirmation acceptance notices.  These are the notices returned to
-# senders when they initially confirm their original message causing
-# it to be delivered.  Their content is based on the
-# confirm_accept_initial.txt template.
-#
-# Default is True (turned on)
-if not vars().has_key('CONFIRM_ACCEPT_INITIAL_NOTIFY'):
-    CONFIRM_ACCEPT_INITIAL_NOTIFY = True
-
-# CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY
-# Set this variable to False if you do not want to generate already
-# confirmed notices.  These are the notices returned to senders when
-# they successfully confirm a message which has already been
-# confirmed.  Their content is based on the
-# confirm_accept_already_confirmed.txt template.
-#
-# Default is True (turned on)
-if not vars().has_key('CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY'):
-    CONFIRM_ACCEPT_ALREADY_CONFIRMED_NOTIFY = True
-
-# CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY
-# Set this variable to False if you do not want to generate already
-# released notices.  These are the notices returned to senders when
-# they successfully confirm a message which has already been released
-# by tmda-pending or tmda-cgi.  Their content is based on the
-# confirm_accept_already_released.txt template.
-#
-# Default is True (turned on)
-if not vars().has_key('CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY'):
-    CONFIRM_ACCEPT_ALREADY_RELEASED_NOTIFY = True
-    
 # CONFIRM_ACCEPT_CC
 # An optional e-mail address which will be sent a copy of the
 # confirmation acceptance messages people send you.
@@ -777,7 +746,10 @@
 
 # ACTION_MISSING_PENDING
 # Specifies how confirmation messages should be disposed of if the
-# message to be confirmed can not be located.
+# message to be confirmed can not be located on disk.  This might be
+# the case if you hand-released the message before the sender tried to
+# confirm it by e-mail, or if the sender sent multiple confirmation
+# replies.
 # Possible values include:
 #
 # "bounce"

Index: Pending.py
===================================================================
RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Pending.py	15 Jan 2004 22:47:21 -0000	1.30
+++ Pending.py	2 Mar 2004 02:26:42 -0000	1.31
@@ -117,29 +117,13 @@
             return
 
     def listIds(self):
-        """Return the full list of message identifiers (both pending
-        and delivered)."""
+        """Return the full list of message identifiers."""
         return self.msgs
 
-    def listConfirmedIds(self):
-        """Return the list of messages delivered by confirmation."""
-        return filter(lambda x: x.endswith(',C'), self.listIds())
-
-    def listReleasedIds(self):
-        """Return the list of messages delivered by release."""
-        return filter(lambda x: x.endswith(',R'), self.listIds())
-
-    def listDeliveredIds(self):
-        """Return the list of delivered (i.e, confirmed or released)
-        messages."""
-        return self.listConfirmedIds() + self.listReleasedIds()
-
     def listPendingIds(self):
-        """Return the list of still pending (i.e, not yet confirmed or
-        released) messages."""
-        return [i for i in self.listIds()
-                if not (i.endswith(',C') or i.endswith(',R'))]
-        
+        """Return the list of still pending messages."""
+        return self.listIds()
+                       
     
     ## Cache related functions (-C option)
     def _loadCache(self):
@@ -219,17 +203,6 @@
                 # in case of concurrent cleanups
                 pass
 
-    def checkDelivered(self, M):
-        """Check if the message has already been delivered."""
-        if M.wasDelivered():
-            if self.dispose == 'delete':
-                # pretend it isn't delivered if we want to delete
-                # old message, else delivered messages will never
-                # be removed from disk
-                return 0
-            return 1
-        return 0
-
     def disposeMessage(self, M):
         """Dispose the message."""
         if self.dispose is None or self.dispose == 'pass':
@@ -282,8 +255,6 @@
                 self.cPrint(obj)
                 continue
 
-            if self.checkDelivered(M):
-                continue
             if not self.checkTreshold(M.msgid):
                 continue
             if not self._addCache(M.msgid):
@@ -351,11 +322,6 @@
             self.dispose_def = self.dispose
         return self
 
-    def checkDelivered(self, M):
-        if M.wasDelivered():
-            return 1
-        return 0
-
     def processMessage(self, M):
         if self.terse:
             self.Print()
@@ -562,10 +528,3 @@
             str+= '<mailto:%s>' % self.confirm_accept_address
         return str
 
-    def wasDelivered(self):
-        """Check if the message has already been delivered, and how."""
-        if self.msgid.endswith(',R') or self.msgid.endswith(',C'):
-            return self.msgid[-1]
-        else:
-            return None
-