Changeset 7223 for main/waeup.sirp/trunk/src/waeup

Timestamp:

27 Nov 2011, 08:07:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Add name of administrator which is displayed on contact form.

Location:

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

Files:

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

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

@@ -463 +463 @@
     pnav = 2
 
+    @property
+    def config(self):
+        return grok.getSite()['configuration']
+
     def title(self):
         """Return True if the calling user is authenticated.
@@ -468 +472 @@
         userid = self.request.principal.id
         if userid != 'zope.anybody':
-            tt = u'Contact'
+            tt = u'Contact %s' % self.config.name_admin
         else:
             tt = u'Enquiries'
@@ -510 +514 @@
         msg = MIMEText(text % (fullname,regno,descr))
         msg['From'] = '%s <%s>' % (fullname,email)
-
-        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())
+        
+        msg['To'] = self.config.email_admin
+        msg['Subject'] = self.config.email_subject
+        server = smtplib.SMTP(self.config.smtp_server)
+        if self.config.smtp_requires_login:
+            server.login(self.config.smtp_username,self.config.smtp_password)
+        server.sendmail(email,self.config.email_admin,msg.as_string())
 
         server.quit()

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

@@ -311 +311 @@
         )
 
+    name_admin = schema.TextLine(
+        title = u'Name of Administrator',
+        default = u'Administrator',
+        required = False,
+        )
+
     email_admin = schema.ASCIILine(
-        title = u'Email',
+        title = u'Email Address of Administrator',
         default = 'contact@waeup.org',
         required = False,