Add missing file

doc/api/resources/checkin.rst

@@ -71,6 +71,8 @@ Checking a ticket in
    :>json object questions: List of questions to be answered for check-in, only set on status ``"incomplete"``.
    :>json object media_policy: Reusable media policy (see documentation on items), only set on status ``"exchange"``.
    :>json object media_type: Reusable media type (see documentation on items), only set on status ``"exchange"``.
+   :>json boolean simulate: Do not actually perform the check-in, only simulate the response. The ``position`` response
+                            object will not reflect the simulated changes.
 
    **Example request**:
 

doc/api/resources/checkinlists.rst

@@ -351,8 +351,7 @@ Endpoints
 
    :<json boolean error_reason: One of ``canceled``, ``invalid``, ``unpaid``, ``product``, ``rules``, ``revoked``,
                                 ``incomplete``, ``already_redeemed``, ``blocked``, ``invalid_time``, or ``error``. Required.
-   :<json raw_barcode: The raw barcode or identifier you scanned. Required.
-   :<json raw_source_type: The type of medium you scanned, defaults to ``barcode``. Optional.
+   :<json raw_barcode: The raw barcode you scanned. Required.
    :<json datetime: Date and time of the scan. Optional.
    :<json type: Type of scan, defaults to ``"entry"``.
    :<json position: Internal ID of an order position you matched. Optional.

doc/api/resources/orders.rst

@@ -864,9 +864,6 @@ Generating new secrets
 
    Triggers generation of new ``secret`` and ``web_secret`` attributes for both the order and all order positions.
 
-   Ticket secrets of order positions that have been used to issue a gift card can not
-   be changed. Only the link (``web_secret``) will be changed in this case.
-
    **Example request**:
 
    .. sourcecode:: http
@@ -898,9 +895,6 @@ Generating new secrets
 
    Triggers generation of a new ``secret`` and ``web_secret`` attribute for a single order position.
 
-   Ticket secrets of order positions that have been used to issue a gift card can not
-   be changed. Only the link (``web_secret``) will be changed in this case.
-
    **Example request**:
 
    .. sourcecode:: http

doc/development/setup.rst

@@ -53,7 +53,7 @@ Working with the code
 ---------------------
 If you do not have a recent installation of ``nodejs``, install it now::
 
-    curl -sL https://deb.nodesource.com/setup_24.x | sudo -E bash -
+    curl -sL https://deb.nodesource.com/setup_17.x | sudo -E bash -
     sudo apt install nodejs
 
 To make sure it is on your path variable, close and reopen your terminal. Now, install the Python-level dependencies of pretix::

package-lock.json

@@ -2584,9 +2584,9 @@
       }
     },
     "node_modules/immutable": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz",
-      "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
       "dev": true,
       "license": "MIT"
     },
