Commits

Luke Plant committed df7630c
  • Participants
  • Parent commits 88a97e7

Comments (0)

Files changed (3)

File cciw/cciwmain/views/misc.py

 Message:
 %(message)s
 
-""" % locals(), "website@cciw.co.uk", [settings.FEEDBACK_EMAIL_TO])
+""" % locals(), settings.SERVER_EMAIL, [settings.FEEDBACK_EMAIL_TO])
 
 class FeedbackForm(CciwFormMixin, forms.Form):
     email = forms.EmailField(label="Email address", max_length=320)

File cciw/forums/models.py

 
 """ % {'from': from_member.user_name, 'to': to_member.user_name,
         'domain': common.get_current_domain(), 'message': text},
-        "website@cciw.co.uk", [to_member.email])
+        settings.SERVER_EMAIL, [to_member.email])
         return msg
 
 

File cciw/forums/views/memberadmin.py

 ignore this e-mail.
 
 """ % {'domain': common.get_current_domain(), 'email': urllib.quote(email), 'hash': email_hash(email)},
-"website@cciw.co.uk", [email])
+                   settings.SERVER_EMAIL, [email])
 
 
 def send_username_reminder(member):
 
 Thanks.
 """ % {'domain': common.get_current_domain(), 'user_name': member.user_name },
-    "website@cciw.co.uk", [member.email])
+    settings.SERVER_EMAIL, [member.email])
 
 
 def send_newpassword_email(member):
 
 """ % {'domain': common.get_current_domain(), 'user_name': member.user_name,
        'password': password, 'hash': hash},
-    "website@cciw.co.uk", [member.email])
+    settings.SERVER_EMAIL, [member.email])
 
 
 def create_new_password_hash(password, user_name):
 """ % {'domain': common.get_current_domain(), 'email': urllib.quote(new_email),
        'user_name': urllib.quote(member.user_name),
        'hash': email_and_username_hash(new_email, member.user_name)},
-    "website@cciw.co.uk", [new_email])
+    settings.SERVER_EMAIL, [new_email])
 
 
 #################  VIEW FUNCTIONS #####################