[Collective-checkins] PloneMailBoxer PloneMailBoxer.py,1.9,1.10

[robert r. <re...@us...>]

Update of /cvsroot/collective/PloneMailBoxer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19728

Modified Files:
	PloneMailBoxer.py 
Log Message:
major adapdation to MailBoxer 3.2. Still testing, so do not use it. It does load, you can create an object. that is how far my testing went.

Index: PloneMailBoxer.py
===================================================================
RCS file: /cvsroot/collective/PloneMailBoxer/PloneMailBoxer.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PloneMailBoxer.py	24 Dec 2003 00:07:24 -0000	1.9
+++ PloneMailBoxer.py	26 Feb 2005 03:03:11 -0000	1.10
@@ -135,67 +135,90 @@
                  mtahosts, description):
         DefaultDublinCoreImpl.__init__(self)
         PloneFolder.__init__(self, id, title=title)
-        MailBoxer.__init__(self, id, title, mailto, moderator, moderated,
-                           archived, mtahosts)
+        #_robert_ MailBoxer seems to have changed its interface
+        MailBoxer.__init__(self, id, title)#, mailto, moderator, moderated,
+                           #archived, mtahosts)
         self.setDescription(description)
         self.setTitle(title)
+        #_robert_
+        #self.edit(title, mailto, moderator, moderated, 0, archived)
         
     security.declareProtected(ManageProperties, 'edit')
     def edit(self, title, mailto, moderator, moderated, plainmail, archived):
         """Edit basic properties
         """
         self.title = title
-        self.manage_changeProperties(
-            mailto=mailto,
-            moderated=moderated,
-            plainmail=plainmail,
-            archived=archived
-            )
-        if len(self.moderator):
-            self.moderator[0] = moderator
-        else:
-            self.moderator.append(moderator)
+        #_robert_ MailBoxer allows to override the properties
+#         self.manage_changeProperties(
+#             mailto=mailto,
+#             moderated=moderated,
+#             plainmail=plainmail,
+#             archived=archived
+#             )
+        MailBoxer.setValueFor(self, 'mailto', mailto)
+        MailBoxer.setValueFor(self, 'moderator', moderator)
+        MailBoxer.setValueFor(self, 'moderated', moderated)
+        MailBoxer.setValueFor(self, 'maiplainmail', plainmail)
+        MailBoxer.setValueFor(self, 'archived', archived)
+        
+#         if len(self.moderator):
+#             self.moderator[0] = moderator
+#         else:
+#             self.moderator.append(moderator)
         self.reindexObject()
 
     security.declareProtected(ManageProperties, 'addMember')
     def addMember(self, email):
         """Add a member
         """
-        email = email.lower()
-        members = [addr.lower() for addr in self.maillist]
-        if email not in members:
-            members.append(email)
-            members.sort()
-            self.maillist = members
-            return email
+        #_robert
+        return MailBoxer.manage_addMember(self, email)
+#         email = email.lower()
+#         members = [addr.lower() for addr in self.maillist]
+#         if email not in members:
+#             members.append(email)
+#             members.sort()
+#             self.maillist = members
+#             return email
 
     security.declareProtected(ManageProperties, 'deleteMembers')
     def deleteMembers(self, emails):
         """Delete members
         """
+        #_robert
+        MailBoxer.manage_delMember(self, email)
         emails = [email.lower() for email in emails]
-        members = [addr.lower() for addr in self.maillist
-                   if not addr.lower() in emails]
-        self.maillist = members
+        for email in emails:
+            MailBoxer.manage_delMember(self, email)
+#         members = [addr.lower() for addr in self.maillist
+#                    if not addr.lower() in emails]
+#         self.maillist = members
+        # _robert_ why should we return emails ????
         return emails
 
     security.declareProtected(ManageProperties, 'resetBounces')
     def resetBounces(self, emails):
         """Removes bounced addresses from the bounces list.
         """
-        bounces = self.bounces
-        for addr in emails:
-            if bounces.has_key(addr):
-                del bounces[addr]
-        self._p_changed = 1
+        #_robert_
+        MailBoxer.manage_resetBounces(self, emails)
+#         bounces = self.bounces
+#         for addr in emails:
+#             if bounces.has_key(addr):
+#                 del bounces[addr]
+#         self._p_changed = 1
+        # _robert_ why should we return emails ????
         return emails
 
     security.declareProtected(ManageProperties, 'deleteBounces')
     def deleteBounces(self, emails):
         """Deletes bounced addresses from the members list.
         """
-        self.deleteMembers(emails)
-        self.resetBounces(emails)
+        #_robert_
+        MailBoxer.manage_deleteBounces(self, emails)
+#         self.deleteMembers(emails)
+#         self.resetBounces(emails)
+        # _robert_ why should we return emails ????
         return emails
 
 Globals.InitializeClass(PloneMailBoxer)
@@ -280,9 +303,9 @@
         Adds a new PloneMailBoxerArchive
         """
         ob = PloneMailBoxerArchive(id, title)
-    	self._setObject(id, ob)
+        self._setObject(id, ob)
         self.portal_types.getTypeInfo('MailBoxer Archive')._finishConstruction(ob)
-    	if REQUEST is not None:
+        if REQUEST is not None:
             return self.folder_contents(self, REQUEST,
                                         portal_status_message='Archive added')