fixed rego from email address [SF#947414]

Author: Richard Jones

CHANGES.txt

@@ -14,6 +14,7 @@ Fixed:
 - fixed handling of key values starting with numbers (sf bug 941363)
 - fixed journal "param" column size in RDBMS backends
 - fixed static file serving
+- fixed rego from email address (sf bug 947414)
 
 
 2004-04-18 0.7.0b3

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.96 2004-05-02 23:16:05 richard Exp $
+# $Id: rdbms_common.py,v 1.97 2004-05-04 05:56:48 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -981,6 +981,8 @@ def addjournal(self, classname, nodeid, action, params, creator=None,
         if isinstance(params, type({})):
             properties = self.getclass(classname).getprops()
             for param, value in params.items():
+                if not value:
+                    continue
                 property = properties[param]
                 cvt = self.hyperdb_to_sql_value[property.__class__]
                 if isinstance(property, Password):
@@ -1032,17 +1034,20 @@ def getjournal(self, classname, nodeid):
         properties = self.getclass(classname).getprops()
         for nodeid, date_stamp, user, action, params in journal:
             params = eval(params)
-            for param, value in params.items():
-                property = properties[param]
-                cvt = self.sql_to_hyperdb_value[property.__class__]
-                if isinstance(property, Password):
-                    params[param] = cvt(value)
-                elif isinstance(property, Date):
-                    params[param] = cvt(value)
-                elif isinstance(property, Interval):
-                    params[param] = cvt(value)
-                elif isinstance(property, Boolean):
-                    params[param] = cvt(value)
+            if isinstance(params, type({})):
+                for param, value in params.items():
+                    if not value:
+                        continue
+                    property = properties[param]
+                    cvt = self.sql_to_hyperdb_value[property.__class__]
+                    if isinstance(property, Password):
+                        params[param] = cvt(value)
+                    elif isinstance(property, Date):
+                        params[param] = cvt(value)
+                    elif isinstance(property, Interval):
+                        params[param] = cvt(value)
+                    elif isinstance(property, Boolean):
+                        params[param] = cvt(value)
             # XXX numeric ids
             res.append((str(nodeid), dc(date_stamp), user, action, params))
         return res

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.24 2004-05-02 23:16:05 richard Exp $
+#$Id: actions.py,v 1.25 2004-05-04 05:56:54 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -746,7 +746,7 @@ def handle(self):
 """ % {'name': props['username'], 'tracker': tracker_name, 'url': self.base,
         'otk': otk, 'tracker_email': tracker_email}
         if not self.client.standard_message([props['address']], subject,
-                body, tracker_email):
+                body, (tracker_name, tracker_email)):
             return
 
         # commit changes to the database

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.175 2004-05-04 00:02:18 richard Exp $
+# $Id: client.py,v 1.176 2004-05-04 05:56:54 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -670,11 +670,21 @@ def opendb(self, user):
             self.db = self.instance.open(user)
 
     def standard_message(self, to, subject, body, author=None):
+        '''Send a standard email message from Roundup.
+
+        "to"      - recipients list
+        "subject" - Subject
+        "body"    - Message
+        "author"  - (name, address) tuple or None for admin email
+
+        Arguments are passed to the Mailer.standard_message code.
+        '''
         try:
             self.mailer.standard_message(to, subject, body, author)
-            return 1
         except MessageSendError, e:
             self.error_message.append(str(e))
+            return 0
+        return 1
 
     def parsePropsFromForm(self, create=0):
         return FormParser(self).parse(create=create)