Changeset 2293

Timestamp:

29 Sep 2007, 18:19:07 (17 years ago)

Author:

joachim

Message:

better string formatting please test

Location:

WAeUP_SRP/base/skins

Files:

• waeup_default/mail2admin.py (modified) (1 diff)
• waeup_student/mail2student.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_default/mail2admin.py

@@ -15 +15 @@
 # the message format, %s will be filled in from data
 
+# message = """
+# From: %s <%s>
+# To: %s
+# Cc: %s
+# Bcc: %s
+# Reply-To: %s
+# Subject: Uniben Contact
+
+# Fullname: %s
+# Member ID: %s
+# Problem Type: %s
+# Description: %s
+# """
+# msg = message % (
+#      fullname,
+#      email,
+#      prop.email_from_address,
+#      email,
+#      'henrik@waeup.org',
+# #    'js@aixtraware.de',
+#      email,
+#      fullname,
+#      regno,
+#      probtype,
+#      descr,
+#      )
+d = {}
+d['fullname'] = fullname
+d['email'] = email
+d['email_from'] = prop.email_from_address
+d['regno'] = regno
+d['probtype'] = probtype
+d['descr'] = descr
+
 message = """
-From: %s <%s>
-To: %s
-Cc: %s, %s
-Bcc: %s
-Reply-To: %s
+From: %(fullname)s <%(email)s>
+To: %(email_from)s
+Cc: %(email)s
+Bcc: 'henrik@waeup.org'
+Reply-To: %(email)s
 Subject: Uniben Contact
 
-Fullname: %s
-Member ID: %s
-Problem Type: %s
-Description: %s
+Fullname: %(fullname)s
+Member ID: %(regno)s
+Problem Type: %(probtype)s
+Description: %(descr)s
 """
 
 #prop.email_from_address should be used for To:
 
-msg = message % (
-     fullname,
-     email,
-     prop.email_from_address,
-     email,
-     'henrik@waeup.org',
-#    'js@aixtraware.de',
-     email,
-     fullname,
-     regno,
-     probtype,
-     descr,
-     )
-mhost.send(msg)
+mhost.send(msg % d)
 
 REQUEST = context.REQUEST

WAeUP_SRP/base/skins/waeup_student/mail2student.py

@@ -21 +21 @@
 To: %s
 Cc: %s
-Bcc: %s
 Reply-To: %s
 Subject: %s