@@ -3176,9 +3176,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.16",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
-      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
+      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
       "funding": [
         {
           "type": "github",
@@ -3352,9 +3352,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.23",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.23.tgz",
-      "integrity": "sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==",
+      "version": "8.5.15",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -3371,7 +3371,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.16",
+        "nanoid": "^3.3.12",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },

pyproject.toml

@@ -40,11 +40,11 @@ dependencies = [
   "Django[argon2]==5.2.*",
   "django-bootstrap3==26.1",
   "django-compressor==4.6.0",
-  "django-countries==9.0.*",
-  "django-filter==26.1",
+  "django-countries==8.2.*",
+  "django-filter==25.1",
   "django-formset-js-improved==0.5.0.5",
-  "django-formtools==2.7",
-  "django-hierarkey==2.0.*,>=2.0.2",
+  "django-formtools==2.6.1",
+  "django-hierarkey==2.0.*,>=2.0.1",
   "django-hijack==3.7.*",
   "django-i18nfield==1.11.*",
   "django-libsass==0.9",
@@ -52,10 +52,10 @@ dependencies = [
   "django-markup",
   "django-oauth-toolkit==2.3.*",
   "django-otp==1.7.*",
-  "django-phonenumber-field==8.5.*",
+  "django-phonenumber-field==8.4.*",
   "django-querytagger==0.0.3",
   "django-redis==7.0.*",
-  "django-scopes==2.1.*",
+  "django-scopes==2.0.*",
   "django-statici18n==2.7.*",
   "djangorestframework==3.17.*",
   "dnspython==2.8.*",
@@ -94,11 +94,11 @@ dependencies = [
   "redis==7.4.*",
   "reportlab==5.0.*",
   "requests==2.34.*",
-  "sentry-sdk==2.66.*",
+  "sentry-sdk==2.64.*",
   "sepaxml==2.7.*",
   "stripe==7.9.*",
   "text-unidecode==1.*",
-  "tlds>=2026072401",
+  "tlds>=2026041800",
   "tqdm==4.*",
   "ua-parser==1.0.*",
   "vobject==0.9.*",
@@ -112,7 +112,7 @@ dev = [
   "aiohttp==3.14.*",
   "coverage",
   "coveralls",
-  "fakeredis==2.37.*",
+  "fakeredis==2.36.*",
   "flake8==7.3.*",
   "freezegun",
   "isort==8.0.*",

src/pretix/__init__.py

@@ -19,4 +19,4 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-__version__ = "2026.7.0"
+__version__ = "2026.7.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -20,6 +20,7 @@
 # <https://www.gnu.org/licenses/>.
 #
 import logging
+from collections import OrderedDict
 
 from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
@@ -51,18 +52,10 @@ class BaseSecurityProfile:
         """
         raise NotImplementedError()
 
-    @property
-    def priority(self) -> int:
-        """
-        Priority for ordering, higher will come first.
-        """
-        return 100
-
 
 class FullAccessSecurityProfile(BaseSecurityProfile):
     identifier = 'full'
     verbose_name = _('Full device access (reading and changing orders and gift cards, reading of products and settings)')
-    priority = 1000
 
     def is_allowed(self, request):
         return True
@@ -115,7 +108,6 @@ class PretixScanSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
         ('GET', 'api-v1:reusablemedium-list'),
         ('POST', 'api-v1:reusablemedium-lookup'),
@@ -154,7 +146,6 @@ class PretixScanNoSyncNoSearchSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
     )
 
@@ -191,7 +182,6 @@ class PretixScanNoSyncSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:event.settings'),
         ('POST', 'api-v1:upload'),
         ('POST', 'api-v1:checkinrpc.redeem'),
-        ('POST', 'api-v1:checkinrpc.annull'),
         ('GET', 'api-v1:checkinrpc.search'),
     )
 
@@ -202,15 +192,13 @@ def get_all_security_profiles():
     if _ALL_PROFILES:
         return _ALL_PROFILES
 
-    types = []
+    types = OrderedDict()
     for recv, ret in register_device_security_profile.send(None):
         if isinstance(ret, (list, tuple)):
             for r in ret:
-                types.append(r)
+                types[r.identifier] = r
         else:
-            types.append(ret)
-    types.sort(key=lambda el: el.priority, reverse=True)
-    types = {r.identifier: r for r in types}
+            types[ret.identifier] = ret
     _ALL_PROFILES = types
     return types
 

src/pretix/api/serializers/__init__.py

@@ -20,7 +20,6 @@
 # <https://www.gnu.org/licenses/>.
 #
 import json
-import re
 
 from django.db.models import prefetch_related_objects
 from rest_framework import serializers
@@ -136,30 +135,3 @@ class SalesChannelMigrationMixin:
         else:
             value["sales_channels"] = value["limit_sales_channels"]
         return value
-
-
-class CompatDecimalField(serializers.DecimalField):
-    """
-    Historically, pretix recorded tax rates as decimals with two places. Today, pretix supports tax rates with up to
-    four places. Since our API outputs decimals with the stored precision, this would have changed the API output from
-    "19.00" to "19.0000" without warning. While this is semantically the same thing, we need to assume some pretix API
-    users might run into trouble, either because they treat the value as a string and then map something
-    (e.g. ``if tax_rate == "19.00"``) or process it with a language where this is a significant difference. For example,
-    while in Python ``Decimal("19.00") == Decimal("19.0000")`` is true, in Java
-    ``(new BigDecimal("19.00")).equals(new BigDecimal("19.0000"))`` is false and only
-    ``(new BigDecimal("19.00")).compareTo(new BigDecimal("19.0000")) == 0`` is true.
-
-    Therefore, we stay backwards compatible by outputting two decimal places *as long as the trailing digits are zero-valued.
-    """
-
-    regex = re.compile(r"^([0-9]+\.[0-9]{2})0+$")
-
-    def to_representation(self, value):
-        if self.localize:
-            raise ValueError("localization not supported")
-        value = super().to_representation(value)
-        if value and "." not in value:
-            return f"{value}.00"
-        if m := self.regex.match(value):
-            return m.group(1)
-        return value

src/pretix/api/serializers/checkin.py

@@ -90,6 +90,7 @@ class CheckinRPCRedeemInputSerializer(serializers.Serializer):
     answers = serializers.JSONField(required=False, allow_null=True)
     exchange_medium_type = serializers.ChoiceField(required=False, choices=MEDIA_TYPES)
     exchange_medium_identifier = serializers.CharField(required=False)
+    simulate = serializers.BooleanField(default=False, required=False)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

src/pretix/api/serializers/event.py

@@ -48,7 +48,7 @@ from rest_framework.fields import ChoiceField, Field
 from rest_framework.relations import SlugRelatedField
 
 from pretix.api.serializers import (
-    CompatDecimalField, CompatibleJSONField, SalesChannelMigrationMixin,
+    CompatibleJSONField, SalesChannelMigrationMixin,
 )
 from pretix.api.serializers.fields import PluginsField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
@@ -681,7 +681,6 @@ class TaxRuleSerializer(CountryFieldMixin, I18nAwareModelSerializer):
         required=False,
         allow_null=True,
     )
-    rate = CompatDecimalField(max_digits=7, decimal_places=4)
 
     class Meta:
         model = TaxRule

src/pretix/api/serializers/item.py

@@ -42,9 +42,7 @@ from django.utils.functional import cached_property, lazy
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 
-from pretix.api.serializers import (
-    CompatDecimalField, SalesChannelMigrationMixin,
-)
+from pretix.api.serializers import SalesChannelMigrationMixin
 from pretix.api.serializers.event import MetaDataField
 from pretix.api.serializers.fields import UploadedFileField
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
@@ -278,10 +276,10 @@ class ItemAddOnSerializer(serializers.ModelSerializer):
         return value
 
 
-class ItemTaxRateField(CompatDecimalField):
+class ItemTaxRateField(serializers.Field):
     def to_representation(self, i):
         if i.tax_rule:
-            return super().to_representation(Decimal(i.tax_rule.rate))
+            return str(Decimal(i.tax_rule.rate))
         else:
             return str(Decimal('0.00'))
 
@@ -291,7 +289,7 @@ class ItemSerializer(SalesChannelMigrationMixin, I18nAwareModelSerializer):
     bundles = InlineItemBundleSerializer(many=True, required=False)
     variations = InlineItemVariationSerializer(many=True, required=False)
     program_times = InlineItemProgramTimeSerializer(many=True, required=False)
-    tax_rate = ItemTaxRateField(source='*', read_only=True, max_digits=7, decimal_places=4)
+    tax_rate = ItemTaxRateField(source='*', read_only=True)
     meta_data = MetaDataField(required=False, source='*')
     picture = UploadedFileField(required=False, allow_null=True, allowed_types=(
         'image/png', 'image/jpeg', 'image/gif'

src/pretix/api/serializers/order.py

@@ -41,7 +41,7 @@ from rest_framework.exceptions import ValidationError
 from rest_framework.relations import SlugRelatedField
 from rest_framework.reverse import reverse
 
-from pretix.api.serializers import CompatDecimalField, CompatibleJSONField
+from pretix.api.serializers import CompatibleJSONField
 from pretix.api.serializers.event import SubEventSerializer
 from pretix.api.serializers.forms import form_field_to_serializer_field
 from pretix.api.serializers.i18n import I18nAwareModelSerializer
@@ -52,7 +52,6 @@ from pretix.api.signals import order_api_details, orderposition_api_details
 from pretix.base.decimal import round_decimal
 from pretix.base.i18n import language
 from pretix.base.invoicing.transmission import get_transmission_types
-from pretix.base.media import MEDIA_TYPES
 from pretix.base.models import (
     CachedFile, Checkin, Customer, Device, GiftCard, Invoice, InvoiceAddress,
     InvoiceLine, Item, ItemVariation, Order, OrderPosition, Question,
@@ -382,7 +381,6 @@ class PrintLogSerializer(serializers.ModelSerializer):
 class FailedCheckinSerializer(I18nAwareModelSerializer):
     error_reason = serializers.ChoiceField(choices=Checkin.REASONS, required=True, allow_null=False)
     raw_barcode = serializers.CharField(required=True, allow_null=False)
-    raw_source_type = serializers.ChoiceField(choices=[(k, v) for k, v in MEDIA_TYPES.items()], default='barcode')
     position = serializers.PrimaryKeyRelatedField(queryset=OrderPosition.all.none(), required=False, allow_null=True)
     raw_item = serializers.PrimaryKeyRelatedField(queryset=Item.objects.none(), required=False, allow_null=True)
     raw_variation = serializers.PrimaryKeyRelatedField(queryset=ItemVariation.objects.none(), required=False, allow_null=True)
@@ -392,7 +390,7 @@ class FailedCheckinSerializer(I18nAwareModelSerializer):
     class Meta:
         model = Checkin
         fields = ('error_reason', 'error_explanation', 'raw_barcode', 'raw_item', 'raw_variation',
-                  'raw_subevent', 'raw_source_type', 'nonce', 'datetime', 'type', 'position')
+                  'raw_subevent', 'nonce', 'datetime', 'type', 'position')
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -593,7 +591,6 @@ class OrderPositionSerializer(I18nAwareModelSerializer):
     country = CompatibleCountryField(source='*')
     attendee_name = serializers.CharField(required=False)
     plugin_data = OrderPositionPluginDataField(source='*', allow_null=True, read_only=True)
-    tax_rate = CompatDecimalField(max_digits=7, decimal_places=4)
 
     class Meta:
         list_serializer_class = OrderPositionListSerializer
@@ -750,8 +747,6 @@ class OrderPaymentDateField(serializers.DateField):
 
 
 class OrderFeeSerializer(I18nAwareModelSerializer):
-    tax_rate = CompatDecimalField(max_digits=7, decimal_places=4)
-
     class Meta:
         model = OrderFee
         fields = ('id', 'fee_type', 'value', 'description', 'internal_type', 'tax_rate', 'tax_value', 'tax_rule',
@@ -1916,7 +1911,6 @@ class InlineInvoiceLineSerializer(I18nAwareModelSerializer):
     position = LinePositionField(read_only=True)
     event_date_from = serializers.DateTimeField(read_only=True, source="period_start")
     event_date_to = serializers.DateTimeField(read_only=True, source="period_end")
-    tax_rate = CompatDecimalField(max_digits=7, decimal_places=4)
 
     class Meta:
         model = InvoiceLine
@@ -2000,7 +1994,6 @@ class BlockedTicketSecretSerializer(I18nAwareModelSerializer):
 
 class TransactionSerializer(I18nAwareModelSerializer):
     order = serializers.SlugRelatedField(slug_field="code", read_only=True)
-    tax_rate = CompatDecimalField(max_digits=7, decimal_places=4)
 
     class Meta:
         model = Transaction

src/pretix/api/views/checkin.py

@@ -837,6 +837,11 @@ def _redeem_process(*, checkinlists, raw_barcode, answers_data, datetime, force,
             )
 
             if exchange_medium_identifier:  # other fields are filled, see CheckinRPCRedeemInputSerializer.validate
+                if simulate:
+                    raise CheckInError(
+                        gettext('You cannot simulate a medium exchange.'),
+                        'error'
+                    )
                 with transaction.atomic():
                     # Do exchange and check-in atomically, i.e. both succeed or both fail
                     medium = perform_media_exchange(
@@ -1064,6 +1069,7 @@ class CheckinRPCRedeemView(views.APIView):
             legacy_url_support=False,
             exchange_medium_type=s.validated_data.get('exchange_medium_type'),
             exchange_medium_identifier=s.validated_data.get('exchange_medium_identifier'),
+            simulate=s.validated_data.get('simulate'),
         )
 
 

src/pretix/api/views/event.py

@@ -45,7 +45,6 @@ from rest_framework.exceptions import (
     NotFound, PermissionDenied, ValidationError,
 )
 from rest_framework.generics import get_object_or_404
-from rest_framework.mixins import UpdateModelMixin
 from rest_framework.response import Response
 
 from pretix.api.auth.permission import EventCRUDPermission
@@ -712,7 +711,7 @@ class SeatFilter(FilterSet):
         fields = ('zone_name', 'row_name', 'row_label', 'seat_number', 'seat_label', 'seat_guid', 'blocked',)
 
 
-class SeatViewSet(ConditionalListView, UpdateModelMixin, viewsets.ReadOnlyModelViewSet):
+class SeatViewSet(ConditionalListView, viewsets.ModelViewSet):
     serializer_class = SeatSerializer
     queryset = Seat.objects.none()
     write_permission = 'event.settings.general:write'

src/pretix/api/views/order.py

@@ -1658,7 +1658,6 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                         count_waitinglist=False,
                         force=request.data.get('force', False),
                         send_mail=send_mail,
-                        ignore_date=request.data.get('force', False),
                     )
                 except Quota.QuotaExceededException:
                     pass
@@ -1694,8 +1693,7 @@ class PaymentViewSet(CreateModelMixin, viewsets.ReadOnlyModelViewSet):
                             auth=self.request.auth,
                             count_waitinglist=False,
                             send_mail=send_mail,
-                            force=force,
-                            ignore_date=force)
+                            force=force)
         except Quota.QuotaExceededException as e:
             return Response({'detail': str(e)}, status=status.HTTP_400_BAD_REQUEST)
         except PaymentException as e:

src/pretix/base/context.py

@@ -23,7 +23,6 @@ import sys
 
 from django.conf import settings
 from django.urls import reverse
-from django.utils.html import escape, format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext
 
@@ -36,23 +35,21 @@ def get_powered_by(request, safelink=True):
     d = gs.settings.license_check_input
     if d.get('poweredby_name'):
         if d.get('poweredby_url'):
-            msg = format_html(
-                gettext('<a {a_name_attr}>powered by {name}</a> <a {a_attr}>based on pretix</a>'),
+            msg = gettext('<a {a_name_attr}>powered by {name}</a> <a {a_attr}>based on pretix</a>').format(
                 name=d['poweredby_name'],
-                a_name_attr=mark_safe('href="{}" target="_blank" rel="noopener"'.format(
-                    escape(sl(d['poweredby_url'])) if safelink else escape(d['poweredby_url']),
-                )),
-                a_attr=mark_safe('href="{}" target="_blank" rel="noopener"'.format(
+                a_name_attr='href="{}" target="_blank" rel="noopener"'.format(
+                    sl(d['poweredby_url']) if safelink else d['poweredby_url'],
+                ),
+                a_attr='href="{}" target="_blank" rel="noopener"'.format(
                     sl('https://pretix.eu') if safelink else 'https://pretix.eu',
-                ))
+                )
             )
         else:
-            msg = format_html(
-                gettext('<a {a_attr}>powered by {name} based on pretix</a>'),
+            msg = gettext('<a {a_attr}>powered by {name} based on pretix</a>').format(
                 name=d['poweredby_name'],
-                a_attr=mark_safe('href="{}" target="_blank" rel="noopener"'.format(
+                a_attr='href="{}" target="_blank" rel="noopener"'.format(
                     sl('https://pretix.eu') if safelink else 'https://pretix.eu',
-                ))
+                )
             )
     else:
         msg = gettext('<a %(a_attr)s>ticketing powered by pretix</a>') % {

src/pretix/base/email.py

@@ -19,6 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+import ipaddress
 import logging
 import smtplib
 import socket
@@ -42,7 +43,6 @@ from pretix.base.templatetags.rich_text import (
     markdown_compile_email, truelink_callback,
 )
 from pretix.helpers.format import FormattedString, SafeFormatter, format_map
-from pretix.helpers.ssrf import should_block_access
 
 from pretix.base.services.placeholders import (  # noqa
     get_available_placeholders, PlaceholderContext
@@ -57,6 +57,8 @@ logger = logging.getLogger('pretix.base.email')
 
 T = TypeVar("T", bound=EmailBackend)
 
+_cgnat_net = ipaddress.ip_network('100.64.0.0/10')
+
 
 def test_custom_smtp_backend(backend: T, from_addr: str) -> None:
     try:
@@ -252,9 +254,16 @@ def create_connection(address, timeout=socket.getdefaulttimeout(),
         af, socktype, proto, canonname, sa = res
 
         if not getattr(settings, "MAIL_CUSTOM_SMTP_ALLOW_PRIVATE_NETWORKS", False):
-            is_private, msg = should_block_access(sa)
-            if is_private:
-                raise socket.error(msg)
+            ip_addr = ipaddress.ip_address(sa[0])
+            check_ip4 = ip_addr.ipv4_mapped if getattr(ip_addr, "ipv4_mapped", None) else ip_addr
+            if ip_addr.is_multicast:
+                raise socket.error(f"Request to multicast address {sa[0]} blocked")
+            if ip_addr.is_loopback or ip_addr.is_link_local:
+                raise socket.error(f"Request to local address {sa[0]} blocked")
+            if ip_addr.is_private:
+                raise socket.error(f"Request to private address {sa[0]} blocked")
+            if check_ip4 in _cgnat_net:
+                raise socket.error(f"Request to RFC 6598 address {sa[0]} blocked")
 
         sock = None
         try:

src/pretix/base/exporters/customers.py

@@ -40,12 +40,11 @@ from django.utils.translation import gettext as _, gettext_lazy, pgettext_lazy
 
 from pretix.base.settings import PERSON_NAME_SCHEMES
 
-from ..exporter import MultiSheetListExporter, OrganizerLevelExportMixin
-from ..models import Membership
+from ..exporter import ListExporter, OrganizerLevelExportMixin
 from ..signals import register_multievent_data_exporters
 
 
-class CustomerListExporter(OrganizerLevelExportMixin, MultiSheetListExporter):
+class CustomerListExporter(OrganizerLevelExportMixin, ListExporter):
     identifier = 'customerlist'
     verbose_name = gettext_lazy('Customer accounts')
     category = pgettext_lazy('export_category', 'Customer accounts')
@@ -55,20 +54,13 @@ class CustomerListExporter(OrganizerLevelExportMixin, MultiSheetListExporter):
     def get_required_organizer_permission(cls) -> str:
         return 'organizer.customers:write'
 
-    @property
-    def sheets(self):
-        return (
-            ('customers', _('Customers')),
-            ('memberships', _('Memberships')),
-        )
-
     @property
     def additional_form_fields(self):
         return OrderedDict(
             []
         )
 
-    def iterate_customers(self, form_data):
+    def iterate_list(self, form_data):
         qs = self.organizer.customers.prefetch_related('provider')
 
         headers = [
@@ -117,52 +109,6 @@ class CustomerListExporter(OrganizerLevelExportMixin, MultiSheetListExporter):
             ]
             yield row
 
-    def iterate_memberships(self, form_data):
-        qs = Membership.objects.filter(
-            customer__organizer=self.organizer
-        ).prefetch_related('membership_type').select_related('customer', 'granted_in', 'granted_in__order')
-
-        headers = [
-            _('Customer ID'),
-            _('External identifier'),
-            _('Email'),
-            _('Test mode'),
-            _('Canceled'),
-            _('Membership type'),
-            _('Purchase ticket'),
-            _('Start date'),
-            _('Start time'),
-            _('End date'),
-            _('End time'),
-            _('Name'),
-        ]
-        name_scheme = PERSON_NAME_SCHEMES[self.organizer.settings.name_scheme]
-        if name_scheme and len(name_scheme['fields']) > 1:
-            for k, label, w in name_scheme['fields']:
-                headers.append(_('Name') + ': ' + str(label))
-        yield headers
-
-        tz = get_current_timezone()
-        for obj in qs:
-            row = [
-                obj.customer.identifier,
-                obj.customer.external_identifier,
-                obj.customer.email or '',
-                _('Yes') if obj.testmode else _('No'),
-                _('Yes') if obj.canceled else _('No'),
-                str(obj.membership_type.name),
-                f'{obj.granted_in.order.code}-{obj.granted_in.positionid}' if obj.granted_in else None,
-                obj.date_start.astimezone(tz).strftime('%Y-%m-%d'),
-                obj.date_start.astimezone(tz).strftime('%H:%M'),
-                obj.date_end.astimezone(tz).strftime('%Y-%m-%d'),
-                obj.date_end.astimezone(tz).strftime('%H:%M'),
-                obj.attendee_name or '',
-            ]
-            if name_scheme and len(name_scheme['fields']) > 1:
-                for k, label, w in name_scheme['fields']:
-                    row.append(obj.attendee_name_parts.get(k, ''))
-            yield row
-
     def get_filename(self):
         return '{}_customers'.format(self.organizer.slug)
 

src/pretix/base/forms/auth.py

@@ -33,6 +33,8 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
+import hashlib
+import ipaddress
 import logging
 
 from django import forms
@@ -40,12 +42,13 @@ from django.conf import settings
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
 )
+from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
 from pretix.base.metrics import pretix_failed_logins
 from pretix.base.models import User
 from pretix.helpers.dicts import move_to_end
-from pretix.helpers.ratelimit import rate_limit
+from pretix.helpers.http import get_client_ip
 
 logger = logging.getLogger(__name__)
 
@@ -82,20 +85,40 @@ class LoginForm(forms.Form):
         else:
             move_to_end(self.fields, 'keep_logged_in')
 
+    @cached_property
+    def ratelimit_key(self):
+        if not settings.HAS_REDIS:
+            return None
+        client_ip = get_client_ip(self.request)
+        if not client_ip:
+            return None
+        try:
+            client_ip = ipaddress.ip_address(client_ip)
+        except ValueError:
+            # Web server not set up correctly
+            return None
+        if client_ip.is_private:
+            # This is the private IP of the server, web server not set up correctly
+            return None
+        return 'pretix_login_{}'.format(hashlib.sha1(str(client_ip).encode()).hexdigest())
+
     def clean(self):
         if all(k in self.cleaned_data for k, f in self.fields.items() if f.required):
-            rate_limit_kwargs = dict(include_ip_from_request=self.request, max_num=10, expire_time=300)
-            if rate_limit("login", **rate_limit_kwargs, increase=False):
-                # Check rate limit without counting up, we increase below only on failed logins
-                pretix_failed_logins.inc(1, reason="ratelimit")
-                logger.info("Backend login rejected due to rate limit.")
-                raise forms.ValidationError(self.error_messages['rate_limit'], code='rate_limit')
+            if self.ratelimit_key:
+                from django_redis import get_redis_connection
+                rc = get_redis_connection("redis")
+                cnt = rc.get(self.ratelimit_key)
+                if cnt and int(cnt) > 10:
+                    pretix_failed_logins.inc(1, reason="ratelimit")
+                    logger.info("Backend login rejected due to rate limit.")
+                    raise forms.ValidationError(self.error_messages['rate_limit'], code='rate_limit')
             self.user_cache = self.backend.form_authenticate(self.request, self.cleaned_data)
             if self.user_cache is None:
+                if self.ratelimit_key:
+                    rc.incr(self.ratelimit_key)
+                    rc.expire(self.ratelimit_key, 300)
                 logger.info("Backend login invalid.")
                 pretix_failed_logins.inc(1, reason="invalid")
-                # Count towards rate limit (result is ignored, we are checking above)
-                rate_limit("login", **rate_limit_kwargs)
                 raise forms.ValidationError(
                     self.error_messages['invalid_login'],
                     code='invalid_login'

src/pretix/base/forms/questions.py

@@ -959,7 +959,7 @@ class BaseQuestionsForm(forms.Form):
                     label=label, required=required,
                     help_text=help_text,
                     initial=_initial,
-                    widget=TimePickerWidget(without_seconds=True),
+                    widget=TimePickerWidget(time_format=get_format_without_seconds('TIME_INPUT_FORMATS')),
                 )
             elif q.type == Question.TYPE_DATETIME:
                 if not help_text:
@@ -1116,13 +1116,6 @@ class BaseQuestionsForm(forms.Form):
             if q.dependency_question_id and not question_is_visible(q.dependency_question_id, q.dependency_values) and answer is not None:
                 d['question_%d' % q.pk] = None
 
-        # Strip False answers to required yes/no questions even if all_optional is set, as our data model assumes that
-        # required yes/no questions can only be answered with yes
-        for q in question_cache.values():
-            if q.required and q.type == Question.TYPE_BOOLEAN:
-                if 'question_%d' % q.pk in d and d['question_%d' % q.pk] is False:
-                    d['question_%d' % q.pk] = None
-
         return d
 
 

src/pretix/base/forms/user.py

@@ -33,6 +33,7 @@
 # License for the specific language governing permissions and limitations under the License.
 
 from django import forms
+from django.conf import settings
 from django.contrib.auth.hashers import check_password
 from django.contrib.auth.password_validation import (
     password_validators_help_texts, validate_password,
@@ -45,7 +46,6 @@ from pytz import common_timezones
 from pretix.base.models import User
 from pretix.control.forms import SingleLanguageWidget
 from pretix.helpers.format import format_map
-from pretix.helpers.ratelimit import rate_limit
 
 
 class UserSettingsForm(forms.ModelForm):
@@ -128,11 +128,16 @@ class UserPasswordChangeForm(forms.Form):
     def clean_old_pw(self):
         old_pw = self.cleaned_data.get('old_pw')
 
-        if rate_limit("pwchange", self.user.pk, max_num=10, expire_time=300):
-            raise forms.ValidationError(
-                self.error_messages['rate_limit'],
-                code='rate_limit',
-            )
+        if settings.HAS_REDIS:
+            from django_redis import get_redis_connection
+            rc = get_redis_connection("redis")
+            cnt = rc.incr('pretix_pwchange_%s' % self.user.pk)
+            rc.expire('pretix_pwchange_%s' % self.user.pk, 300)
+            if cnt > 10:
+                raise forms.ValidationError(
+                    self.error_messages['rate_limit'],
+                    code='rate_limit',
+                )
 
         if not check_password(old_pw, self.user.password):
             raise forms.ValidationError(
@@ -170,35 +175,19 @@ class UserEmailChangeForm(forms.Form):
     error_messages = {
         'duplicate_identifier': _("There already is an account associated with this email address. "
                                   "Please choose a different one."),
-        'rate_limit': _("For security reasons, please wait 5 minutes before you try again."),
     }
     old_email = forms.EmailField(label=_('Old email address'), disabled=True)
     new_email = forms.EmailField(label=_('New email address'))
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop('user')
-        self.request = kwargs.pop('request')
         super().__init__(*args, **kwargs)
 
     def clean_new_email(self):
         email = self.cleaned_data['new_email']
-
-        if rate_limit("emailchange_attempt", include_ip_from_request=self.request, max_num=5, expire_time=300):
-            # Rate limit lookup for conflicting email addresses to make enumeration harder
-            raise forms.ValidationError(
-                self.error_messages['rate_limit'],
-                code='rate_limit',
-            )
-
         if User.objects.filter(Q(email__iexact=email) & ~Q(pk=self.user.pk)).exists():
             raise forms.ValidationError(
                 self.error_messages['duplicate_identifier'],
                 code='duplicate_identifier',
             )
-
-        if rate_limit("emailchange", self.user.pk, max_num=2, expire_time=300):
-            raise forms.ValidationError(
-                self.error_messages['rate_limit'],
-                code='rate_limit',
-            )
         return email

src/pretix/base/forms/widgets.py

@@ -43,10 +43,6 @@ from django.utils.timezone import get_current_timezone, now
 from django.utils.translation import gettext_lazy as _
 
 from pretix.helpers.format import PlainHtmlAlternativeString
-from pretix.helpers.i18n import (
-    get_format_without_seconds, get_javascript_format,
-    get_javascript_format_without_seconds,
-)
 
 
 def replace_arabic_numbers(inp):
@@ -112,7 +108,7 @@ class DatePickerWidget(forms.DateInput):
 
 
 class TimePickerWidget(forms.TimeInput):
-    def __init__(self, attrs=None, time_format=None, without_seconds=False):
+    def __init__(self, attrs=None, time_format=None):
         attrs = attrs or {}
         if 'placeholder' in attrs:
             del attrs['placeholder']
@@ -121,27 +117,8 @@ class TimePickerWidget(forms.TimeInput):
         time_attrs['class'] += ' timepickerfield'
         time_attrs['autocomplete'] = 'off'
 
-        if time_format or without_seconds:
-            # Explicitly set data-format attributes for the JS layer instead of relying on the body-wide config
-            def time_format_attr():
-                if without_seconds:
-                    return get_javascript_format_without_seconds(time_format or "TIME_INPUT_FORMATS")
-                return get_javascript_format(time_format or "TIME_INPUT_FORMATS")
-
-            time_attrs['data-format'] = lazy(time_format_attr, str)
-
-            def time_format_attr():
-                if without_seconds:
-                    return get_javascript_format_without_seconds(time_format or "TIME_INPUT_FORMATS")
-                return get_javascript_format(time_format or "TIME_INPUT_FORMATS")
-
-            time_attrs['data-format'] = lazy(time_format_attr, str)
-
         def placeholder():
-            if without_seconds:
-                tf = time_format or get_format_without_seconds('TIME_INPUT_FORMATS')
-            else:
-                tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
+            tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
             return now().replace(
                 year=2000, month=1, day=1, hour=0, minute=0, second=0, microsecond=0
             ).strftime(tf)
@@ -205,7 +182,7 @@ class UploadedFileWidget(forms.ClearableFileInput):
 class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
     template_name = 'pretixbase/forms/widgets/splitdatetime.html'
 
-    def __init__(self, attrs=None, date_format=None, time_format=None, min_date=None, max_date=None, without_seconds=False):
+    def __init__(self, attrs=None, date_format=None, time_format=None, min_date=None, max_date=None):
         attrs = attrs or {}
         if 'placeholder' in attrs:
             del attrs['placeholder']
@@ -228,36 +205,14 @@ class SplitDateTimePickerWidget(forms.SplitDateTimeWidget):
                 max_date if not isinstance(max_date, datetime) else max_date.astimezone(get_current_timezone()).date()
             ).isoformat()
 
-        if date_format or time_format or without_seconds:
-            # Explicitly set data-format attributes for the JS layer instead of relying on the body-wide config
-            def date_format_attr():
-                if without_seconds:
-                    return get_javascript_format_without_seconds(date_format or "DATE_INPUT_FORMATS")
-                return get_javascript_format(date_format or "DATE_INPUT_FORMATS")
-
-            date_attrs['data-format'] = lazy(date_format_attr, str)
-
-            def time_format_attr():
-                if without_seconds:
-                    return get_javascript_format_without_seconds(time_format or "TIME_INPUT_FORMATS")
-                return get_javascript_format(time_format or "TIME_INPUT_FORMATS")
-
-            time_attrs['data-format'] = lazy(time_format_attr, str)
-
         def date_placeholder():
-            if without_seconds:
-                df = date_format or get_format_without_seconds('DATE_INPUT_FORMATS')
-            else:
-                df = date_format or get_format('DATE_INPUT_FORMATS')[0]
+            df = date_format or get_format('DATE_INPUT_FORMATS')[0]
             return now().replace(
                 year=2000, month=12, day=31, hour=18, minute=0, second=0, microsecond=0
             ).strftime(df)
 
         def time_placeholder():
-            if without_seconds:
-                tf = time_format or get_format_without_seconds('TIME_INPUT_FORMATS')
-            else:
-                tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
+            tf = time_format or get_format('TIME_INPUT_FORMATS')[0]
             return now().replace(
                 year=2000, month=1, day=1, hour=0, minute=0, second=0, microsecond=0
             ).strftime(tf)

src/pretix/base/middleware.py

@@ -19,8 +19,6 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import base64
-import hashlib
 import logging
 import re
 from collections import OrderedDict
@@ -71,44 +69,11 @@ def get_supported_language(requested_language, allowed_languages, default_langua
     return language
 
 
-class BaseLocaleMiddleware(MiddlewareMixin):
-    """
-    This is a reduced LocaleMiddleware that uses only information contained in the WSGI request data
-    to figure out the language (cookie and browser settings). We need it to have a consistent language
-    for error pages that are generated from the middleware stack before we know e.g. which user is logged
-    in or which event is selected.
-    """
-
-    def process_request(self, request: HttpRequest):
-        language = get_language_from_early_request(request)
-        translation.activate(language)
-        set_region(None)
-        request.LANGUAGE_CODE = language
-        timezone.deactivate()
-
-    def process_response(self, request: HttpRequest, response: HttpResponse):
-        language = translation.get_language()
-        patch_vary_headers(response, ('Accept-Language',))
-        if 'Content-Language' not in response:
-            response['Content-Language'] = language
-        return response
-
-
 class LocaleMiddleware(MiddlewareMixin):
+
     """
-    This is the full LocaleMiddleware that uses all available information to figure out the correct
-    language for the request using all available sources, in this order of priority:
-
-    - Backend: User settings
-    - Language cookie
-    - Frontend: Customer account settings
-    - Browser settings
-    - Frontend: Event/Organizer settings
-    - System default
-
-    It needs to run late in the middleware stack to have all information available for these steps.
-    For some cases, it is even ran a second time since the event is sometimes only figured out after the
-    middleware stack (can happen for plugin views).
+    This middleware sets the correct locale and timezone
+    for a request.
     """
 
     def process_request(self, request: HttpRequest):
@@ -223,24 +188,6 @@ def get_default_language():
         return settings.LANGUAGE_CODE
 
 
-def get_language_from_early_request(request: HttpRequest) -> str:
-    """
-    Analyzes the request to find what language the user wants the system to
-    show using only WSGI-available information. Only languages listed in
-    settings.LANGUAGES are taken into account. If the user requests a sublanguage
-    where we have a main language, we send out the main language.
-    """
-    global _supported
-    if _supported is None:
-        _supported = OrderedDict(settings.LANGUAGES)
-
-    return (
-        get_language_from_cookie(request)
-        or get_language_from_browser(request)
-        or get_default_language()
-    )
-
-
 def get_language_from_request(request: HttpRequest) -> str:
     """
     Analyzes the request to find what language the user wants the system to
@@ -255,6 +202,7 @@ def get_language_from_request(request: HttpRequest) -> str:
     if request.path.startswith(get_script_prefix() + 'control'):
         return (
             get_language_from_user_settings(request)
+            or get_language_from_customer_settings(request)
             or get_language_from_cookie(request)
             or get_language_from_browser(request)
             or get_language_from_event(request)
@@ -314,50 +262,10 @@ def _merge_csp(a, b):
     for k, v in a.items():
         if "'unsafe-inline'" in v:
             # If we need unsafe-inline, drop any hashes or nonce as they will be ignored otherwise
-            a[k] = [i for i in v if not i.startswith("'nonce-") and not i.startswith("'sha256-")]
-
-
-def add_to_response_csp(response, csp_to_merge):
-    if "Content-Security-Policy" in response:
-        csp = _parse_csp(response["Content-Security-Policy"])
-    else:
-        csp = {}
-
-    _merge_csp(csp, csp_to_merge)
-
-    if csp:
-        response["Content-Security-Policy"] = _render_csp(csp)
-
-
-def add_to_response_csp_via_request(request, csp_to_merge):
-    _merge_csp(request._csp_to_merge, csp_to_merge)
-
-
-def calculate_csp_hash(data):
-    hash_str = base64.b64encode(hashlib.sha256(data.encode("utf-8")).digest()).decode("ascii")
-    return f"'sha256-{hash_str}'"
+            a[k] = [i for i in v if not i.startswith("'nonce-") and not i.startswith("'sha-")]
 
 
 class SecurityMiddleware(MiddlewareMixin):
-    SAFE_TYPES = (
-        # CSP policies are only used for:
-        # - HTML and SVG in top-level contexts
-        # - SVG or JS Workers delivered in embedded contexts
-        # See: https://www.w3.org/TR/CSP2/#which-policy-applies
-        # Therefore, we can save bandwidth on not including our (sometimes huge) policy
-        # on API responses or CSS. We do however include it with other types as a precaution
-        # (whitelist instead of blacklist) and we also do not whitelist JavaScript in
-        # we ever add service workers to not break the protection of this feature:
-        # https://www.w3.org/TR/CSP2/#sandboxing-and-workers
-        'application/json',
-        'text/css',
-        # We used to skip CSP for PDF since it was necessary for inline previews in Safari,
-        # but at the moment it does not seem to be an issue to just send it.
-    )
-
-    def process_request(self, request):
-        request._csp_to_merge = {}
-
     def process_response(self, request, resp):
         if settings.DEBUG and resp.status_code >= 400:
             # Don't use CSP on debug error page as it breaks of Django's fancy error
@@ -369,22 +277,13 @@ class SecurityMiddleware(MiddlewareMixin):
         # https://github.com/pretix/pretix/issues/765
         resp['P3P'] = 'CP=\"ALL DSP COR CUR ADM TAI OUR IND COM NAV INT\"'
 
-        if self._needs_csp(request, resp):
+        if not getattr(resp, '_csp_ignore', False):
             resp['Content-Security-Policy'] = _render_csp(self._build_csp(request, resp))
         elif 'Content-Security-Policy' in resp:
             del resp['Content-Security-Policy']
 
         return resp
 
-    def _needs_csp(self, request, resp):
-        if "Content-Type" in resp and resp["Content-Type"].split(";")[0] in self.SAFE_TYPES:
-            return False
-
-        if getattr(resp, '_csp_ignore', False):
-            return False
-
-        return True
-
     def _build_csp(self, request, resp):
         url = resolve(request.path_info)
 
@@ -394,7 +293,7 @@ class SecurityMiddleware(MiddlewareMixin):
             'object-src': ["'none'"],
             'frame-src': ['{static}'],
             'style-src': ["{static}", "{media}"],
-            'connect-src': ["{static}", "{dynamic}", "{media}"],
+            'connect-src': ["{dynamic}", "{media}"],
             'img-src': ["{static}", "{media}", "data:"],
             'font-src': ["{static}"],
             'media-src': ["{static}", "data:"],
@@ -417,6 +316,13 @@ class SecurityMiddleware(MiddlewareMixin):
             h['style-src'] += ["'unsafe-inline'"]
             h['connect-src'] += ["http://localhost:5173", "ws://localhost:5173"]
 
+        if hasattr(request, 'csp_nonce'):
+            nonce = f"'nonce-{request.csp_nonce}'"
+            h['script-src'].append(nonce)
+            if not settings.VITE_DEV_MODE:
+                # can't have 'unsafe-inline' and nonce at the same time
+                h['style-src'].append(nonce)
+
         # Only include pay.google.com for wallet detection purposes on the Payment selection page
         if (
                 url.url_name == "event.order.pay.change" or
@@ -429,9 +335,6 @@ class SecurityMiddleware(MiddlewareMixin):
         if settings.LOG_CSP:
             h['report-uri'] = ["/csp_report/"]
 
-        if request._csp_to_merge:
-            _merge_csp(h, request._csp_to_merge)
-
         if 'Content-Security-Policy' in resp:
             _merge_csp(h, _parse_csp(resp['Content-Security-Policy']))
 
@@ -497,16 +400,8 @@ class RejectInvalidInputMiddleware(MiddlewareMixin):
         if "\x00" in request.META['QUERY_STRING'] or "%00" in request.META['QUERY_STRING']:
             raise BadRequest("Invalid characters in input.")
         if request.method in ('POST', 'PUT', 'PATCH') and request.content_type == "application/x-www-form-urlencoded":
-            try:
-                post_data = request.POST.lists()
-            except BadRequest:
-                # Reading request.POST wasn't possible, probably an invalid charset. Django will crash once we actually
-                # use request.POST, but if we don't, let's not crash it (required for some weird payment provider
-                # webhooks, e.g. computop).
-                pass
-            else:
-                if any("\x00" in value for key, value_list in post_data for value in value_list):
-                    raise BadRequest("Invalid characters in input.")
+            if any("\x00" in value for key, value_list in request.POST.lists() for value in value_list):
+                raise BadRequest("Invalid characters in input.")
 
 
 class CustomCommonMiddleware(CommonMiddleware):

src/pretix/base/migrations/0302_resolve_duplicate_codes_and_secrets.py

@@ -1,58 +0,0 @@
-# Generated by Django 4.2.8 on 2024-07-01 09:27
-import logging
-
-from django.db import migrations
-from django.db.models import Count
-
-logger = logging.getLogger(__name__)
-
-
-def clean_duplicate_secrets(apps, schema_editor):
-    # This will autofix all possible duplicate Order.code and OrderPosition.secret values,
-    # unless Order.code is already too long to append something. This would need to be fixed by
-    # sysadmins manually.
-    OrderPosition = apps.get_model("pretixbase", "OrderPosition")
-    Order = apps.get_model("pretixbase", "Order")
-
-    qs = OrderPosition.all.values("secret", "order__event__organizer_id").order_by().annotate(c=Count("*")).filter(c__gt=1)
-    for row in qs:
-        affected = OrderPosition.all.filter(
-            **{k: v for k, v in row.items() if k != "c"}
-        ).order_by("pk")
-        logger.error(f"Found {row['c']} tickets with with the same secret \"{row['secret']}\" in organizer {row['order__event__organizer_id']}, all except one will be changed")
-        for i, a in enumerate(affected):
-            if i > 0:
-                a.secret = a.secret + "__dupl__" + str(a.pk)
-                logger.info(
-                    f"Ticket {a.pk} has new secret {a.secret}"
-                )
-            a.save(update_fields=["organizer_id", "secret"])
-
-    qs = Order.objects.values("code", "event__organizer_id").order_by().annotate(c=Count("*")).filter(c__gt=1)
-    for row in qs:
-        affected = Order.objects.filter(
-            **{k: v for k, v in row.items() if k != "c"}
-        ).order_by("pk")
-        logger.error(f"Found {row['c']} orders with with the same code \"{row['code']}\" in organizer {row['event__organizer_id']}, all except one will be changed")
-        for i, a in enumerate(affected):
-            if i > 0:
-                if len(a.code) > 16 - len(str(a.pk)):
-                    raise ValueError(f"Cannot auto-fix order with duplicate code {a.code}, order code is too long already")
-                a.code = a.code + str(a.pk).zfill(16 - len(a.code))
-                logger.info(
-                    f"Order {a.pk} has new code {a.code}"
-                )
-            a.save(update_fields=["organizer_id", "code"])
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        (
-            "pretixbase",
-            "0301_reusablemedium_remove_orderposition",
-        ),
-    ]
-
-    operations = [
-        migrations.RunPython(clean_duplicate_secrets, migrations.RunPython.noop),
-    ]

src/pretix/base/migrations/0303_alter_order_organizer_alter_orderposition_organizer.py

@@ -1,46 +0,0 @@
-# Generated by Django 4.2.8 on 2024-07-01 09:27
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        (
-            "pretixbase",
-            "0302_resolve_duplicate_codes_and_secrets",
-        ),
-    ]
-
-    operations = [
-        migrations.RunSQL(
-            "UPDATE pretixbase_order "
-            "SET organizer_id = (SELECT e.organizer_id FROM pretixbase_event e WHERE e.id = pretixbase_order.event_id) "
-            "WHERE pretixbase_order.organizer_id IS NULL;",
-            migrations.RunSQL.noop,
-        ),
-        migrations.RunSQL(
-            "UPDATE pretixbase_orderposition "
-            "SET organizer_id = (SELECT e.organizer_id FROM pretixbase_order o LEFT JOIN pretixbase_event e ON e.id = o.event_id WHERE o.id = pretixbase_orderposition.order_id) "
-            "WHERE pretixbase_orderposition.organizer_id IS NULL;",
-            migrations.RunSQL.noop,
-        ),
-        migrations.AlterField(
-            model_name="order",
-            name="organizer",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="orders",
-                to="pretixbase.organizer",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="orderposition",
-            name="organizer",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="order_positions",
-                to="pretixbase.organizer",
-            ),
-        ),
-    ]

src/pretix/base/migrations/0304_tax_rate_decimals.py

@@ -1,48 +0,0 @@
-# Generated by Django 5.2.12 on 2026-04-15 20:10
-
-from decimal import Decimal
-
-from django.db import migrations, models
-
-import pretix.helpers.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0303_alter_order_organizer_alter_orderposition_organizer'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='cartposition',
-            name='tax_rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, default=Decimal('0'), max_digits=7),
-        ),
-        migrations.AlterField(
-            model_name='invoiceline',
-            name='tax_rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, default=Decimal('0'), max_digits=7),
-        ),
-        migrations.AlterField(
-            model_name='orderfee',
-            name='tax_rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, max_digits=7),
-        ),
-        migrations.AlterField(
-            model_name='orderposition',
-            name='tax_rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, max_digits=7),
-        ),
-        migrations.AlterField(
-            model_name='transaction',
-            name='tax_rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, max_digits=7),
-        ),
-        migrations.AlterField(
-            model_name='taxrule',
-            name='rate',
-            field=pretix.helpers.models.NormalizedDecimalField(decimal_places=4, max_digits=7),
-        ),
-
-    ]

src/pretix/base/migrations/0305_fixup_eventmetaproperties.py

@@ -1,91 +0,0 @@
-# Generated by Django 5.2.12 on 2026-04-28 11:34
-import logging
-
-from django.db import IntegrityError, migrations, transaction
-from django.db.models import Count, F
-
-logger = logging.getLogger(__name__)
-
-
-def fix_cross_organizer_eventmetavalues(apps, schema_editor):
-    EventMetaProperty = apps.get_model("pretixbase", "EventMetaProperty")
-    EventMetaValue = apps.get_model("pretixbase", "EventMetaValue")
-
-    cross_org_values = EventMetaValue.objects.filter(
-        event__organizer__pk__ne=F('property__organizer__pk')
-    ).order_by('event__organizer__slug', 'event__slug')
-    for emv in cross_org_values:
-        logger.warning("%s", f"Fixing cross-organizer EventMetaValue: {emv.event.organizer.slug}/{emv.event.slug}")
-        logger.warning("  %s", f"{emv.property.name}({emv.property.id}@{emv.property.organizer.slug}) = {repr(emv.value)}")
-        try:
-            emv.property = emv.event.organizer.meta_properties.get(name=emv.property.name)
-            if EventMetaValue.objects.filter(event=emv.event, property=emv.property).exists():
-                correct = EventMetaValue.objects.get(event=emv.event, property=emv.property)
-                if correct.value != emv.value:
-                    logger.warning("  %s", f"WARN: conflicting EventMetaValue with property in correct organizer already exists, deleting the cross-organizer one")
-                else:
-                    logger.warning("  %s", f"OK: same-value EventMetaValue with property in correct organizer already exists, deleting the cross-organizer one")
-                logger.warning("  %s", f"keeping: {correct.property.name}({correct.property.id}@{correct.property.organizer.slug}) = {repr(correct.value)}")
-                emv.delete()
-            else:
-                logger.warning("  %s", f"OK: found existing EventMetaProperty in {emv.event.organizer.slug}, updating reference")
-                logger.warning("  %s", f"after: {emv.property.name}({emv.property.id}@{emv.property.organizer.slug}) = {repr(emv.value)}")
-                emv.save(update_fields=["property"])
-        except EventMetaProperty.DoesNotExist:
-            meta_prop = emv.property
-            meta_prop.pk = None
-            meta_prop.organizer = emv.event.organizer
-            meta_prop.filter_public = False
-            meta_prop.save(force_insert=True)
-            logger.warning("  %s", f"WARN: found no matching EventMetaProperty, creating")
-            logger.warning("  %s", f"after: {emv.property.name}({emv.property.id}@{emv.property.organizer.slug}) = {repr(emv.value)}")
-            emv.save(update_fields=["property"])
-
-
-def make_eventmetaproperties_unique(apps, schema_editor):
-    EventMetaProperty = apps.get_model("pretixbase", "EventMetaProperty")
-    EventMetaValue = apps.get_model("pretixbase", "EventMetaValue")
-
-    duplicates = EventMetaProperty.objects.values('organizer', 'organizer__slug', 'name').annotate(count=Count('id')).filter(count__gt=1)
-    for dup in duplicates:
-        logger.warning("%s", f"Fixup duplicate property {dup['organizer__slug']} {dup['name']}")
-        props = list(EventMetaProperty.objects.filter(organizer=dup['organizer'], name=dup['name']))
-
-        target = props[0]
-        invalid = props[1:]
-
-        try:
-            with transaction.atomic():
-                affected = EventMetaValue.objects.filter(
-                    event__organizer=dup['organizer'], property__in=invalid
-                ).update(
-                    property=target
-                )
-                logger.warning("%s", f"  Switching {affected} value(s) over to {target.name}({target.id}@{target.organizer.slug})")
-
-        except IntegrityError as e:
-            logger.warning("%s", f"  Failed to switch all value(s) over to {target.name}({target.id}@{target.organizer.slug})")
-            logger.warning("%s", f"  {e}")
-            for prop in invalid:
-                newname = f'{prop.name}_DUPLICATE_{prop.id}'
-                logger.warning("%s", f"  Renaming {prop.name}({prop.id}@{prop.organizer.slug}) to {newname}({prop.id}@{prop.organizer.slug})")
-                prop.name = newname
-                prop.filter_public = False
-                prop.save()
-
-        else:
-            for prop in invalid:
-                logger.warning("%s", f"  Deleting {prop.name}({prop.id}@{prop.organizer.slug})")
-                prop.delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0304_tax_rate_decimals"),
-    ]
-
-    operations = [
-        migrations.RunPython(fix_cross_organizer_eventmetavalues, migrations.RunPython.noop),
-        migrations.RunPython(make_eventmetaproperties_unique, migrations.RunPython.noop),
-    ]

src/pretix/base/migrations/0306_alter_eventmetaproperty_unique_together.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.2.12 on 2026-04-28 11:34
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0305_fixup_eventmetaproperties"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="eventmetaproperty",
-            unique_together={("organizer", "name")},
-        ),
-    ]

src/pretix/base/models/event.py

@@ -179,12 +179,6 @@ class EventMixin:
             self.date_to.astimezone(tz), ("D" if short else "l")
         )
 
