Remove legacy contact forms, move to forms-builder.

[wolnelektury.git] / src / contact / views.py

diff --git a/src/contact/views.py b/src/contact/views.py
index 8bd8097..5f22f79 100644 (file)
--- a/src/contact/views.py
+++ b/src/contact/views.py
@@ -1,8 +1,9 @@
-# -*- coding: utf-8 -*-
-from urllib import unquote
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+from urllib.parse import unquote
 
-import pytz
-from django.conf import settings
+from datetime import datetime
 from django.contrib.auth.decorators import permission_required
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
@@ -11,11 +12,10 @@ from django.views.decorators.cache import never_cache
 from fnpdjango.utils.views import serve_file
 from honeypot.decorators import check_honeypot
 
+from wolnelektury.utils import localtime_to_utc
 from .forms import contact_forms
 from .models import Attachment, Contact
 
-tz = pytz.timezone(settings.TIME_ZONE)
-
 
 @check_honeypot
 @never_cache
@@ -26,8 +26,8 @@ def form(request, form_tag, force_enabled=False):
         raise Http404
     if not (force_enabled and request.user.is_superuser):
         disabled = getattr(form_class, 'disabled', False)
-        end_tuple = getattr(form_class, 'ends_on')
-        end_time = timezone.datetime(*end_tuple, tzinfo=tz) if end_tuple else None
+        end_tuple = getattr(form_class, 'ends_on', None)
+        end_time = localtime_to_utc(datetime(*end_tuple)) if end_tuple else None
         expired = end_time and end_time < timezone.now()
         if disabled or expired:
             template = getattr(form_class, 'disabled_template', None)
@@ -42,15 +42,15 @@ def form(request, form_tag, force_enabled=False):
     if request.method == 'POST':
         formsets = {
             prefix: formset_class(request.POST, request.FILES, prefix=prefix)
-            for prefix, formset_class in formset_classes.iteritems()}
-        if form.is_valid() and all(formset.is_valid() for formset in formsets.itervalues()):
+            for prefix, formset_class in formset_classes.items()}
+        if form.is_valid() and all(formset.is_valid() for formset in formsets.values()):
             contact = form.save(request, formsets.values())
             if form.result_page:
                 return redirect('contact_results', contact.id, contact.digest())
             else:
                 return redirect('contact_thanks', form_tag)
     else:
-        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.iteritems()}
+        formsets = {prefix: formset_class(prefix=prefix) for prefix, formset_class in formset_classes.items()}
 
     return render(
         request, ['contact/%s/form.html' % form_tag, 'contact/form.html'],