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

Timestamp:

16 Dec 2011, 07:13:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Seat up a global utility class to ease customization. Transform send_mail function into a utility method.

File:

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

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

@@ -50 +50 @@
     ILocalRolesAssignable, DuplicationError, IConfigurationContainer,
     ISessionConfiguration, ISessionConfigurationAdd,
-    IPasswordValidator, IContactForm)
+    IPasswordValidator, IContactForm, ISIRPUtils)
 from waeup.sirp.permissions import get_users_with_local_roles, get_all_roles
 from waeup.sirp.students.catalog import search as searchstudents
@@ -58 +58 @@
 from waeup.sirp.widgets.restwidget import ReSTDisplayWidget
 from waeup.sirp.authentication import get_principal_role_manager
-from waeup.sirp.utils.helpers import get_user_account, send_mail
+from waeup.sirp.utils.helpers import get_user_account
 from waeup.sirp.browser.layout import jsaction, JSAction
 
@@ -228 +228 @@
         email_to = self.config.email_admin
         subject = self.config.email_subject
-        success = send_mail(fullname,username,usertype,self.config.name,
-                  body,email_from,email_to,subject)
+        sirp_utils = getUtility(ISIRPUtils)
+        success = sirp_utils.sendMail(fullname,username,usertype,
+                  self.config.name,body,email_from,email_to,subject)
         if success:
             self.flash('Your message has been sent.')
@@ -252 +253 @@
         subject = self.config.email_subject
         usertype = u'Anonymous'
-        success = send_mail(fullname,username,usertype,self.config.name,
-                  body,email_from,email_to,subject)
+        sirp_utils = getUtility(ISIRPUtils)
+        success = sirp_utils.sendMail(fullname,username,usertype,
+                  self.config.name,body,email_from,email_to,subject)
         if success:
             self.flash('Your message has been sent.')
@@ -476 +478 @@
         email_to = self.context.email
         subject = self.config.email_subject
-        success = send_mail(fullname,username,usertype,self.config.name,
-                  body,email_from,email_to,subject)
+        sirp_utils = getUtility(ISIRPUtils)
+        success = sirp_utils.sendMail(fullname,username,usertype,
+                  self.config.name,body,email_from,email_to,subject)
         if success:
             self.flash('Your message has been sent.')