Fix contact form bug.

[prawokultury.git] / contact / forms.py

diff --git a/contact/forms.py b/contact/forms.py
index 81a83df..1195f02 100644 (file)
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -1,18 +1,24 @@
 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.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.utils.translation import ugettext_lazy as _
 from .models import Attachment, Contact
 
 
 contact_forms = {}
-class ContactFormMeta(forms.Form.__metaclass__):
+admin_list_width = 0
+class ContactFormMeta(forms.Form.__class__):
     def __new__(cls, *args, **kwargs):
+        global admin_list_width
         model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs)
         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))
         contact_forms[model.form_tag] = model
         return model
 
@@ -20,30 +26,40 @@ class ContactFormMeta(forms.Form.__metaclass__):
 class ContactForm(forms.Form):
     """Subclass and define some fields."""
     __metaclass__ = ContactFormMeta
+
+    started = False
+    form_tag = None
+    save_as_tag = None
+    form_title = _('Contact form')
+    submit_label = _('Submit')
+    admin_list = None
+
     required_css_class = 'required'
     contact = forms.CharField(max_length=128)
-    form_tag = None
 
     def save(self, request):
         body = {}
         for name, value in self.cleaned_data.items():
             if not isinstance(value, UploadedFile) and name != 'contact':
                     body[name] = value
+        save_as_tag = self.save_as_tag or self.form_tag
         contact = Contact.objects.create(body=body,
                     ip=request.META['REMOTE_ADDR'],
                     contact=self.cleaned_data['contact'],
-                    form_tag=self.form_tag)
+                    form_tag=save_as_tag)
         for name, value in self.cleaned_data.items():
             if isinstance(value, UploadedFile):
                 attachment = Attachment(contact=contact, tag=name)
                 attachment.file.save(value.name, value)
                 attachment.save()
 
+        site = Site.objects.get_current()
         dictionary = {
             'form_tag': self.form_tag,
-            'site': Site.objects.get_current(),
+            'site_name': site.name,
+            'site_domain': site.domain,
             'contact': contact,
-            'admin_url': '',
+            'form': self,
         }
         context = RequestContext(request)
         mail_managers_subject = render_to_string([
@@ -57,7 +73,11 @@ class ContactForm(forms.Form):
         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', 
@@ -67,7 +87,7 @@ class ContactForm(forms.Form):
                     'contact/mail_body.txt', 
                 ], dictionary, context)
             send_mail(mail_subject, mail_body,
-                'no-reply@%s' % dictionary['site'].domain,
+                'no-reply@%s' % site.domain,
                 [contact.contact],
                 fail_silently=True)