ADS System

[edumed.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index e369e95..2cea310 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-

 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site

+from django.core.exceptions import ValidationError

 from django.core.files.uploadedfile import UploadedFile
 from django.core.mail import send_mail, mail_managers
 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


@@ -10,10 +12,12 @@ from django.utils.translation import ugettext_lazy as _
 
 contact_forms = {}
 admin_list_width = 0
 
 contact_forms = {}
 admin_list_width = 0

+
+

 class ContactFormMeta(forms.Form.__class__):
 class ContactFormMeta(forms.Form.__class__):

-    def __new__(cls, *args, **kwargs):
+    def __new__(cls, name, bases, attrs):

         global admin_list_width
         global admin_list_width

-        model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs)
+        model = super(ContactFormMeta, cls).__new__(cls, name, bases, attrs)

         assert model.form_tag not in contact_forms, 'Duplicate form_tag.'
         if model.admin_list:
             admin_list_width = max(admin_list_width, len(model.admin_list))
         assert model.form_tag not in contact_forms, 'Duplicate form_tag.'
         if model.admin_list:
             admin_list_width = max(admin_list_width, len(model.admin_list))


@@ -49,10 +53,11 @@ class ContactForm(forms.Form):
                 if sub_body:
                     body.setdefault(f.form_tag, []).append(sub_body)
                 
                 if sub_body:
                     body.setdefault(f.form_tag, []).append(sub_body)
                 

-        contact = Contact.objects.create(body=body,
-                    ip=request.META['REMOTE_ADDR'],
-                    contact=self.cleaned_data['contact'],
-                    form_tag=self.form_tag)
+        contact = Contact.objects.create(
+            body=body,
+            ip=request.META['REMOTE_ADDR'],
+            contact=self.cleaned_data['contact'],
+            form_tag=self.form_tag)

         for name, value in self.cleaned_data.items():
             if isinstance(value, UploadedFile):
                 attachment = Attachment(contact=contact, tag=name)
         for name, value in self.cleaned_data.items():
             if isinstance(value, UploadedFile):
                 attachment = Attachment(contact=contact, tag=name)


@@ -62,8 +67,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)


@@ -75,10 +80,13 @@ class ContactForm(forms.Form):
                 'contact/%s/mail_managers_body.txt' % self.form_tag,
                 'contact/mail_managers_body.txt', 
             ], dictionary, context)
                 'contact/%s/mail_managers_body.txt' % self.form_tag,
                 'contact/mail_managers_body.txt', 
             ], dictionary, context)

-        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):
+        try:
+            validate_email(contact.contact)
+        except ValidationError:
+            pass
+        else:

             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', 


@@ -87,9 +95,6 @@ class ContactForm(forms.Form):
                     'contact/%s/mail_body.txt' % self.form_tag,
                     'contact/mail_body.txt', 
                 ], dictionary, context)
                     'contact/%s/mail_body.txt' % self.form_tag,
                     'contact/mail_body.txt', 
                 ], dictionary, context)

-            send_mail(mail_subject, mail_body,
-                'no-reply@%s' % site.domain,
-                [contact.contact],
-                fail_silently=True)
+            send_mail(mail_subject, mail_body, 'no-reply@%s' % site.domain, [contact.contact], fail_silently=True)

 
         return contact
 
         return contact