-    def is_same_day(self):
-        if not self.date_to:
-            return True
-        else:
-            return self.date_from.astimezone(self.timezone).date() == self.date_to.astimezone(self.timezone).date()
-
     def get_date_range_display(self, tz=None, force_show_end=False, as_html=False, try_to_show_times=False) -> str:
         """
         Returns a formatted string containing the start date and the end date
@@ -238,9 +232,6 @@ class EventMixin:
 
     @property
     def timezone(self):
-        # If we get rid of the shim, verify that
-        # https://github.com/py-vobject/vobject/issues/117#issuecomment-5045645314
-        # has been released and included
         return pytz_deprecation_shim.timezone(self.settings.timezone)
 
     @property
@@ -658,7 +649,7 @@ class Event(EventMixin, LoggedModel):
     is_remote = models.BooleanField(
         default=False,
         verbose_name=_("This event is remote or partially remote."),
-        help_text=_("This will be used to let users know if the event is in a different timezone, and to let us calculate the local time of a user."),
+        help_text=_("This will be used to let users know if the event is in a different timezone and let’s us calculate users’ local times."),
     )
     geo_lat = models.FloatField(
         verbose_name=_("Latitude"),
@@ -1412,12 +1403,15 @@ class Event(EventMixin, LoggedModel):
 
         for mp in self.organizer.meta_properties.all():
             if mp.required and not self.meta_data.get(mp.name):
-                issues.append(format_html(
-                    '<a href="{href}{href_hash}">{text}</a>',
-                    text=gettext('You need to fill the meta parameter "{property}".').format(property=mp.name),
-                    href=reverse('control:event.settings', kwargs={'organizer': self.organizer.slug, 'event': self.slug}),
-                    href_hash=f'#id_prop-{mp.pk}-value',
-                ))
+                issues.append(
+                    ('<a {a_attr}>' + gettext('You need to fill the meta parameter "{property}".') + '</a>').format(
+                        property=mp.name,
+                        a_attr='href="%s#id_prop-%d-value"' % (
+                            reverse('control:event.settings', kwargs={'organizer': self.organizer.slug, 'event': self.slug}),
+                            mp.pk
+                        )
+                    )
+                )
 
         responses = event_live_issues.send(self)
         for receiver, response in sorted(responses, key=lambda r: str(r[0])):
@@ -1860,7 +1854,6 @@ class EventMetaProperty(LoggedModel):
 
     class Meta:
         ordering = ("position", "name",)
-        unique_together = ('organizer', 'name')
 
     @property
     def choice_keys(self):

src/pretix/base/models/invoices.py

@@ -49,7 +49,6 @@ from django_scopes import ScopedManager
 
 from pretix.base.settings import COUNTRIES_WITH_STATE_IN_ADDRESS
 from pretix.helpers.countries import FastCountryField
-from pretix.helpers.models import NormalizedDecimalField
 
 
 def invoice_filename(instance, filename: str) -> str:
@@ -451,7 +450,7 @@ class InvoiceLine(models.Model):
     description = models.TextField()
     gross_value = models.DecimalField(max_digits=13, decimal_places=2)
     tax_value = models.DecimalField(max_digits=13, decimal_places=2, default=Decimal('0.00'))
-    tax_rate = NormalizedDecimalField(max_digits=7, decimal_places=4, default=Decimal('0'))
+    tax_rate = models.DecimalField(max_digits=7, decimal_places=2, default=Decimal('0.00'))
     tax_name = models.CharField(max_length=190)
     tax_code = models.CharField(max_length=190, null=True, blank=True)
     subevent = models.ForeignKey('SubEvent', null=True, blank=True, on_delete=models.PROTECT)

src/pretix/base/models/items.py

@@ -885,6 +885,26 @@ class Item(LoggedModel):
             return False
         return True
 
+    def unavailability_reason(self, now_dt: datetime=None, has_voucher=False, subevent=None) -> Optional[str]:
+        now_dt = now_dt or time_machine_now()
+        subevent_item = subevent and subevent.item_overrides.get(self.pk)
+        if not self.active:
+            return 'active'
+        elif self.available_from and self.available_from > now_dt:
+            return 'available_from'
+        elif self.available_until and self.available_until < now_dt:
+            return 'available_until'
+        elif (self.require_voucher or self.hide_without_voucher) and not has_voucher:
+            return 'require_voucher'
+        elif subevent_item and subevent_item.available_from and subevent_item.available_from > now_dt:
+            return 'available_from'
+        elif subevent_item and subevent_item.available_until and subevent_item.available_until < now_dt:
+            return 'available_until'
+        elif self.hidden_if_item_available and self._dependency_available:
+            return 'hidden_if_item_available'
+        else:
+            return None
+
     def _get_quotas(self, ignored_quotas=None, subevent=None):
         check_quotas = set(getattr(
             self, '_subevent_quotas',  # Utilize cache in product list
@@ -1393,6 +1413,22 @@ class ItemVariation(models.Model):
             return False
         return True
 
+    def unavailability_reason(self, now_dt: datetime=None, has_voucher=False, subevent=None) -> Optional[str]:
+        now_dt = now_dt or time_machine_now()
+        subevent_var = subevent and subevent.var_overrides.get(self.pk)
+        if not self.active:
+            return 'active'
+        elif self.available_from and self.available_from > now_dt:
+            return 'available_from'
+        elif self.available_until and self.available_until < now_dt:
+            return 'available_until'
+        elif subevent_var and subevent_var.available_from and subevent_var.available_from > now_dt:
+            return 'available_from'
+        elif subevent_var and subevent_var.available_until and subevent_var.available_until < now_dt:
+            return 'available_until'
+        else:
+            return None
+
     @property
     def meta_data(self):
         data = self.item.meta_data

src/pretix/base/models/orders.py

@@ -87,7 +87,6 @@ from pretix.base.timemachine import time_machine_now
 
 from ...helpers import OF_SELF
 from ...helpers.countries import CachedCountries, FastCountryField
-from ...helpers.models import NormalizedDecimalField
 from ...helpers.names import build_name
 from ...testutils.middleware import debugflags_var
 from ._transactions import (
@@ -225,6 +224,8 @@ class Order(LockModel, LoggedModel):
         "Organizer",
         related_name="orders",
         on_delete=models.CASCADE,
+        null=True,
+        blank=True,
     )
     event = models.ForeignKey(
         Event,
@@ -328,7 +329,7 @@ class Order(LockModel, LoggedModel):
         default="line",
     )
 
-    objects = ScopedManager(OrderQuerySet.as_manager().__class__, organizer='organizer')
+    objects = ScopedManager(OrderQuerySet.as_manager().__class__, organizer='event__organizer')
 
     class Meta:
         verbose_name = _("Order")
@@ -508,20 +509,20 @@ class Order(LockModel, LoggedModel):
 
     @classmethod
     def annotate_overpayments(cls, qs, results=True, refunds=True, sums=False):
-        payment_sum = OrderPayment.objects.with_scopes_disabled().filter(
+        payment_sum = OrderPayment.objects.filter(
             state__in=(OrderPayment.PAYMENT_STATE_CONFIRMED, OrderPayment.PAYMENT_STATE_REFUNDED),
             order=OuterRef('pk')
         ).order_by().values('order').annotate(s=Sum('amount')).values('s')
-        refund_sum = OrderRefund.objects.with_scopes_disabled().filter(
+        refund_sum = OrderRefund.objects.filter(
             state__in=(OrderRefund.REFUND_STATE_DONE, OrderRefund.REFUND_STATE_TRANSIT,
                        OrderRefund.REFUND_STATE_CREATED),
             order=OuterRef('pk')
         ).order_by().values('order').annotate(s=Sum('amount')).values('s')
-        external_refund = OrderRefund.objects.with_scopes_disabled().filter(
+        external_refund = OrderRefund.objects.filter(
             state=OrderRefund.REFUND_STATE_EXTERNAL,
             order=OuterRef('pk')
         )
-        pending_refund = OrderRefund.objects.with_scopes_disabled().filter(
+        pending_refund = OrderRefund.objects.filter(
             state__in=(OrderRefund.REFUND_STATE_CREATED, OrderRefund.REFUND_STATE_TRANSIT),
             order=OuterRef('pk')
         )
@@ -2072,17 +2073,6 @@ class OrderPayment(models.Model):
         """
         return '{}-P-{}'.format(self.order.code, self.local_id)
 
-    @property
-    def global_id(self):
-        """
-        The global ID of this payment, constructed by the organizer slug, event slug, and the full id.
-        """
-        return "{organizer}-{event}-{full_id}".format(
-            organizer=self.order.organizer.slug.upper(),
-            event=self.order.event.slug.upper(),
-            full_id=self.full_id,
-        )
-
     def save(self, *args, **kwargs):
         if not self.local_id:
             self.local_id = (self.order.payments.aggregate(m=Max('local_id'))['m'] or 0) + 1
@@ -2283,17 +2273,6 @@ class OrderRefund(models.Model):
         """
         return '{}-R-{}'.format(self.order.code, self.local_id)
 
-    @property
-    def global_id(self):
-        """
-        The global ID of this refund, constructed by the organizer slug, event slug, and the full id.
-        """
-        return "{organizer}-{event}-{full_id}".format(
-            organizer=self.order.organizer.slug.upper(),
-            event=self.order.event.slug.upper(),
-            full_id=self.full_id,
-        )
-
     def save(self, *args, **kwargs):
         if not self.local_id:
             self.local_id = (self.order.refunds.aggregate(m=Max('local_id'))['m'] or 0) + 1
@@ -2308,12 +2287,9 @@ class OrderRefund(models.Model):
         super().save(*args, **kwargs)
 
 
-def ActivePositionManager(**scope):
-    class InnerClass(ScopedManager(**scope).__class__):
-        def get_queryset(self):
-            return super().get_queryset().filter(canceled=False)
-
-    return InnerClass()
+class ActivePositionManager(ScopedManager(organizer='order__event__organizer').__class__):
+    def get_queryset(self):
+        return super().get_queryset().filter(canceled=False)
 
 
 class OrderFee(RoundingCorrectionMixin, models.Model):
@@ -2380,8 +2356,8 @@ class OrderFee(RoundingCorrectionMixin, models.Model):
     )
     description = models.CharField(max_length=190, blank=True)
     internal_type = models.CharField(max_length=255, blank=True)
-    tax_rate = NormalizedDecimalField(
-        max_digits=7, decimal_places=4,
+    tax_rate = models.DecimalField(
+        max_digits=7, decimal_places=2,
         verbose_name=_('Tax rate')
     )
     tax_rule = models.ForeignKey(
@@ -2403,7 +2379,7 @@ class OrderFee(RoundingCorrectionMixin, models.Model):
     canceled = models.BooleanField(default=False)
 
     all = ScopedManager(organizer='order__event__organizer')
-    objects = ActivePositionManager(organizer='order__event__organizer')
+    objects = ActivePositionManager()
 
     @property
     def net_value(self):
@@ -2565,6 +2541,8 @@ class OrderPosition(AbstractPosition):
         "Organizer",
         related_name="order_positions",
         on_delete=models.CASCADE,
+        null=True,
+        blank=True,
     )
     order = models.ForeignKey(
         Order,
@@ -2577,8 +2555,8 @@ class OrderPosition(AbstractPosition):
         max_digits=13, decimal_places=2, null=True, blank=True,
     )
 
-    tax_rate = NormalizedDecimalField(
-        max_digits=7, decimal_places=4,
+    tax_rate = models.DecimalField(
+        max_digits=7, decimal_places=2,
         verbose_name=_('Tax rate')
     )
     tax_rule = models.ForeignKey(
@@ -2621,8 +2599,8 @@ class OrderPosition(AbstractPosition):
         blank=True,
     )
 
-    all = ScopedManager(organizer='organizer')
-    objects = ActivePositionManager(organizer='organizer')
+    all = ScopedManager(organizer='order__event__organizer')
+    objects = ActivePositionManager()
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -3096,8 +3074,8 @@ class Transaction(models.Model):
     price_includes_rounding_correction = models.DecimalField(
         max_digits=13, decimal_places=2, default=Decimal("0.00")
     )
-    tax_rate = NormalizedDecimalField(
-        max_digits=7, decimal_places=4,
+    tax_rate = models.DecimalField(
+        max_digits=7, decimal_places=2,
         verbose_name=_('Tax rate')
     )
     tax_rule = models.ForeignKey(
@@ -3212,8 +3190,8 @@ class CartPosition(AbstractPosition):
         verbose_name=_("Limit for extending expiration date"),
         null=True
     )
-    tax_rate = NormalizedDecimalField(
-        max_digits=7, decimal_places=4, default=Decimal('0'),
+    tax_rate = models.DecimalField(
+        max_digits=7, decimal_places=2, default=Decimal('0.00'),
         verbose_name=_('Tax rate')
     )
     tax_code = models.CharField(

src/pretix/base/models/tax.py

@@ -40,7 +40,6 @@ from pretix.base.decimal import round_decimal
 from pretix.base.models.base import LoggedModel
 from pretix.base.templatetags.money import money_filter
 from pretix.helpers.countries import FastCountryField
-from pretix.helpers.models import NormalizedDecimalField
 
 
 class TaxedPrice:
@@ -336,9 +335,9 @@ class TaxRule(LoggedModel):
         max_length=190,
         choices=TAX_CODE_LISTS,
     )
-    rate = NormalizedDecimalField(
-        max_digits=7,
-        decimal_places=4,
+    rate = models.DecimalField(
+        max_digits=10,
+        decimal_places=2,
         validators=[
             MaxValueValidator(
                 limit_value=Decimal("100.00"),

src/pretix/base/models/vouchers.py

@@ -32,10 +32,8 @@
 # Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
-import datetime
-from dataclasses import dataclass
+
 from decimal import ROUND_HALF_UP, Decimal
-from typing import Union
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -423,33 +421,27 @@ class Voucher(LoggedModel):
         return False
 
     @staticmethod
-    def get_affected_quotas(quota, item, variation, subevent):
-        if quota:
-            return {quota}
-        elif item and variation:
-            return set(variation.quotas.filter(subevent=subevent))
-        elif item and not item.has_variations:
-            return set(item.quotas.filter(subevent=subevent))
-        elif item and item.has_variations:
-            return set(
-                Quota.objects.filter(
-                    pk__in=Quota.variations.through.objects.filter(
-                        itemvariation__item=item,
-                        quota__subevent=subevent,
-                    ).values('quota_id')
-                )
-            )
-        else:
-            return set()
-
-    @staticmethod
-    def clean_quota_get_ignored(voucher_data: Union["VoucherBulkData", "Voucher"]):
-        if voucher_data:
-            valid = voucher_data.valid_until is None or voucher_data.valid_until >= now()
-            if valid and voucher_data.block_quota and voucher_data.max_usages > voucher_data.redeemed:
-                return Voucher.get_affected_quotas(voucher_data.quota, voucher_data.item, voucher_data.variation, voucher_data.subevent)
-
-        return set()
+    def clean_quota_get_ignored(old_instance):
+        quotas = set()
+        was_valid = old_instance and (
+            old_instance.valid_until is None or old_instance.valid_until >= now()
+        )
+        if old_instance and old_instance.block_quota and was_valid:
+            if old_instance.quota:
+                quotas.add(old_instance.quota)
+            elif old_instance.variation:
+                quotas |= set(old_instance.variation.quotas.filter(subevent=old_instance.subevent))
+            elif old_instance.item:
+                if old_instance.item.has_variations:
+                    quotas |= set(
+                        Quota.objects.filter(pk__in=Quota.variations.through.objects.filter(
+                            itemvariation__item=old_instance.item,
+                            quota__subevent=old_instance.subevent,
+                        ).values('quota_id'))
+                    )
+                else:
+                    quotas |= set(old_instance.item.quotas.filter(subevent=old_instance.subevent))
+        return quotas
 
     @staticmethod
     def clean_quota_check(data, cnt, old_instance, event, quota, item, variation):
@@ -461,8 +453,22 @@ class Voucher(LoggedModel):
         if event.has_subevents and data.get('block_quota') and not data.get('subevent'):
             raise ValidationError(_('If you want this voucher to block quota, you need to select a specific date.'))
 
-        new_quotas = Voucher.get_affected_quotas(quota, item, variation, data.get('subevent'))
-        if not new_quotas:
+        if quota:
+            new_quotas = {quota}
+        elif item and variation:
+            new_quotas = set(variation.quotas.filter(subevent=data.get('subevent')))
+        elif item and not item.has_variations:
+            new_quotas = set(item.quotas.filter(subevent=data.get('subevent')))
+        elif item and item.has_variations:
+            new_quotas = set(
+                Quota.objects.filter(
+                    pk__in=Quota.variations.through.objects.filter(
+                        itemvariation__item=item,
+                        quota__subevent=data.get('subevent'),
+                    ).values('quota_id')
+                )
+            )
+        else:
             raise ValidationError(_('You need to select a specific product or quota if this voucher should reserve '
                                     'tickets.'))
 
@@ -638,16 +644,3 @@ class Voucher(LoggedModel):
             ]
         ).aggregate(s=Sum('voucher_budget_use'))['s'] or Decimal('0.00')
         return ops
-
-
-@dataclass
-class VoucherBulkData:
-    item: object
-    variation: object
-    quota: object
-    block_quota: bool
-    valid_until: datetime.datetime
-    subevent: object
-    redeemed: int
-    max_usages: int
-    allow_ignore_quota: bool

src/pretix/base/payment.py

@@ -936,7 +936,7 @@ class BasePaymentProvider:
         """
         Will be called if the *event administrator* views the details of a payment.
 
-        It should return a SafeString containing HTML code, with information regarding the current payment
+        It should return HTML code containing information regarding the current payment
         status and, if applicable, next steps.
 
         The default implementation returns an empty string.
@@ -961,7 +961,7 @@ class BasePaymentProvider:
         """
         Will be called if the *event administrator* views the details of a refund.
 
-        It should return a SafeString containing HTML code, with information regarding the current refund
+        It should return HTML code containing information regarding the current refund
         status and, if applicable, next steps.
 
         The default implementation returns an empty string.
@@ -1706,58 +1706,6 @@ class GiftCardPayment(BasePaymentProvider):
         )
 
 
-class BaseHistoricalPaymentProvider(BasePaymentProvider):
-    """
-    Base class for payment providers that no longer exist but can't be deleted to make sure historical
-    payments are shown correctly.
-
-    Subclasses are recommended to only implement:
-        - identifier
-        - verbose_name
-        - public_name
-    - payment_control_render
-    - payment_control_render_short
-    - refund_control_render
-    - refund_control_render_short
-    - render_invoice_text
-    - render_invoice_stamp
-    - api_payment_details
-    - api_refund_details
-    - shred_payment_info
-    - matching_id
-    - refund_matching_id
-    """
-
-    @property
-    def is_enabled(self) -> bool:
-        return False
-
-    @property
-    def settings_form_fields(self) -> dict:
-        return {}
-
-    def is_allowed(self, request: HttpRequest, total: Decimal=None) -> bool:
-        return False
-
-    def payment_is_valid_session(self, request: HttpRequest, payment: OrderPayment):
-        return False
-
-    def order_change_allowed(self, order: Order, request: HttpRequest=None) -> bool:
-        return False
-
-    def payment_refund_supported(self, payment: OrderPayment) -> bool:
-        return False
-
-    def payment_partial_refund_supported(self, payment: OrderPayment) -> bool:
-        return False
-
-    def execute_payment(self, request: HttpRequest, payment: OrderPayment):
-        raise PaymentException(_("This payment provider exists for historical purposes only and is no longer usable."))
-
-    def execute_refund(self, refund: OrderRefund):
-        raise PaymentException(_("This payment provider exists for historical purposes only and is no longer usable."))
-
-
 @receiver(register_payment_providers, dispatch_uid="payment_free")
 def register_payment_provider(sender, **kwargs):
     return [FreeOrderProvider, BoxOfficeProvider, OffsettingProvider, ManualPayment, GiftCardPayment]

src/pretix/base/secrets.py

@@ -245,9 +245,6 @@ def recv_classic(sender, **kwargs):
 
 
 def assign_ticket_secret(event, position, force_invalidate_if_revokation_list_used=False, force_invalidate=False, save=True):
-    if position.pk and position.issued_gift_cards.exists():
-        return
-
     gen = event.ticket_secret_generator
     if gen.use_revocation_list and force_invalidate_if_revokation_list_used:
         force_invalidate = True

src/pretix/base/services/checkin.py

@@ -40,7 +40,7 @@ import dateutil
 import dateutil.parser
 from dateutil.tz import datetime_exists
 from django.core.files import File
-from django.db import IntegrityError, transaction
+from django.db import IntegrityError
 from django.db.models import (
     BooleanField, Case, Count, ExpressionWrapper, F, IntegerField, Max, Min,
     OuterRef, Q, Subquery, TextField, Value, When,
@@ -59,6 +59,7 @@ from pretix.base.models import (
 )
 from pretix.base.signals import checkin_created, periodic_task
 from pretix.helpers import OF_SELF
+from pretix.helpers.database import conditional_atomic
 from pretix.helpers.jsonlogic import Logic
 from pretix.helpers.jsonlogic_boolalg import convert_to_dnf
 from pretix.helpers.jsonlogic_query import (
@@ -1043,10 +1044,10 @@ def perform_checkin(op: OrderPosition, clist: CheckinList, given_answers: dict,
         if not simulate:
             _save_answers(op, answers, given_answers)
 
-    with transaction.atomic():
+    with conditional_atomic(not simulate):
         # Lock order positions, if it is an entry. We don't need it for exits, as a race condition wouldn't be problematic
         opqs = OrderPosition.all.select_related("order", "item")
-        if type != Checkin.TYPE_EXIT:
+        if type != Checkin.TYPE_EXIT and not simulate:
             opqs = opqs.select_for_update(of=OF_SELF)
         op = opqs.get(pk=op.pk)
 

src/pretix/base/services/cross_selling.py

@@ -29,7 +29,7 @@ from typing import List
 from django.utils.functional import cached_property
 
 from pretix.base.models import CartPosition, ItemCategory, SalesChannel
-from pretix.presale.productlist import prepare_item_list_for_shop
+from pretix.presale.views.event import get_grouped_items
 
 
 class DummyCategory:
@@ -162,7 +162,7 @@ class CrossSellingService:
         ]
 
     def _prepare_items(self, subevent, items_qs, discount_info):
-        items, _btn = prepare_item_list_for_shop(
+        items, _btn = get_grouped_items(
             self.event,
             subevent=subevent,
             voucher=None,

src/pretix/base/services/memberships.py

@@ -24,7 +24,6 @@ from typing import List, Optional
 
 from dateutil.relativedelta import relativedelta
 from django.core.exceptions import ValidationError
-from django.db import transaction
 from django.utils.formats import date_format
 from django.utils.translation import gettext_lazy as _
 
@@ -97,8 +96,6 @@ def validate_memberships_in_order(customer: Customer, positions: List[AbstractPo
     :param valid_from_not_chosen: Set to ``True`` to indicate that the customer is in an early step of the checkout flow
                                   where the valid_from date is not selected yet. In this case, the valid_from date is not checked.
     """
