[Checkins] SVN: Products.TransactionalMailHost/trunk/ MailHost
compatible send() method
Andreas Jung
andreas at andreas-jung.com
Sat Aug 18 10:26:43 EDT 2007
Log message for revision 78939:
MailHost compatible send() method
Changed:
U Products.TransactionalMailHost/trunk/mailhost.py
U Products.TransactionalMailHost/trunk/version.txt
-=-
Modified: Products.TransactionalMailHost/trunk/mailhost.py
===================================================================
--- Products.TransactionalMailHost/trunk/mailhost.py 2007-08-18 14:14:20 UTC (rev 78938)
+++ Products.TransactionalMailHost/trunk/mailhost.py 2007-08-18 14:26:42 UTC (rev 78939)
@@ -7,10 +7,11 @@
import os
import logging
+from cStringIO import StringIO
from Globals import InitializeClass
from AccessControl import ClassSecurityInfo
-from AccessControl.Permissions import use_mailhost_services
+from AccessControl.Permissions import use_mailhost_services, view_management_screens
from OFS.SimpleItem import SimpleItem
from OFS.PropertyManager import PropertyManager
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -65,14 +66,27 @@
security.declareProtected(use_mailhost_services, 'send')
- def send(self, fromaddr, toaddrs, message):
- """ Send out a mail """
+ def send(self, message, fromaddr, toaddrs, subject=None, encode=None):
+ """ Send out a mail.
+ 'subject' and 'encode' are unused (and kept right now
+ for backward compatibility.
+ """
delivery = DirectMailDelivery(self._getMailer())
delivery.send(fromaddr, toaddrs, message)
- LOG.info('Sending mail from %s to %s succeeded' % (fromaddr, toaddrs))
+ LOG.debug('Sending mail from %s to %s succeeded' % (fromaddr, toaddrs))
+ security.declareProtected(view_management_screens, 'manage_editProperties')
+ def manage_editProperties(self, REQUEST):
+ """ Invalidate _v_mailer """
+
+ if hasattr(self, '_v_mailer'):
+ del self._v_mailer
+
+ return super(MailHost, self).manage_editProperties(REQUEST)
+
+
InitializeClass(MailHost)
Modified: Products.TransactionalMailHost/trunk/version.txt
===================================================================
--- Products.TransactionalMailHost/trunk/version.txt 2007-08-18 14:14:20 UTC (rev 78938)
+++ Products.TransactionalMailHost/trunk/version.txt 2007-08-18 14:26:42 UTC (rev 78939)
@@ -1 +1 @@
-0.1.0
+0.1.1
More information about the Checkins
mailing list