Changeset 7400 for main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

Timestamp:

20 Dec 2011, 08:09:38 (13 years ago)

Author:

Henrik Bettermann

Message:

Use send_mail function also in sendMail method. browser.txt still fails.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -29 +29 @@
 
 def send_mail(from_name,from_email,rcpt_name,rcpt_email,subject,body,config):
+    """
+    XXX: While this method is unicode-proof (i.e. it can handle
+         non-plain-ASCII chars in names and messages) other
+         methods inhere are not and will fail silently. Some
+         reorganization of SMPT-related code is needed here.
+    """
 
     header_charset = 'ISO-8859-1'
@@ -44 +50 @@
             body.encode(body_charset)
         except UnicodeError:
-            print "FAILED: ", body_charset, text
+            print "FAILED: ", body_charset, body
             pass
         else:
@@ -82 +88 @@
 %s
 """
-        msg = MIMEText(text % (fullname,username,usertype,portal,body))
-        msg['From'] = '%s <%s>' % (fullname,email_from)
-        msg['To'] = email_to
-        msg['Subject'] = subject
-        server = smtplib.SMTP(config.smtp_server)
-        if config.smtp_requires_login:
-            server.login(config.smtp_username,config.smtp_password)
-        try:
-            server.sendmail(email_from,email_to,msg.as_string())
-        except:
-            return False
-        server.quit()
-        return True
+        from_name = fullname
+        from_email = email_from
+        rcpt_name = 'xyz'
+        rcpt_email = email_to
+        body = text % (fullname,username,usertype,portal,body)
+        return send_mail(
+            from_name,from_email,rcpt_name,rcpt_email,subject,body,config)
 
     def fullname(self,firstname,lastname,middlename=None):
@@ -116 +116 @@
 
         Returns True or False to indicate successful operation.
-
-        XXX: While this method is unicode-proof (i.e. it can handle
-             non-plain-ASCII chars in names and messages) other
-             methods inhere are not and will fail silently. Some
-             reorganization of SMPT-related code is needed here.
         """
         username = applicant.applicant_id