Changeset 7221 for main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

Timestamp:

27 Nov 2011, 06:50:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Now we have a configuration object and can provide ContactAdminForm? with proper credentials for a smtp server.

Add Email address to IAccount objects so that 'From' fields in emails, sent by users, can be automatically filled.

File:

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

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

@@ -313 +313 @@
         name = data['name']
         title = data['title']
+        email = data['email']
         description = data['description']
         #password = data['password']
@@ -326 +327 @@
                 return
         try:
-            self.context.addUser(name, password, title=title,
+            self.context.addUser(name, password, title=title, email=email,
                                  description=description, roles=roles)
         except KeyError:
@@ -506 +507 @@
         msg['From'] = '%s <%s>' % (fullname,email)
 
-        # These parameters should be part of the portal configuration.
-        msg['To'] = 'contact@waeup.org'
-        msg['Subject'] = 'WAeUP Contact'
-        #server = smtplib.SMTP('smtp_server')
-        # Also connection details (username, passwords, host, port,
-        # etc.) should be settable somewhere.
-        # server.login('user_name','secret_password')
-        server = smtplib.SMTP('localhost')
-        server.sendmail(email,'contact@waeup.org',msg.as_string())
+        config = grok.getSite()['configuration']
+        msg['To'] = config.email_admin
+        msg['Subject'] = config.email_subject
+        server = smtplib.SMTP(config.smtp_server)
+        if config.smtp_requires_login:
+            server.login(config.smtp_username,config.smtp_password)
+        server.sendmail(email,config.email_admin,msg.as_string())
 
         server.quit()