Changeset 7404 for main

Timestamp:

20 Dec 2011, 09:33:10 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename sendMail method to be more precise and not confuse with the send_mail function.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (3 diffs)
• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -226 +226 @@
                            'user_type', 'system').title()
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(
+        success = sirp_utils.sendContactForm(
                 fullname,email,
                 self.config.name_admin,self.config.email_admin,
@@ -247 +247 @@
     def send(self, *args, **data):
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(
+        success = sirp_utils.sendContactForm(
                 data['fullname'],data['email_from'],
                 self.config.name_admin,self.config.email_admin,
@@ -470 +470 @@
                            'user_type', 'system').title()
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(
+        success = sirp_utils.sendContactForm(
                 self.request.principal.title,email,
                 self.context.title,self.context.email,

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

@@ -143 +143 @@
     """A collection of methods which are subject to customization.
     """
-    def sendMail(fullname,username,usertype,portal,body,email_from,email_to,subject):
+    def sendContactForm(
+          from_name,from_addr,rcpt_name,rcpt_addr,
+          from_username,usertype,portal,body,subject):
         """Send an email with data provided by forms.
         """

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -392 +392 @@
                            'user_type', 'system').title()
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(
+        success = sirp_utils.sendContactForm(
                 self.request.principal.title,email,
                 self.context.display_fullname,self.context.email,

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

@@ -41 +41 @@
     from_addr = from_addr.encode('ascii')
     rpct_addr = rcpt_addr.encode('ascii')
-
     for body_charset in ['US-ASCII', 'ISO-8859-1', 'UTF-8']:
         try:
             body.encode(body_charset)
         except UnicodeError:
-            print "FAILED: ", body_charset, body
+            #print "FAILED: ", body_charset, body
             pass
         else:
             break
-
     msg = MIMEText(body.encode(body_charset), 'plain', body_charset)
     msg['From'] = formataddr((from_name, from_addr))
@@ -72 +70 @@
     grok.implements(ISIRPUtils)
 
-    def sendMail(self,from_name,from_addr,rcpt_name,rcpt_addr,
+    def sendContactForm(self,from_name,from_addr,rcpt_name,rcpt_addr,
                 from_username,usertype,portal,body,subject):
         """Send an email with data provided by forms.