Oh, right

[edumed.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index e369e95..b975da3 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -1,7 +1,7 @@
 from django.contrib.sites.models import Site
 from django.core.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers
 from django.contrib.sites.models import Site
 from django.core.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers

-from django.core.validators import email_re
+from django.core.validators import validate_email

 from django import forms
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django import forms
 from django.template.loader import render_to_string
 from django.template import RequestContext


@@ -62,8 +62,8 @@ class ContactForm(forms.Form):
         site = Site.objects.get_current()
         dictionary = {
             'form_tag': self.form_tag,
         site = Site.objects.get_current()
         dictionary = {
             'form_tag': self.form_tag,

-            'site_name': site.name,
-            'site_domain': site.domain,
+            'site_name': getattr(self, 'site_name', site.name),
+            'site_domain': getattr(self, 'site_domain', site.domain),

             'contact': contact,
         }
         context = RequestContext(request)
             'contact': contact,
         }
         context = RequestContext(request)


@@ -78,7 +78,7 @@ class ContactForm(forms.Form):
         mail_managers(mail_managers_subject, mail_managers_body, 
             fail_silently=True)
 
         mail_managers(mail_managers_subject, mail_managers_body, 
             fail_silently=True)
 

-        if email_re.match(contact.contact):
+        if validate_email(contact.contact):

             mail_subject = render_to_string([
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt', 
             mail_subject = render_to_string([
                     'contact/%s/mail_subject.txt' % self.form_tag,
                     'contact/mail_subject.txt',