X-Git-Url: https://git.mdrn.pl/prawokultury.git/blobdiff_plain/2cd938606837981b7a3914458ae0071828ef37ca..3552318f888ebf2ab262ca435ec00eb706badadd:/contact/forms.py

diff --git a/contact/forms.py b/contact/forms.py
index d2df1f7..de4cd74 100644
--- a/contact/forms.py
+++ b/contact/forms.py
@@ -1,7 +1,8 @@
 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
@@ -11,7 +12,7 @@ from .models import Attachment, Contact
 
 contact_forms = {}
 admin_list_width = 0
-class ContactFormMeta(forms.Form.__metaclass__):
+class ContactFormMeta(forms.Form.__class__):
     def __new__(cls, *args, **kwargs):
         global admin_list_width
         model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs)
@@ -26,7 +27,9 @@ 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
@@ -34,17 +37,32 @@ class ContactForm(forms.Form):
     required_css_class = 'required'
     contact = forms.CharField(max_length=128)
 
+    def __init__(self, *args, **kwargs):
+        key = kwargs.pop('key', None)
+        super(ContactForm, self).__init__(*args, **kwargs)
+        self.key = key
+
     def save(self, request):
+        key = self.key
         body = {}
         for name, value in self.cleaned_data.items():
-            if not isinstance(value, UploadedFile) and name != 'contact':
+            if not isinstance(value, UploadedFile) and name != 'contact' and not name.startswith('_'):
                     body[name] = value
-        contact = Contact.objects.create(body=body,
+        save_as_tag = self.save_as_tag or self.form_tag
+        if key:
+            contact = Contact.objects.get(form_tag=save_as_tag, key=key)
+            contact.body = body
+            contact.ip = request.META['REMOTE_ADDR'] or '127.0.0.1'
+            contact.contact = self.cleaned_data['contact']
+            contact.save()
+        else:
+            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):
+                contact.attachment_set.filter(tag=name).delete()
                 attachment = Attachment(contact=contact, tag=name)
                 attachment.file.save(value.name, value)
                 attachment.save()
@@ -55,12 +73,13 @@ class ContactForm(forms.Form):
             'site_name': site.name,
             'site_domain': site.domain,
             'contact': contact,
+            'form': self,
         }
         context = RequestContext(request)
         mail_managers_subject = render_to_string([
                 'contact/%s/mail_managers_subject.txt' % self.form_tag,
                 'contact/mail_managers_subject.txt', 
-            ], dictionary, context)
+            ], dictionary, context).strip()
         mail_managers_body = render_to_string([
                 'contact/%s/mail_managers_body.txt' % self.form_tag,
                 'contact/mail_managers_body.txt', 
@@ -68,11 +87,15 @@ 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', 
-                ], dictionary, context)
+                ], dictionary, context).strip()
             mail_body = render_to_string([
                     'contact/%s/mail_body.txt' % self.form_tag,
                     'contact/mail_body.txt',