-    if lock and not transaction.get_connection().in_atomic_block:
-        raise Exception('validate_memberships_in_order(lock=True) should only be called in atomic transaction!')
     tz = event.timezone
     applicable_positions = [
         p for p in positions

src/pretix/base/services/orders.py

@@ -110,7 +110,6 @@ from pretix.celery_app import app
 from pretix.helpers import OF_SELF
 from pretix.helpers.models import modelcopy
 from pretix.helpers.periodic import minimum_interval
-from pretix.presale.productlist import prepare_item_list_for_shop
 from pretix.testutils.middleware import debugflags_var
 
 
@@ -791,12 +790,6 @@ def _check_positions(event: Event, now_dt: datetime, time_machine_now_dt: dateti
                 [op.seat for op in sorted_positions if op.seat],
                 shared_lock_objects=[event]
             )
-    elif any(cp.voucher and cp.voucher.budget for cp in sorted_positions):
-        # Voucher budgets are not guaranteed by the cart manager
-        lock_objects(
-            [op.voucher for op in sorted_positions if op.voucher and op.voucher.budget],
-            shared_lock_objects=[event]
-        )
 
     q_avail = Counter()
     v_avail = Counter()
@@ -1606,7 +1599,6 @@ class OrderChangeManager:
         'seat_forbidden': gettext_lazy('The selected product does not allow to select a seat.'),
         'tax_rule_country_blocked': gettext_lazy('The selected country is blocked by your tax rule.'),
         'gift_card_change': gettext_lazy('You cannot change the price of a position that has been used to issue a gift card.'),
-        'gift_card_secret': gettext_lazy('You cannot change the ticket secret of a position that has been used to issue a gift card.'),
         'max_items_per_product': ngettext_lazy(
             "You cannot select more than %(max)s item of the product %(product)s.",
             "You cannot select more than %(max)s items of the product %(product)s.",
@@ -1764,9 +1756,6 @@ class OrderChangeManager:
         self._operations.append(self.RegenerateSecretOperation(position))
 
     def change_ticket_secret(self, position: OrderPosition, new_secret: str):
-        if position.issued_gift_cards.exists():
-            raise OrderError(self.error_messages['gift_card_secret'])
-
         self._operations.append(self.ChangeSecretOperation(position, new_secret))
 
     def change_valid_from(self, position: OrderPosition, new_value: datetime):
@@ -1954,18 +1943,13 @@ class OrderChangeManager:
 
         :param addons: A list of dictionaries with the keys ``"addon_to"``, ``"item"``, ``"variation"`` (all ID values),
                        ``"count"``, and ``"price"``.
-        :param limit_main_positions: By default, the method works on all positions of the order. If you set this to a
+        :param limit_main_positions: By default, the method works on all methods of the order. If you set this to a
                                      queryset or a list of positions, all other positions and their add-ons will be kept
                                      untouched.
         """
         if self._operations:
             raise ValueError("Setting addons should be the first/only operation")
 
-        def _allowed_on_order_sales_channel(item_or_var, order):
-            return item_or_var.all_sales_channels or (
-                order.sales_channel.identifier in (s.identifier for s in item_or_var.limit_sales_channels.all())
-            )
-
         # Prepare containers for min/max check of products
         item_counts = Counter()
         for p in self.order.positions.all():
@@ -2059,11 +2043,13 @@ class OrderChangeManager:
             if not item.is_available() or (variation and not variation.is_available()):
                 raise OrderError(error_messages['unavailable'])
 
-            if not _allowed_on_order_sales_channel(item, self.order):
-                raise OrderError(error_messages['unavailable'])
+            if not item.all_sales_channels:
+                if self.order.sales_channel.identifier not in (s.identifier for s in item.limit_sales_channels.all()):
+                    raise OrderError(error_messages['unavailable'])
 
-            if variation and not _allowed_on_order_sales_channel(variation, self.order):
-                raise OrderError(error_messages['unavailable'])
+            if variation and not variation.all_sales_channels:
+                if self.order.sales_channel.identifier not in (s.identifier for s in variation.limit_sales_channels.all()):
+                    raise OrderError(error_messages['unavailable'])
 
             if subevent and item.pk in subevent.item_overrides and not subevent.item_overrides[item.pk].is_available():
                 raise OrderError(error_messages['not_for_sale'])
@@ -2111,36 +2097,6 @@ class OrderChangeManager:
                     )
                     item_counts[item] += 1
 
-        def _addon_is_available(a):
-            # If an item is no longer available due to time, it should usually also be no longer
-            # user-removable, because e.g. the stock has already been ordered.
-            # We always set voucher=None because that's what's done when generating the form in
-            # OrderChangeMixin (vouchers for addons are not supported).
-            # This also prevents accidental removal through the UI because a hidden product will no longer
-            # be part of the input.
-            if not _allowed_on_order_sales_channel(a.item, self.order) or (
-                a.variation and not _allowed_on_order_sales_channel(a.variation, self.order)
-            ):
-                return False
-
-            items, _ = prepare_item_list_for_shop(
-                self.order.event,
-                channel=self.order.sales_channel,
-                subevent=a.subevent,
-                voucher=None,
-                base_qs=Item.objects.filter(pk=a.item.pk),
-                allow_addons=True
-            )
-            if (not items) or items[0].current_unavailability_reason:
-                return False
-
-            if a.variation:
-                variations = [var for var in items[0].available_variations if var.pk == a.variation.pk]
-                if (not variations) or variations[0].current_unavailability_reason:
-                    return False
-
-            return True
-
         # Detect removed add-ons and create RemoveOperations
         for cp, al in list(current_addons.items()):
             for k, v in al.items():
@@ -2150,7 +2106,22 @@ class OrderChangeManager:
                     for a in current_addons[cp][k][:current_num - input_num]:
                         if a.canceled:
                             continue
-                        if not _addon_is_available(a):
+                        is_unavailable = (
+                            # If an item is no longer available due to time, it should usually also be no longer
+                            # user-removable, because e.g. the stock has already been ordered.
+                            # We always pass has_voucher=True because if a product now requires a voucher, it usually does
+                            # not mean it should be unremovable for others.
+                            # This also prevents accidental removal through the UI because a hidden product will no longer
+                            # be part of the input.
+                            (a.variation and a.variation.unavailability_reason(has_voucher=True, subevent=a.subevent))
+                            or (a.variation and not a.variation.all_sales_channels and not a.variation.limit_sales_channels.contains(self.order.sales_channel))
+                            or a.item.unavailability_reason(has_voucher=True, subevent=a.subevent)
+                            or (
+                                not a.item.all_sales_channels and
+                                not a.item.limit_sales_channels.contains(self.order.sales_channel)
+                            )
+                        )
+                        if is_unavailable:
                             # "Re-select" add-on
                             selected_addons[cp.id, a.item.category_id][a.item_id, a.variation_id] += 1
                             continue

src/pretix/base/signals.py

@@ -535,9 +535,8 @@ EventPluginRegistry = PluginAwareRegistry  # for backwards compatibility
 event_live_issues = EventPluginSignal()
 """
 This signal is sent out to determine whether an event can be taken live. If you want to
-prevent the event from going live, return an error message to display to the user (either
-as a SafeString containing HTML, or a string that will be HTML-escaped). If you don't,
-your receiver should return ``None``.
+prevent the event from going live, return a string that will be displayed to the user
+as the error message. If you don't, your receiver should return ``None``.
 
 As with all event-plugin signals, the ``sender`` keyword argument will contain the event.
 """

src/pretix/base/templatetags/eventsignal.py

@@ -22,7 +22,6 @@
 import importlib
 
 from django import template
-from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
 from pretix.base.models import Event
@@ -45,7 +44,7 @@ def eventsignal(event: Event, signame: str, **kwargs):
     _html = []
     for receiver, response in signal.send(event, **kwargs):
         if response:
-            _html.append(conditional_escape(response))
+            _html.append(response)
     return mark_safe("".join(_html))
 
 
@@ -64,5 +63,5 @@ def signal(signame: str, request, **kwargs):
     _html = []
     for receiver, response in signal.send(request, **kwargs):
         if response:
-            _html.append(conditional_escape(response))
+            _html.append(response)
     return mark_safe("".join(_html))

src/pretix/base/templatetags/money.py

@@ -26,8 +26,6 @@ from babel.numbers import format_currency
 from django import template
 from django.conf import settings
 from django.template.defaultfilters import floatformat
-from django.utils import formats
-from django.utils.safestring import mark_safe
 
 from pretix.base.i18n import get_babel_locale
 
@@ -84,19 +82,3 @@ def money_numberfield_filter(value: Decimal, arg=''):
 
     places = settings.CURRENCY_PLACES.get(arg, 2)
     return str(value.quantize(Decimal('1') / 10 ** places, ROUND_HALF_UP))
-
-
-@register.filter(is_safe=True)
-def tax_rate_format(number):
-    """
-    Display a Decimal to its significant decimal places, used for tax rates.
-    """
-    assert isinstance(number, Decimal)
-    return mark_safe(
-        formats.number_format(
-            number.normalize(),
-            -number.as_tuple().exponent,
-            use_l10n=True,
-            force_grouping=False,
-        )
-    )

src/pretix/base/templatetags/vite.py

@@ -19,10 +19,12 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
+
 import json
 import logging
 import pathlib
 import re
+import secrets
 from urllib.parse import urljoin
 from urllib.request import urlopen
 
@@ -31,10 +33,6 @@ from django import template
 from django.conf import settings
 from django.utils.safestring import mark_safe
 
-from pretix.base.middleware import (
-    add_to_response_csp_via_request, calculate_csp_hash,
-)
-
 register = template.Library()
 LOGGER = logging.getLogger(__name__)
 _MANIFEST = {}
@@ -236,16 +234,10 @@ def vite_importmap(context):
     if not imports:
         return ""
 
-    json_string = json.dumps({"imports": imports})
-
-    # Calculate hash and add it to the CSP info in the request, so that will be merged into the
-    # response header later on by the middleware
+    # Generate a nonce and store it on the request so the CSP middleware can allow it
+    nonce = secrets.token_urlsafe(16)
     request = context.get('request')
     if request:
-        csp_hash = calculate_csp_hash(json_string)
-        add_to_response_csp_via_request(request, {
-            'style-src': [csp_hash],
-            'script-src': [csp_hash],
-        })
+        request.csp_nonce = nonce
 
-    return f'<script type="importmap">{json_string}</script>'
+    return f'<script type="importmap" nonce="{nonce}">{json.dumps({"imports": imports})}</script>'

src/pretix/base/views/errors.py

@@ -27,11 +27,11 @@ from django.template import TemplateDoesNotExist, loader
 from django.template.loader import get_template
 from django.utils.functional import Promise
 from django.utils.translation import gettext as _
+from django.views.decorators.csrf import requires_csrf_token
 from sentry_sdk import last_event_id
 
 from pretix.base.i18n import language
 from pretix.base.middleware import get_language_from_request
-from pretix.multidomain.middlewares import requires_csrf_token
 
 
 def csrf_failure(request, reason=""):

src/pretix/celery_app.py

@@ -59,7 +59,7 @@ def on_task_prerun(sender, task_id, task, **kwargs):
     from pretix.helpers.logs import local
 
     local.request_id = task_id
-    if task.request.headers and "X-Pretix-Trace" in task.request.headers:
+    if "X-Pretix-Trace" in task.request.headers:
         local.trace = task.request.headers["X-Pretix-Trace"].split(" ")
     else:
         local.trace = []

src/pretix/control/forms/event.py

@@ -197,10 +197,10 @@ class EventWizardBasicsForm(I18nModelForm):
             'presale_end': SplitDateTimeField,
         }
         widgets = {
-            'date_from': SplitDateTimePickerWidget(without_seconds=True),
-            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_basics-date_from_0'}, without_seconds=True),
-            'presale_start': SplitDateTimePickerWidget(without_seconds=True),
-            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_basics-presale_start_0'}, without_seconds=True),
+            'date_from': SplitDateTimePickerWidget(),
+            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_basics-date_from_0'}),
+            'presale_start': SplitDateTimePickerWidget(),
+            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_basics-presale_start_0'}),
             'slug': SlugWidget,
         }
 
@@ -521,11 +521,11 @@ class EventUpdateForm(I18nModelForm):
             'limit_sales_channels': SafeModelMultipleChoiceField,
         }
         widgets = {
-            'date_from': SplitDateTimePickerWidget(without_seconds=True),
-            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}, without_seconds=True),
-            'date_admission': SplitDateTimePickerWidget(attrs={'data-date-default': '#id_date_from_0'}, without_seconds=True),
-            'presale_start': SplitDateTimePickerWidget(without_seconds=True),
-            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_presale_start_0'}, without_seconds=True),
+            'date_from': SplitDateTimePickerWidget(),
+            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}),
+            'date_admission': SplitDateTimePickerWidget(attrs={'data-date-default': '#id_date_from_0'}),
+            'presale_start': SplitDateTimePickerWidget(),
+            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_presale_start_0'}),
         }
 
 
@@ -1905,6 +1905,12 @@ class QuickSetupForm(I18nForm):
         required=False,
         help_text=_("We'll show this publicly to allow attendees to contact you.")
     )
+    contact_url = forms.URLField(
+        label=_("Contact URL"),
+        required=False,
+        help_text=_("If you set this, the footer contact link will point here instead of using the email address above. "
+                    "Please note that you still need to add a contact email address that will be shared with all emails you send.")
+    )
     total_quota = forms.IntegerField(
         label=_("Total capacity"),
         min_value=0,

src/pretix/control/forms/filter.py

@@ -39,7 +39,6 @@ from urllib.parse import urlencode
 from django import forms
 from django.apps import apps
 from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
 from django.db.models import (
     Count, Exists, F, Max, Model, OrderBy, OuterRef, Q, QuerySet,
 )
@@ -60,7 +59,7 @@ from pretix.base.models import (
     Gate, Invoice, InvoiceAddress, Item, Order, OrderPayment, OrderPosition,
     OrderRefund, Organizer, OutgoingMail, Question, QuestionAnswer, Quota,
     SalesChannel, SubEvent, SubEventMetaValue, Team, TeamAPIToken, TeamInvite,
-    User, Voucher,
+    Voucher,
 )
 from pretix.base.signals import register_payment_providers
 from pretix.base.timeframes import (
@@ -771,7 +770,7 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
                 )
             elif q.type == Question.TYPE_TIME:
                 self.fields[fname] = forms.TimeField(
-                    widget=TimePickerWidget(without_seconds=True),
+                    widget=TimePickerWidget(time_format=get_format_without_seconds('TIME_INPUT_FORMATS')),
                     help_text=_('Exact matches only'),
                     **kwargs,
                 )
@@ -3008,91 +3007,3 @@ class OutgoingMailFilterForm(FilterForm):
             qs = qs.order_by("-created", "-pk")
 
         return qs
-
-
-class LogFilterForm(FilterForm):
-    source = forms.ChoiceField(
-        label=_('Source'),
-        choices=[
-            ('', _('All sources')),
-            ('team', _('Team actions')),
-            ('customer', _('Customer actions')),
-            ('device', _('Device actions')),
-        ],
-        required=False
-    )
-    device = SafeModelChoiceField(
-        label=_('Device'),
-        empty_label=_('All devices'),
-        queryset=Device.objects.none(),
-        required=False
-    )
-    user_email = forms.EmailField(
-        label=_('User email'),
-        widget=forms.EmailInput(
-            attrs={"placeholder": _('All users')}
-        ),
-        required=False
-    )
-    action_type = forms.CharField(
-        widget=forms.HiddenInput,
-        required=False,
-    )
-    content_type = forms.ModelChoiceField(
-        queryset=ContentType.objects.all(),
-        widget=forms.HiddenInput,
-        required=False,
-    )
-    object = forms.IntegerField(
-        widget=forms.HiddenInput,
-        required=False
-    )
-
-    def __init__(self, *args, **kwargs):
-        self.organizer = kwargs.pop('organizer')
-        super().__init__(*args, **kwargs)
-
-        self.fields['device'].queryset = self.organizer.devices.all().order_by('device_id')
-        self.fields['device'].widget = Select2(
-            attrs={
-                'data-model-select2': 'generic',
-                'data-select2-url': reverse('control:organizer.devices.select2', kwargs={
-                    'organizer': self.organizer.slug,
-                }),
-                'data-placeholder': _('All devices'),
-            }
-        )
-        self.fields['device'].widget.choices = self.fields['device'].choices
-        self.fields['device'].label = _('Device')
-
-    def filter_qs(self, qs):
-        fdata = self.cleaned_data
-        if fdata.get('source') == 'team':
-            qs = qs.filter(user__isnull=False)
-        elif fdata.get('source') == 'device':
-            qs = qs.filter(device__isnull=False)
-        elif fdata.get('source') == 'customer':
-            qs = qs.filter(user__isnull=True, device__isnull=True)
-
-        if fdata.get('device'):
-            qs = qs.filter(device_id=fdata['device'].pk)
-
-        if fdata.get('action_type'):
-            qs = qs.filter(action_type__in=fdata['action_type'].split(','))
-
-        if fdata.get('user_email'):
-            try:
-                user = User.objects.get(email=fdata['user_email'].lower())
-                qs = qs.filter(user=user)
-            except User.DoesNotExist:
-                # Do not actively leak info that this user does not exist. Yes, this will likely have a
-                # timing attack possibility, but with the magic that database query planners do,
-                # it's probably impossible to avoid that.
-                qs = qs.none()
-
-        if fdata.get('content_type'):
-            qs = qs.filter(content_type=fdata.get('content_type'))
-
-            if fdata.get('object'):
-                qs = qs.filter(object_id=fdata.get('object'))
-        return qs

src/pretix/control/forms/item.py

@@ -246,8 +246,8 @@ class QuestionForm(I18nModelForm):
             'valid_string_length_max',
         ]
         widgets = {
-            'valid_datetime_min': SplitDateTimePickerWidget(without_seconds=True),
-            'valid_datetime_max': SplitDateTimePickerWidget(without_seconds=True),
+            'valid_datetime_min': SplitDateTimePickerWidget(),
+            'valid_datetime_max': SplitDateTimePickerWidget(),
             'valid_date_min': DatePickerWidget(),
             'valid_date_max': DatePickerWidget(),
             'items': forms.CheckboxSelectMultiple(
@@ -1427,6 +1427,6 @@ class ItemProgramTimeForm(I18nModelForm):
             'end': forms.SplitDateTimeField,
         }
         widgets = {
-            'start': SplitDateTimePickerWidget(without_seconds=True),
-            'end': SplitDateTimePickerWidget(without_seconds=True),
+            'start': SplitDateTimePickerWidget(),
+            'end': SplitDateTimePickerWidget(),
         }

src/pretix/control/forms/orders.py

@@ -562,7 +562,9 @@ class OrderPositionChangeForm(forms.Form):
         if instance.addon_to_id:
             del self.fields['operation_split']
 
-        if not instance.seat and not instance._seat_allowed:
+        if not instance.seat and not (
+                instance.item.seat_category_mappings.filter(subevent=instance.subevent).exists()
+        ):
             del self.fields['seat']
 
         choices = [

src/pretix/control/forms/subevents.py

@@ -39,7 +39,6 @@ from pretix.base.reldate import RelativeDateTimeField, RelativeDateWrapper
 from pretix.base.templatetags.money import money_filter
 from pretix.control.forms import SplitDateTimeField, SplitDateTimePickerWidget
 from pretix.control.forms.rrule import RRuleForm
-from pretix.helpers.i18n import get_javascript_format_without_seconds
 from pretix.helpers.money import change_decimal_field
 
 
@@ -81,11 +80,11 @@ class SubEventForm(I18nModelForm):
             'presale_end': SplitDateTimeField,
         }
         widgets = {
-            'date_from': SplitDateTimePickerWidget(without_seconds=True),
-            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}, without_seconds=True),
-            'date_admission': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}, without_seconds=True),
-            'presale_start': SplitDateTimePickerWidget(without_seconds=True),
-            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_presale_start_0'}, without_seconds=True),
+            'date_from': SplitDateTimePickerWidget(),
+            'date_to': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}),
+            'date_admission': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_date_from_0'}),
+            'presale_start': SplitDateTimePickerWidget(),
+            'presale_end': SplitDateTimePickerWidget(attrs={'data-date-after': '#id_presale_start_0'}),
         }
 
 
@@ -163,7 +162,7 @@ class SubEventBulkEditForm(I18nModelForm):
             self.fields[k + '_time'] = forms.TimeField(
                 label=self._meta.model._meta.get_field(k).verbose_name,
                 help_text=self._meta.model._meta.get_field(k).help_text,
-                widget=TimePickerWidget(without_seconds=True),
+                widget=TimePickerWidget(),
                 required=False,
             )
 
@@ -507,12 +506,6 @@ class TimeForm(forms.Form):
         required=False
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['time_from'].widget.attrs['data-format'] = get_javascript_format_without_seconds("TIME_INPUT_FORMATS")
-        self.fields['time_to'].widget.attrs['data-format'] = get_javascript_format_without_seconds("TIME_INPUT_FORMATS")
-        self.fields['time_admission'].widget.attrs['data-format'] = get_javascript_format_without_seconds("TIME_INPUT_FORMATS")
-
 
 TimeFormSet = formset_factory(
     TimeForm,

src/pretix/control/forms/vouchers.py

@@ -32,20 +32,16 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-import copy
 import csv
-from collections import Counter, namedtuple
+from collections import namedtuple
 from io import StringIO
 
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import EmailValidator
-from django.db.models import Count, F, Max
 from django.db.models.functions import Upper
-from django.forms.utils import ErrorDict
 from django.urls import reverse
-from django.utils.timezone import now
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
 from django_scopes.forms import SafeModelChoiceField
 
 from pretix.base.email import get_available_placeholders
@@ -54,10 +50,7 @@ from pretix.base.forms import (
 )
 from pretix.base.forms.widgets import format_placeholders_help_text
 from pretix.base.i18n import language
-from pretix.base.models import Item, ItemVariation, Quota, SubEvent, Voucher
-from pretix.base.models.vouchers import VoucherBulkData
-from pretix.base.services.locking import lock_objects
-from pretix.base.services.quotas import QuotaAvailability
+from pretix.base.models import Item, Voucher
 from pretix.control.forms import SplitDateTimeField, SplitDateTimePickerWidget
 from pretix.control.forms.widgets import Select2, Select2ItemVarQuota
 from pretix.control.signals import voucher_form_validation
@@ -112,22 +105,20 @@ class VoucherForm(I18nModelForm):
             except Item.DoesNotExist:
                 pass
         super().__init__(*args, **kwargs)
-        if not self.event and self.instance:
-            self.event = self.instance.event
 
         self.fields['tag'].widget.attrs['data-typeahead-url'] = reverse('control:event.vouchers.tags.typeahead', kwargs={
-            'event': self.event.slug,
-            'organizer': self.event.organizer.slug,
+            'event': instance.event.slug,
+            'organizer': instance.event.organizer.slug,
         })
 
-        if self.event.has_subevents:
-            self.fields['subevent'].queryset = self.event.subevents.all()
+        if instance.event.has_subevents:
+            self.fields['subevent'].queryset = instance.event.subevents.all()
             self.fields['subevent'].widget = Select2(
                 attrs={
                     'data-model-select2': 'event',
                     'data-select2-url': reverse('control:event.subevents.select2', kwargs={
-                        'event': self.event.slug,
-                        'organizer': self.event.organizer.slug,
+                        'event': instance.event.slug,
+                        'organizer': instance.event.organizer.slug,
                     }),
                 }
             )
@@ -137,19 +128,18 @@ class VoucherForm(I18nModelForm):
             del self.fields['subevent']
 
         choices = []
-        prefix = (self.prefix + '-') if self.prefix else ''
-        if 'itemvar' in initial or (self.data and prefix + 'itemvar' in self.data):
-            iv = self.data.get(prefix + 'itemvar', '') or initial.get('itemvar', '') or ''
+        if 'itemvar' in initial or (self.data and 'itemvar' in self.data):
+            iv = self.data.get('itemvar') or initial.get('itemvar', '')
             if iv.startswith('q-'):
-                q = self.event.quotas.get(pk=iv[2:])
+                q = self.instance.event.quotas.get(pk=iv[2:])
                 choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q)))
             elif '-' in iv:
                 itemid, varid = iv.split('-')
-                i = self.event.items.get(pk=itemid)
+                i = self.instance.event.items.get(pk=itemid)
                 v = i.variations.get(pk=varid)
                 choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (str(i), v.value)))
             elif iv:
-                i = self.event.items.get(pk=iv)
+                i = self.instance.event.items.get(pk=iv)
                 if i.variations.exists():
                     choices.append((str(i.pk), _('{product} – Any variation').format(product=i)))
                 else:
@@ -160,8 +150,8 @@ class VoucherForm(I18nModelForm):
             attrs={
                 'data-model-select2': 'generic',
                 'data-select2-url': reverse('control:event.vouchers.itemselect2', kwargs={
-                    'event': self.event.slug,
-                    'organizer': self.event.organizer.slug,
+                    'event': instance.event.slug,
+                    'organizer': instance.event.organizer.slug,
                 }),
                 'data-placeholder': _('All products')
             }
@@ -169,7 +159,7 @@ class VoucherForm(I18nModelForm):
         self.fields['itemvar'].required = False
         self.fields['itemvar'].widget.choices = self.fields['itemvar'].choices
 
-        if self.event.seating_plan or self.event.subevents.filter(seating_plan__isnull=False).exists():
+        if self.instance.event.seating_plan or self.instance.event.subevents.filter(seating_plan__isnull=False).exists():
             self.fields['seat'] = forms.CharField(
                 label=_("Specific seat ID"),
                 max_length=255,
@@ -179,45 +169,40 @@ class VoucherForm(I18nModelForm):
                 help_text=str(self.instance.seat) if self.instance.seat else '',
             )
 
-    def parse_itemvar(self, data):
-        try:
-            itemid = quotaid = None
-            iv = data.get('itemvar', '')
-            if iv.startswith('q-'):
-                quotaid = iv[2:]
-            elif '-' in iv:
-                itemid, varid = iv.split('-')
-            elif iv:
-                itemid, varid = iv, None
-            else:
-                itemid, varid = None, None
-
-            if itemid:
-                item = self.event.items.get(pk=itemid)
-                if varid:
-                    variation = item.variations.get(pk=varid)
-                else:
-                    variation = None
-                quota = None
-            elif quotaid:
-                quota = self.event.quotas.get(pk=quotaid)
-                item = None
-                variation = None
-            else:
-                quota = None
-                item = None
-                variation = None
-
-            return (item, variation, quota)
-
-        except ObjectDoesNotExist:
-            raise ValidationError(_("Invalid product selected."))
-
     def clean(self):
         data = super().clean()
 
         if not self._errors:
-            self.instance.item, self.instance.variation, self.instance.quota = self.parse_itemvar(self.data)
+            try:
+                itemid = quotaid = None
+                iv = self.data.get('itemvar', '')
+                if iv.startswith('q-'):
+                    quotaid = iv[2:]
+                elif '-' in iv:
+                    itemid, varid = iv.split('-')
+                elif iv:
+                    itemid, varid = iv, None
+                else:
+                    itemid, varid = None, None
+
+                if itemid:
+                    self.instance.item = self.instance.event.items.get(pk=itemid)
+                    if varid:
+                        self.instance.variation = self.instance.item.variations.get(pk=varid)
+                    else:
+                        self.instance.variation = None
+                    self.instance.quota = None
+                elif quotaid:
+                    self.instance.quota = self.instance.event.quotas.get(pk=quotaid)
+                    self.instance.item = None
+                    self.instance.variation = None
+                else:
+                    self.instance.quota = None
+                    self.instance.item = None
+                    self.instance.variation = None
+
+            except ObjectDoesNotExist:
+                raise ValidationError(_("Invalid product selected."))
 
         if 'codes' in data:
             data['codes'] = [a.strip() for a in data.get('codes', '').strip().split("\n") if a]
@@ -229,7 +214,7 @@ class VoucherForm(I18nModelForm):
 
         try:
             Voucher.clean_item_properties(
-                data, self.event,
+                data, self.instance.event,
                 self.instance.quota, self.instance.item, self.instance.variation,
                 seats_given=data.get('seat') or data.get('seats'),
                 block_quota=data.get('block_quota')
@@ -249,7 +234,7 @@ class VoucherForm(I18nModelForm):
 
         try:
             Voucher.clean_subevent(
-                data, self.event
+                data, self.instance.event
             )
         except ValidationError as e:
             raise ValidationError({"subevent": e.message})
@@ -265,19 +250,19 @@ class VoucherForm(I18nModelForm):
         if check_quota:
             Voucher.clean_quota_check(
                 data, cnt, self.initial_instance_data,
-                self.event, self.instance.quota, self.instance.item, self.instance.variation
+                self.instance.event, self.instance.quota, self.instance.item, self.instance.variation
             )
-        Voucher.clean_voucher_code(data, self.event, self.instance.pk)
+        Voucher.clean_voucher_code(data, self.instance.event, self.instance.pk)
         if 'seat' in self.fields:
             if data.get('seat'):
                 self.instance.seat = Voucher.clean_seat_id(
-                    data, self.instance.item, self.instance.quota, self.event, self.instance.pk
+                    data, self.instance.item, self.instance.quota, self.instance.event, self.instance.pk
                 )
                 self.instance.item = self.instance.seat.product
             else:
                 self.instance.seat = None
 
-        voucher_form_validation.send(sender=self.event, form=self, data=data)
+        voucher_form_validation.send(sender=self.instance.event, form=self, data=data)
 
         return data
 
@@ -285,215 +270,6 @@ class VoucherForm(I18nModelForm):
         return super().save(commit)
 
 
-class VoucherBulkEditForm(VoucherForm):
-    def __init__(self, *args, **kwargs):
-        self.mixed_values = kwargs.pop('mixed_values')
-        self.queryset = kwargs.pop('queryset')
-        super().__init__(**kwargs)
-        del self.fields["code"]
-        self.fields.pop("seat", None)
-
-    def is_bulk_checked(self, fieldname):
-        return self.prefix + fieldname in self.data.getlist('_bulk')
-
-    def clean(self):
-        # We skip the parent class because it's not suited for bulk editing and implement custom validation here.
-        # This does not validate *everything* we validate in VoucherForm. For example, we skip validation that one does
-        # not create a voucher for an add-on product or that the seat matches the product to save on complexity.
-        # This is a UX validation only anyway, since one could first create the voucher and then make the product an
-        # add-on product. However, we need to validate everything that we don't want violated in the database.
-        data = super(VoucherForm, self).clean()
-
-        if self.is_bulk_checked("itemvar"):
-            data["item"], data["variation"], data["quota"] = self.parse_itemvar(data)
-
-        if self.is_bulk_checked("max_usages") and "max_usages" in data:
-            max_redeemed = self.queryset.aggregate(m=Max("redeemed"))["m"]
-            if data["max_usages"] < max_redeemed:
-                raise ValidationError(_(
-                    "You cannot reduce the maximum number of redemptions to %(max_usages)s, because at least one "
-                    "of the selected vouchers has already been redeemed %(max_redeemed)s times."
-                ) % {"max_usages": data["max_usages"], "max_redeemed": max_redeemed})
-
-        # Check diff on product and quota usage based on old groups of vouchers
-        if any(self.is_bulk_checked(k) for k in ("max_usages", "itemvar", "block_quota", "valid_until", "subevent")):
-            quota_diff = Counter()
-
-            current_vouchers = self.queryset.order_by().values(
-                "item", "variation", "quota", "block_quota", "valid_until", "subevent", "redeemed", "max_usages",
-                "allow_ignore_quota",
-            ).annotate(c=Count("*"))
-            item_cache = {i.pk: i for i in Item.objects.filter(pk__in=[c["item"] for c in current_vouchers])}
-            var_cache = {v.pk: v for v in ItemVariation.objects.filter(pk__in=[c["variation"] for c in current_vouchers])}
-            quota_cache = {q.pk: q for q in Quota.objects.filter(pk__in=[c["quota"] for c in current_vouchers])}
-            subevent_cache = {s.pk: s for s in SubEvent.objects.filter(pk__in=[c["subevent"] for c in current_vouchers])}
-
-            for current in current_vouchers:
-                bulk_count = current.pop('c')
-                current = VoucherBulkData(**current)
-                # Get quotas that are currently used
-                if current.item:
-                    current.item = item_cache[current.item]
-                if current.variation:
-                    current.variation = var_cache[current.variation]
-                if current.quota:
-                    current.quota = quota_cache[current.quota]
-                if current.subevent:
-                    current.subevent = subevent_cache[current.subevent]
-
-                old_quotas = Voucher.clean_quota_get_ignored(current)
-                old_amount = max(current.max_usages - current.redeemed, 0) * bulk_count
-
-                # Predict state after change
-                after_change = copy.copy(current)
-                if self.is_bulk_checked("itemvar") and "itemvar" in data:
-                    after_change.item = data["item"]
-                    after_change.variation = data["variation"]
-                    after_change.quota = data["quota"]
-                if self.is_bulk_checked("subevent") and "subevent" in data:
-                    after_change.subevent = data["subevent"]
-                if self.is_bulk_checked("max_usages") and "max_usages" in data:
-                    after_change.max_usages = data["max_usages"]
-                if self.is_bulk_checked("block_quota") and "block_quota" in data:
-                    after_change.block_quota = data["block_quota"]
-                if self.is_bulk_checked("valid_until") and "valid_until" in data:
-                    after_change.valid_until = data["valid_until"]
-                if self.is_bulk_checked("allow_ignore_quota") and "allow_ignore_quota" in data:
-                    after_change.allow_ignore_quota = data["allow_ignore_quota"]
-
-                if after_change.quota and self.event.has_subevents and not after_change.subevent:
-                    raise ValidationError(_("You cannot create a voucher that allows selection of a quota but has no date selected."))
-
-                if after_change.quota and after_change.subevent and after_change.quota.subevent_id != after_change.subevent.pk:
-                    raise ValidationError(_("The selected quota does not match the selected subevent."))
-
-                if after_change.block_quota and self.event.has_subevents and not after_change.subevent:
-                    raise ValidationError(
-                        _('If you want this voucher to block quota, you need to select a specific date.'))
-
-                if after_change.block_quota and not after_change.item and not after_change.quota:
-                    raise ValidationError(
-                        _('You need to select a specific product or quota if this voucher should reserve '
-                          'tickets.')
-                    )
-
-                if after_change.allow_ignore_quota:
-                    # todo: is this the most useful way to do this?
-                    continue
-
-                new_quotas = Voucher.clean_quota_get_ignored(after_change)
-                new_amount = max(after_change.max_usages - after_change.redeemed, 0) * bulk_count
-
-                if new_quotas != old_quotas or new_amount != old_amount:
-                    for q in old_quotas:
-                        quota_diff[q] -= old_amount
-                    for q in new_quotas:
-                        quota_diff[q] += new_amount
-
-            if any(v > 0 for q, v in quota_diff.items()):
-                lock_objects([q for q, v in quota_diff.items() if q.size is not None and v > 0], shared_lock_objects=[self.event])
-                qa = QuotaAvailability(count_waitinglist=False)
-                qa.queue(*(q for q, v in quota_diff.items() if v > 0))
-                qa.compute()
-
-                if any(qa.results[q][0] != Quota.AVAILABILITY_OK or (qa.results[q][1] is not None and qa.results[q][1] < required)
-                       for q, required in quota_diff.items() if required > 0):
-                    raise ValidationError(_(
-                        'There is no sufficient quota available to perform this change.'
-                    ))
-
-        has_seat = self.queryset.filter(seat__isnull=False).exists()
-        if has_seat:
-            if self.is_bulk_checked("max_usages"):
-                raise ValidationError(_(
-                    'Changing the maximum number of usages in bulk is not supported if any of the selected vouchers '
-                    'is assigned a seat.'
-                ))
-            if self.is_bulk_checked("subevent"):
-                raise ValidationError(pgettext_lazy(
-                    'subevent',
-                    'Changing the date in bulk is not supported if any of the selected vouchers '
-                    'is assigned a seat.'
-                ))
-            if self.is_bulk_checked("itemvar") and data["quota"]:
-                raise ValidationError(_(
-                    'Changing the product to a quota is not supported if any of the selected vouchers '
-                    'is assigned a seat.'
-                ))
-
-            if self.is_bulk_checked("valid_until"):
-                if data["valid_until"] is None or data["valid_until"] >= now():
-                    currently_not_blocked_seats = self.queryset.filter(
-                        seat__isnull=False,
-                        max_usages__gt=F("redeemed"),
-                        valid_until__lt=now(),
-                    )
-                    if self.event.has_subevents:
-                        subevents = self.event.subevents.filter(pk__in=currently_not_blocked_seats.values_list("subevent"))
-                        for se in subevents:
-                            conflicts = currently_not_blocked_seats.filter(
-                                subevent=se
-                            ).exclude(
-                                seat_id__in=se.free_seats().values("pk")
-                            )
-                            if conflicts:
-                                raise ValidationError(_(
-                                    'This change cannot be completed because not all assigned seats of the vouchers are '
-                                    'still available'
-                                ))
-                    else:
-                        conflicts = currently_not_blocked_seats.exclude(
-                            seat_id__in=self.event.free_seats().values("pk")
-                        )
-                        if conflicts:
-                            raise ValidationError(_(
-                                'This change cannot be completed because not all assigned seats of the vouchers are '
-                                'still available'
-                            ))
-
-        return data
-
-    def save(self, commit=True):
-        objs = list(self.queryset)
-        fields = set()
-
-        check_map = {
-            'price_mode': '__price',
-            'value': '__price',
-        }
-        for k in self.fields:
-            if not self.is_bulk_checked(check_map.get(k, k)):
-                continue
-
-            if k == 'itemvar':
-                fields.add("item")
-                fields.add("variation")
-                fields.add("quota")
-            else:
-                fields.add(k)
-            for obj in objs:
-                if k == 'itemvar':
-                    obj.item = self.cleaned_data["item"]
-                    obj.variation = self.cleaned_data["variation"]
-                    obj.quota = self.cleaned_data["quota"]
-                else:
-                    setattr(obj, k, self.cleaned_data[k])
-
-        fields = [f for f in fields if f != 'itemvars']
-        if fields:
-            Voucher.objects.bulk_update(objs, fields, 200)
-
-    def full_clean(self):
-        if len(self.data) == 0:
-            # form wasn't submitted
-            self._errors = ErrorDict()
-            return
-        super().full_clean()
-
-    def _post_clean(self):
-        pass  # skip model-level clean
-
-
 class VoucherBulkForm(VoucherForm):
     codes = forms.CharField(
         widget=forms.Textarea,

src/pretix/control/logdisplay.py

@@ -33,7 +33,6 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under the License.
 
-import functools
 from collections import defaultdict
 from datetime import datetime
 from decimal import Decimal
@@ -70,15 +69,6 @@ OVERVIEW_BANLIST = [
 ]
 
 
-@functools.lru_cache(maxsize=32)
-def object_id_to_string(model_class, **kwargs):
-    # The cache is thread-local and persists requests, but it's small enough that we can accept that
-    try:
-        return str(model_class.objects.get(**kwargs))
-    except model_class.DoesNotExist:
-        return "?"
-
-
 class OrderChangeLogEntryType(OrderLogEntryType):
     prefix = _('The order has been changed:')
 
@@ -103,10 +93,10 @@ class OrderItemChanged(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         old_item = str(event.items.get(pk=data['old_item']))
         if data['old_variation']:
-            old_item += ' - ' + str(object_id_to_string(ItemVariation, item__event_id=event.pk, pk=data['old_variation']))
+            old_item += ' - ' + str(ItemVariation.objects.get(item__event=event, pk=data['old_variation']))
         new_item = str(event.items.get(pk=data['new_item']))
         if data['new_variation']:
-            new_item += ' - ' + str(object_id_to_string(ItemVariation, item__event_id=event.pk, pk=data['new_variation']))
+            new_item += ' - ' + str(ItemVariation.objects.get(item__event=event, pk=data['new_variation']))
         return _('Position #{posid}: {old_item} ({old_price}) changed to {new_item} ({new_price}).').format(
             posid=data.get('positionid', '?'),
             old_item=old_item, new_item=new_item,
@@ -163,14 +153,14 @@ class OrderTaxRuleChanged(OrderChangeLogEntryType):
         if 'positionid' in data:
             return _('Tax rule of position #{posid} changed from {old_rule} to {new_rule}.').format(
                 posid=data.get('positionid', '?'),
-                old_rule=object_id_to_string(TaxRule, pk=data['old_taxrule']) if data['old_taxrule'] else '–',
-                new_rule=object_id_to_string(TaxRule, pk=data['new_taxrule']),
+                old_rule=TaxRule.objects.get(pk=data['old_taxrule']) if data['old_taxrule'] else '–',
+                new_rule=TaxRule.objects.get(pk=data['new_taxrule']),
             )
         elif 'fee' in data:
             return _('Tax rule of fee #{fee} changed from {old_rule} to {new_rule}.').format(
                 fee=data.get('fee', '?'),
-                old_rule=object_id_to_string(TaxRule, pk=data['old_taxrule']) if data['old_taxrule'] else '–',
-                new_rule=object_id_to_string(TaxRule, pk=data['new_taxrule']),
+                old_rule=TaxRule.objects.get(pk=data['old_taxrule']) if data['old_taxrule'] else '–',
+                new_rule=TaxRule.objects.get(pk=data['new_taxrule']),
             )
 
 
@@ -214,7 +204,7 @@ class OrderCanceled(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         old_item = str(event.items.get(pk=data['old_item']))
         if data['old_variation']:
-            old_item += ' - ' + object_id_to_string(ItemVariation, pk=data['old_variation'])
+            old_item += ' - ' + str(ItemVariation.objects.get(pk=data['old_variation']))
         return _('Position #{posid} ({old_item}, {old_price}) canceled.').format(
             posid=data.get('positionid', '?'),
             old_item=old_item,
@@ -229,7 +219,7 @@ class OrderPositionAdded(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         item = str(event.items.get(pk=data['item']))
         if data['variation']:
-            item += ' - ' + object_id_to_string(ItemVariation, item__event_id=event.pk, pk=data['variation'])
+            item += ' - ' + str(ItemVariation.objects.get(item__event=event, pk=data['variation']))
         if data['addon_to']:
             addon_to = OrderPosition.objects.get(order__event=event, pk=data['addon_to'])
             return _('Position #{posid} created: {item} ({price}) as an add-on to position #{addon_to}.').format(
@@ -293,7 +283,7 @@ class OrderChangedSplit(OrderChangeLogEntryType):
     def display_prefixed(self, event: Event, logentry: LogEntry, data):
         old_item = str(event.items.get(pk=data['old_item']))
         if data['old_variation']:
-            old_item += ' - ' + object_id_to_string(ItemVariation, pk=data['old_variation'])
+            old_item += ' - ' + str(ItemVariation.objects.get(pk=data['old_variation']))
         url = reverse('control:event.order', kwargs={
             'event': event.slug,
             'organizer': event.organizer.slug,
@@ -349,7 +339,6 @@ class OrderChangedSplitFrom(OrderLogEntryType):
     'pretix.event.checkin.reverted': _('The check-in of position #{posid} on list "{list}" has been reverted.'),
 })
 class CheckinErrorLogEntryType(OrderLogEntryType):
-
     def display(self, logentry: LogEntry, data):
         return self.display_plain(self.plain, logentry, data)
 
@@ -364,7 +353,10 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
         event = logentry.event
 
         if 'list' in data and event:
-            data['list'] = object_id_to_string(CheckinList, event_id=event.id, pk=data['list'])
+            try:
+                data['list'] = event.checkin_lists.get(pk=data.get('list')).name
+            except CheckinList.DoesNotExist:
+                data['list'] = _("(unknown)")
         else:
             data['list'] = _("(unknown)")
 

src/pretix/control/middleware.py

@@ -37,7 +37,7 @@ from urllib.parse import quote, urljoin, urlparse
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, logout
 from django.contrib.auth.views import redirect_to_login
-from django.http import Http404, HttpResponse
+from django.http import Http404
 from django.shortcuts import get_object_or_404, resolve_url
 from django.template.response import TemplateResponse
 from django.urls import get_script_prefix, resolve, reverse
@@ -98,8 +98,6 @@ class PermissionMiddleware:
         super().__init__()
 
     def _login_redirect(self, request):
-        from django.contrib.auth.views import redirect_to_login
-
         # Taken from django/contrib/auth/decorators.py
         path = request.build_absolute_uri()
         # urlparse chokes on lazy objects in Python 3, force to str
@@ -112,21 +110,10 @@ class PermissionMiddleware:
         if ((not login_scheme or login_scheme == current_scheme) and
                 (not login_netloc or login_netloc == current_netloc)):
             path = request.get_full_path()
+        from django.contrib.auth.views import redirect_to_login
 
-        if request.headers.get("X-Requested-With") == "XMLHttpRequest":
-            # It's not useful to return a 302 redirect on a XMLHttpRequest request,  because
-            # the XMLHttpRequest is unable to detect redirects.
-            return HttpResponse(
-                "Authentication required",
-                status=401,
-                headers={
-                    # Appending ?next= is handled by client, because it should be the top-level context url,
-                    # not the URL called in the background
-                    "X-Login-Url": resolved_login_url,
-                }
-            )
-
-        return redirect_to_login(path, resolved_login_url, REDIRECT_FIELD_NAME)
+        return redirect_to_login(
+            path, resolved_login_url, REDIRECT_FIELD_NAME)
 
     def __call__(self, request):
         url = resolve(request.path_info)

src/pretix/control/signals.py

@@ -39,8 +39,7 @@ from pretix.base.signals import (
 html_page_start = GlobalSignal()
 """
 This signal allows you to put code in the beginning of the main page for every
-page in the backend. You are expected to return a SafeString containing HTML, or
-a string that will be HTML-escaped.
+page in the backend. You are expected to return HTML.
 
 The ``sender`` keyword argument will contain the request.
 """
@@ -130,7 +129,7 @@ event_dashboard_top = EventPluginSignal()
 Arguments: 'request'
 
 This signal is sent out to include custom HTML in the top part of the the event dashboard.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
+Receivers should return HTML.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 An additional keyword argument ``subevent`` *can* contain a sub-event.
@@ -141,7 +140,7 @@ event_dashboard_widgets = EventPluginSignal()
 This signal is sent out to include widgets in the event dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
 
-* content (SafeString, containing HTML)
+* content (str, containing HTML)
 * display_size (str, one of "full" (whole row), "big" (half a row) or "small"
   (quarter of a row). May be ignored on small displays, default is "small")
 * priority (int, used for ordering, higher comes first, default is 1)
@@ -158,7 +157,7 @@ Arguments: 'user'
 This signal is sent out to include widgets in the personal user dashboard. Receivers
 should return a list of dictionaries, where each dictionary can have the keys:
 
-* content (SafeString, containing HTML)
+* content (str, containing HTML)
 * display_size (str, one of "full" (whole row), "big" (half a row) or "small"
   (quarter of a row). May be ignored on small displays, default is "small")
 * priority (int, used for ordering, higher comes first, default is 1)
@@ -173,7 +172,6 @@ Arguments: 'form'
 
 This signal allows you to add additional HTML to the form that is used for modifying vouchers.
 You receive the form object in the ``form`` keyword argument.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 """
@@ -211,7 +209,6 @@ Arguments: 'quota'
 
 This signal allows you to append HTML to a Quota's detail view. You receive the
 quota as argument in the ``quota`` keyword argument.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 """
@@ -222,7 +219,6 @@ Arguments: 'subevent'
 
 This signal allows you to append HTML to a SubEvent's detail view. You receive the
 subevent as argument in the ``subevent`` keyword argument.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 """
@@ -269,8 +265,7 @@ order_info = EventPluginSignal()
 """
 Arguments: ``order``, ``request``
 
-This signal is sent out to display additional information on the order detail page.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
+This signal is sent out to display additional information on the order detail page
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
@@ -280,8 +275,7 @@ order_approve_info = EventPluginSignal()
 """
 Arguments: ``order``, ``request``
 
-This signal is sent out to display additional information on the order approve page.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
+This signal is sent out to display additional information on the order approve page
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
@@ -292,7 +286,6 @@ order_position_buttons = EventPluginSignal()
 Arguments: ``order``, ``position``, ``request``
 
 This signal is sent out to display additional buttons for a single position of an order.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 Additionally, the argument ``order`` and ``request`` are available.
@@ -322,7 +315,6 @@ Arguments: 'request'
 
 This signal is sent out to include template snippets on the settings page of an event
 that allows generating a pretix Widget code.
-Receivers should return a SafeString containing HTML, or a string that will be HTML-escaped.
 
 As with all event plugin signals, the ``sender`` keyword argument will contain the event.
 A second keyword argument ``request`` will contain the request object.

src/pretix/control/templates/pretixcontrol/auth/login.html

@@ -56,4 +56,5 @@
     </form>
     <script type="text/plain" id="good_origin">{{ good_origin }}</script>
     <script type="text/plain" id="bad_origin_report_url">{{ bad_origin_report_url }}</script>
+    <!-- pretix-login-marker -->{# marker required for ajax calls to detect that user session is over #}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/auth/login_2fa.html

@@ -3,7 +3,6 @@
 {% load i18n %}
 {% load static %}
 {% load compress %}
-{% load escapejson %}
 {% block content %}
     <form class="form-signin" action="" method="post" id="webauthn-form">
         {% csrf_token %}
@@ -31,7 +30,8 @@
     </form>
     {% if jsondata %}
         <script type="text/json" id="webauthn-login">
-            {{ jsondata|escapejson }}
+            {{ jsondata|safe }}
+
         </script>
     {% endif %}
     {% compress js %}

src/pretix/control/templates/pretixcontrol/dashboard.html

@@ -28,7 +28,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </div>
                 </div>
@@ -51,7 +51,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </div>
                 </div>
@@ -72,7 +72,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </div>
                 </div>
@@ -94,7 +94,7 @@
                             {% if w.lazy %}
                                 <span class="fa fa-cog fa-4x"></span>
                             {% else %}
-                                {{ w.content }}
+                                {{ w.content|safe }}
                             {% endif %}
                         </a>
                     {% else %}
@@ -102,7 +102,7 @@
                             {% if w.lazy %}
                                 <span class="fa fa-cog fa-4x"></span>
                             {% else %}
-                                {{ w.content }}
+                                {{ w.content|safe }}
                             {% endif %}
                         </div>
                     {% endif %}

src/pretix/control/templates/pretixcontrol/email_setup_simple.html

@@ -50,46 +50,6 @@
                         {% endblocktrans %}
                     </div>
                 {% endif %}
-                {% if dkim_warning %}
-                    <div class="alert alert-danger">
-                        <p>
-                            {{ dkim_warning }}
-                        </p>
-                        <p>
-                            {% trans "Your new DKIM record should be set up as a CNAME record like this:" %}
-                        </p>
-                        <pre><code>{{ dkim_hostname }}  CNAME  {{ dkim_cname }}</code></pre>
-                        <p>
-                            {% trans "Please keep in mind that updates to DNS might require multiple hours to take effect." %}
-                        </p>
-                    </div>
-                {% elif dkim_cname %}
-                    <div class="alert alert-success">
-                        {% blocktrans trimmed %}
-                            We found a DKIM record on your domain for this system. Great!
-                        {% endblocktrans %}
-                    </div>
-                {% endif %}
-                {% if dmarc_warning %}
-                    <div class="alert alert-danger">
-                        <p>
-                            {{ dmarc_warning }}
-                        </p>
-                        <p>
-                            {% trans "Your new DMARC record could look like this:" %}
-                        </p>
-                        <pre><code>_dmarc.{{ hostname }}  TXT  "v=DMARC1; p=quarantine; sp=none; adkim=r; aspf=r;"</code></pre>
-                        <p>
-                            {% trans "Please keep in mind that updates to DNS might require multiple hours to take effect." %}
-                        </p>
-                    </div>
-                {% elif dkim_cname %}
-                    <div class="alert alert-success">
-                        {% blocktrans trimmed %}
-                            We found a DMARC record on your domain for this system. Great!
-                        {% endblocktrans %}
-                    </div>
-                {% endif %}
                 {% if verification %}
                     <h3>{% trans "Verification" %}</h3>
                     <p>
@@ -110,7 +70,7 @@
             </div>
         </div>
 
-        {% if spf_warning or dkim_warning or dmarc_warning %}
+        {% if spf_warning %}
             <div class="form-group submit-group">
                 <a href="" class="btn btn-default btn-save">
                     {% trans "Cancel" %}

src/pretix/control/templates/pretixcontrol/event/dashboard_partial_warnings.html

@@ -1,58 +0,0 @@
-{% load i18n %}
-{% if has_overpaid_orders %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            This event contains <strong>overpaid orders</strong>, for example due to duplicate payment attempts.
-            You should review the cases and consider refunding the overpaid amount to the user.
-        {% endblocktrans %}
-        <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=overpaid"
-                class="btn btn-primary">{% trans "Show overpaid orders" %}</a>
-    </div>
-{% endif %}
-{% if has_pending_refunds %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            This event contains <strong>pending refunds</strong> that you should take care of.
-        {% endblocktrans %}
-        <a href="{% url "control:event.orders.refunds" event=request.event.slug organizer=request.event.organizer.slug %}"
-           class="btn btn-primary">{% trans "Show pending refunds" %}</a>
-    </div>
-{% endif %}
-{% if has_cancellation_requests %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            This event contains <strong>requested cancellations</strong> that you should take care of.
-        {% endblocktrans %}
-        <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=rc"
-           class="btn btn-primary">{% trans "Show orders requesting cancellation" %}</a>
-    </div>
-{% endif %}
-{% if has_pending_approvals %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            This event contains <strong>pending approvals</strong> that you should take care of.
-        {% endblocktrans %}
-        <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=pa"
-           class="btn btn-primary">{% trans "Show orders pending approval" %}</a>
-    </div>
-{% endif %}
-{% if has_pending_orders_with_full_payment %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            This event contains <strong>fully paid orders</strong> that are not marked as paid, probably
-            because no quota was left at the time their payment arrived. You should review the cases and consider
-            either refunding the customer or creating more space.
-        {% endblocktrans %}
-        <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=pendingpaid"
-           class="btn btn-primary">{% trans "Show affected orders" %}</a>
-    </div>
-{% endif %}
-{% if has_sync_problems %}
-    <div class="alert alert-warning">
-        {% blocktrans trimmed %}
-            Orders in this event could not be <strong>synced to an external system</strong> as configured.
-        {% endblocktrans %}
-        <a href="{% url "control:event.datasync.failedjobs" event=request.event.slug organizer=request.event.organizer.slug %}"
-           class="btn btn-primary">{% trans "Show sync problems" %}</a>
-    </div>
-{% endif %}

src/pretix/control/templates/pretixcontrol/event/index.html

@@ -14,7 +14,6 @@
             {% else %}
                 {{ request.event.get_date_range_display }}
             {% endif %}
-            <span id="warnings_loading" class="fa fa-cog fa-spin"></span>
         </small>
     </h1>
     <div class="helper-space-below">
@@ -32,7 +31,63 @@
         </div>
         <div class="clearfix"></div>
     </div>
-    <div id="warnings_target"></div>
+    {% if has_overpaid_orders %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                This event contains <strong>overpaid orders</strong>, for example due to duplicate payment attempts.
+                You should review the cases and consider refunding the overpaid amount to the user.
+            {% endblocktrans %}
+            <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=overpaid"
+                    class="btn btn-primary">{% trans "Show overpaid orders" %}</a>
+        </div>
+    {% endif %}
+    {% if has_pending_refunds %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                This event contains <strong>pending refunds</strong> that you should take care of.
+            {% endblocktrans %}
+            <a href="{% url "control:event.orders.refunds" event=request.event.slug organizer=request.event.organizer.slug %}"
+                    class="btn btn-primary">{% trans "Show pending refunds" %}</a>
+        </div>
+    {% endif %}
+    {% if has_cancellation_requests %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                This event contains <strong>requested cancellations</strong> that you should take care of.
+            {% endblocktrans %}
+            <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=rc"
+                    class="btn btn-primary">{% trans "Show orders requesting cancellation" %}</a>
+        </div>
+    {% endif %}
+    {% if has_pending_approvals %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                This event contains <strong>pending approvals</strong> that you should take care of.
+            {% endblocktrans %}
+            <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=pa"
+                    class="btn btn-primary">{% trans "Show orders pending approval" %}</a>
+        </div>
+    {% endif %}
+    {% if has_pending_orders_with_full_payment %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                This event contains <strong>fully paid orders</strong> that are not marked as paid, probably
+                because no quota was left at the time their payment arrived. You should review the cases and consider
+                either refunding the customer or creating more space.
+            {% endblocktrans %}
+            <a href="{% url "control:event.orders" event=request.event.slug organizer=request.event.organizer.slug %}?status=pendingpaid"
+                    class="btn btn-primary">{% trans "Show affected orders" %}</a>
+        </div>
+    {% endif %}
+    {% if has_sync_problems %}
+        <div class="alert alert-warning">
+            {% blocktrans trimmed %}
+                Orders in this event could not be <strong>synced to an external system</strong> as configured.
+            {% endblocktrans %}
+            <a href="{% url "control:event.datasync.failedjobs" event=request.event.slug organizer=request.event.organizer.slug %}"
+                    class="btn btn-primary">{% trans "Show sync problems" %}</a>
+        </div>
+    {% endif %}
     {% eventsignal request.event "pretix.control.signals.event_dashboard_top" request=request %}
 
     {% if request.event.has_subevents %}
@@ -51,7 +106,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </a>
                 {% elif w.link %}
@@ -59,7 +114,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x´"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </a>
                 {% else %}
@@ -67,7 +122,7 @@
                         {% if w.lazy %}
                             <span class="fa fa-cog fa-4x"></span>
                         {% else %}
-                            {{ w.content }}
+                            {{ w.content|safe }}
                         {% endif %}
                     </div>
                 {% endif %}

src/pretix/control/templates/pretixcontrol/event/live.html

@@ -19,7 +19,7 @@
                         </p>
                         <ul>
                             {% for issue in issues %}
-                                <li>{{ issue }}</li>
+                                <li>{{ issue|safe }}</li>
                             {% endfor %}
                         </ul>
                     </div>
@@ -42,7 +42,7 @@
                         </p>
                         <ul>
                             {% for issue in issues %}
-                                <li>{{ issue }}</li>
+                                <li>{{ issue|safe }}</li>
                             {% endfor %}
                         </ul>
                     </div>

src/pretix/control/templates/pretixcontrol/event/logs.html

@@ -1,12 +1,41 @@
 {% extends "pretixcontrol/items/base.html" %}
 {% load i18n %}
 {% load static %}
-{% load bootstrap3 %}
-{% load icon %}
 {% block title %}{% trans "Event logs" %}{% endblock %}
 {% block inside %}
     <h1>{% trans "Event logs" %}</h1>
-    {% include "pretixcontrol/fragment_log_filter_form.html" %}
+    <form class="form-inline helper-display-inline" action="" method="get">
+        <input type="hidden" name="content_type" value="{{ request.GET.content_type }}">
+        <input type="hidden" name="object" value="{{ request.GET.object }}">
+        <p>
+            <select name="user" class="form-control">
+                <option value="">{% trans "All actions" %}</option>
+                <option value="yes" {% if request.GET.user == "yes" %}selected="selected"{% endif %}>
+                    {% trans "Team actions" %}
+                </option>
+                <option value="no" {% if request.GET.user == "no" %}selected="selected"{% endif %}>
+                    {% trans "Customer actions" %}
+                </option>
+                {% for up in userlist %}
+                    {% if up.user__id %}
+                        <option value="{{ up.user__id }}"
+                                {% if request.GET.user == up.user__id %}selected="selected"{% endif %}>
+                            {{ up.user__email }}
+                        </option>
+                    {% endif %}
+                {% endfor %}
+                {% for d in devicelist %}
+                    {% if d.device__id %}
+                        <option value="d-{{ d.device__id }}"
+                                {% if "d-" in request.GET.user and request.GET.user|slice:"2:" == d.device__id|slugify %}selected="selected"{% endif %}>
+                            {{ d.device__name }}
+                        </option>
+                    {% endif %}
+                {% endfor %}
+            </select>
+            <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
+        </p>
+    </form>
     <ul class="list-group">
         {% for log in logs %}
             <li class="list-group-item logentry">
@@ -66,5 +95,5 @@
             </div>
         {% endfor %}
     </ul>
-    {% include "pretixcontrol/pagination_huge.html" %}
+    {% include "pretixcontrol/pagination.html" %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/event/payment.html

@@ -12,7 +12,7 @@
                 <table class="table table-payment-providers">
                     <tbody>
                     {% for provider in providers %}
-                        <tr{% if provider.highlight %} class="success-left"{% endif %}>
+                        <tr>
                             <td>
                                 <strong>{{ provider.verbose_name }}</strong>
                             </td>
@@ -56,7 +56,7 @@
                             <td colspan="4">
                                 <br>
                                 {% url "control:event.settings.plugins" event=request.event.slug organizer=request.organizer.slug as plugin_settings_url %}
-                                <a href="{{ plugin_settings_url }}?go=payment#tab-0-1-open" class="btn btn-default">
+                                <a href="{{ plugin_settings_url }}#tab-0-1-open" class="btn btn-default">
                                     <i class="fa fa-plus"></i> {% trans "Enable additional payment plugins" %}
                                 </a>
                             </td>

src/pretix/control/templates/pretixcontrol/event/plugins.html

@@ -28,7 +28,6 @@
     </div>
     <form action="" method="post" class="form-horizontal form-plugins">
         {% csrf_token %}
-        <input type="hidden" name="go" value="{{ request.GET.go }}">
         <div id="plugin_search_results" class="panel panel-default collapse">
             <div class="panel-heading">
                 <button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button>

src/pretix/control/templates/pretixcontrol/event/quick_setup.html

@@ -193,6 +193,7 @@
                     {% endblocktrans %}
                 </p>
                 {% bootstrap_field form.contact_mail layout="control" %}
+                {% bootstrap_field form.contact_url layout="control" %}
                 {% bootstrap_field form.imprint_url layout="control" %}
             </div>
         </fieldset>

src/pretix/control/templates/pretixcontrol/fragment_log_filter_form.html

@@ -1,38 +0,0 @@
-{% load i18n %}
-{% load bootstrap3 %}
-{% load icon %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">
-            {% trans "Filter" %}
-        </h3>
-    </div>
-    <form class="panel-body filter-form" action="" method="get">
-        <div class="row">
-            <div class="col-md-3 col-xs-6">
-                {% bootstrap_field filter_form.source %}
-            </div>
-            <div class="col-md-3 col-xs-6">
-                {% bootstrap_field filter_form.device %}
-            </div>
-            <div class="col-md-3 col-xs-6">
-                {% bootstrap_field filter_form.user_email %}
-            </div>
-        </div>
-        {{ filter_form.action_type }}
-        {{ filter_form.content_type }}
-        {{ filter_form.object }}
-        {% if filter_form.is_valid and filter_form.cleaned_data.action_type %}
-            {% icon "filter" %} <code>{{ filter_form.cleaned_data.action_type }}</code>
-        {% endif %}
-        {% if filter_form.is_valid and filter_form.cleaned_data.content_type and filter_form.cleaned_data.object %}
-            {% icon "filter" %} {% trans "Specific object selected" %}
-        {% endif %}
-        <div class="text-right flip">
-            <button class="btn btn-primary btn-lg" type="submit">
-                <span class="fa fa-filter"></span>
-                {% trans "Filter" %}
-            </button>
-        </div>
-    </form>
-</div>

src/pretix/control/templates/pretixcontrol/items/index.html

@@ -156,11 +156,11 @@
                                     <br/>
                                     <small class="text-muted">
                                         {% if not i.tax_rule.price_includes_tax %}
-                                            {% blocktrans trimmed with rate=i.tax_rule.rate|tax_rate_format taxname=i.tax_rule.name %}
+                                            {% blocktrans trimmed with rate=i.tax_rule.rate|floatformat:-2 taxname=i.tax_rule.name %}
                                                 <strong>plus</strong> {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         {% else %}
-                                            {% blocktrans trimmed with rate=i.tax_rule.rate|tax_rate_format taxname=i.tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=i.tax_rule.rate|floatformat:-2 taxname=i.tax_rule.name|default:s_taxes %}
                                                 incl. {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         {% endif %}

src/pretix/control/templates/pretixcontrol/order/cancel.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load bootstrap3 %}
 {% load money %}
-{% load wrap_in %}
 {% block title %}
     {% trans "Cancel order" %}
 {% endblock %}
@@ -27,7 +26,7 @@
         {% if form.cancellation_fee %}
             {% if fee %}
                 {% with fee|money:request.event.currency as f %}
-                    <p>{% blocktrans trimmed with fee=f|wrap_in:"strong" %}
+                    <p>{% blocktrans trimmed with fee="<strong>"|add:f|add:"</strong>"|safe %}
                         The configured cancellation fee for a self-service cancellation would be {{ fee }} for this
                         order, but for a cancellation performed by you, you need to set the cancellation fee here:
                     {% endblocktrans %}</p>

src/pretix/control/templates/pretixcontrol/order/change.html

@@ -284,14 +284,6 @@
                             </div>
                             <div class="col-sm-4">
                                 {% bootstrap_field position.form.operation_secret layout='inline' %}
-                                {% if position.issued_gift_cards.exists %}
-                                    <div class="alert alert-info">
-                                        {% blocktrans trimmed %}
-                                        Ticket secrets of order positions that have been used to issue a gift card can not
-                                        be changed. Only the link will be changed in this case.
-                                        {% endblocktrans %}
-                                    </div>
-                                {% endif %}
                             </div>
                         </div>
 

src/pretix/control/templates/pretixcontrol/order/index.html

@@ -705,7 +705,7 @@
                                     {% if line.tax_rate %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=line.tax_rate|tax_rate_format taxname=line.tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=line.tax_rate|floatformat:-2 taxname=line.tax_rule.name|default:s_taxes %}
                                                 <strong>plus</strong> {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
@@ -715,7 +715,7 @@
                                     {% if line.tax_rate and line.price %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=line.tax_rate|tax_rate_format taxname=line.tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=line.tax_rate|floatformat:-2 taxname=line.tax_rule.name|default:s_taxes %}
                                                 incl. {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
@@ -755,7 +755,7 @@
                                     {% if fee.tax_rate %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=fee.tax_rate|tax_rate_format taxname=fee.tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=fee.tax_rate|floatformat:-2 taxname=fee.tax_rule.name|default:s_taxes %}
                                                 <strong>plus</strong> {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
@@ -765,7 +765,7 @@
                                     {% if fee.tax_rate %}
                                         <br/>
                                         <small>
-                                            {% blocktrans trimmed with rate=fee.tax_rate|tax_rate_format taxname=fee.tax_rule.name|default:s_taxes %}
+                                            {% blocktrans trimmed with rate=fee.tax_rate|floatformat:-2 taxname=fee.tax_rule.name|default:s_taxes %}
                                                 incl. {{ rate }}% {{ taxname }}
                                             {% endblocktrans %}
                                         </small>
@@ -833,7 +833,7 @@
                                 <strong>{% trans "Pending total" %}</strong>
                             </div>
                             <div class="col-md-3 col-xs-6 col-md-offset-5 price">
-                                <strong>{{ pending_sum|money:event.currency }}</strong>
+                                <strong>{{ order.pending_sum|money:event.currency }}</strong>
                             </div>
                             <div class="clearfix"></div>
                         </div>
@@ -903,7 +903,7 @@
                                             <tr>
                                                 <td colspan="1"></td>
                                                 <td colspan="5">
-                                                    {{ p.html_info }}
+                                                    {{ p.html_info|safe }}
                                                     {% if staff_session %}
                                                         <p>
                                                             <a href="" class="btn btn-default btn-xs admin-only" data-expandpayment data-id="{{ p.pk }}">
@@ -1018,7 +1018,7 @@
                                                             </dl>
                                                         {% endif %}
                                                         {% if r.html_info %}
-                                                            {{ r.html_info }}
+                                                            {{ r.html_info|safe }}
                                                         {% endif %}
                                                         {% if staff_session %}
                                                             <p>

src/pretix/control/templates/pretixcontrol/organizers/device_connect.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load static %}
 {% load bootstrap3 %}
-{% load escapejson %}
 {% block inner %}
     <h1>{% trans "Connect to device:" %} {{ device.name }}</h1>
 
@@ -19,7 +18,7 @@
                 {% trans "Open the app that you want to connect and optionally reset it to the original state." %}
             </li>
             <li>{% trans "Scan the following configuration code:" %}<br><br>
-                <script type="application/json" data-replace-with-qr>{{ qrdata|escapejson_dumps }}</script><br>
+                <script type="text/json" data-replace-with-qr>{{ qrdata|safe }}</script><br>
                 {% trans "If your app/device does not support scanning a QR code, you can also enter the following information:" %}
                 <br>
                 <strong>{% trans "System URL:" %}</strong> <code id="system_url">{{ settings.SITE_URL }}</code>

src/pretix/control/templates/pretixcontrol/organizers/devices.html

@@ -137,15 +137,6 @@
                             </td>
                             <td>
                                 {{ d.software_brand|default_if_none:"" }} {{ d.software_version|default_if_none:"" }}
-                                {% if staff_session %}
-                                    <details class="admin-only">
-                                        <summary>
-                                            <i class="fa fa-angle-down collapse-indicator"></i>
-                                            {% trans "Details" %}
-                                        </summary>
-                                        <pre class="admin-only">{{ d.info|pprint }}</pre>
-                                    </details>
-                                {% endif %}
                             </td>
                             <td>
                                 {% if d.initialized %}

src/pretix/control/templates/pretixcontrol/organizers/logs.html

@@ -4,7 +4,24 @@
 {% block title %}{% trans "Organizer logs" %}{% endblock %}
 {% block inside %}
     <h1>{% trans "Organizer logs" %}</h1>
-    {% include "pretixcontrol/fragment_log_filter_form.html" %}
+    <form class="form-inline helper-display-inline" action="" method="get">
+        <input type="hidden" name="content_type" value="{{ request.GET.content_type }}">
+        <input type="hidden" name="object" value="{{ request.GET.object }}">
+        <p>
+            <select name="user" class="form-control">
+                <option value="">{% trans "All actions" %}</option>
+                {% for up in userlist %}
+                    {% if up.user__id %}
+                        <option value="{{ up.user__id }}"
+                                {% if request.GET.user == up.user__id %}selected="selected"{% endif %}>
+                            {{ up.user__email }}
+                        </option>
+                    {% endif %}
+                {% endfor %}
+            </select>
+            <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
+        </p>
+    </form>
     <ul class="list-group">
         {% for log in logs %}
             <li class="list-group-item logentry">
@@ -64,5 +81,5 @@
             </div>
         {% endfor %}
     </ul>
-    {% include "pretixcontrol/pagination_huge.html" %}
+    {% include "pretixcontrol/pagination.html" %}
 {% endblock %}

src/pretix/control/templates/pretixcontrol/pdf/index.html

@@ -560,10 +560,11 @@
             </div>
         </div>
     </div>
+    <script type="text/plain" id="schema-url">{% static "schema/pdf-layout.schema.json" %}</script>
     <script type="text/javascript" src="{% static "pdfjs/pdf.js" %}"></script>
+    <script type="text/javascript" src="{% static "ajv/ajv2020.bundle.min.js" %}"></script>
     <script type="text/javascript" src="{% static "fabric/fabric.min.js" %}"></script>
     <script type="text/javascript" src="{% static "pretixcontrol/js/ui/editor.js" %}"></script>
-    <script type="text/javascript" src="{% static "schema/pdf-layout.validate.js" %}"></script>
     <img src="{% static 'pretixpresale/pdf/powered_by_pretix_dark.png' %}" id="poweredby-dark" class="sr-only">
     <img src="{% static 'pretixpresale/pdf/powered_by_pretix_white.png' %}" id="poweredby-white" class="sr-only">
     {% for family, styles in fonts.items %}

src/pretix/control/templates/pretixcontrol/user/2fa_confirm_totp.html

@@ -1,7 +1,6 @@
 {% extends "pretixcontrol/base.html" %}
 {% load i18n %}
 {% load bootstrap3 %}
-{% load escapejson %}
 {% block title %}{% trans "Add a two-factor authentication device" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Add a two-factor authentication device" %}</h1>
@@ -33,7 +32,7 @@
         </li>
         <li>
             {% trans "Add a new account to the app by scanning the following barcode:" %}
-            <script type="application/json" data-replace-with-qr>{{ qrdata|escapejson_dumps }}</script>
+            <div class="qrcode-canvas" data-qrdata="#qrdata"></div>
             <p>
                 <a data-toggle="collapse" href="#no_scan">
                     {% trans "Can't scan the barcode?" %}
@@ -82,4 +81,9 @@
         </li>
     </ol>
 
+    <script type="text/json" id="qrdata">
+        {{ qrdata|safe }}
+
+
+    </script>
 {% endblock %}

src/pretix/control/templates/pretixcontrol/user/2fa_confirm_webauthn.html

@@ -3,7 +3,6 @@
 {% load bootstrap3 %}
 {% load static %}
 {% load compress %}
-{% load escapejson %}
 {% block title %}{% trans "Add a two-factor authentication device" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Add a two-factor authentication device" %}</h1>
@@ -27,7 +26,9 @@
         {% trans "Device registration failed." %}
     </div>
     <script type="text/json" id="webauthn-enroll">
-        {{ jsondata|escapejson }}
+        {{ jsondata|safe }}
+
+
     </script>
     {% compress js %}
         <script type="text/javascript" src="{% static "pretixcontrol/js/base64js.js" %}"></script>

src/pretix/control/templates/pretixcontrol/user/reauth.html

@@ -3,7 +3,6 @@
 {% load bootstrap3 %}
 {% load compress %}
 {% load static %}
-{% load escapejson %}
 {% block content %}
     <form class="form-signin" id="webauthn-form" action="" method="post">
         {% csrf_token %}
@@ -44,7 +43,7 @@
 
         {% if jsondata %}
             <script type="text/json" id="webauthn-login">
-                {{ jsondata|escapejson }}
+            {{ jsondata|safe }}
             </script>
         {% endif %}
         {% compress js %}

src/pretix/control/templates/pretixcontrol/vouchers/bulk_edit.html

@@ -1,83 +0,0 @@
-{% extends "pretixcontrol/items/base.html" %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load eventsignal %}
-{% load eventurl %}
-{% block title %}{% trans "Change multiple vouchers" %}{% endblock %}
-{% block inside %}
-    <h1>
-        {% trans "Change multiple vouchers" %}
-        <small>
-            {% blocktrans trimmed with number=vouchers.count %}
-                {{ number }} selected
-            {% endblocktrans %}
-        </small>
-    </h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        <div class="hidden">
-            {% for v in vouchers %}
-                <input type="hidden" name="voucher" value="{{ v.pk }}">
-            {% endfor %}
-        </div>
-        {% bootstrap_form_errors form %}
-            <fieldset>
-                <legend>{% trans "Voucher details" %}</legend>
-                {% bootstrap_field form.max_usages layout="bulkedit" %}
-                {% bootstrap_field form.valid_until layout="bulkedit" %}
-                {% bootstrap_field form.itemvar layout="bulkedit" %}
-
-                <div class="bulk-edit-field-group">
-                    <label class="field-toggle">
-                        <input type="checkbox" name="_bulk" value="{{ form.prefix }}__price" {% if form.prefix|add:"__price" in bulk_selected %}checked{% endif %}>
-                        {% trans "change" context "form_bulk" %}
-                    </label>
-                    <div class="field-content">
-                        <div class="form-group">
-                            <label class="col-md-3 control-label" for="id_tag">{% trans "Price effect" %}</label>
-                            <div class="col-md-5">
-                                {% bootstrap_field form.price_mode show_label=False form_group_class="" %}
-                            </div>
-                            <div class="col-md-4">
-                                {% bootstrap_field form.value show_label=False form_group_class="" %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <div class="col-md-9 col-md-offset-3">
-                        <div class="controls">
-                            <div class="alert alert-info">
-                                {% blocktrans trimmed %}
-                                    If you choose "any product" for a specific quota and choose to reserve quota for this
-                                    voucher above, the product can still be unavailable to the voucher holder if another quota
-                                    associated with the product is sold out!
-                                {% endblocktrans %}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                {% if form.subevent %}
-                    {% bootstrap_field form.subevent layout="bulkedit" %}
-                {% endif %}
-            </fieldset>
-            <fieldset>
-                <legend>{% trans "Advanced settings" %}</legend>
-                {% bootstrap_field form.block_quota layout="bulkedit" %}
-                {% bootstrap_field form.allow_ignore_quota layout="bulkedit" %}
-                {% bootstrap_field form.min_usages layout="bulkedit" %}
-                {% bootstrap_field form.budget addon_after=request.event.currency layout="bulkedit" %}
-                {% bootstrap_field form.tag layout="bulkedit" %}
-                {% bootstrap_field form.comment layout="bulkedit" %}
-                {% bootstrap_field form.show_hidden_items layout="bulkedit" %}
-                {% bootstrap_field form.all_addons_included layout="bulkedit" %}
-                {% bootstrap_field form.all_bundles_included layout="bulkedit" %}
-            </fieldset>
-            <div class="form-group submit-group">
-                <button type="submit" class="btn btn-primary btn-save">
-                    {% trans "Save" %}
-                </button>
-            </div>
-    </form>
-{% endblock %}

src/pretix/control/templates/pretixcontrol/vouchers/index.html

@@ -99,9 +99,6 @@
         </p>
         <form action="{% url "control:event.vouchers.bulkaction"  organizer=request.event.organizer.slug event=request.event.slug %}" method="post">
             {% csrf_token %}
-            {% for field in filter_form %}
-                {{ field.as_hidden }}
-            {% endfor %}
             <div class="table-responsive">
                 <table class="table table-hover table-quotas">
                     <thead>
@@ -115,50 +112,38 @@
                         {% endif %}
                         <th>
                             {% trans "Voucher code" %}
-                            <a href="?{% url_replace request 'filter-ordering' '-code' %}"><i class="fa fa-caret-down"></i></a>
-                            <a href="?{% url_replace request 'filter-ordering' 'code' %}"><i class="fa fa-caret-up"></i></a>
+                            <a href="?{% url_replace request 'ordering' '-code' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'ordering' 'code' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         <th>
                             {% trans "Redemptions" %}
-                            <a href="?{% url_replace request 'filter-ordering' '-redeemed' %}"><i class="fa fa-caret-down"></i></a>
-                            <a href="?{% url_replace request 'filter-ordering' 'redeemed' %}"><i class="fa fa-caret-up"></i></a>
+                            <a href="?{% url_replace request 'ordering' '-redeemed' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'ordering' 'redeemed' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         <th>
                             {% trans "Expiry" %}
-                            <a href="?{% url_replace request 'filter-ordering' '-valid_until' %}"><i class="fa fa-caret-down"></i></a>
-                            <a href="?{% url_replace request 'filter-ordering' 'valid_until' %}"><i class="fa fa-caret-up"></i></a>
+                            <a href="?{% url_replace request 'ordering' '-valid_until' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'ordering' 'valid_until' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         <th>
                             {% trans "Tag" %}
-                            <a href="?{% url_replace request 'filter-ordering' '-tag' %}"><i class="fa fa-caret-down"></i></a>
-                            <a href="?{% url_replace request 'filter-ordering' 'tag' %}"><i class="fa fa-caret-up"></i></a>
+                            <a href="?{% url_replace request 'ordering' '-tag' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'ordering' 'tag' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         <th>
                             {% trans "Product" %}
-                            <a href="?{% url_replace request 'filter-ordering' '-item' %}"><i class="fa fa-caret-down"></i></a>
-                            <a href="?{% url_replace request 'filter-ordering' 'item' %}"><i class="fa fa-caret-up"></i></a>
+                            <a href="?{% url_replace request 'ordering' '-item' %}"><i class="fa fa-caret-down"></i></a>
+                            <a href="?{% url_replace request 'ordering' 'item' %}"><i class="fa fa-caret-up"></i></a>
                         </th>
                         {% if request.event.has_subevents %}
                             <th>
                                 {% trans "Date" context "subevent" %}
-                                <a href="?{% url_replace request 'filter-ordering' '-subevent' %}"><i class="fa fa-caret-down"></i></a>
-                                <a href="?{% url_replace request 'filter-ordering' 'subevent' %}"><i class="fa fa-caret-up"></i></a>
+                                <a href="?{% url_replace request 'ordering' '-subevent' %}"><i class="fa fa-caret-down"></i></a>
+                                <a href="?{% url_replace request 'ordering' 'subevent' %}"><i class="fa fa-caret-up"></i></a>
                             </th>
                         {% endif %}
                         <th></th>
                     </tr>
-                    {% if "event.vouchers:write" in request.eventpermset and page_obj.paginator.num_pages > 1 %}
-                        <tr class="table-select-all warning hidden">
-                            <td>
-                                <input type="checkbox" name="__ALL" id="__all" data-results-total="{{ page_obj.paginator.count }}">
-                            </td>
-                            <td colspan="5">
-                                <label for="__all">
-                                    {% trans "Select all results on other pages as well" %}
-                                </label>
-                            </td>
-                        </tr>
-                    {% endif %}
                     </thead>
                     <tbody>
                     {% for v in vouchers %}
@@ -226,10 +211,6 @@
                         <i class="fa fa-trash" aria-hidden="true"></i>
                         {% trans "Delete selected" %}
                     </button>
-                    <button type="submit" class="btn btn-primary btn-save" name="action" value="edit"
-                            formaction="{% url "control:event.vouchers.bulkedit"  organizer=request.event.organizer.slug event=request.event.slug %}">
-                        <i class="fa fa-edit"></i>{% trans "Edit selected" %}
-                    </button>
                 </div>
             {% endif %}
         </form>

src/pretix/control/templates/pretixcontrol/vouchers/tags.html

@@ -49,11 +49,11 @@
                         <td>
                             <strong>
                             {% if t.tag %}
-                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?filter-tag={{ '"'|add:t.tag|add:'"'|urlencode }}">
+                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?tag={{ '"'|add:t.tag|add:'"'|urlencode }}">
                                     {{ t.tag }}
                                 </a>
                             {% else %}
-                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?filter-tag={{ '<>'|urlencode }}">
+                                <a href="{% url "control:event.vouchers" organizer=request.event.organizer.slug event=request.event.slug %}?tag={{ '<>'|urlencode }}">
                                     {% trans "Empty tag" %}
                                 </a>
                             {% endif %}

src/pretix/control/templates/pretixcontrol/waitinglist/index.html

@@ -251,7 +251,7 @@
                         </td>
                         <td>
                             {% if e.voucher %}
-                                <a href="{% url "control:event.voucher" organizer=request.event.organizer.slug event=request.event.slug voucher=e.voucher.pk %}?next={{ request.get_full_path|urlencode }}">
+                                <a href="{% url "control:event.voucher" organizer=request.event.organizer.slug event=request.event.slug voucher=e.voucher.pk %}">
                                     {{ e.voucher }}
                                 </a>
                             {% elif not e.voucher and e.availability.0 == 100 and e.availability.1|default_if_none:"none" != "none" %}

src/pretix/control/urls.py

@@ -273,8 +273,7 @@ urlpatterns = [
         re_path(r'^$', dashboards.event_index, name='event.index'),
         re_path(r'^qrcode.(?P<filetype>(png|jpeg|gif|svg))$', event.EventQRCode.as_view(), name='event.qrcode'),
         re_path(r'^widgets.json$', dashboards.event_index_widgets_lazy, name='event.index.widgets'),
-        re_path(r'^dashboard/partials/logs$', dashboards.event_index_log_lazy, name='event.index.logs'),
-        re_path(r'^dashboard/partials/warnings$', dashboards.event_index_warnings_lazy, name='event.index.warnings'),
+        re_path(r'^logs/embed$', dashboards.event_index_log_lazy, name='event.index.logs'),
         re_path(r'^live/$', event.EventLive.as_view(), name='event.live'),
         re_path(r'^transfer_session/$', event.EventTransferSession.as_view(), name='event.transfer_session'),
         re_path(r'^logs/$', event.EventLog.as_view(), name='event.log'),
@@ -384,7 +383,6 @@ urlpatterns = [
         re_path(r'^vouchers/bulk_add$', vouchers.VoucherBulkCreate.as_view(), name='event.vouchers.bulk'),
         re_path(r'^vouchers/bulk_add/mail_preview$', vouchers.VoucherBulkMailPreview.as_view(), name='event.vouchers.bulk.mail_preview'),
         re_path(r'^vouchers/bulk_action$', vouchers.VoucherBulkAction.as_view(), name='event.vouchers.bulkaction'),
-        re_path(r'^vouchers/bulk_edit$', vouchers.VoucherBulkUpdateView.as_view(), name='event.vouchers.bulkedit'),
         re_path(r'^vouchers/import/$', modelimport.VoucherImportView.as_view(), name='event.vouchers.import'),
         re_path(r'^vouchers/import/(?P<file>[^/]+)/$', modelimport.VoucherProcessView.as_view(), name='event.vouchers.import.process'),
         re_path(r'^orders/(?P<code>[0-9A-Z]+)/transition$', orders.OrderTransition.as_view(),

src/pretix/control/views/auth.py

@@ -65,7 +65,6 @@ from pretix.base.forms.auth import (
 from pretix.base.metrics import pretix_failed_logins, pretix_successful_logins
 from pretix.base.models import TeamInvite, U2FDevice, User, WebAuthnDevice
 from pretix.helpers.http import get_client_ip, redirect_to_url
-from pretix.helpers.ratelimit import rate_limit, rate_limit_reset
 from pretix.helpers.security import handle_login_source, session_login
 
 logger = logging.getLogger(__name__)
@@ -244,8 +243,7 @@ def invite(request, token):
     if request.user.is_authenticated:
         if inv.team.members.filter(pk=request.user.pk).exists():
             messages.error(request, _('You cannot accept the invitation for "{}" as you already are part of '
-                                      'this team. If you want to add a different user or create a new account, '
-                                      'log out and click the invitation link again.').format(inv.team.name))
+                                      'this team.').format(inv.team.name))
             return redirect('control:index')
         else:
             with transaction.atomic():
@@ -320,12 +318,19 @@ class Forgot(TemplateView):
         if self.form.is_valid():
             email = self.form.cleaned_data['email']
 
+            has_redis = settings.HAS_REDIS
+
             try:
                 user = User.objects.get(is_active=True, auth_backend='native', email__iexact=email)
 
-                if rate_limit("pwreset", user.pk, max_num=1, expire_time=3600 * 24):
-                    user.log_action('pretix.control.auth.user.forgot_password.denied.repeated')
-                    raise RepeatedResetDenied()
+                if has_redis:
+                    from django_redis import get_redis_connection
+                    rc = get_redis_connection("redis")
+                    if rc.exists('pretix_pwreset_%s' % (user.id)):
+                        user.log_action('pretix.control.auth.user.forgot_password.denied.repeated')
+                        raise RepeatedResetDenied()
+                    else:
+                        rc.setex('pretix_pwreset_%s' % (user.id), 3600 * 24, '1')
 
             except User.DoesNotExist:
                 logger.warning('Backend password reset for unregistered e-mail \"' + email + '\" requested.')
@@ -338,7 +343,6 @@ class Forgot(TemplateView):
                 user.log_action('pretix.control.auth.user.forgot_password.mail_sent')
 
             finally:
-                has_redis = settings.HAS_REDIS
                 if has_redis:
                     messages.info(request, _('If the address is registered to valid account, then we have sent you an email containing further instructions. '
                                              'Please note that we will send at most one email every 24 hours.'))
@@ -407,7 +411,11 @@ class Recover(TemplateView):
             messages.success(request, _('You can now login using your new password.'))
             user.log_action('pretix.control.auth.user.forgot_password.recovered')
 
-            rate_limit_reset("pwreset", user.pk)
+            has_redis = settings.HAS_REDIS
+            if has_redis:
+                from django_redis import get_redis_connection
+                rc = get_redis_connection("redis")
+                rc.delete('pretix_pwreset_%s' % user.id)
             return redirect('control:auth.login')
         else:
             return self.get(request, *args, **kwargs)

src/pretix/control/views/checkin.py

@@ -484,17 +484,10 @@ class CheckinListView(EventPermissionRequiredMixin, PaginationMixin, ListView):
 
     def get_queryset(self):
         qs = Checkin.all.filter(
-            list_id__in=self.request.event.checkin_lists.values_list('id', flat=True),
+            list__event=self.request.event,
+        ).select_related(
+            'position', 'position__order', 'position__item', 'position__variation', 'position__subevent'
         ).prefetch_related(
-            # For events with huge numbers of check-ins, prefetch_related is a lot more efficient than
-            # select_related, since it just needs to query one page size of positions instead of joining
-            # multiple huge tables during result computation
-            Prefetch(
-                'position',
-                queryset=OrderPosition.all.select_related(
-                    'order', 'item', 'variation', 'subevent',
-                )
-            ),
             'list', 'gate', 'device'
         )
         if self.filter_form.is_valid():

src/pretix/control/views/dashboards.py

@@ -49,7 +49,7 @@ from django.shortcuts import render
 from django.template.loader import get_template
 from django.urls import reverse
 from django.utils.formats import date_format
-from django.utils.html import conditional_escape, escape, format_html
+from django.utils.html import escape
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _, ngettext, pgettext
 
@@ -112,7 +112,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
 
     return [
         {
-            'content': None if lazy else format_html(NUM_WIDGET, num=intcomma(tickc), text=_('Attendees (ordered)')),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(tickc), text=_('Attendees (ordered)')),
             'lazy': 'attendees-ordered',
             'display_size': 'small',
             'priority': 100,
@@ -122,7 +122,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
             }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
         },
         {
-            'content': None if lazy else format_html(NUM_WIDGET, num=intcomma(paidc), text=_('Attendees (paid)')),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(paidc), text=_('Attendees (paid)')),
             'lazy': 'attendees-paid',
             'display_size': 'small',
             'priority': 100,
@@ -132,8 +132,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
             }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
         },
         {
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
+            'content': None if lazy else NUM_WIDGET.format(
                 num=money_filter(round_decimal(rev, sender.currency), sender.currency, hide_currency=True),
                 text=_('Total revenue ({currency})').format(currency=sender.currency)
             ),
@@ -146,7 +145,7 @@ def base_widgets(sender, subevent=None, lazy=False, **kwargs):
             }) + ('?subevent={}'.format(subevent.pk) if subevent else '')
         },
         {
-            'content': None if lazy else format_html(NUM_WIDGET, num=prodc, text=_('Active products')),
+            'content': None if lazy else NUM_WIDGET.format(num=prodc, text=_('Active products')),
             'lazy': 'active-products',
             'display_size': 'small',
             'priority': 100,
@@ -210,8 +209,8 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
                             quota_cache[q.pk] = (quota_cache[q.pk][0], quota_cache[q.pk][1] - min(wlt['cnt'], row[1]))
 
         widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET, num=intcomma(happy), text=_('available to give to people on waiting list')
+            'content': None if lazy else NUM_WIDGET.format(
+                num=intcomma(happy), text=_('available to give to people on waiting list')
             ),
             'lazy': 'waitinglist-avail',
             'priority': 50,
@@ -221,9 +220,7 @@ def waitinglist_widgets(sender, subevent=None, lazy=False, **kwargs):
             })
         })
         widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET, num=intcomma(wles.count()), text=_('total waiting list length')
-            ),
+            'content': None if lazy else NUM_WIDGET.format(num=intcomma(wles.count()), text=_('total waiting list length')),
             'lazy': 'waitinglist-length',
             'display_size': 'small',
             'priority': 50,
@@ -250,10 +247,9 @@ def quota_widgets(sender, subevent=None, lazy=False, **kwargs):
         if not lazy:
             status, left = qa.results[q] if q in qa.results else q.availability(allow_cache=True)
         widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
+            'content': None if lazy else NUM_WIDGET.format(
                 num='{}/{}'.format(intcomma(left), intcomma(q.size)) if q.size is not None else '\u221e',
-                text=format_html(_('{quota} left'), quota=q.name)
+                text=_('{quota} left').format(quota=escape(q.name))
             ),
             'lazy': 'quota-{}'.format(q.pk),
             'display_size': 'small',
@@ -272,8 +268,7 @@ def shop_state_widget(sender, **kwargs):
     return [{
         'display_size': 'small',
         'priority': 1000,
-        'content': format_html(
-            '<div class="shopstate">{t1}<br><span class="{cls}"><span class="fa {icon}"></span> {state}</span>{t2}</div>',
+        'content': '<div class="shopstate">{t1}<br><span class="{cls}"><span class="fa {icon}"></span> {state}</span>{t2}</div>'.format(
             t1=_('Your ticket shop is'), t2=_('Click here to change'),
             state=_('live') if sender.live and not sender.testmode else (
                 _('live and in test mode') if sender.live else (
@@ -304,10 +299,9 @@ def checkin_widget(sender, subevent=None, lazy=False, **kwargs):
     qs = sender.checkin_lists.filter(subevent=subevent)
     for cl in qs:
         widgets.append({
-            'content': None if lazy else format_html(
-                NUM_WIDGET,
+            'content': None if lazy else NUM_WIDGET.format(
                 num='{}/{}'.format(intcomma(cl.inside_count), intcomma(cl.position_count)),
-                text=format_html(_('Present – {list}'), list=cl.name)
+                text=_('Present – {list}').format(list=escape(cl.name))
             ),
             'lazy': 'checkin-{}'.format(cl.pk),
             'display_size': 'small',
@@ -346,12 +340,6 @@ def welcome_wizard_widget(sender, **kwargs):
     }]
 
 
-def build_json_response(widgets):
-    for widget in widgets:
-        widget['content'] = conditional_escape(widget['content'])
-    return JsonResponse({'widgets': widgets})
-
-
 def event_index(request, organizer, event):
     from pretix.control.forms.event import CommentForm
 
@@ -379,42 +367,6 @@ def event_index(request, organizer, event):
         'comment_form': CommentForm(initial={'comment': request.event.comment}, readonly=not can_change_event_settings),
     }
 
-    ctx['timeline'] = [
-        {
-            'date': t.datetime.astimezone(request.event.timezone).date(),
-            'entry': t,
-            'time': t.datetime.astimezone(request.event.timezone)
-        }
-        for t in timeline_for_event(request.event, subevent)
-    ]
-    ctx['today'] = now().astimezone(request.event.timezone).date()
-    ctx['nearly_now'] = now().astimezone(request.event.timezone) - timedelta(seconds=20)
-    resp = render(request, 'pretixcontrol/event/index.html', ctx)
-    return resp
-
-
-def event_index_widgets_lazy(request, organizer, event):
-    subevent = None
-    if request.GET.get("subevent", "") != "" and request.event.has_subevents:
-        i = request.GET.get("subevent", "")
-        try:
-            subevent = request.event.subevents.get(pk=i)
-        except SubEvent.DoesNotExist:
-            pass
-
-    widgets = []
-    for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=False):
-        widgets.extend(result)
-
-    return build_json_response(widgets)
-
-
-def event_index_warnings_lazy(request, organizer, event):
-    can_view_orders = request.user.has_event_permission(request.organizer, request.event, 'event.orders:read',
-                                                        request=request)
-    can_change_event_settings = request.user.has_event_permission(request.organizer, request.event,
-                                                                  'event.settings.general:write', request=request)
-    ctx = {}
     ctx['has_overpaid_orders'] = can_view_orders and Order.annotate_overpayments(request.event.orders).filter(
         Q(~Q(status=Order.STATUS_CANCELED) & Q(pending_sum_t__lt=0))
         | Q(Q(status=Order.STATUS_CANCELED) & Q(pending_sum_rc__lt=0))
@@ -438,11 +390,35 @@ def event_index_warnings_lazy(request, organizer, event):
         | Q(failed_attempts__gt=0)
     ).exists()
 
-    return render(
-        request,
-        'pretixcontrol/event/dashboard_partial_warnings.html',
-        ctx
-    )
+    ctx['timeline'] = [
+        {
+            'date': t.datetime.astimezone(request.event.timezone).date(),
+            'entry': t,
+            'time': t.datetime.astimezone(request.event.timezone)
+        }
+        for t in timeline_for_event(request.event, subevent)
+    ]
+    ctx['today'] = now().astimezone(request.event.timezone).date()
+    ctx['nearly_now'] = now().astimezone(request.event.timezone) - timedelta(seconds=20)
+    resp = render(request, 'pretixcontrol/event/index.html', ctx)
+    # resp['Content-Security-Policy'] = "style-src 'unsafe-inline'"
+    return resp
+
+
+def event_index_widgets_lazy(request, organizer, event):
+    subevent = None
+    if request.GET.get("subevent", "") != "" and request.event.has_subevents:
+        i = request.GET.get("subevent", "")
+        try:
+            subevent = request.event.subevents.get(pk=i)
+        except SubEvent.DoesNotExist:
+            pass
+
+    widgets = []
+    for r, result in event_dashboard_widgets.send(sender=request.event, subevent=subevent, lazy=False):
+        widgets.extend(result)
+
+    return JsonResponse({'widgets': widgets})
 
 
 def event_index_log_lazy(request, organizer, event):
@@ -477,7 +453,7 @@ def event_index_log_lazy(request, organizer, event):
 
     return render(
         request,
-        'pretixcontrol/event/dashboard_partial_logs.html',
+        'pretixcontrol/event/logs_embed.html',
         {
             'logs': qs[:5]
         }
@@ -529,7 +505,7 @@ def widgets_for_event_qs(request, qs, user, nmax, lazy=False):
         <a href="{url}" class="event">
             <div class="name">{event}</div>
             <div class="daterange">{daterange}</div>
-            <div class="times">{times}{timezone}</div>
+            <div class="times">{times}</div>
         </a>
         <div class="bottomrow">
             {orders}
@@ -573,16 +549,14 @@ def widgets_for_event_qs(request, qs, user, nmax, lazy=False):
                 status = ('success', _('On sale'))
 
         widgets.append({
-            'content': format_html(
-                tpl,
+            'content': tpl.format(
                 event=escape(event.name),
                 times=_('Event series') if event.has_subevents else (
                     ((date_format(event.date_admission.astimezone(tz), 'TIME_FORMAT') + ' / ')
                      if event.date_admission and event.date_admission != event.date_from else '')
                     + (date_format(event.date_from.astimezone(tz), 'TIME_FORMAT') if event.date_from else '')
-                ),
-                timezone=(
-                    format_html(' <span class="fa fa-globe text-muted" data-toggle="tooltip" title="{}"></span>', tzname)
+                ) + (
+                    ' <span class="fa fa-globe text-muted" data-toggle="tooltip" title="{}"></span>'.format(tzname)
                     if tzname != request.timezone and not event.has_subevents else ''
                 ),
                 url=reverse('control:event.index', kwargs={
@@ -590,8 +564,7 @@ def widgets_for_event_qs(request, qs, user, nmax, lazy=False):
                     'organizer': event.organizer.slug
                 }),
                 orders=(
-                    format_html(
-                        '<a href="{orders_url}" class="orders">{orders_text}</a>',
+                    '<a href="{orders_url}" class="orders">{orders_text}</a>'.format(
                         orders_url=reverse('control:event.orders', kwargs={
                             'event': event.slug,
                             'organizer': event.organizer.slug
@@ -658,7 +631,7 @@ def user_index_widgets_lazy(request):
         request.user,
         8
     )
-    return build_json_response(widgets)
+    return JsonResponse({'widgets': widgets})
 
 
 def user_index(request):

src/pretix/control/views/event.py

@@ -41,7 +41,7 @@ from collections import OrderedDict, defaultdict
 from decimal import Decimal
 from io import BytesIO
 from itertools import groupby
-from urllib.parse import quote, urlsplit
+from urllib.parse import urlsplit
 from zoneinfo import ZoneInfo
 
 import bleach
@@ -60,7 +60,7 @@ from django.http import (
     Http404, HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed,
     JsonResponse,
 )
-from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import NoReverseMatch, reverse
 from django.utils.functional import cached_property
 from django.utils.html import conditional_escape, format_html
@@ -82,7 +82,7 @@ from pretix.base.models import Event, LogEntry, Order, TaxRule, Voucher
 from pretix.base.models.event import EventMetaValue
 from pretix.base.services import tickets
 from pretix.base.services.invoices import build_preview_invoice_pdf
-from pretix.base.signals import get_defining_app, register_ticket_outputs
+from pretix.base.signals import register_ticket_outputs
 from pretix.base.templatetags.rich_text import markdown_compile_email
 from pretix.control.forms.event import (
     CancelSettingsForm, CommentForm, ConfirmTextFormset, EventDeleteForm,
@@ -119,9 +119,8 @@ from ...helpers.compat import CompatDeleteView
 from ...helpers.format import (
     PlainHtmlAlternativeString, SafeFormatter, format_map,
 )
-from ..forms.filter import LogFilterForm
 from ..logdisplay import OVERVIEW_BANLIST
-from . import CreateView, LargeResultSetPaginator, PaginationMixin, UpdateView
+from . import CreateView, PaginationMixin, UpdateView
 
 logger = logging.getLogger(__name__)
 
@@ -442,7 +441,6 @@ class EventPlugins(EventSettingsViewMixin, EventPermissionRequiredMixin, Templat
         plugins_available = {
             p.module: p for p in self.available_plugins(self.object)
         }
-        plugin_enabled = None
 
         with transaction.atomic():
             save_organizer = False
@@ -492,7 +490,6 @@ class EventPlugins(EventSettingsViewMixin, EventPermissionRequiredMixin, Templat
                                 format_html(_('The plugin {} is now active.'),
                                             format_html("<strong>{}</strong>", pluginmeta.name)),
                             ]
-                        plugin_enabled = module
                         messages.success(self.request, mark_safe("".join(info)))
                     else:
                         self.request.event.log_action('pretix.event.plugins.disabled', user=self.request.user,
@@ -502,19 +499,13 @@ class EventPlugins(EventSettingsViewMixin, EventPermissionRequiredMixin, Templat
             self.object.save()
             if save_organizer:
                 self.object.organizer.save()
-        return redirect(self.get_success_url(plugin_enabled))
+        return redirect(self.get_success_url())
 
-    def get_success_url(self, plugin_enabled) -> str:
-        if plugin_enabled and self.request.POST.get('go') == 'payment':
-            return reverse('control:event.settings.payment', kwargs={
-                'organizer': self.request.organizer.slug,
-                'event': self.request.event.slug,
-            }) + '?highlight=' + quote(plugin_enabled) + '#'
-        else:
-            return reverse('control:event.settings.plugins', kwargs={
-                'organizer': self.request.organizer.slug,
-                'event': self.request.event.slug,
-            })
+    def get_success_url(self) -> str:
+        return reverse('control:event.settings.plugins', kwargs={
+            'organizer': self.request.organizer.slug,
+            'event': self.request.event.slug,
+        })
 
 
 class PaymentProviderSettings(EventSettingsViewMixin, EventPermissionRequiredMixin, TemplateView, SingleObjectMixin):
@@ -680,8 +671,6 @@ class PaymentSettings(WritePermissionMixin, EventSettingsViewMixin, EventSetting
             p.sales_channels = [sales_channels[channel] for channel in p.settings.get('_restrict_to_sales_channels', as_type=list, default=['web'])]
             if p.is_meta:
                 p.show_enabled = p.settings._enabled in (True, 'True')
-            if self.request.GET.get('highlight') and getattr(get_defining_app(p), 'name', None) == self.request.GET.get('highlight'):
-                p.highlight = True
         return context
 
 
@@ -963,12 +952,7 @@ class MailSettingsRendererPreview(MailSettingsPreview):
                     context=context,
                 )
                 r = HttpResponse(v, content_type='text/html')
-                r['Content-Security-Policy'] = (
-                    # Plugin-provided email templates will contain inline styles or remote images
-                    # but emails should not contain JS
-                    "style-src 'unsafe-inline'; "
-                    "img-src https: data:"
-                )
+                r._csp_ignore = True
                 return r
         else:
             raise Http404(_('Unknown email renderer.'))
@@ -1254,7 +1238,6 @@ class EventDelete(RecentAuthenticationRequiredMixin, EventPermissionRequiredMixi
 class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView):
     template_name = 'pretixcontrol/event/logs.html'
     model = LogEntry
-    paginator_class = LargeResultSetPaginator
     context_object_name = 'logs'
 
     def get_queryset(self):
@@ -1284,20 +1267,32 @@ class EventLog(EventPermissionRequiredMixin, PaginationMixin, ListView):
                 ]
             qs = qs.filter(content_type__in=allowed_types)
 
-        if self.filter_form.is_valid():
-            qs = self.filter_form.filter_qs(qs)
+        if self.request.GET.get('user') == 'yes':
+            qs = qs.filter(user__isnull=False)
+        elif self.request.GET.get('user') == 'no':
+            qs = qs.filter(user__isnull=True)
+        elif self.request.GET.get('user', '').startswith('d-'):
+            qs = qs.filter(device_id=self.request.GET.get('user')[2:])
+        elif self.request.GET.get('user'):
+            qs = qs.filter(user_id=self.request.GET.get('user'))
+
+        if self.request.GET.get('action_type'):
+            qs = qs.filter(action_type=self.request.GET['action_type'])
+
+        if self.request.GET.get('content_type'):
+            qs = qs.filter(content_type=get_object_or_404(ContentType, pk=self.request.GET.get('content_type')))
+
+            if self.request.GET.get('object'):
+                qs = qs.filter(object_id=self.request.GET.get('object'))
 
         return qs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data()
-        ctx['filter_form'] = self.filter_form
+        ctx['userlist'] = self.request.event.logentry_set.order_by().distinct().values('user__id', 'user__email')
+        ctx['devicelist'] = self.request.event.logentry_set.order_by('device__name').distinct().values('device__id', 'device__name')
         return ctx
 
-    @cached_property
-    def filter_form(self):
-        return LogFilterForm(data=self.request.GET, organizer=self.request.organizer)
-
 
 class EventComment(EventPermissionRequiredMixin, View):
     permission = 'event.settings.general:write'
@@ -1433,16 +1428,11 @@ class TaxUpdate(EventSettingsViewMixin, EventPermissionRequiredMixin, UpdateView
         form.instance.custom_rules = json.dumps([
             f.cleaned_data for f in self.formset.ordered_forms if f not in self.formset.deleted_forms
         ], cls=I18nJSONEncoder)
-        if form.has_changed() or self.formset.has_changed():
-            change_data = {
-                k: form.cleaned_data.get(k) for k in form.changed_data
-            }
-            if self.formset.has_changed():
-                change_data["custom_rules"] = [
-                    f.cleaned_data for f in self.formset.ordered_forms if f not in self.formset.deleted_forms
-                ]
+        if form.has_changed():
             self.object.log_action(
-                'pretix.event.taxrule.changed', user=self.request.user, data=change_data
+                'pretix.event.taxrule.changed', user=self.request.user, data={
+                    k: form.cleaned_data.get(k) for k in form.changed_data
+                }
             )
         return super().form_valid(form)
 
@@ -1568,7 +1558,7 @@ class WidgetSettings(EventSettingsViewMixin, EventPermissionRequiredMixin, FormV
         return ctx
 
 
-class QuickSetupView(EventPermissionRequiredMixin, FormView):
+class QuickSetupView(FormView):
     template_name = 'pretixcontrol/event/quick_setup.html'
     permission = 'event.settings.general:write'
     form_class = QuickSetupForm

src/pretix/control/views/mail.py

@@ -35,7 +35,7 @@ from django.utils.translation import ngettext
 from django.views import View
 from django.views.generic import DetailView, ListView
 
-from pretix.base.middleware import add_to_response_csp
+from pretix.base.middleware import _merge_csp, _parse_csp, _render_csp
 from pretix.base.models import OutgoingMail
 from pretix.base.services.mail import mail_send_task
 from pretix.control.forms.filter import OutgoingMailFilterForm
@@ -108,12 +108,18 @@ class OutgoingMailDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequir
 
     def dispatch(self, request, *args, **kwargs):
         response = super().dispatch(request, *args, **kwargs)
-        add_to_response_csp(response, {
+        if 'Content-Security-Policy' in response:
+            h = _parse_csp(response['Content-Security-Policy'])
+        else:
+            h = {}
+        csps = {
             'frame-src': ['data:'],
             # Unfortuantely, we can't avoid unsafe-inline for style here.
             # See outgoingmail.js for the protection measures we take.
             'style-src': ["'unsafe-inline'"],
-        })
+        }
+        _merge_csp(h, csps)
+        response['Content-Security-Policy'] = _render_csp(h)
         return response
 
     def get_context_data(self, **kwargs):

src/pretix/control/views/mailsetup.py

@@ -41,30 +41,6 @@ from pretix.control.forms.mailsetup import SimpleMailForm, SMTPMailForm
 logger = logging.getLogger(__name__)
 
 
-def get_cname_record(hostname):
-    try:
-        r = dns.resolver.Resolver()
-        answers = r.resolve(hostname, 'CNAME')
-        answers = list(answers)
-        if len(answers) != 1:
-            logger.exception('Found multiple CNAME records for {}'.format(hostname))
-            return
-        return str(answers[0].target).lower()
-    except:
-        logger.exception('Could not fetch CNAME record for {}'.format(hostname))
-
-
-def get_dmarc_record(hostname):
-    try:
-        r = dns.resolver.Resolver()
-        for resp in r.resolve("_dmarc." + hostname, 'TXT'):
-            data = b''.join(resp.strings).decode()
-            if 'DMARC1' in data.strip():
-                return data
-    except:
-        logger.exception("Could not fetch DMARC record for {}".format(hostname))
-
-
 def get_spf_record(hostname):
     try:
         r = dns.resolver.Resolver()
@@ -73,7 +49,7 @@ def get_spf_record(hostname):
             if data.lower().strip().startswith('v=spf1 '):  # RFC7208, section 4.5
                 return data
     except:
-        logger.exception("Could not fetch SPF record for {}".format(hostname))
+        logger.exception("Could not fetch SPF record")
 
 
 def _check_spf_record(not_found_lookup_parts, spf_record, depth):
@@ -192,15 +168,10 @@ class MailSettingsSetupView(TemplateView):
                 return super().get(request, *args, **kwargs)
 
             session_key = f'sender_mail_verification_code_{self.request.path}_{self.simple_form.cleaned_data.get("mail_from")}'
-            verify_dns = (
-                settings.MAIL_CUSTOM_SENDER_SPF_STRING or
-                (settings.MAIL_CUSTOM_SENDER_DKIM_CNAME and settings.MAIL_CUSTOM_SENDER_DKIM_SELECTOR) or
-                settings.MAIL_CUSTOM_SENDER_DMARC_REQUIRED
-            )
             allow_save = (
                 (not settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED or
                  ('verification' in self.request.POST and self.request.POST.get('verification', '') == self.request.session.get(session_key, None))) and
-                (not verify_dns or self.request.POST.get('state') == 'save')
+                (not settings.MAIL_CUSTOM_SENDER_SPF_STRING or self.request.POST.get('state') == 'save')
             )
 
             if allow_save:
@@ -221,8 +192,8 @@ class MailSettingsSetupView(TemplateView):
 
             spf_warning = None
             spf_record = None
-            hostname = self.simple_form.cleaned_data['mail_from'].split('@')[-1]
             if settings.MAIL_CUSTOM_SENDER_SPF_STRING:
+                hostname = self.simple_form.cleaned_data['mail_from'].split('@')[-1]
                 spf_record = get_spf_record(hostname)
                 if not spf_record:
                     spf_warning = _(
@@ -239,43 +210,7 @@ class MailSettingsSetupView(TemplateView):
                         'this system in the SPF record.'
                     )
 
-            dkim_warning = None
-            dkim_hostname = None
-            dkim_cname = None
-            if settings.MAIL_CUSTOM_SENDER_DKIM_CNAME and settings.MAIL_CUSTOM_SENDER_DKIM_SELECTOR:
-                dkim_hostname = settings.MAIL_CUSTOM_SENDER_DKIM_SELECTOR + '._domainkey.' + hostname
-                cname_target = get_cname_record(dkim_hostname)
-                dkim_cname = settings.MAIL_CUSTOM_SENDER_DKIM_CNAME
-                if not dkim_cname.endswith("."):
-                    dkim_cname += "."
-                if "%s" in dkim_cname:
-                    dkim_cname = dkim_cname.replace("%s", hostname.replace(".", "-").lower())
-                if not cname_target:
-                    dkim_warning = _(
-                        'We could not find a CNAME record pointing to our DKIM key for domain you are trying to use. '
-                        'This means that there is a very high change most of the emails will be rejected or marked as '
-                        'spam. We strongly recommend setting up DKIM through a CNAME record. You can do so through the '
-                        'DNS settings at the provider you registered your domain with.'
-                    )
-                elif cname_target != dkim_cname:
-                    dkim_warning = _(
-                        'We found a CNAME record for a DKIM key, but it is not pointing to the right location. '
-                        'This means that there is a very high chance most of the emails will be rejected or marked as '
-                        'spam. You should update the DNS settings of your domain.'
-                    )
-
-            dmarc_warning = None
-            dmarc_record = None
-            if settings.MAIL_CUSTOM_SENDER_DMARC_REQUIRED:
-                dmarc_record = get_dmarc_record(hostname)
-                if not dmarc_record:
-                    spf_warning = _(
-                        'We did not find DMARC record for your domain. This means that there is a very high chance '
-                        'most of the emails will be rejected or marked as spam. You should update the DNS settings '
-                        'of your domain.'
-                    )
-
-            verification = settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED and not spf_warning and not dkim_warning and not dmarc_warning
+            verification = settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED and not spf_warning
             if verification:
                 if 'verification' in self.request.POST:
                     messages.error(request, _('The verification code was incorrect, please try again.'))
@@ -306,12 +241,6 @@ class MailSettingsSetupView(TemplateView):
                     'spf_warning': spf_warning,
                     'spf_record': spf_record,
                     'spf_key': settings.MAIL_CUSTOM_SENDER_SPF_STRING,
-                    'dkim_warning': dkim_warning,
-                    'dkim_hostname': dkim_hostname,
-                    'dkim_cname': dkim_cname,
-                    'dmarc_warning': dmarc_warning,
-                    'dmarc_record': dmarc_record,
-                    'hostname': hostname,
                     'recp': self.simple_form.cleaned_data.get('mail_from')
                 },
                 using=self.template_engine,

src/pretix/control/views/orders.py

@@ -64,7 +64,7 @@ from django.urls import reverse
 from django.utils import formats
 from django.utils.formats import date_format, get_format
 from django.utils.functional import cached_property
-from django.utils.html import conditional_escape, escape, format_html
+from django.utils.html import conditional_escape, escape
 from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.safestring import mark_safe
 from django.utils.timezone import make_aware, now
@@ -79,9 +79,9 @@ from pretix.base.email import get_email_context
 from pretix.base.exporter import MultiSheetListExporter
 from pretix.base.i18n import language
 from pretix.base.models import (
-    CachedFile, CachedTicket, Checkin, GiftCard, Invoice, InvoiceAddress, Item,
+    CachedFile, CachedTicket, Checkin, Invoice, InvoiceAddress, Item,
     ItemVariation, LogEntry, Order, QuestionAnswer, Quota,
-    ScheduledEventExport, SeatCategoryMapping, generate_secret,
+    ScheduledEventExport, generate_secret,
 )
 from pretix.base.models.orders import (
     CancellationRequest, OrderFee, OrderPayment, OrderPosition, OrderRefund,
@@ -551,10 +551,10 @@ class OrderDetail(OrderView):
         ctx['refunds'] = self.order.refunds.select_related('payment').order_by('-created')
         for p in ctx['payments']:
             if p.payment_provider:
-                p.html_info = p.payment_provider.payment_control_render(self.request, p) or ""
+                p.html_info = (p.payment_provider.payment_control_render(self.request, p) or "").strip()
         for r in ctx['refunds']:
             if r.payment_provider:
-                r.html_info = r.payment_provider.refund_control_render(self.request, r) or ""
+                r.html_info = (r.payment_provider.refund_control_render(self.request, r) or "").strip()
         ctx['invoices'] = list(self.order.invoices.all().select_related('event'))
         ctx['comment_form'] = CommentForm(initial={
             'comment': self.order.comment,
@@ -564,11 +564,10 @@ class OrderDetail(OrderView):
         })
         ctx['display_locale'] = dict(settings.LANGUAGES)[self.object.locale or self.request.event.settings.locale]
 
-        pending_sum = self.order.pending_sum
-        ctx['overpaid'] = pending_sum * -1
+        ctx['overpaid'] = self.order.pending_sum * -1
         ctx['download_buttons'] = self.download_buttons
         ctx['payment_refund_sum'] = self.order.payment_refund_sum
-        ctx['pending_sum'] = pending_sum
+        ctx['pending_sum'] = self.order.pending_sum
         ctx['uncancelled_invoice'] = self.order.invoices.exclude(
             Exists(self.order.invoices.filter(refers=OuterRef('pk'), is_cancellation=True))
         ).exclude(is_cancellation=True).first()
@@ -602,9 +601,8 @@ class OrderDetail(OrderView):
         ).prefetch_related(
             'item__questions', 'issued_gift_cards', 'owned_gift_cards', 'linked_media',
             Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options').select_related('question')),
-            Prefetch('all_checkins', queryset=Checkin.all.select_related('list', 'gate').order_by('datetime')),
+            Prefetch('all_checkins', queryset=Checkin.all.select_related('list').order_by('datetime')),
             Prefetch('print_logs', queryset=PrintLog.objects.select_related('device').order_by('datetime')),
-            Prefetch('subevent', queryset=self.request.event.subevents.all()),
         ).order_by('positionid')
 
         positions = []
@@ -1987,37 +1985,20 @@ class OrderChange(OrderView):
     def fees(self):
         fees = list(self.order.fees.all())
         for f in fees:
-            f.form = OrderFeeChangeForm(
-                prefix='of-{}'.format(f.pk),
-                instance=f,
-                data=self.request.POST if self.request.method == "POST" else None
-            )
+            f.form = OrderFeeChangeForm(prefix='of-{}'.format(f.pk), instance=f,
+                                        data=self.request.POST if self.request.method == "POST" else None)
         return fees
 
     @cached_property
     def positions(self):
         positions = list(self.order.positions.select_related(
             'item', 'item__tax_rule', 'used_membership', 'used_membership__membership_type', 'tax_rule',
-            'seat',
-        ).prefetch_related(
-            Prefetch(
-                'subevent',
-                queryset=self.request.event.subevents.all(),
-            ),
-            'granted_memberships',
-            'issued_gift_cards',
-            'addons',
-        ).annotate(
-            _seat_allowed=Exists(SeatCategoryMapping.objects.filter(subevent=OuterRef("subevent"), product=OuterRef("item")))
-        ))
+            'seat', 'subevent',
+        ).prefetch_related('granted_memberships'))
         for p in positions:
-            p.form = OrderPositionChangeForm(
-                prefix='op-{}'.format(p.pk),
-                instance=p,
-                items=self.items,
-                initial={'seat': p.seat.seat_guid if p.seat else None},
-                data=self.request.POST if self.request.method == "POST" else None
-            )
+            p.form = OrderPositionChangeForm(prefix='op-{}'.format(p.pk), instance=p, items=self.items,
+                                             initial={'seat': p.seat.seat_guid if p.seat else None},
+                                             data=self.request.POST if self.request.method == "POST" else None)
         return positions
 
     def get_context_data(self, **kwargs):
@@ -2280,12 +2261,6 @@ class OrderContactChange(OrderView):
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data()
         ctx['form'] = self.form
-        if self.order.all_positions.filter(Exists(GiftCard.objects.filter(issued_in=OuterRef('pk')))).exists():
-            self.form.fields['regenerate_secrets'].help_text = format_html(
-                '{}<br><br><strong><span class="fa fa-warning"></span> {}</strong>',
-                self.form.fields['regenerate_secrets'].help_text,
-                _("Ticket secrets of order positions that have been used to issue a gift card can not be changed. Only the link will be changed in this case."),
-            )
         return ctx
 
     @cached_property

src/pretix/control/views/organizer.py

@@ -113,8 +113,7 @@ from pretix.base.views.tasks import AsyncAction
 from pretix.control.forms.exports import ScheduledOrganizerExportForm
 from pretix.control.forms.filter import (
     CustomerFilterForm, DeviceFilterForm, EventFilterForm, GiftCardFilterForm,
-    LogFilterForm, OrganizerFilterForm, ReusableMediaFilterForm,
-    TeamFilterForm,
+    OrganizerFilterForm, ReusableMediaFilterForm, TeamFilterForm,
 )
 from pretix.control.forms.orders import ExporterForm
 from pretix.control.forms.organizer import (
@@ -134,7 +133,7 @@ from pretix.control.permissions import (
     organizer_permission_required,
 )
 from pretix.control.signals import nav_organizer
-from pretix.control.views import LargeResultSetPaginator, PaginationMixin
+from pretix.control.views import PaginationMixin
 from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.helpers import OF_SELF, GroupConcat
 from pretix.helpers.compat import CompatDeleteView
@@ -2664,7 +2663,6 @@ class LogView(OrganizerPermissionRequiredMixin, PaginationMixin, ListView):
     template_name = 'pretixcontrol/organizers/logs.html'
     permission = 'organizer.settings.general:write'
     model = LogEntry
-    paginator_class = LargeResultSetPaginator
     context_object_name = 'logs'
 
     def get_queryset(self):
@@ -2674,21 +2672,16 @@ class LogView(OrganizerPermissionRequiredMixin, PaginationMixin, ListView):
             'user', 'content_type', 'api_token', 'oauth_application', 'device'
         ).order_by('-datetime')
         qs = qs.exclude(action_type__in=OVERVIEW_BANLIST)
-
-        if self.filter_form.is_valid():
-            qs = self.filter_form.filter_qs(qs)
-
+        if self.request.GET.get('action_type'):
+            qs = qs.filter(action_type=self.request.GET['action_type'])
+        if self.request.GET.get('user'):
+            qs = qs.filter(user_id=self.request.GET.get('user'))
         return qs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data()
-        ctx['filter_form'] = self.filter_form
         return ctx
 
-    @cached_property
-    def filter_form(self):
-        return LogFilterForm(data=self.request.GET, organizer=self.request.organizer)
-
 
 class MembershipTypeListView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, ListView):
     model = MembershipType

src/pretix/control/views/pdf.py

@@ -70,6 +70,7 @@ class BaseEditorView(EventPermissionRequiredMixin, TemplateView):
         if 'placeholders' in request.GET:
             return self.get_placeholders_help(request)
         resp = super().get(request, *args, **kwargs)
+        resp._csp_ignore = True
         return resp
 
     def get_placeholders_help(self, request):

src/pretix/control/views/subevents.py

@@ -85,7 +85,6 @@ from pretix.control.views import PaginationMixin
 from pretix.control.views.event import MetaDataEditorMixin
 from pretix.helpers import GroupConcat
 from pretix.helpers.compat import CompatDeleteView
-from pretix.helpers.i18n import get_format_without_seconds
 from pretix.helpers.models import modelcopy
 
 
@@ -879,7 +878,7 @@ class SubEventBulkCreate(SubEventEditorMixin, EventPermissionRequiredMixin, Asyn
         ctx['rrule_formset'] = self.rrule_formset
         ctx['time_formset'] = self.time_formset
 
-        tf = get_format_without_seconds('TIME_INPUT_FORMATS')
+        tf = get_format('TIME_INPUT_FORMATS')[0]
         ctx['time_admission_sample'] = time(8, 30, 0).strftime(tf)
         ctx['time_begin_sample'] = time(9, 0, 0).strftime(tf)
         ctx['time_end_sample'] = time(18, 0, 0).strftime(tf)

src/pretix/control/views/user.py

@@ -46,7 +46,6 @@ from django.contrib.auth import update_session_auth_hash
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import BadRequest, PermissionDenied
 from django.db import transaction
-from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.crypto import get_random_string
@@ -81,7 +80,6 @@ from pretix.control.permissions import (
 )
 from pretix.control.views.auth import get_u2f_appid, get_webauthn_rp_id
 from pretix.helpers.http import redirect_to_url
-from pretix.helpers.ratelimit import rate_limit, rate_limit_reset
 from pretix.helpers.security import session_reauth
 from pretix.helpers.u2f import websafe_encode
 
@@ -96,20 +94,6 @@ class RecentAuthenticationRequiredMixin:
     def dispatch(self, request, *args, **kwargs):
         tdelta = time.time() - request.session.get('pretix_auth_login_time', 0)
         if tdelta > self.max_time:
-
-            if request.headers.get("X-Requested-With") == "XMLHttpRequest":
-                # It's not useful to return a 302 redirect on a XMLHttpRequest request,  because
-                # the XMLHttpRequest is unable to detect redirects.
-                return HttpResponse(
-                    "Authentication required",
-                    status=401,
-                    headers={
-                        # Appending ?next= is handled by client, because it should be the top-level context url,
-                        # not the URL called in the background
-                        "X-Login-Url": reverse('control:user.reauth')
-                    }
-                )
-
             return redirect(reverse('control:user.reauth') + '?next=' + quote(request.get_full_path()))
         return super().dispatch(request, *args, **kwargs)
 
@@ -865,7 +849,6 @@ class UserPasswordChangeView(FormView):
             msgs = []
             msgs.append(_('Your password has been changed.'))
             self.request.user.send_security_notice(msgs)
-            rate_limit_reset("pwreset", self.request.user.pk)
 
             self.request.user.log_action('pretix.user.settings.changed', user=self.request.user, data={'new_pw': True})
 
@@ -896,7 +879,6 @@ class UserEmailChangeView(RecentAuthenticationRequiredMixin, FormView):
 
         return {
             **super().get_form_kwargs(),
-            "request": self.request,
             "user": self.request.user,
         }
 
@@ -926,10 +908,6 @@ class UserEmailVerifyView(View):
             messages.success(self.request, _('Your email address was already verified.'))
             return redirect(reverse('control:user.settings', kwargs={}))
 
-        if rate_limit("emailverify", self.request.user.pk, max_num=2, expire_time=300):
-            messages.error(self.request, _("For security reasons, please wait 5 minutes before you try again."))
-            return redirect(reverse('control:user.settings', kwargs={}))
-
         self.request.user.send_confirmation_code(
             session=self.request.session,
             reason='email_verify',

src/pretix/control/views/vouchers.py

@@ -40,11 +40,9 @@ import bleach
 from defusedcsv import csv
 from django.conf import settings
 from django.contrib import messages
-from django.core.exceptions import (
-    BadRequest, PermissionDenied, ValidationError,
-)
+from django.core.exceptions import PermissionDenied, ValidationError
 from django.db import connection, transaction
-from django.db.models import Count, Exists, OuterRef, Sum
+from django.db.models import Exists, OuterRef, Sum
 from django.http import (
     Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect,
     JsonResponse,
@@ -53,12 +51,11 @@ from django.shortcuts import redirect, render
 from django.urls import resolve, reverse
 from django.utils.functional import cached_property
 from django.utils.html import format_html
-from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import (
-    CreateView, FormView, ListView, TemplateView, UpdateView, View,
+    CreateView, ListView, TemplateView, UpdateView, View,
 )
 from django_scopes import scopes_disabled
 
@@ -73,9 +70,7 @@ from pretix.base.services.vouchers import vouchers_send
 from pretix.base.templatetags.rich_text import markdown_compile_email
 from pretix.base.views.tasks import AsyncFormView
 from pretix.control.forms.filter import VoucherFilterForm, VoucherTagFilterForm
-from pretix.control.forms.vouchers import (
-    VoucherBulkEditForm, VoucherBulkForm, VoucherForm,
-)
+from pretix.control.forms.vouchers import VoucherBulkForm, VoucherForm
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.signals import voucher_form_class
 from pretix.control.views import PaginationMixin
@@ -85,37 +80,7 @@ from pretix.helpers.models import modelcopy
 from pretix.multidomain.urlreverse import eventreverse_absolute
 
 
-class VoucherQueryMixin:
-
-    @cached_property
-    def request_data(self):
-        if self.request.method == "POST":
-            return self.request.POST
-        return self.request.GET
-
-    @scopes_disabled()  # we have an event check here, and we can save some performance on subqueries
-    def get_queryset(self):
-        qs = self.request.event.vouchers.exclude(
-            Exists(WaitingListEntry.objects.filter(voucher_id=OuterRef('pk')))
-        )
-        if 'voucher' in self.request_data and '__ALL' not in self.request_data:
-            qs = qs.filter(
-                id__in=self.request_data.getlist('voucher')
-            )
-        elif self.request.method == 'GET' or '__ALL' in self.request_data:
-            if self.filter_form.is_valid():
-                qs = self.filter_form.filter_qs(qs)
-        else:
-            raise BadRequest("No vouchers selected")
-
-        return qs
-
-    @cached_property
-    def filter_form(self):
-        return VoucherFilterForm(data=self.request_data, prefix='filter', event=self.request.event)
-
-
-class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMixin, ListView):
+class VoucherList(PaginationMixin, EventPermissionRequiredMixin, ListView):
     model = Voucher
     context_object_name = 'vouchers'
     template_name = 'pretixcontrol/vouchers/index.html'
@@ -123,15 +88,25 @@ class VoucherList(VoucherQueryMixin, PaginationMixin, EventPermissionRequiredMix
 
     @scopes_disabled()  # we have an event check here, and we can save some performance on subqueries
     def get_queryset(self):
-        return Voucher.annotate_budget_used(super().get_queryset().select_related(
+        qs = Voucher.annotate_budget_used(self.request.event.vouchers.exclude(
+            Exists(WaitingListEntry.objects.filter(voucher_id=OuterRef('pk')))
+        ).select_related(
             'item', 'variation', 'seat'
         ))
+        if self.filter_form.is_valid():
+            qs = self.filter_form.filter_qs(qs)
+
+        return qs
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx['filter_form'] = self.filter_form
         return ctx
 
+    @cached_property
+    def filter_form(self):
+        return VoucherFilterForm(data=self.request.GET, event=self.request.event)
+
     def get(self, request, *args, **kwargs):
         if request.GET.get("download", "") == "yes":
             return self._download_csv()
@@ -318,12 +293,6 @@ class VoucherUpdate(EventPermissionRequiredMixin, UpdateView):
                 f.disabled = True
         return form
 
-    def get_form_kwargs(self):
-        return {
-            **super().get_form_kwargs(),
-            "event": self.request.event,
-        }
-
     def get_object(self, queryset=None) -> VoucherForm:
         url = resolve(self.request.path_info)
         try:
@@ -351,8 +320,6 @@ class VoucherUpdate(EventPermissionRequiredMixin, UpdateView):
         return super().post(request, *args, **kwargs)
 
     def get_success_url(self) -> str:
-        if "next" in self.request.GET and url_has_allowed_host_and_scheme(self.request.GET.get("next"), allowed_hosts=None):
-            return self.request.GET.get("next")
         return reverse('control:event.vouchers', kwargs={
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug,
@@ -636,21 +603,26 @@ class VoucherRNG(EventPermissionRequiredMixin, View):
         })
 
 
-class VoucherBulkAction(VoucherQueryMixin, EventPermissionRequiredMixin, View):
+class VoucherBulkAction(EventPermissionRequiredMixin, View):
     permission = 'event.vouchers:write'
 
+    @cached_property
+    def objects(self):
+        return self.request.event.vouchers.filter(
+            id__in=self.request.POST.getlist('voucher')
+        )
+
     @transaction.atomic
     def post(self, request, *args, **kwargs):
         if request.POST.get('action') == 'delete':
             return render(request, 'pretixcontrol/vouchers/delete_bulk.html', {
-                'allowed': self.get_queryset().filter(redeemed=0),
-                'forbidden': self.get_queryset().exclude(redeemed=0),
+                'allowed': self.objects.filter(redeemed=0),
+                'forbidden': self.objects.exclude(redeemed=0),
             })
         elif request.POST.get('action') == 'delete_confirm':
             log_entries = []
             to_delete = []
-            to_update = []
-            for obj in self.get_queryset():
+            for obj in self.objects:
                 if obj.allow_delete():
                     log_entries.append(obj.log_action('pretix.voucher.deleted', user=self.request.user, save=False))
                     to_delete.append(obj.pk)
@@ -660,14 +632,12 @@ class VoucherBulkAction(VoucherQueryMixin, EventPermissionRequiredMixin, View):
                         'bulk': True
                     }, save=False))
                     obj.max_usages = min(obj.redeemed, obj.max_usages)
-                    to_update.append(obj)
+                    obj.save(update_fields=['max_usages'])
 
             if to_delete:
                 CartPosition.objects.filter(addon_to__voucher_id__in=to_delete).delete()
                 CartPosition.objects.filter(voucher_id__in=to_delete).delete()
                 Voucher.objects.filter(pk__in=to_delete).delete()
-            if to_update:
-                Voucher.objects.bulk_update(to_update, ['max_usages'])
 
             LogEntry.bulk_create_and_postprocess(log_entries)
             messages.success(request, _('The selected vouchers have been deleted or disabled.'))
@@ -678,117 +648,3 @@ class VoucherBulkAction(VoucherQueryMixin, EventPermissionRequiredMixin, View):
             'organizer': self.request.event.organizer.slug,
             'event': self.request.event.slug,
         })
-
-
-class VoucherBulkUpdateView(VoucherQueryMixin, EventPermissionRequiredMixin, FormView):
-    template_name = 'pretixcontrol/vouchers/bulk_edit.html'
-    permission = 'event.vouchers:write'
-    context_object_name = 'vouchers'
-    form_class = VoucherBulkEditForm
-
-    def get_queryset(self):
-        return super().get_queryset().prefetch_related(None).order_by()
-
-    def get(self, request, *args, **kwargs):
-        return HttpResponse(status=405)
-
-    @cached_property
-    def is_submitted(self):
-        # Usually, django considers a form "bound" / "submitted" on every POST request. However, this view is always
-        # called with POST method, even if just to pass the selection of objects to work on, so we want to modify
-        # that behavior
-        return '_bulk' in self.request.POST
-
-    def get_form_kwargs(self):
-        initial = {}
-        mixed_values = set()
-        qs = self.get_queryset().annotate()
-
-        fields = (
-            'valid_until', 'block_quota', 'allow_ignore_quota', 'value', 'tag', 'comment', 'max_usages',
-            'min_usages', 'price_mode', 'subevent', 'show_hidden_items', 'all_addons_included', 'all_bundles_included',
-            'budget',
-        )
-        for f in fields:
-            existing_values = list(qs.order_by(f).values(f).annotate(c=Count('*')))
-            if len(existing_values) == 1:
-                initial[f] = existing_values[0][f]
-            elif len(existing_values) > 1:
-                mixed_values.add(f)
-                if f == "max_usages":
-                    initial[f] = 1
-                else:
-                    initial[f] = None
-
-        existing_values = list(qs.order_by("item", "variation", "quota").values("item", "variation", "quota").annotate(c=Count('*')))
-        if len(existing_values) == 1:
-            i = existing_values[0]
-            if i["quota"]:
-                initial["itemvar"] = f'q-{i["quota"]}'
-            elif i["variation"]:
-                initial["itemvar"] = f'{i["item"]}-{i["variation"]}'
-            elif i["item"]:
-                initial["itemvar"] = f'{i["item"]}'
-            else:
-                initial["itemvar"] = None
-        elif len(existing_values) > 1:
-            mixed_values.add("itemvar")
-            initial["itemvar"] = None
-
-        kwargs = super().get_form_kwargs()
-        kwargs['event'] = self.request.event
-        kwargs['prefix'] = 'bulkedit'
-        kwargs['initial'] = initial
-        kwargs['queryset'] = self.get_queryset()
-        kwargs['mixed_values'] = mixed_values
-        if not self.is_submitted:
-            kwargs['data'] = None
-            kwargs['files'] = None
-        return kwargs
-
-    def get_success_url(self):
-        return reverse('control:event.vouchers', kwargs={
-            'organizer': self.request.event.organizer.slug,
-            'event': self.request.event.slug,
-        })
-
-    def form_valid(self, form):
-        log_entries = []
-
-        # Main form
-        form.save()
-        data = {
-            k: v
-            for k, v in form.cleaned_data.items()
-            if k in form.changed_data
-        }
-        data['_raw_bulk_data'] = self.request.POST.dict()
-        for obj in self.get_queryset():
-            log_entries.append(
-                obj.log_action('pretix.voucher.changed', data=data, user=self.request.user, save=False)
-            )
-
-        LogEntry.bulk_create_and_postprocess(log_entries)
-
-        messages.success(self.request, _('Your changes have been saved.'))
-        return super().form_valid(form)
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
-        ctx['vouchers'] = self.get_queryset()
-        ctx['bulk_selected'] = self.request.POST.getlist("_bulk")
-        return ctx
-
-    @transaction.atomic
-    def post(self, request, *args, **kwargs):
-        form = self.get_form()
-        is_valid = (
-            self.is_submitted and
-            form.is_valid()
-        )
-        if is_valid:
-            return self.form_valid(form)
-        else:
-            if self.is_submitted:
-                messages.error(self.request, _('We could not save your changes. See below for details.'))
-            return self.form_invalid(form)

src/pretix/helpers/cookies.py

@@ -19,9 +19,7 @@
 # You should have received a copy of the GNU Affero General Public License along with this program.  If not, see
 # <https://www.gnu.org/licenses/>.
 #
-import itertools
 import re
-from http.cookies import Morsel
 
 from django.conf import settings
 
@@ -50,41 +48,6 @@ def set_cookie_without_samesite(request, response, key, *args, **kwargs):
         response.cookies[key]['Partitioned'] = True
 
 
-def thoroughly_delete_cookie(response, cookie_name, **kwargs):
-    """ Deletes different possible versions of a cookie (SameSite, Partitioned) """
-    properties = {"SameSite": ["", 'None'], "Partitioned": ["", True]}
-    for i, values in enumerate(itertools.product(*properties.values())):
-        m = Morsel()
-        m.set(cookie_name, '', '')
-        m.update(kwargs)
-        m.update(zip(properties.keys(), values))
-        m['expires'] = "Thu, 01 Jan 1970 00:00:00 GMT"
-
-        response.cookies[f'___DELETECOOKIE__{i}___{cookie_name}'] = m
-
-    # Make sure settings a cookie afterwards will add a new item in the dictionary, placing
-    # it below our deletion headers.
-    response.cookies.pop(cookie_name, None)
-
-
-def get_all_values_of_cookie(cookie_header, cookie_name):
-    # like django.http.cookie.parse_cookie, but returns all values of duplicated cookies instead of only the last
-    values = list()
-    if not cookie_header:
-        return values
-    for chunk in cookie_header.split(";"):
-        if "=" in chunk:
-            key, val = chunk.split("=", 1)
-        else:
-            # Assume an empty name per
-            # https://bugzilla.mozilla.org/show_bug.cgi?id=169091
-            key, val = "", chunk
-        key, val = key.strip(), val.strip()
-        if key == cookie_name:
-            values.append(val)
-    return values
-
-
 # Based on https://www.chromium.org/updates/same-site/incompatible-clients
 # Copyright 2019 Google LLC.
 # SPDX-License-Identifier: Apache-2.0

src/pretix/helpers/database.py

@@ -285,3 +285,12 @@ def get_deterministic_ordering(model, ordering):
             # on the primary key to provide total ordering.
             ordering.append("-pk")
     return ordering
+
+
+@contextlib.contextmanager
+def conditional_atomic(do_atomic, **kwargs):
+    if do_atomic:
+        with transaction.atomic(**kwargs):
+            yield
+    else:
+        yield

src/pretix/helpers/escapejson.py

@@ -47,5 +47,5 @@ def escapejson(value):
 
 @keep_lazy(str, SafeText)
 def escapejson_attr(value):
-    """Hex encodes characters for use in a html attribute."""
+    """Hex encodes characters for use in a html attributw script."""
     return mark_safe(force_str(value).translate(_json_escapes_attr))