Changeset 7402 for main/waeup.sirp/trunk/src/waeup/sirp/browser

Timestamp:

20 Dec 2011, 09:18:02 (13 years ago)

Author:

Henrik Bettermann

Message:

Harmonize sendMail method (work in progress).

File:

• main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py (modified) (3 diffs)

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

@@ -219 +219 @@
         fullname = self.request.principal.title
         try:
-            email_from = self.request.principal.email
+            email = self.request.principal.email
         except AttributeError:
-            email_from = self.config.email_admin
+            email = self.config.email_admin
         username = self.request.principal.id
         usertype = getattr(self.request.principal,
                            'user_type', 'system').title()
-        body = data['body']
-        email_to = self.config.email_admin
-        subject = self.config.email_subject
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(fullname,username,usertype,
-                  self.config.name,body,email_from,email_to,subject)
+        success = sirp_utils.sendMail(
+                fullname,email,
+                self.config.name_admin,self.config.email_admin,
+                username,usertype,self.config.name,
+                data['body'],self.config.email_subject)
         if success:
             self.flash('Your message has been sent.')
@@ -246 +246 @@
     @grok.action('Send now')
     def send(self, *args, **data):
-        email_from = data['email_from']
-        fullname = data['fullname']
-        body = data['body']
-        username = u'None'
-        email_to = self.config.email_admin
-        subject = self.config.email_subject
-        usertype = u'Anonymous'
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(fullname,username,usertype,
-                  self.config.name,body,email_from,email_to,subject)
+        success = sirp_utils.sendMail(
+                data['fullname'],data['email_from'],
+                self.config.name_admin,self.config.email_admin,
+                u'None',u'Anonymous',self.config.name,
+                data['body'],self.config.email_subject)
         if success:
             self.flash('Your message has been sent.')
@@ -467 +463 @@
     @grok.action('Send message now')
     def send(self, *args, **data):
-        fullname = self.request.principal.title
         try:
-            email_from = self.request.principal.email
+            email = self.request.principal.email
         except AttributeError:
-            email_from = self.config.email_admin
-        username = self.request.principal.id
+            email = self.config.email_admin
         usertype = getattr(self.request.principal,
                            'user_type', 'system').title()
-        body = data['body']
-        email_to = self.context.email
-        subject = self.config.email_subject
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(fullname,username,usertype,
-                  self.config.name,body,email_from,email_to,subject)
+        success = sirp_utils.sendMail(
+                self.request.principal.title,email,
+                self.context.title,self.context.email,
+                self.request.principal.id,usertype,self.config.name,
+                data['body'],self.config.email_subject)
         if success:
             self.flash('Your message has been sent.')