Revert "Redesign of email settings (#2426)"

This reverts commit e3c7cd7c6d.

doc/admin/config.rst

@@ -220,30 +220,12 @@ Example::
 ``user``, ``password``
     The SMTP user data to use for the connection. Empty by default.
 
-``tls``, ``ssl``
-    Use STARTTLS or SSL for the SMTP connection. Off by default.
-
 ``from``
     The email address to set as ``From`` header in outgoing emails by the system.
     Default: ``pretix@localhost``
 
-``from_notifications``
-    The email address to set as ``From`` header in admin notification emails by the system.
-    Defaults to the value of ``from``.
-
-``from_organizers``
-    The email address to set as ``From`` header in outgoing emails by the system sent on behalf of organizers.
-    Defaults to the value of ``from``.
-
-``custom_sender_verification_required``
-    If this is on (the default), organizers need to verify email addresses they want to use as senders in their event.
-
-``custom_sender_spf_string``
-    If this is set to a valid SPF string, pretix will show a warning if organizers use a sender address from a domain
-    that does not include this value.
-
-``custom_smtp_allow_private_networks``
-    If this is off (the default), custom SMTP servers cannot be private network addresses.
+``tls``, ``ssl``
+    Use STARTTLS or SSL for the SMTP connection. Off by default.
 
 ``admins``
     Comma-separated list of email addresses that should receive a report about every error code 500 thrown by pretix.

doc/admin/installation/docker_smallscale.rst

@@ -36,6 +36,9 @@ Linux and firewalls, we recommend that you start with `ufw`_.
           SSL certificates can be obtained for free these days. We also *do not* provide support for HTTP-only
           installations except for evaluation purposes.
 
+.. warning:: We recommend **PostgreSQL**. If you go for MySQL, make sure you run **MySQL 5.7 or newer** or
+             **MariaDB 10.2.7 or newer**.
+
 .. warning:: By default, using `ufw` in conjunction will not have any effect. Please make sure to either bind the exposed
              ports of your docker container explicitly to 127.0.0.1 or configure docker to respect any set up firewall
              rules.
@@ -58,9 +61,6 @@ directory writable to the user that runs pretix inside the docker container::
 Database
 --------
 
-.. warning:: **Please use PostgreSQL for all new installations**. If you need to go for MySQL, make sure you run
-             **MySQL 5.7 or newer** or **MariaDB 10.2.7 or newer**.
-
 Next, we need a database and a database user. We can create these with any kind of database managing tool or directly on
 our database's shell. Please make sure that UTF8 is used as encoding for the best compatibility. You can check this with
 the following command::
@@ -91,8 +91,6 @@ When using MySQL, make sure you set the character set of the database to ``utf8m
 
     mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
-You will also need to make sure that ``sql_mode`` in your ``my.cnf`` file does **not** include ``ONLY_FULL_GROUP_BY``.
-
 Redis
 -----
 
@@ -108,18 +106,6 @@ Now restart redis-server::
 
     # systemctl restart redis-server
 
-In this setup, systemd will delete ``/var/run/redis`` on every redis restart, which will cause issues with pretix. To
-prevent this, you can execute::
-
-   # systemctl edit redis-server
-
-And insert the following::
-
-    [Service]
-    # Keep the directory around so that pretix.service in docker does not need to be
-    # restarted when redis is restarted.
-    RuntimeDirectoryPreserve=yes
-
 .. warning:: Setting the socket permissions to 777 is a possible security problem. If you have untrusted users on your
              system or have high security requirements, please don't do this and let redis listen to a TCP socket
              instead. We recommend the socket approach because the TCP socket in combination with docker's networking

doc/admin/installation/manual_smallscale.rst

@@ -34,6 +34,9 @@ Linux and firewalls, we recommend that you start with `ufw`_.
           SSL certificates can be obtained for free these days. We also *do not* provide support for HTTP-only
           installations except for evaluation purposes.
 
+.. warning:: We recommend **PostgreSQL**. If you go for MySQL, make sure you run **MySQL 5.7 or newer** or
+             **MariaDB 10.2.7 or newer**.
+
 Unix user
 ---------
 
@@ -47,9 +50,6 @@ In this guide, all code lines prepended with a ``#`` symbol are commands that yo
 Database
 --------
 
-.. warning:: **Please use PostgreSQL for all new installations**. If you need to go for MySQL, make sure you run
-             **MySQL 5.7 or newer** or **MariaDB 10.2.7 or newer**.
-
 Having the database server installed, we still need a database and a database user. We can create these with any kind
 of database managing tool or directly on our database's shell. Please make sure that UTF8 is used as encoding for the
 best compatibility. You can check this with the following command::
@@ -65,8 +65,6 @@ When using MySQL, make sure you set the character set of the database to ``utf8m
 
     mysql > CREATE DATABASE pretix DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
-You will also need to make sure that ``sql_mode`` in your ``my.cnf`` file does **not** include ``ONLY_FULL_GROUP_BY``.
-
 Package dependencies
 --------------------
 

doc/api/resources/orders.rst

@@ -839,7 +839,6 @@ Creating orders
    * ``comment`` (optional)
    * ``custom_followup_at`` (optional)
    * ``checkin_attention`` (optional)
-   * ``require_approval`` (optional)
    * ``invoice_address`` (optional)
 
       * ``company``
@@ -899,9 +898,8 @@ Creating orders
 
    * ``force`` (optional). If set to ``true``, quotas will be ignored.
    * ``send_email`` (optional). If set to ``true``, the same emails will be sent as for a regular order, regardless of
-     whether these emails are enabled for certain sales channels. If set to ``null``, behavior will be controlled by pretix'
-     settings based on the sales channels (added in pretix 4.7). Defaults to ``false``.
-     Used to be ``send_mail`` before pretix 3.14.
+     whether these emails are enabled for certain sales channels. Defaults to
+     ``false``. Used to be ``send_mail`` before pretix 3.14.
 
    If you want to use add-on products, you need to set the ``positionid`` fields of all positions manually
    to incrementing integers starting with ``1``. Then, you can reference one of these

doc/development/api/auth.rst

@@ -20,31 +20,20 @@ Basically, three pre-defined flows are supported:
 * Authentication mechanisms that rely on **redirection**, e.g. to an OAuth provider. These can be implemented by
   supplying a ``authentication_url`` method and implementing a custom return view.
 
-For security reasons, authentication backends are *not* automatically discovered through a signal. Instead, they must
-explicitly be set through the ``auth_backends`` directive in the ``pretix.cfg`` :ref:`configuration file <config>`.
+Authentication backends are *not* collected through a signal. Instead, they must explicitly be set through the
+``auth_backends`` directive in the ``pretix.cfg`` :ref:`configuration file <config>`.
 
-In each of these methods (``form_authenticate``, ``request_authenticate``, or your custom view) you are supposed to
-use ``User.objects.get_or_create_for_backend`` to get a :py:class:`pretix.base.models.User` object from the database
-or create a new one.
+In each of these methods (``form_authenticate``, ``request_authenticate`` or your custom view) you are supposed to
+either get an existing :py:class:`pretix.base.models.User` object from the database or create a new one. There are a
+few rules you need to follow:
 
-There are a few rules you need to follow:
+* You **MUST** only return users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
 
-* You **MUST** have some kind of identifier for a user that is globally unique and **SHOULD** never change, even if the
-  user's name or email address changes. This could e.g. be the ID of the user in an external database. The identifier
-  must not be longer than 190 characters. If you worry your backend might generated longer identifiers, consider
-  using a hash function to trim them to a constant length.
-
-* You **SHOULD** not allow users created by other authentication backends to log in through your code, and you **MUST**
-  only create, modify or return users with ``auth_backend`` set to your backend.
+* You **MUST** create new users with the ``auth_backend`` attribute set to the ``identifier`` value of your backend.
 
 * Every user object **MUST** have an email address. Email addresses are globally unique. If the email address is
   already registered to a user who signs in through a different backend, you **SHOULD** refuse the login.
 
-``User.objects.get_or_create_for_backend`` will follow these rules for you automatically. It works like this:
-
-.. autoclass:: pretix.base.models.auth.UserManager
-   :members: get_or_create_for_backend
-
 The backend interface
 ---------------------
 
@@ -70,7 +59,6 @@ The backend interface
 
    .. automethod:: authentication_url
 
-
 Logging users in
 ----------------
 
@@ -80,45 +68,3 @@ recommend that you use the following utility method to correctly set session val
 authentication (if activated):
 
 .. autofunction:: pretix.control.views.auth.process_login
-
-A custom view that is called after a redirect from an external identity provider could look like this::
-
-   from django.contrib import messages
-   from django.shortcuts import redirect
-   from django.urls import reverse
-
-   from pretix.base.models import User
-   from pretix.base.models.auth import EmailAddressTakenError
-   from pretix.control.views.auth import process_login
-
-
-   def return_view(request):
-       # Verify validity of login with the external provider's API
-       api_response = my_verify_login_function(
-           code=request.GET.get('code')
-       )
-
-       try:
-           u = User.objects.get_or_create_for_backend(
-               'my_backend_name',
-               api_response['userid'],
-               api_response['email'],
-               set_always={
-                   'fullname': '{} {}'.format(
-                       api_response.get('given_name', ''),
-                       api_response.get('family_name', ''),
-                   ),
-               },
-               set_on_creation={
-                   'locale': api_response.get('locale').lower()[:2],
-                   'timezone': api_response.get('zoneinfo', 'UTC'),
-               }
-           )
-       except EmailAddressTakenError:
-           messages.error(
-               request, _('We cannot create your user account as a user account in this system '
-                          'already exists with the same email address.')
-           )
-           return redirect(reverse('control:auth.login'))
-       else:
-           return process_login(request, u, keep_logged_in=False)

doc/development/api/plugins.rst

@@ -92,7 +92,6 @@ those will be displayed but not block the plugin execution.
 
 The ``AppConfig`` class may implement a method ``is_available(event)`` that checks if a plugin
 is available for a specific event. If not, it will not be shown in the plugin list of that event.
-You should not define ``is_available`` and ``restricted`` on the same plugin.
 
 Plugin registration
 -------------------

doc/plugins/digital.rst

@@ -61,7 +61,7 @@ Variable                            Description
 ``attendee_city``                   City of the ticket holder's address (or empty)
 ``attendee_country``                Country code of the ticket holder's address (or empty)
 ``attendee_state``                  State of the ticket holder's address (or empty)
-``answers[XYZ]``                    Answer to the custom question with identifier ``XYZ``
+``answer[XYZ]``                     Answer to the custom question with identifier ``XYZ``
 ``invoice_name``                    Full name of the invoice address (or empty)
 ``invoice_name_*``                  Name parts of the invoice address, depending on configuration, e.g. ``invoice_name_given_name`` or ``invoice_name_family_name``
 ``invoice_company``                 Company of the invoice address (or empty)

doc/plugins/imported_secrets.rst

@@ -1,301 +0,0 @@
-Secrets Import
-==============
-
-Usually, pretix generates ticket secrets (i.e. the QR code used for scanning) itself. You can read more about this
-process at :ref:`secret_generators`.
-
-With the "Secrets Import" plugin, you can upload your own list of secrets to be used instead. This is useful for
-integrating with third-party check-in systems.
-
-
-API Resource description
--------------------------
-
-The secrets import plugin provides a HTTP API that allows you to create new secrets.
-
-The imported secret resource contains the following public fields:
-
-.. rst-class:: rest-resource-table
-
-===================================== ========================== =======================================================
-Field                                 Type                       Description
-===================================== ========================== =======================================================
-id                                    integer                    Internal ID of the secret
-secret                                string                     Actual string content of the secret (QR code content)
-used                                  boolean                    Whether the secret was already used for a ticket. If ``true``,
-                                                                 the secret can no longer be deleted. Secrets are never used
-                                                                 twice, even if an order is canceled or deleted.
-item                                  integer                    Internal ID of a product, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this product.
-variation                             integer                    Internal ID of a product variation, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this product variation.
-subevent                              integer                    Internal ID of an event series date, or ``null``. If set, the secret
-                                                                 will only be used for tickets of this event series date.
-===================================== ========================== =======================================================
-
-API Endpoints
--------------
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/
-
-   Returns a list of all secrets imported for an event.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "count": 1,
-        "next": null,
-        "previous": null,
-        "results": [
-          {
-            "id": 1,
-            "secret": "foobar",
-            "used": false,
-            "item": null,
-            "variation": null,
-            "subevent": null
-          }
-        ]
-      }
-
-   :query page: The page number in case of a multi-page result set, default is 1
-   :param organizer: The ``slug`` field of a valid organizer
-   :param event: The ``slug`` field of the event to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer or event does not exist **or** you have no permission to view it.
-
-.. http:get:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Returns information on one secret, identified by its ID.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      GET /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to fetch
-   :param event: The ``slug`` field of the event to fetch
-   :param id: The ``id`` field of the secret to fetch
-   :statuscode 200: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to view it.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/
-
-   Create a new secret.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      {
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 201 Created
-      Vary: Accept
-      Content-Type: application/json
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": null,
-        "variation": null,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to a create new secret for
-   :param event: The ``slug`` field of the event to create a new secret for
-   :statuscode 201: no error
-   :statuscode 400: The secret could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create secrets.
-
-.. http:post:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/bulk_create/
-
-   Create new secrets in bulk (up to 500 per request). The request either succeeds or fails entirely.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      POST /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/bulk_create/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 166
-
-      [
-        {
-          "secret": "foobar",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        },
-        {
-          "secret": "baz",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        }
-      ]
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: application/json
-
-      [
-        {
-          "id": 1,
-          "secret": "foobar",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        },
-        {
-          "id": 2,
-          "secret": "baz",
-          "used": false,
-          "item": null,
-          "variation": null,
-          "subevent": null
-        }
-      ]
-
-   :param organizer: The ``slug`` field of the organizer to create new secrets for
-   :param event: The ``slug`` field of the event to create new secrets for
-   :statuscode 201: no error
-   :statuscode 400: The secrets could not be created due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event does not exist **or** you have no permission to create secrets.
-
-
-.. http:patch:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Update a secret. You can also use ``PUT`` instead of ``PATCH``. With ``PUT``, you have to provide all fields of
-   the resource, other fields will be reset to default. With ``PATCH``, you only need to provide the fields that you
-   want to change.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      PATCH /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-      Content-Type: application/json
-      Content-Length: 34
-
-      {
-        "item": 2
-      }
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 200 OK
-      Vary: Accept
-      Content-Type: text/javascript
-
-      {
-        "id": 1,
-        "secret": "foobar",
-        "used": false,
-        "item": 2,
-        "variation": null,
-        "subevent": null
-      }
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the secret to modify
-   :statuscode 200: no error
-   :statuscode 400: The secret could not be modified due to invalid submitted data.
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to change it.
-
-
-.. http:delete:: /api/v1/organizers/(organizer)/events/(event)/imported_secrets/(id)/
-
-   Delete a secret. You can only delete secrets that have not yet been used.
-
-   **Example request**:
-
-   .. sourcecode:: http
-
-      DELETE /api/v1/organizers/bigevents/events/sampleconf/imported_secrets/1/ HTTP/1.1
-      Host: pretix.eu
-      Accept: application/json, text/javascript
-
-   **Example response**:
-
-   .. sourcecode:: http
-
-      HTTP/1.1 204 No Content
-      Vary: Accept
-
-   :param organizer: The ``slug`` field of the organizer to modify
-   :param event: The ``slug`` field of the event to modify
-   :param id: The ``id`` field of the secret to delete
-   :statuscode 204: no error
-   :statuscode 401: Authentication failure
-   :statuscode 403: The requested organizer/event/secret does not exist **or** you have no permission to change it **or** the secret has already been used
-

doc/plugins/index.rst

@@ -17,6 +17,4 @@ If you want to **create** a plugin, please go to the
    campaigns
    certificates
    digital
-   imported_secrets
    webinar
-   presale-saml

doc/plugins/presale-saml.rst

@@ -1,405 +0,0 @@
-.. highlight:: ini
-.. spelling::
-
-   IdP
-   skIDentity
-   ePA
-   NPA
-
-Presale SAML Authentication
-===========================
-
-The Presale SAML Authentication plugin is an advanced plugin, which most event
-organizers will not need to use. However, for the select few  who do require
-strong customer authentication that cannot be covered by the built-in customer
-account functionality, this plugin allows pretix to connect to a SAML IdP and
-perform authentication and retrieval of user information.
-
-Usage of the plugin is governed by two separate sets of settings: The plugin
-installation, the Service Provider (SP) configuration and the event
-configuration.
-
-Plugin installation and initial configuration
----------------------------------------------
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, you can
-          skip this section.
-
-The plugin is installed as any other plugin in the pretix ecosystem. As a
-pretix system administrator, please follow the instructions in the the
-:ref:`Administrator documentation <admindocs>`.
-
-Once installed, you will need to assess, if you want (or need) your pretix
-instance to be a single SP for all organizers and events or if every event
-organizer has to provide their own SP.
-
-Take the example of a university which runs pretix under an pretix Enterprise
-agreement. Since they only provide ticketing services to themselves (every
-organizer is still just a different department of the same university), a
-single SP should be enough.
-
-On the other hand, a reseller such as `pretix.eu`_ who services a multitude
-of clients would not work that way. Here, every organizer is a separate
-legal entity and as such will also need to provide their own SP configuration:
-Company A will expect their SP to reflect their company - and not a generalized
-"pretix SP".
-
-Once you have decided on the mode of operation, the :ref:`Configuration file
-<config>` needs to be extended to reflect your choice.
-
-Example::
-
-    [presale-saml]
-    level=global
-
-``level``
-    ``global`` to use only a single, system-wide SP, ``organizer`` for multiple
-    SPs, configured on the organizer-level. Defaults to ``organizer``.
-
-Service Provider configuration
-------------------------------
-
-Global Level
-^^^^^^^^^^^^
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, you can
-          skip this section and follow the instructions on the upcoming
-          Organizer Level settings.
-
-As a user with administrative privileges, please activate them by clicking the
-`Admin Mode` button in the top right hand corner.
-
-You should now see a new menu-item titled `SAML` appear.
-
-Organizer Level
-^^^^^^^^^^^^^^^
-
-Navigate to the organizer settings in the pretix backend. In the navigation
-bar, you will find a menu-item titled `SAML` if your user has the `Can
-change organizer settings` permission.
-
-
-.. note:: If you are a customer of our hosted `pretix.eu`_ offering, the menu
-          will only appear once one of our friendly customer service agents
-          has enabled the Presale SAML Authentication plugin for at least one
-          of your events. Feel free to get in touch with us!
-
-Setting up the SP
-^^^^^^^^^^^^^^^^^
-
-No matter where your SP configuration lives, you will be greeted by a very
-long list of fields of which almost all of them will need to be filled. Please
-don't be discouraged - most of the settings don't need to be decided by yourself
-and/or are already preset with a sensible default setting.
-
-If you are not sure what setting you should choose for any of the fields, you
-should reach out to your IdP operator as they can tell you exactly what the IdP
-expects and - more importantly - supports.
-
-``IdP Metadata URL``
-    Please provide the URL where your IdP outputs its metadata. For most IdPs,
-    this URL is static and the same for all SPs. If you are a member of the
-    DFN-AAI, you can find the meta-data for the `Test-, Basic- and
-    Advanced-Federation`_ on their website. Please do talk with your local
-    IdP operator though, as you might not even need to go through the DFN-AAI
-    and might just use your institutions local IdP which will also host their
-    metadata on a different URL.
-
-    The URL needs to be publicly accessible, as saving the settings form will
-    fail if the IdP metadata cannot be retrieved. pretix will also automatically
-    refresh the IdP metadata on a regular basis.
-
-``SP Entity Id``
-    By default, we recommend that you use the system-proposed metadata-URL as
-    the Entity Id of your SP. However, if so desired or required by your IdP,
-    you can also set any other, arbitrary URL as the SP Entity Id.
-
-``SP Name / SP Decription``
-    Most IdP will display the name and description of your SP to the users
-    during authentication. The description field can be used to explain to the
-    users how their data is being used.
-
-``SP X.509 Certificate / SP X.509 Private Key``
-    Your SP needs a certificate and a private key for said certificate. Please
-    coordinate with your IdP, if you are supposed to generate these yourself or
-    if they are provided to you.
-
-``SP X.509 New Certificate``
-    As certificates have an expiry date, they need to be renewed on a regular
-    basis. In order to facilitate the rollover from the expiring to the new
-    certificate, you can provide the new certificate already before the expiration
-    of the existing one. That way, the system will automatically use the correct
-    one. Once the old certificate has expired and is not used anymore at all,
-    you can move the new certificate into the slot of the normal certificate and
-    keep the new slot empty for your next renewal process.
-
-``Requested Attributes``
-    An IdP can hold a variety of attributes of an authenticating user. While
-    your IdP will dictate which of the available attributes your SP can consume
-    in theory, you will still need to define exactly which attributes the SP
-    should request.
-
-    The notation is a JSON list of objects with 5 attributes each:
-
-      * ``attributeValue``: Can be defaulted to ``[]``.
-      * ``friendlyName``: String used in the upcoming event-level settings to
-        retrieve the attributes data.
-      * ``isRequired``: Boolean indicating whether the IdP must enforce the
-        transmission of this attribute. In most cases, ``true`` is the best
-        choice.
-      * ``name``: String of the internal, technical name of the requested
-        attribute. Often starting with ``urn:mace:dir:attribute-def:``,
-        ``urn:oid:`` or ``http://``/``https://``.
-      * ``nameFormat``: String describing the type of ``name`` that has been
-        set in the previous section. Often starting with
-        ``urn:mace:shibboleth:1.0:`` or ``urn:oasis:names:tc:SAML:2.0:``.
-
-    Your IdP can provide you with a list of available attributes. See below
-    for a sample configuration in an academic context.
-
-    Note, that you can have multiple attributes with the same ``friendlyName``
-    but different ``name``s. This is often used in systems, where the same
-    information (for example a persons name) is saved in different fields -
-    for example because one institution is returning SAML 1.0 and other
-    institutions are returning SAML 2.0 style attributes. Typically, this only
-    occurs in mix environments like the DFN-AAI with a large number of
-    participants. If you are only using your own institutions IdP and not
-    authenticating anyone outside of your realm, this should not be a common
-    sight.
-
-``Encrypt/Sign/Require ...``
-    Does what is says on the box - please inquire with your IdP for the
-    necessary settings. Most settings can be turned on as they increase security,
-    however some IdPs might stumble over some of them.
-
-``Signature / Digest Algorithm``
-    Please chose appropriate algorithms, that both pretix/your SP and the IdP
-    can communicate with. A common source of issues when connecting to a
-    Shibboleth-based IdP is the Digest Algorithm: pretix does not support
-    ``http://www.w3.org/2009/xmlenc11#rsa-oaep`` and authentication will fail
-    if the IdP enforces this.
-
-``Technical/Support Contacts``
-    Those contacts are encoded into the SPs public meta data and might be
-    displayed to users having trouble authenticating. It is recommended to
-    provide a dedicated point of contact for technical issues, as those will
-    be the ones to change the configuration for the SP.
-
-Event / Authentication configuration
-------------------------------------
-
-Basic settings
-^^^^^^^^^^^^^^
-
-Once the plugin has been enabled for a pretix event using the Plugins-menu from
-the event's settings, a new *SAML* menu item will show up.
-
-On this page, the actual authentication can be configured.
-
-``Checkout Explanation``
-    Since most users probably won't be familiar with why they have to authenticate
-    to buy a ticket, you can provide them a small blurb here. Markdown is supported.
-
-``Attribute RegEx``
-    By default, any successful authentication with the IdP will allow the user to
-    proceed with their purchase. Should the allowed audience needed to be restricted
-    further, a set of regular Expressions can be used to do this.
-
-    An Attribute RegEx of ``{}`` will allow any authenticated user to pass.
-
-    A RegEx of ``{ "affiliation": "^(employee@pretix.eu|staff@pretix.eu)$" }`` will
-    only allow user to pass which have the ``affiliation`` attribute and whose
-    attribute either matches ``employee@pretix.eu`` or ``staff@pretix.eu``.
-
-    Please make sure that the attribute you are querying is also requested from the
-    IdP in the first place - for a quick check you can have a look at the top of
-    the page where all currently configured attributes are listed.
-
-``RegEx Fail Explanation``
-    Only used in conjunction with the above Attribute RegEx. Should the user not
-    pass the restrictions imposed by the regular expression, the user is shown
-    this error-message.
-
-    If you are - for example in an university context - restricting access to
-    students only, you might want to explain here that Employees are not allowed
-    to book tickets.
-
-``Ticket Secret SAML Attribute``
-    In very specific instances, it might be desirable that the ticket-secret is
-    not the randomly one generated by pretix but rather based on one of the
-    users attributes - for example their unique ID or access card number.
-
-    To achieve this, the name of a SAML-attribute can be specified here.
-
-    It is however necessary to note, that even with this setting in use,
-    ticket-secrets need to be unique. This is why when this setting is enabled,
-    the default, pretix-generated ticket-secret is prefixed with the attributes
-    value.
-
-    Example: A users ``cardid`` attribute has the value of ``01189998819991197253``.
-    The default random ticket secret would have been
-    ``yczygpw9877akz2xwdhtdyvdqwkv7npj``. The resulting new secret will now be
-    ``01189998819991197253_yczygpw9877akz2xwdhtdyvdqwkv7npj``.
-
-    That way, the ticket secret is still unique, but when checking into an event,
-    the user can easily be searched and found using their identifier.
-
-IdP-provided E-Mail addresses, names
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-By default, pretix will only authenticate the user and not process the received
-data any further.
-
-However, there are a few exceptions to this rule.
-
-There are a few `magic` attributes that pretix will use to automatically populate
-the corresponding fields within the checkout process **and lock them out from
-user editing**.
-
-  * ``givenName`` and ``sn``: If both of those attributes are present and pretix
-    is configured to collect the users name, these attributes' values are used
-    for the given and family name respectively.
-  * ``email``: If this attribute is present, the E-Mail-address of the users will
-    be set to the one transmitted through the attributes.
-
-The latter might pose a problem, if the IdP is transmitting an ``email`` attribute
-which does contain a system-level mail address which is only used as an internal
-identifier but not as a real mailbox. In this case, please consider setting the
-``friendlyName`` of the attribute to a different value than ``email`` or removing
-this field from the list of requested attributes altogether.
-
-Saving attributes to questions
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-By setting the ``internal identifier`` of a user-defined question to the same name
-as a SAML attribute, pretix will save the value of said attribute into the question.
-
-All the same as in the above section on E-Mail addresses, those fields become
-non-editable by the user.
-
-Please be aware that some specialty question types might not be compatible with
-the SAML attributes due to specific format requirements. If in doubt (or if the
-checkout fails/the information is not properly saved), try setting the question
-type to a simple type like "Text (one line)".
-
-Notes and configuration examples
---------------------------------
-
-Requesting SAML 1.0 and 2.0 attributes from an academic IdP
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This requests the ``eduPersonPrincipalName`` (also sometimes called EPPN),
-``email``, ``givenName`` and ``sn`` both in SAML 1.0 and SAML 2.0 attributes.
-
-.. sourcecode:: json
-
-    [
-        {
-            "attributeValue": [],
-            "friendlyName": "eduPersonPrincipalName",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:eduPersonPrincipalName",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "eduPersonPrincipalName",
-            "isRequired": true,
-            "name": "urn:oid:1.3.6.1.4.1.5923.1.1.1.6",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "email",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:mail",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "email",
-            "isRequired": true,
-            "name": "urn:oid:0.9.2342.19200300.100.1.3",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "givenName",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:givenName",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "givenName",
-            "isRequired": true,
-            "name": "urn:oid:2.5.4.42",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "sn",
-            "isRequired": true,
-            "name": "urn:mace:dir:attribute-def:sn",
-            "nameFormat": "urn:mace:shibboleth:1.0:attributeNamespace:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "sn",
-            "isRequired": true,
-            "name": "urn:oid:2.5.4.4",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        }
-    ]
-
-skIDentity IdP Metadata URL
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Since the IdP Metadata URL for `skIDentity`_ is not readily documented/visible
-in their backend, we document it here:
-``https://service.skidentity.de/fs/saml/metadata``
-
-Requesting skIDentity attributes for electronic identity cards
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This requests the basic ``eIdentifier``, ``IDType``, ``IDIssuer``, and
-``NameID`` from the `skIDentity`_ SAML service, which are available for
-electronic ID cards such as the German ePA/NPA. (Other attributes such as
-the name and address are available at additional cost from the IdP).
-
-.. sourcecode:: json
-
-    [
-        {
-            "attributeValue": [],
-            "friendlyName": "eIdentifier",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/eIdentifier",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "IDType",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/IDType",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "IDIssuer",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/IDIssuer",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        },
-        {
-            "attributeValue": [],
-            "friendlyName": "NameID",
-            "isRequired": true,
-            "name": "http://www.skidentity.de/att/NameID",
-            "nameFormat": "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-        }
-    ]
-
-.. _pretix.eu: https://pretix.eu
-.. _Test-, Basic- and Advanced-Federation: https://doku.tid.dfn.de/en:metadata
-.. _skIDentity: https://www.skidentity.de/

doc/user/events/ticket_secrets.rst

@@ -1,5 +1,3 @@
-.. _secret_generators:
-
 Ticket secret generators
 ========================
 

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__ = "4.7.0"
+__version__ = "4.6.0.dev0"

src/pretix/api/auth/devicesecurity.py

@@ -167,8 +167,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('GET', 'api-v1:checkinlist-list'),
         ('POST', 'api-v1:checkinlistpos-redeem'),
         ('POST', 'plugins:pretix_posbackend:order.posprintlog'),
-        ('POST', 'plugins:pretix_posbackend:order.poslock'),
-        ('DELETE', 'plugins:pretix_posbackend:order.poslock'),
         ('DELETE', 'api-v1:cartposition-detail'),
         ('GET', 'api-v1:giftcard-list'),
         ('POST', 'api-v1:giftcard-transact'),
@@ -176,8 +174,6 @@ class PretixPosSecurityProfile(AllowListSecurityProfile):
         ('POST', 'plugins:pretix_posbackend:posreceipt-list'),
         ('POST', 'plugins:pretix_posbackend:posclosing-list'),
         ('POST', 'plugins:pretix_posbackend:posdebugdump-list'),
-        ('POST', 'plugins:pretix_posbackend:posdebuglogentry-list'),
-        ('POST', 'plugins:pretix_posbackend:posdebuglogentry-bulk-create'),
         ('GET', 'plugins:pretix_posbackend:poscashier-list'),
         ('POST', 'plugins:pretix_posbackend:stripeterminal.token'),
         ('GET', 'api-v1:revokedsecrets-list'),

src/pretix/api/serializers/checkin.py

@@ -60,7 +60,7 @@ class CheckinListSerializer(I18nAwareModelSerializer):
         full_data = self.to_internal_value(self.to_representation(self.instance)) if self.instance else {}
         full_data.update(data)
 
-        for item in full_data.get('limit_products', []):
+        for item in full_data.get('limit_products'):
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))
 

src/pretix/api/serializers/event.py

@@ -713,6 +713,7 @@ class EventSettingsSerializer(SettingsSerializer):
         'ticket_download_require_validated_email',
         'ticket_secret_length',
         'mail_prefix',
+        'mail_from',
         'mail_from_name',
         'mail_attach_ical',
         'mail_attach_tickets',

src/pretix/api/serializers/item.py

@@ -251,12 +251,9 @@ class ItemSerializer(I18nAwareModelSerializer):
         bundles_data = validated_data.pop('bundles') if 'bundles' in validated_data else {}
         meta_data = validated_data.pop('meta_data', None)
         picture = validated_data.pop('picture', None)
-        require_membership_types = validated_data.pop('require_membership_types', [])
         item = Item.objects.create(**validated_data)
         if picture:
             item.picture.save(os.path.basename(picture.name), picture)
-        if require_membership_types:
-            item.require_membership_types.add(*require_membership_types)
 
         for variation_data in variations_data:
             require_membership_types = variation_data.pop('require_membership_types', [])

src/pretix/api/serializers/order.py

@@ -934,8 +934,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
     consume_carts = serializers.ListField(child=serializers.CharField(), required=False)
     force = serializers.BooleanField(default=False, required=False)
     payment_date = serializers.DateTimeField(required=False, allow_null=True)
-    send_email = serializers.BooleanField(default=False, required=False, allow_null=True)
-    require_approval = serializers.BooleanField(default=False, required=False)
+    send_email = serializers.BooleanField(default=False, required=False)
     simulate = serializers.BooleanField(default=False, required=False)
     customer = serializers.SlugRelatedField(slug_field='identifier', queryset=Customer.objects.none(), required=False)
 
@@ -948,7 +947,7 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         model = Order
         fields = ('code', 'status', 'testmode', 'email', 'phone', 'locale', 'payment_provider', 'fees', 'comment', 'sales_channel',
                   'invoice_address', 'positions', 'checkin_attention', 'payment_info', 'payment_date', 'consume_carts',
-                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at', 'require_approval')
+                  'force', 'send_email', 'simulate', 'customer', 'custom_followup_at')
 
     def validate_payment_provider(self, pp):
         if pp is None:
@@ -1042,8 +1041,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
         force = validated_data.pop('force', False)
         simulate = validated_data.pop('simulate', False)
         self._send_mail = validated_data.pop('send_email', False)
-        if self._send_mail is None:
-            self._send_mail = validated_data.get('sales_channel') in self.context['event'].settings.mail_sales_channel_placed_paid
 
         if 'invoice_address' in validated_data:
             iadata = validated_data.pop('invoice_address')
@@ -1222,8 +1219,6 @@ class OrderCreateSerializer(I18nAwareModelSerializer):
             order.set_expires(subevents=[p.get('subevent') for p in positions_data])
             order.meta_info = "{}"
             order.total = Decimal('0.00')
-            if validated_data.get('require_approval') is not None:
-                order.require_approval = validated_data['require_approval']
             if simulate:
                 order = WrappedModel(order)
                 order.last_modified = now()

src/pretix/api/views/exporters.py

@@ -132,7 +132,7 @@ class EventExportersViewSet(ExportersMixin, viewsets.ViewSet):
     def exporters(self):
         exporters = []
         responses = register_data_exporters.send(self.request.event)
-        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
             ex._serializer = JobRunSerializer(exporter=ex)
             exporters.append(ex)
         return exporters

src/pretix/api/views/order.py

@@ -646,11 +646,7 @@ class OrderViewSet(viewsets.ModelViewSet):
                     payment and order.total == Decimal('0.00') and order.status == Order.STATUS_PAID and
                     not order.require_approval and payment.provider == "free"
                 )
-                if order.require_approval:
-                    email_template = request.event.settings.mail_text_order_placed_require_approval
-                    log_entry = 'pretix.event.order.email.order_placed_require_approval'
-                    email_attendees = False
-                elif free_flow:
+                if free_flow:
                     email_template = request.event.settings.mail_text_order_free
                     log_entry = 'pretix.event.order.email.order_free'
                     email_attendees = request.event.settings.mail_send_order_free_attendee
@@ -663,13 +659,12 @@ class OrderViewSet(viewsets.ModelViewSet):
 
                 _order_placed_email(
                     request.event, order, payment.payment_provider if payment else None, email_template,
-                    log_entry, invoice, payment, is_free=free_flow
+                    log_entry, invoice, payment
                 )
                 if email_attendees:
                     for p in order.positions.all():
                         if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry,
-                                                         is_free=free_flow)
+                            _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry)
 
                 if not free_flow and order.status == Order.STATUS_PAID and payment:
                     payment._send_paid_mail(invoice, None, '')

src/pretix/base/auth.py

@@ -94,9 +94,6 @@ class BaseAuthBackend:
         This method will be called after the user filled in the login form. ``request`` will contain
         the current request and ``form_data`` the input for the form fields defined in ``login_form_fields``.
         You are expected to either return a ``User`` object (if login was successful) or ``None``.
-
-        You are expected to either return a ``User`` object (if login was successful) or ``None``. You should
-        obtain this user object using ``User.objects.get_or_create_for_backend``.
         """
         return
 
@@ -107,9 +104,7 @@ class BaseAuthBackend:
         reverse proxy, you can directly return a ``User`` object that will be logged in.
 
         ``request`` will contain the current request.
-
-        You are expected to either return a ``User`` object (if login was successful) or ``None``. You should
-        obtain this user object using ``User.objects.get_or_create_for_backend``.
+        You are expected to either return a ``User`` object (if login was successful) or ``None``.
         """
         return
 

src/pretix/base/email.py

@@ -33,7 +33,6 @@ from django.core.mail.backends.smtp import EmailBackend
 from django.db.models import Count
 from django.dispatch import receiver
 from django.template.loader import get_template
-from django.utils.formats import date_format
 from django.utils.timezone import now
 from django.utils.translation import (
     get_language, gettext_lazy as _, pgettext_lazy,
@@ -165,20 +164,9 @@ class TemplateBasedMailRenderer(BaseHTMLMailRenderer):
                 has_addons=Count('addons')
             ))
             htmlctx['cart'] = [(k, list(v)) for k, v in groupby(
-                sorted(
-                    positions,
-                    key=lambda op: (
-                        (op.addon_to.positionid if op.addon_to_id else op.positionid),
-                        op.positionid
-                    )
-                ),
-                key=lambda op: (
-                    op.item,
-                    op.variation,
-                    op.subevent,
-                    op.attendee_name,
-                    (op.pk if op.addon_to_id else None),
-                    (op.pk if op.has_addons else None)
+                positions, key=lambda op: (
+                    op.item, op.variation, op.subevent, op.attendee_name,
+                    (op.pk if op.addon_to_id else None), (op.pk if op.has_addons else None)
                 )
             )]
 
@@ -465,15 +453,6 @@ def base_placeholders(sender, **kwargs):
                 }
             ),
         ),
-        SimpleFunctionalMailTextPlaceholder(
-            'event_location', ['event_or_subevent'], lambda event_or_subevent: str(event_or_subevent.location or ''),
-            lambda event: str(event.location or ''),
-        ),
-        SimpleFunctionalMailTextPlaceholder(
-            'event_admission_time', ['event_or_subevent'],
-            lambda event_or_subevent: date_format(event_or_subevent.date_admission, 'TIME_FORMAT') if event_or_subevent.date_admission else '',
-            lambda event: date_format(event.date_admission, 'TIME_FORMAT') if event.date_admission else '',
-        ),
         SimpleFunctionalMailTextPlaceholder(
             'subevent', ['waiting_list_entry', 'event'],
             lambda waiting_list_entry, event: str(waiting_list_entry.subevent or event),
@@ -643,10 +622,6 @@ def base_placeholders(sender, **kwargs):
             'meta_%s' % k, ['event'], lambda event, k=k: event.meta_data[k],
             v
         ))
-        ph.append(SimpleFunctionalMailTextPlaceholder(
-            'meta_%s' % k, ['event_or_subevent'], lambda event_or_subevent, k=k: event_or_subevent.meta_data[k],
-            v
-        ))
 
     return ph
 

src/pretix/base/exporters/orderlist.py

@@ -573,7 +573,6 @@ class OrderListExporter(MultiSheetListExporter):
             pgettext('address', 'State'),
             _('Voucher'),
             _('Pseudonymization ID'),
-            _('Ticket secret'),
             _('Seat ID'),
             _('Seat name'),
             _('Seat zone'),
@@ -670,7 +669,6 @@ class OrderListExporter(MultiSheetListExporter):
                     op.state or '',
                     op.voucher.code if op.voucher else '',
                     op.pseudonymization_id,
-                    op.secret,
                 ]
 
                 if op.seat:

src/pretix/base/forms/__init__.py

@@ -38,7 +38,6 @@ import i18nfield.forms
 from django import forms
 from django.forms.models import ModelFormMetaclass
 from django.utils.crypto import get_random_string
-from django.utils.translation import gettext_lazy as _
 from formtools.wizard.views import SessionWizardView
 from hierarkey.forms import HierarkeyForm
 
@@ -129,12 +128,6 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
         # at all, it will be considered a changed value and stored. We do not want that, as it makes it very hard to add
         # languages to an organizer/event later on. So we trick it and make sure nothing gets changed in that situation.
         for name, field in self.fields.items():
-            if isinstance(field, SecretKeySettingsField) and d.get(name) == SECRET_REDACTED and not self.initial.get(name):
-                self.add_error(
-                    name,
-                    _('Due to technical reasons you cannot set inputs, that need to be masked (e.g. passwords), to %(value)s.') % {'value': SECRET_REDACTED}
-                )
-
             if isinstance(field, i18nfield.forms.I18nFormField):
                 value = d.get(name)
                 if not value:

src/pretix/base/forms/questions.py

@@ -47,9 +47,7 @@ from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.core.validators import (
-    MaxValueValidator, MinValueValidator, RegexValidator,
-)
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db.models import QuerySet
 from django.forms import Select, widgets
 from django.utils import translation
@@ -189,15 +187,6 @@ class NamePartsFormField(forms.MultiValueField):
         defaults = {
             'widget': self.widget,
             'max_length': kwargs.pop('max_length', None),
-            'validators': [
-                RegexValidator(
-                    # The following characters should never appear in a name anywhere of
-                    # the world. However, they commonly appear in inputs generated by spam
-                    # bots.
-                    r'^[^$€/%§{}<>~]*$',
-                    message=_('Please do not use special characters in names.')
-                )
-            ]
         }
         self.scheme_name = kwargs.pop('scheme')
         self.titles = kwargs.pop('titles')
@@ -218,7 +207,6 @@ class NamePartsFormField(forms.MultiValueField):
             if fname == 'title' and self.scheme_titles:
                 d = dict(defaults)
                 d.pop('max_length', None)
-                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[('', '')] + [(d, d) for d in self.scheme_titles[1]]
@@ -227,7 +215,6 @@ class NamePartsFormField(forms.MultiValueField):
             elif fname == 'salutation':
                 d = dict(defaults)
                 d.pop('max_length', None)
-                d.pop('validators', None)
                 field = forms.ChoiceField(
                     **d,
                     choices=[('', '---')] + PERSON_NAME_SALUTATIONS

src/pretix/base/management/commands/check_order_transactions.py

@@ -104,4 +104,4 @@ class Command(BaseCommand):
             print(f"Error in order {o.full_code}: status={o.status}, sum(positions)+sum(fees)={o.position_total + o.fee_total}, "
                   f"order.total={o.total}, sum(transactions)={o.tx_total}, expected={o.correct_total}, pos_cnt={o.position_cnt}, tx_pos_cnt={o.tx_cnt}")
 
-        self.stderr.write(self.style.SUCCESS('Check completed.'))
+        self.stderr.write(self.style.SUCCESS(f'Check completed.'))

src/pretix/base/migrations/0208_auto_20220214_1632.py

@@ -1,22 +0,0 @@
-# Generated by Django 3.2.4 on 2022-02-14 16:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pretixbase', '0207_auto_20220119_1427'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='auth_backend_identifier',
-            field=models.CharField(db_index=True, max_length=190, null=True),
-        ),
-        migrations.AlterUniqueTogether(
-            name='user',
-            unique_together={('auth_backend', 'auth_backend_identifier')},
-        ),
-    ]

src/pretix/base/models/auth.py

@@ -44,7 +44,7 @@ from django.contrib.auth.models import (
 )
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.contenttypes.models import ContentType
-from django.db import IntegrityError, models, transaction
+from django.db import models
 from django.db.models import Q
 from django.utils.crypto import get_random_string, salted_hmac
 from django.utils.timezone import now
@@ -61,10 +61,6 @@ from pretix.helpers.urls import build_absolute_uri
 from .base import LoggingMixin
 
 
-class EmailAddressTakenError(IntegrityError):
-    pass
-
-
 class UserManager(BaseUserManager):
     """
     This is the user manager for our custom user model. See the User
@@ -87,116 +83,6 @@ class UserManager(BaseUserManager):
         user.save()
         return user
 
-    def get_or_create_for_backend(self, backend, identifier, email, set_always, set_on_creation):
-        """
-        This method should be used by third-party authentication backends to log in a user.
-        It either returns an already existing user or creates a new user.
-
-        In pretix 4.7 and earlier, email addresses were the only property to identify a user with.
-        Starting with pretix 4.8, backends SHOULD instead use a unique, immutable identifier
-        based on their backend data store to allow for changing email addresses.
-
-        This method transparently handles the conversion of old user accounts and adds the
-        backend identifier to their database record.
-
-        This method will never return users managed by a different authentication backend.
-        If you try to create an account with an email address already blocked by a different
-        authentication backend, :py:class:`EmailAddressTakenError` will be raised. In this case,
-        you should display a message to the user.
-
-        :param backend: The `identifier` attribute of the authentication backend
-        :param identifier: The unique, immutable identifier of this user, max. 190 characters
-        :param email: The user's email address
-        :param set_always: A dictionary of fields to update on the user model on every login
-        :param set_on_creation: A dictionary of fields to set on the user model if it's newly created
-        :return: A `User` instance.
-        """
-        if identifier is None:
-            raise ValueError('You need to supply a custom, unique identifier for this user.')
-        if email is None:
-            raise ValueError('You need to supply an email address for this user.')
-        if 'auth_backend_identifier' in set_always or 'auth_backend_identifier' in set_on_creation or \
-                'auth_backend' in set_always or 'auth_backend' in set_on_creation:
-            raise ValueError('You may not update auth_backend/auth_backend_identifier.')
-        if len(identifier) > 190:
-            raise ValueError('The user identifier must not be more than 190 characters.')
-
-        # Always update the email address
-        set_always.update({'email': email})
-
-        # First, check if we find the user based on it's backend-specific authenticator
-        try:
-            u = self.get(
-                auth_backend=backend,
-                auth_backend_identifier=identifier,
-            )
-            dirty = False
-            for k, v in set_always.items():
-                if getattr(u, k) != v:
-                    setattr(u, k, v)
-                    dirty = True
-            if dirty:
-                try:
-                    with transaction.atomic():
-                        u.save(update_fields=set_always.keys())
-                except IntegrityError:
-                    # This might only raise IntegrityError if the email address is used
-                    # by someone else
-                    raise EmailAddressTakenError()
-            return u
-        except self.model.DoesNotExist:
-            pass
-
-        # Second, check if we find the user based on their email address and this backend
-        try:
-            u = self.get(
-                auth_backend=backend,
-                auth_backend_identifier__isnull=True,
-                email=email,
-            )
-            u.auth_backend_identifier = identifier
-            for k, v in set_always.items():
-                setattr(u, k, v)
-            try:
-                with transaction.atomic():
-                    u.save(update_fields=['auth_backend_identifier'] + list(set_always.keys()))
-                return u
-            except IntegrityError:
-                # This might only raise IntegrityError if this code is being executed twice
-                # and runs into a race condition, this mechanism is taken from Django's
-                # get_or_create
-                try:
-                    return self.get(
-                        auth_backend=backend,
-                        auth_backend_identifier=identifier,
-                    )
-                except self.model.DoesNotExist:
-                    pass
-                raise
-        except self.model.DoesNotExist:
-            pass
-
-        # Third, create a new user
-        u = User(
-            auth_backend=backend,
-            auth_backend_identifier=identifier,
-            **set_on_creation,
-            **set_always,
-        )
-        try:
-            u.save(force_insert=True)
-            return u
-        except IntegrityError:
-            # This might either be a race condition or the email address is taken
-            # by a different backend
-            try:
-                return self.get(
-                    auth_backend=backend,
-                    auth_backend_identifier=identifier,
-                )
-            except self.model.DoesNotExist:
-                raise EmailAddressTakenError()
-
 
 def generate_notifications_token():
     return get_random_string(length=32)
@@ -231,10 +117,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
     :type needs_password_change: bool
     :param timezone: The user's preferred timezone.
     :type timezone: str
-    :param auth_backend: The identifier of the authentication backend plugin responsible for managing this user.
-    :type auth_backend: str
-    :param auth_backend_identifier: The native identifier of the user provided by a non-native authentication backend.
-    :type auth_backend_identifier: str
     """
 
     USERNAME_FIELD = 'email'
@@ -270,7 +152,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
     )
     notifications_token = models.CharField(max_length=255, default=generate_notifications_token)
     auth_backend = models.CharField(max_length=255, default='native')
-    auth_backend_identifier = models.CharField(max_length=190, db_index=True, null=True, blank=True)
     session_token = models.CharField(max_length=32, default=generate_session_token)
 
     objects = UserManager()
@@ -283,7 +164,6 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin):
         verbose_name = _("User")
         verbose_name_plural = _("Users")
         ordering = ('email',)
-        unique_together = (('auth_backend', 'auth_backend_identifier'),)
 
     def save(self, *args, **kwargs):
         self.email = self.email.lower()

src/pretix/base/models/checkin.py

@@ -221,7 +221,7 @@ class CheckinList(LoggedModel):
             return rules
 
         if operator in ('or', 'and') and seen_nonbool:
-            raise ValidationError('You cannot use OR/AND logic on a level below a comparison operator.')
+            raise ValidationError(f'You cannot use OR/AND logic on a level below a comparison operator.')
 
         for v in values:
             cls.validate_rules(v, seen_nonbool=seen_nonbool or operator not in ('or', 'and'), depth=depth + 1)

src/pretix/base/models/customers.py

@@ -172,7 +172,6 @@ class Customer(LoggedModel):
         return salted_hmac(key_salt, payload).hexdigest()
 
     def get_email_context(self):
-        from pretix.base.email import get_name_parts_localized
         ctx = {
             'name': self.name,
             'organizer': self.organizer.name,
@@ -181,13 +180,7 @@ class Customer(LoggedModel):
         for f, l, w in name_scheme['fields']:
             if f == 'full_name':
                 continue
-            ctx['name_%s' % f] = get_name_parts_localized(self.name_parts, f)
-
-        if "concatenation_for_salutation" in name_scheme:
-            ctx['name_for_salutation'] = name_scheme["concatenation_for_salutation"](self.name_parts)
-        else:
-            ctx['name_for_salutation'] = name_scheme["concatenation"](self.name_parts)
-
+            ctx['name_%s' % f] = self.name_parts.get(f, '')
         return ctx
 
     @property

src/pretix/base/models/event.py

@@ -665,13 +665,13 @@ class Event(EventMixin, LoggedModel):
 
         return locking.LockManager(self)
 
-    def get_mail_backend(self, timeout=None):
+    def get_mail_backend(self, timeout=None, force_custom=False):
         """
         Returns an email server connection, either by using the system-wide connection
         or by returning a custom one based on the event's settings.
         """
 
-        if self.settings.smtp_use_custom:
+        if self.settings.smtp_use_custom or force_custom:
             return get_connection(backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
                                   host=self.settings.smtp_host,
                                   port=self.settings.smtp_port,
@@ -1179,21 +1179,21 @@ class Event(EventMixin, LoggedModel):
             if not p.name.startswith('.') and getattr(p, 'visible', True)
         }
 
-    def set_active_plugins(self, modules, allow_restricted=frozenset()):
+    def set_active_plugins(self, modules, allow_restricted=False):
         plugins_active = self.get_plugins()
         plugins_available = self.get_available_plugins()
 
         enable = [m for m in modules if m not in plugins_active and m in plugins_available]
 
         for module in enable:
-            if getattr(plugins_available[module].app, 'restricted', False) and module not in allow_restricted:
+            if getattr(plugins_available[module].app, 'restricted', False) and not allow_restricted:
                 modules.remove(module)
             elif hasattr(plugins_available[module].app, 'installed'):
                 getattr(plugins_available[module].app, 'installed')(self)
 
         self.plugins = ",".join(modules)
 
-    def enable_plugin(self, module, allow_restricted=frozenset()):
+    def enable_plugin(self, module, allow_restricted=False):
         plugins_active = self.get_plugins()
         from pretix.presale.style import regenerate_css
 

src/pretix/base/models/items.py

@@ -44,7 +44,7 @@ import dateutil.parser
 import pytz
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.core.validators import MinValueValidator, RegexValidator
+from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models import Q
 from django.utils import formats
@@ -479,14 +479,12 @@ class Item(LoggedModel):
     min_per_order = models.IntegerField(
         verbose_name=_('Minimum amount per order'),
         null=True, blank=True,
-        validators=[MinValueValidator(0)],
         help_text=_('This product can only be bought if it is added to the cart at least this many times. If you keep '
                     'the field empty or set it to 0, there is no special limit for this product.')
     )
     max_per_order = models.IntegerField(
         verbose_name=_('Maximum amount per order'),
         null=True, blank=True,
-        validators=[MinValueValidator(0)],
         help_text=_('This product can only be bought at most this many times within one order. If you keep the field '
                     'empty or set it to 0, there is no special limit for this product. The limit for the maximum '
                     'number of items in the whole order applies regardless.')
@@ -1699,7 +1697,7 @@ class Quota(LoggedModel):
             if event != item.event:
                 raise ValidationError(_('One or more items do not belong to this event.'))
             if item.has_variations:
-                if not variations or not any(var.item == item for var in variations):
+                if not any(var.item == item for var in variations):
                     raise ValidationError(_('One or more items has variations but none of these are in the variations list.'))
 
     @staticmethod

src/pretix/base/models/orders.py

@@ -976,7 +976,7 @@ class Order(LockModel, LoggedModel):
             SendMailException, TolerantDict, mail, render_mail,
         )
 
-        if not self.email and not (position and position.attendee_email):
+        if not self.email:
             return
 
         for k, v in self.event.meta_data.items():
@@ -1724,10 +1724,10 @@ class OrderPayment(models.Model):
             email_context = get_email_context(event=self.order.event, order=self.order, position=position)
             email_subject = _('Event registration confirmed: %(code)s') % {'code': self.order.code}
             try:
-                position.send_mail(
+                self.order.send_mail(
                     email_subject, email_template, email_context,
                     'pretix.event.order.email.order_paid', user,
-                    invoices=[],
+                    invoices=[], position=position,
                     attach_tickets=True,
                     attach_ical=self.order.event.settings.mail_attach_ical
                 )

src/pretix/base/models/organizer.py

@@ -191,12 +191,12 @@ class Organizer(LoggedModel):
             e.delete()
         self.teams.all().delete()
 
-    def get_mail_backend(self, timeout=None):
+    def get_mail_backend(self, timeout=None, force_custom=False):
         """
         Returns an email server connection, either by using the system-wide connection
         or by returning a custom one based on the organizer's settings.
         """
-        if self.settings.smtp_use_custom:
+        if self.settings.smtp_use_custom or force_custom:
             return get_connection(backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
                                   host=self.settings.smtp_host,
                                   port=self.settings.smtp_port,

src/pretix/base/models/seating.py

@@ -26,7 +26,7 @@ import jsonschema
 from django.contrib.staticfiles import finders
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import Exists, F, OuterRef, Q, Subquery, Value
+from django.db.models import Exists, F, OuterRef, Q, Value
 from django.db.models.functions import Power
 from django.utils.deconstruct import deconstructible
 from django.utils.timezone import now
@@ -281,26 +281,10 @@ class Seat(models.Model):
             q = Q(has_order=True) | Q(has_voucher=True)
             if ignore_cart is not True:
                 q |= Q(has_cart=True)
-
-            # The following looks like it makes no sense. Why wouldn't we just use ``Value(self.x)``, we already now
-            # the value? The reason is that x and y are floating point values generated from our JSON files. As it turns
-            # out, PostgreSQL MIGHT store floating point values with a different precision based on the underlying system
-            # architecture. So if we generate e.g. 670.247128887222289 from the JSON file and store it to the database,
-            # PostgreSQL will store it as 670.247128887222289 internally. However if we query it again, we only get
-            # 670.247128887222 back. But if we do calculations with a field in PostgreSQL itself, it uses the full
-            # precision for the calculation.
-            # We don't actually care about the results with this precision, but we care that the results from this
-            # function are exactly the same as from event.free_seats(), so we do this subquery trick to deal with
-            # PostgreSQL's internal values in both cases.
-            # In the long run, we probably just want to round the numbers on insert...
-            # See also https://www.postgresql.org/docs/11/runtime-config-client.html#GUC-EXTRA-FLOAT-DIGITS
-            self_x = Subquery(Seat.objects.filter(pk=self.pk).values('x'))
-            self_y = Subquery(Seat.objects.filter(pk=self.pk).values('y'))
-
             qs_closeby_taken = qs_annotated.annotate(
                 distance=(
-                    Power(F('x') - self_x, Value(2), output_field=models.FloatField()) +
-                    Power(F('y') - self_y, Value(2), output_field=models.FloatField())
+                    Power(F('x') - Value(self.x), Value(2), output_field=models.FloatField()) +
+                    Power(F('y') - Value(self.y), Value(2), output_field=models.FloatField())
                 )
             ).exclude(pk=self.pk).filter(
                 q,

src/pretix/base/services/checkin.py

@@ -373,22 +373,22 @@ class SQLLogic:
                 ).astimezone(pytz.UTC))
             elif values[0] == 'date_from':
                 return Coalesce(
-                    F('subevent__date_from'),
-                    F('order__event__date_from'),
+                    F(f'subevent__date_from'),
+                    F(f'order__event__date_from'),
                 )
             elif values[0] == 'date_to':
                 return Coalesce(
-                    F('subevent__date_to'),
-                    F('subevent__date_from'),
-                    F('order__event__date_to'),
-                    F('order__event__date_from'),
+                    F(f'subevent__date_to'),
+                    F(f'subevent__date_from'),
+                    F(f'order__event__date_to'),
+                    F(f'order__event__date_from'),
                 )
             elif values[0] == 'date_admission':
                 return Coalesce(
-                    F('subevent__date_admission'),
-                    F('subevent__date_from'),
-                    F('order__event__date_admission'),
-                    F('order__event__date_from'),
+                    F(f'subevent__date_admission'),
+                    F(f'subevent__date_from'),
+                    F(f'order__event__date_admission'),
+                    F(f'order__event__date_from'),
                 )
             else:
                 raise ValueError(f'Unknown time type {values[0]}')

src/pretix/base/services/export.py

@@ -56,8 +56,6 @@ def export(self, event: Event, fileid: str, provider: str, form_data: Dict[str,
     with language(event.settings.locale, event.settings.region), override(event.settings.timezone):
         responses = register_data_exporters.send(event)
         for receiver, response in responses:
-            if not response:
-                continue
             ex = response(event, event.organizer, set_progress)
             if ex.identifier == provider:
                 d = ex.render(form_data)

src/pretix/base/services/mail.py

@@ -77,7 +77,7 @@ from pretix.base.signals import email_filter, global_email_filter
 from pretix.celery_app import app
 from pretix.helpers.hierarkey import clean_filename
 from pretix.multidomain.urlreverse import build_absolute_uri
-from pretix.presale.ical import get_private_icals
+from pretix.presale.ical import get_ical
 
 logger = logging.getLogger('pretix.base.mail')
 INVALID_ADDRESS = 'invalid-pretix-mail-address'
@@ -217,8 +217,7 @@ def mail(email: Union[str, Sequence[str]], subject: str, template: Union[str, La
                 for bcc_mail in settings_holder.settings.mail_bcc.split(','):
                     bcc.append(bcc_mail.strip())
 
-            if settings_holder.settings.mail_from in (settings.DEFAULT_FROM_EMAIL, settings.MAIL_FROM_ORGANIZERS) \
-                    and settings_holder.settings.contact_mail and not headers.get('Reply-To'):
+            if settings_holder.settings.mail_from == settings.DEFAULT_FROM_EMAIL and settings_holder.settings.contact_mail and not headers.get('Reply-To'):
                 headers['Reply-To'] = settings_holder.settings.contact_mail
 
             prefix = settings_holder.settings.get('mail_prefix')
@@ -430,7 +429,18 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                                     }
                                 )
                         if attach_ical:
-                            for i, cal in enumerate(get_private_icals(event, [position] if position else order.positions.all())):
+                            ical_events = set()
+                            if event.has_subevents:
+                                if position:
+                                    ical_events.add(position.subevent)
+                                else:
+                                    for p in order.positions.all():
+                                        ical_events.add(p.subevent)
+                            else:
+                                ical_events.add(order.event)
+
+                            for i, e in enumerate(ical_events):
+                                cal = get_ical([e])
                                 email.attach('event-{}.ics'.format(i), cal.serialize(), 'text/calendar')
 
             email = email_filter.send_chained(event, 'message', message=email, order=order, user=user)
@@ -579,7 +589,7 @@ def mail_send_task(self, *args, to: List[str], subject: str, body: str, html: st
                             }
                         )
                     raise e
-            if log_target:
+            if logger:
                 log_target.log_action(
                     'pretix.email.error',
                     data={

src/pretix/base/services/notifications.py

@@ -148,7 +148,7 @@ def send_notification_mail(notification: Notification, user: User):
         ),
         'body': body_plain,
         'html': body_html,
-        'sender': settings.MAIL_FROM_NOTIFICATIONS,
+        'sender': settings.MAIL_FROM,
         'headers': {},
         'user': user.pk
     })

src/pretix/base/services/orders.py

@@ -932,7 +932,7 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d
 
 
 def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, log_entry: str,
-                        invoice, payment: OrderPayment, is_free=False):
+                        invoice, payment: OrderPayment):
     email_context = get_email_context(event=event, order=order, payment=payment if pprov else None)
     email_subject = _('Your order: %(code)s') % {'code': order.code}
     try:
@@ -941,7 +941,7 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
             log_entry,
             invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [],
             attach_tickets=True,
-            attach_ical=event.settings.mail_attach_ical and (not event.settings.mail_attach_ical_paid_only or is_free),
+            attach_ical=event.settings.mail_attach_ical,
             attach_other_files=[a for a in [
                 event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
             ] if a],
@@ -950,17 +950,18 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider,
         logger.exception('Order received email could not be sent')
 
 
-def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, log_entry: str, is_free=False):
+def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, log_entry: str):
     email_context = get_email_context(event=event, order=order, position=position)
     email_subject = _('Your event registration: %(code)s') % {'code': order.code}
 
     try:
-        position.send_mail(
+        order.send_mail(
             email_subject, email_template, email_context,
             log_entry,
             invoices=[],
             attach_tickets=True,
-            attach_ical=event.settings.mail_attach_ical and (not event.settings.mail_attach_ical_paid_only or is_free),
+            position=position,
+            attach_ical=event.settings.mail_attach_ical,
             attach_other_files=[a for a in [
                 event.settings.get('mail_attachment_new_order', as_type=str, default='')[len('file://'):]
             ] if a],
@@ -1069,13 +1070,11 @@ def _perform_order(event: Event, payment_provider: str, position_ids: List[str],
             email_attendees_template = event.settings.mail_text_order_placed_attendee
 
         if sales_channel in event.settings.mail_sales_channel_placed_paid:
-            _order_placed_email(event, order, pprov, email_template, log_entry, invoice, payment,
-                                is_free=free_order_flow)
+            _order_placed_email(event, order, pprov, email_template, log_entry, invoice, payment)
             if email_attendees:
                 for p in order.positions.all():
                     if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email:
-                        _order_placed_email_attendee(event, order, p, email_attendees_template, log_entry,
-                                                     is_free=free_order_flow)
+                        _order_placed_email_attendee(event, order, p, email_attendees_template, log_entry)
 
     return order.id
 
@@ -1593,22 +1592,21 @@ class OrderChangeManager:
 
             op = opcache[a['addon_to']]
             item = _items_cache[a['item']]
-            subevent = op.subevent  # for now, we might lift this requirement later
             variation = _variations_cache[a['variation']] if a['variation'] is not None else None
 
             if item.category_id not in available_categories[op.pk]:
                 raise OrderError(error_messages['addon_invalid_base'])
 
             # Fetch all quotas. If there are no quotas, this item is not allowed to be sold.
-            quotas = list(item.quotas.filter(subevent=subevent)
-                          if variation is None else variation.quotas.filter(subevent=subevent))
+            quotas = list(item.quotas.filter(subevent=op.subevent)
+                          if variation is None else variation.quotas.filter(subevent=op.subevent))
             if not quotas:
                 raise OrderError(error_messages['unavailable'])
 
             if (a['item'], a['variation']) in input_addons[op.id]:
                 raise OrderError(error_messages['addon_duplicate_item'])
 
-            if item.require_voucher or item.hide_without_voucher or (variation and variation.hide_without_voucher):
+            if item.require_voucher or op.item.hide_without_voucher or (op.variation and op.variation.hide_without_voucher):
                 raise OrderError(error_messages['voucher_required'])
 
             if not item.is_available() or (variation and not variation.is_available()):
@@ -1618,11 +1616,11 @@ class OrderChangeManager:
                     variation and self.order.sales_channel not in variation.sales_channels):
                 raise OrderError(error_messages['unavailable'])
 
-            if subevent and item.pk in subevent.item_overrides and not subevent.item_overrides[item.pk].is_available():
+            if op.subevent and item.pk in op.subevent.item_overrides and not op.subevent.item_overrides[op.item.pk].is_available():
                 raise OrderError(error_messages['not_for_sale'])
 
-            if subevent and variation and variation.pk in subevent.var_overrides and \
-                    not subevent.var_overrides[variation.pk].is_available():
+            if op.subevent and variation and variation.pk in op.subevent.var_overrides and \
+                    not op.subevent.var_overrides[variation.pk].is_available():
                 raise OrderError(error_messages['not_for_sale'])
 
             if item.has_variations and not variation:
@@ -1631,10 +1629,10 @@ class OrderChangeManager:
             if variation and variation.item_id != item.pk:
                 raise OrderError(error_messages['not_for_sale'])
 
-            if subevent and subevent.presale_start and now() < subevent.presale_start:
+            if op.subevent and op.subevent.presale_start and now() < op.subevent.presale_start:
                 raise OrderError(error_messages['not_started'])
 
-            if (subevent and subevent.presale_has_ended) or self.event.presale_has_ended:
+            if (op.subevent and op.subevent.presale_has_ended) or self.event.presale_has_ended:
                 raise OrderError(error_messages['ended'])
 
             if item.require_bundling:

src/pretix/base/services/seating.py

@@ -45,7 +45,7 @@ def validate_plan_change(event, subevent, plan):
                 seat=OuterRef('pk'),
                 canceled=False,
             ).exclude(
-                order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)
+                order__status=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)
             ))
         ).annotate(has_v=Count('vouchers')).filter(
             subevent=subevent,
@@ -69,7 +69,7 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None):
             seat=OuterRef('pk'),
             canceled=False,
         ).exclude(
-            order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)
+            order__status=Order.STATUS_CANCELED
         )),
         has_v=Count('vouchers')
     ).filter(subevent=subevent).order_by():
@@ -134,7 +134,7 @@ def generate_seats(event, subevent, plan, mapping, blocked_guids=None):
     Seat.objects.bulk_create(create_seats)
     CartPosition.objects.filter(seat__in=[s.pk for s in current_seats.values()]).delete()
     OrderPosition.all.filter(
-        Q(canceled=True) | Q(order__status__in=(Order.STATUS_CANCELED, Order.STATUS_EXPIRED)),
+        Q(canceled=True) | Q(order__status=Order.STATUS_CANCELED),
         seat__in=[s.pk for s in current_seats.values()],
     ).update(seat=None)
     Seat.objects.filter(pk__in=[s.pk for s in current_seats.values()]).delete()

src/pretix/base/settings.py

@@ -94,25 +94,6 @@ def primary_font_kwargs():
     }
 
 
-def restricted_plugin_kwargs():
-    from pretix.base.plugins import get_all_plugins
-
-    plugins_available = [
-        (p.module, p.name) for p in get_all_plugins(None)
-        if (
-            not p.name.startswith('.') and
-            getattr(p, 'visible', True) and
-            getattr(p, 'restricted', False) and
-            not hasattr(p, 'is_available')  # this means you should not really use restricted and is_available
-        )
-    ]
-    return {
-        'widget': forms.CheckboxSelectMultiple,
-        'label': _("Allow usage of restricted plugins"),
-        'choices': plugins_available,
-    }
-
-
 class LazyI18nStringList(UserList):
     def __init__(self, init_list=None):
         super().__init__()
@@ -128,13 +109,6 @@ class LazyI18nStringList(UserList):
 
 
 DEFAULTS = {
-    'allowed_restricted_plugins': {
-        'default': [],
-        'type': list,
-        'form_class': forms.MultipleChoiceField,
-        'serializer_class': serializers.MultipleChoiceField,
-        'form_kwargs': lambda: restricted_plugin_kwargs(),
-    },
     'customer_accounts': {
         'default': 'False',
         'type': bool,
@@ -1599,32 +1573,6 @@ DEFAULTS = {
             help_text=_("If enabled, we will attach an .ics calendar file to order confirmation emails."),
         )
     },
-    'mail_attach_ical_paid_only': {
-        'default': 'False',
-        'type': bool,
-        'form_class': forms.BooleanField,
-        'serializer_class': serializers.BooleanField,
-        'form_kwargs': dict(
-            label=_("Attach calendar files only after order has been paid"),
-            help_text=_("Use this if you e.g. put a private access link into the calendar file to make sure people only "
-                        "receive it after their payment was confirmed."),
-        )
-    },
-    'mail_attach_ical_description': {
-        'default': '',
-        'type': LazyI18nString,
-        'form_class': I18nFormField,
-        'form_kwargs': dict(
-            label=_("Event description"),
-            widget=I18nTextarea,
-            help_text=_(
-                "You can use this to share information with your attendees, such as travel information or the link to a digital event. "
-                "If you keep it empty, we will put a link to the event shop, the admission time, and your organizer name in there. "
-                "We do not allow using placeholders with sensitive person-specific data as calendar entries are often shared with an "
-                "unspecified number of people."
-            ),
-        )
-    },
     'mail_prefix': {
         'default': None,
         'type': str,
@@ -1641,7 +1589,7 @@ DEFAULTS = {
         'type': str
     },
     'mail_from': {
-        'default': settings.MAIL_FROM_ORGANIZERS,
+        'default': settings.MAIL_FROM,
         'type': str,
         'form_class': forms.EmailField,
         'serializer_class': serializers.EmailField,

src/pretix/base/shredder.py

@@ -34,6 +34,7 @@
 
 import json
 import os
+from datetime import timedelta
 from typing import List, Tuple
 
 from django.db import transaction
@@ -69,11 +70,11 @@ def shred_constraints(event: Event):
             max_fromto=Greatest(Max('date_to'), Max('date_from'))
         )
         max_date = max_date['max_fromto'] or max_date['max_to'] or max_date['max_from']
-        if max_date is not None and max_date >= now():
-            return _('Your event needs to be over to use this feature.')
+        if max_date is not None and max_date > now() - timedelta(days=30):
+            return _('Your event needs to be over for at least 30 days to use this feature.')
     else:
-        if (event.date_to or event.date_from) >= now():
-            return _('Your event needs to be over to use this feature.')
+        if (event.date_to or event.date_from) > now() - timedelta(days=30):
+            return _('Your event needs to be over for at least 30 days to use this feature.')
     if event.live:
         return _('Your ticket shop needs to be offline to use this feature.')
     return None

src/pretix/base/views/redirect.py

@@ -23,8 +23,8 @@ import urllib.parse
 
 from django.core import signing
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
-from django.shortcuts import render
 from django.urls import reverse
+from django.shortcuts import render
 
 
 def _is_samesite_referer(request):

src/pretix/base/views/tasks.py

@@ -205,8 +205,6 @@ class AsyncFormView(AsyncMixin, FormView):
     Also, all form keyword arguments except ``instance`` need to be serializable.
     """
     known_errortypes = ['ValidationError']
-    expected_exceptions = (ValidationError,)
-    task_base = ProfiledEventTask
 
     def __init_subclass__(cls):
         def async_execute(self, *, request_path, query_string, form_kwargs, locale, tz, organizer=None, event=None, user=None, session_key=None):
@@ -224,7 +222,7 @@ class AsyncFormView(AsyncMixin, FormView):
             elif organizer:
                 view_instance.request.organizer = organizer
             if user:
-                view_instance.request.user = User.objects.get(pk=user) if isinstance(user, int) else user
+                view_instance.request.user = User.objects.get(pk=user)
             if session_key:
                 engine = import_module(settings.SESSION_ENGINE)
                 self.SessionStore = engine.SessionStore
@@ -233,7 +231,7 @@ class AsyncFormView(AsyncMixin, FormView):
             with translation.override(locale), timezone.override(pytz.timezone(tz)):
                 form_class = view_instance.get_form_class()
                 if form_kwargs.get('instance'):
-                    form_kwargs['instance'] = cls.model.objects.get(pk=form_kwargs['instance'])
+                    cls.model.objects.get(pk=form_kwargs['instance'])
 
                 form_kwargs = view_instance.get_async_form_kwargs(form_kwargs, organizer, event)
                 form = form_class(**form_kwargs)
@@ -241,10 +239,10 @@ class AsyncFormView(AsyncMixin, FormView):
                 return view_instance.async_form_valid(self, form)
 
         cls.async_execute = app.task(
-            base=cls.task_base,
+            base=ProfiledEventTask,
             bind=True,
             name=cls.__module__ + '.' + cls.__name__ + '.async_execute',
-            throws=cls.expected_exceptions
+            throws=(ValidationError,)
         )(async_execute)
 
     def async_form_valid(self, task, form):

src/pretix/control/forms/__init__.py

@@ -48,7 +48,7 @@ from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 from django_scopes.forms import SafeModelMultipleChoiceField
 
-from ...base.forms import I18nModelForm
+from ...base.forms import I18nModelForm, SecretKeySettingsField
 
 # Import for backwards compatibility with okd import paths
 from ...base.forms.widgets import (  # noqa
@@ -373,6 +373,49 @@ class FontSelect(forms.RadioSelect):
     option_template_name = 'pretixcontrol/font_option.html'
 
 
+class SMTPSettingsMixin(forms.Form):
+    smtp_use_custom = forms.BooleanField(
+        label=_("Use custom SMTP server"),
+        help_text=_("All mail related to your event will be sent over the smtp server specified by you."),
+        required=False
+    )
+    smtp_host = forms.CharField(
+        label=_("Hostname"),
+        required=False,
+        widget=forms.TextInput(attrs={'placeholder': 'mail.example.org'})
+    )
+    smtp_port = forms.IntegerField(
+        label=_("Port"),
+        required=False,
+        widget=forms.TextInput(attrs={'placeholder': 'e.g. 587, 465, 25, ...'})
+    )
+    smtp_username = forms.CharField(
+        label=_("Username"),
+        widget=forms.TextInput(attrs={'placeholder': 'myuser@example.org'}),
+        required=False
+    )
+    smtp_password = SecretKeySettingsField(
+        label=_("Password"),
+        required=False,
+    )
+    smtp_use_tls = forms.BooleanField(
+        label=_("Use STARTTLS"),
+        help_text=_("Commonly enabled on port 587."),
+        required=False
+    )
+    smtp_use_ssl = forms.BooleanField(
+        label=_("Use SSL"),
+        help_text=_("Commonly enabled on port 465."),
+        required=False
+    )
+
+    def clean(self):
+        data = super().clean()
+        if data.get('smtp_use_tls') and data.get('smtp_use_ssl'):
+            raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
+        return data
+
+
 class ItemMultipleChoiceField(SafeModelMultipleChoiceField):
     def label_from_instance(self, obj):
         return str(obj) if obj.active else mark_safe(f'<strike class="text-muted">{escape(obj)}</strike>')

src/pretix/control/forms/event.py

@@ -64,7 +64,7 @@ from pretix.base.settings import (
     PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS, validate_event_settings,
 )
 from pretix.control.forms import (
-    MultipleLanguagesWidget, SlugWidget, SplitDateTimeField,
+    MultipleLanguagesWidget, SlugWidget, SMTPSettingsMixin, SplitDateTimeField,
     SplitDateTimePickerWidget,
 )
 from pretix.control.forms.widgets import Select2
@@ -865,15 +865,14 @@ def contains_web_channel_validate(val):
         raise ValidationError(_("The online shop must be selected to receive these emails."))
 
 
-class MailSettingsForm(SettingsForm):
+class MailSettingsForm(SMTPSettingsMixin, SettingsForm):
     auto_fields = [
         'mail_prefix',
+        'mail_from',
         'mail_from_name',
         'mail_attach_ical',
         'mail_attach_tickets',
         'mail_attachment_new_order',
-        'mail_attach_ical_paid_only',
-        'mail_attach_ical_description',
     ]
 
     mail_sales_channel_placed_paid = forms.MultipleChoiceField(
@@ -1081,8 +1080,7 @@ class MailSettingsForm(SettingsForm):
         'mail_text_download_reminder_attendee': ['event', 'order', 'position'],
         'mail_text_resend_link': ['event', 'order'],
         'mail_text_waiting_list': ['event', 'waiting_list_entry'],
-        'mail_text_resend_all_links': ['event', 'orders'],
-        'mail_attach_ical_description': ['event', 'event_or_subevent'],
+        'mail_text_resend_all_links': ['event', 'orders']
     }
 
     def _set_field_placeholders(self, fn, base_parameters):

src/pretix/control/forms/filter.py

@@ -1881,7 +1881,7 @@ class VoucherFilterForm(FilterForm):
             if s == '<>':
                 qs = qs.filter(Q(tag__isnull=True) | Q(tag=''))
             elif s[0] == '"' and s[-1] == '"':
-                qs = qs.filter(tag__exact=s[1:-1])
+                qs = qs.filter(tag__iexact=s[1:-1])
             else:
                 qs = qs.filter(tag__icontains=s)
 

src/pretix/control/forms/item.py

@@ -627,9 +627,7 @@ class ItemUpdateForm(I18nModelForm):
                 'class': 'scrolling-multiple-choice'
             }),
             'generate_tickets': TicketNullBooleanSelect(),
-            'show_quota_left': ShowQuotaNullBooleanSelect(),
-            'max_per_order': forms.widgets.NumberInput(attrs={'min': 0}),
-            'min_per_order': forms.widgets.NumberInput(attrs={'min': 0}),
+            'show_quota_left': ShowQuotaNullBooleanSelect()
         }
 
 

src/pretix/control/forms/mailsetup.py

@@ -1,129 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-2021 rami.io GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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 socket
-
-from django import forms
-from django.conf import settings
-from django.core.exceptions import ValidationError
-from django.utils.translation import gettext_lazy as _
-
-from pretix.base.forms import SecretKeySettingsField, SettingsForm
-
-
-class SMTPMailForm(SettingsForm):
-    mail_from = forms.EmailField(
-        label=_("Sender address"),
-        help_text=_("Sender address for outgoing emails"),
-        required=True,
-    )
-    smtp_host = forms.CharField(
-        label=_("Hostname"),
-        required=True,
-        widget=forms.TextInput(attrs={'placeholder': 'mail.example.org'})
-    )
-    smtp_port = forms.IntegerField(
-        label=_("Port"),
-        required=True,
-        widget=forms.TextInput(attrs={'placeholder': 'e.g. 587, 465, 25, ...'})
-    )
-    smtp_username = forms.CharField(
-        label=_("Username"),
-        widget=forms.TextInput(attrs={'placeholder': 'myuser@example.org'}),
-        required=False
-    )
-    smtp_password = SecretKeySettingsField(
-        label=_("Password"),
-        required=False,
-    )
-    smtp_use_tls = forms.BooleanField(
-        label=_("Use STARTTLS"),
-        help_text=_("Commonly enabled on port 587."),
-        required=False
-    )
-    smtp_use_ssl = forms.BooleanField(
-        label=_("Use SSL"),
-        help_text=_("Commonly enabled on port 465."),
-        required=False
-    )
-
-    def clean(self):
-        data = super().clean()
-        if data.get('smtp_use_tls') and data.get('smtp_use_ssl'):
-            raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
-        for k, v in self.fields.items():
-            val = data.get(k)
-            if v._required and not val:
-                self.add_error(k, _('This field is required.'))
-        return data
-
-    def clean_smtp_host(self):
-        v = self.cleaned_data['smtp_host']
-        if not settings.MAIL_CUSTOM_SMTP_ALLOW_PRIVATE_NETWORKS:
-            try:
-                if ipaddress.ip_address(v).is_private:
-                    raise ValidationError(_('You are not allowed to use this mail server, please choose one with a '
-                                            'public IP address instead.'))
-            except ValueError:
-                try:
-                    if ipaddress.ip_address(socket.gethostbyname(v)).is_private:
-                        raise ValidationError(_('You are not allowed to use this mail server, please choose one with a '
-                                                'public IP address instead.'))
-                except OSError:
-                    raise ValidationError(_('We were unable to resolve this hostname.'))
-        return v
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if self.obj.settings.mail_from in (settings.MAIL_FROM, settings.MAIL_FROM_ORGANIZERS):
-            self.initial.pop('mail_from')
-
-        for k, v in self.fields.items():
-            v._required = v.required
-            v.required = False
-            v.widget.is_required = False
-
-
-class SimpleMailForm(SettingsForm):
-    mail_from = forms.EmailField(
-        label=_("Sender address"),
-        help_text=_("Sender address for outgoing emails"),
-        required=True,
-    )
-
-    def clean(self):
-        cleaned_data = super().clean()
-        for k, v in self.fields.items():
-            val = cleaned_data.get(k)
-            if v._required and not val:
-                self.add_error(k, _('This field is required.'))
-        return cleaned_data
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if self.obj.settings.mail_from in (settings.MAIL_FROM, settings.MAIL_FROM_ORGANIZERS):
-            self.initial.pop('mail_from')
-
-        for k, v in self.fields.items():
-            v._required = v.required
-            v.required = False
-            v.widget.is_required = False

src/pretix/control/forms/orders.py

@@ -612,7 +612,7 @@ class OrderMailForm(forms.Form):
     )
     attach_tickets = forms.BooleanField(
         label=_("Attach tickets"),
-        help_text=_("Will be ignored if tickets exceed a given size limit to ensure email deliverability."),
+        help_text=_("Will be ignored if all tickets in this order exceed a given size limit to ensure email deliverability."),
         required=False
     )
     attach_invoices = forms.ModelMultipleChoiceField(

src/pretix/control/forms/organizer.py

@@ -60,7 +60,9 @@ from pretix.base.models import (
     MembershipType, Organizer, Team,
 )
 from pretix.base.settings import PERSON_NAME_SCHEMES, PERSON_NAME_TITLE_GROUPS
-from pretix.control.forms import ExtFileField, SplitDateTimeField
+from pretix.control.forms import (
+    ExtFileField, SMTPSettingsMixin, SplitDateTimeField,
+)
 from pretix.control.forms.event import (
     SafeEventMultipleChoiceField, multimail_validate,
 )
@@ -286,7 +288,6 @@ class OrganizerSettingsForm(SettingsForm):
         required=False,
     )
     auto_fields = [
-        'allowed_restricted_plugins',
         'customer_accounts',
         'customer_accounts_link_by_email',
         'invoice_regenerate_allowed',
@@ -340,12 +341,7 @@ class OrganizerSettingsForm(SettingsForm):
     )
 
     def __init__(self, *args, **kwargs):
-        is_admin = kwargs.pop('is_admin', False)
         super().__init__(*args, **kwargs)
-
-        if not is_admin:
-            del self.fields['allowed_restricted_plugins']
-
         self.fields['name_scheme'].choices = (
             (k, _('Ask for {fields}, display like {example}').format(
                 fields=' + '.join(str(vv[1]) for vv in v['fields']),
@@ -362,8 +358,9 @@ class OrganizerSettingsForm(SettingsForm):
         ]
 
 
-class MailSettingsForm(SettingsForm):
+class MailSettingsForm(SMTPSettingsMixin, SettingsForm):
     auto_fields = [
+        'mail_from',
         'mail_from_name',
     ]
 
@@ -428,7 +425,6 @@ class MailSettingsForm(SettingsForm):
                 if f == 'full_name':
                     continue
                 placeholders['name_%s' % f] = name_scheme['sample'][f]
-            placeholders['name_for_salutation'] = _("Mr Doe")
         return placeholders
 
     def _set_field_placeholders(self, fn, base_parameters):

src/pretix/control/templates/pretixcontrol/email/email_setup.txt

@@ -1,14 +0,0 @@
-{% load i18n %}{% blocktrans with code=code instance=instance %}Hello,
-
-someone requested to use {{ address }} as a sender address on {{ instance }}.
-This will allow them to send emails that are shown to originate from this email address.
-If that was you, please enter the following confirmation code:
-
-{{ code }}
-
-If this was not requested by you, you can safely ignore this email.
-
-Best regards,
-
-Your {{ instance }} team
-{% endblocktrans %}

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

@@ -1,127 +0,0 @@
-{% extends basetpl %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load hierarkey_form %}
-{% load static %}
-{% block title %}{% trans "Organizer" %}{% endblock %}
-{% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        <div class="panel-group" id="email">
-            <div class="panel panel-default">
-                <div class="accordion-radio">
-                    <div class="panel-heading">
-                        <p class="panel-title">
-                            <input type="radio" name="mode" value="system"
-                                   data-parent="#email"
-                                   {% if mode == "system" %}checked="checked"{% endif %}
-                                   id="input_mode_system"
-                                   data-toggle="radiocollapse" data-target="#mode_system"/>
-                            <label for="input_mode_system"><strong>{% trans "Use system default" %}</strong></label>
-                        </p>
-                    </div>
-                </div>
-                <div id="mode_system"
-                     class="panel-collapse collapsed {% if mode == "system" %}in{% endif %}">
-                    <div class="panel-body form-horizontal">
-                        <p>
-                            {% blocktrans trimmed %}
-                                E-mails will be sent through the system's default server. They will show the following
-                                sender information:
-                            {% endblocktrans %}
-                        </p>
-                        <dl class="dl-horizontal">
-                            <dt>{% trans "From" context "mail_header" %}</dt>
-                            <dd>{{ object.settings.mail_from_name|default_if_none:object.name }}
-                                &lt;{{ default_sender_address }}&gt;
-                            </dd>
-                            {% if object.settings.contact_mail %}
-                                <dt>{% trans "Reply-To" context "mail_header" %}</dt>
-                                <dd>{{ object.settings.contact_mail }}</dd>
-                            {% endif %}
-                        </dl>
-                    </div>
-                </div>
-            </div>
-            <div class="panel panel-default">
-                <div class="accordion-radio">
-                    <div class="panel-heading">
-                        <p class="panel-title">
-                            <input type="radio" name="mode" value="simple"
-                                   data-parent="#email"
-                                   {% if mode == "simple" %}checked="checked"{% endif %}
-                                   id="input_mode_simple"
-                                   data-toggle="radiocollapse" data-target="#mode_simple"/>
-                            <label for="input_mode_simple"><strong>{% trans "Use system email server with a custom sender address" %}</strong></label>
-                        </p>
-                    </div>
-                </div>
-                <div id="mode_simple"
-                     class="panel-collapse collapsed {% if mode == "simple" %}in{% endif %}">
-                    <div class="panel-body form-horizontal">
-                        <p>
-                            {% blocktrans trimmed %}
-                                E-mails will be sent through the system's default server but with your own sender
-                                address.
-                                This will make your emails look more personalized and coming directly from you, but it
-                                also might require some extra steps to ensure good deliverability.
-                            {% endblocktrans %}
-                        </p>
-                        {% bootstrap_form simple_form layout="control" %}
-                    </div>
-                </div>
-            </div>
-            <div class="panel panel-default">
-                <div class="accordion-radio">
-                    <div class="panel-heading">
-                        <p class="panel-title">
-                            <input type="radio" name="mode" value="smtp"
-                                   data-parent="#email"
-                                   {% if mode == "smtp" %}checked="checked"{% endif %}
-                                   id="input_mode_smtp"
-                                   data-toggle="radiocollapse" data-target="#mode_smtp"/>
-                            <label for="input_mode_smtp"><strong>{% trans "Use a custom SMTP server" %}</strong></label>
-                        </p>
-                    </div>
-                </div>
-                <div id="mode_smtp"
-                     class="panel-collapse collapsed {% if mode == "smtp" %}in{% endif %}">
-                    <div class="panel-body form-horizontal">
-                        <p>
-                            {% blocktrans trimmed %}
-                                For full customization, you can configure your own SMTP server that will be used for
-                                email sending.
-                            {% endblocktrans %}
-                        </p>
-                        {% bootstrap_form smtp_form layout="control" %}
-                    </div>
-                </div>
-            </div>
-            {% if request.event %}
-                <div class="panel panel-default">
-                    <div class="accordion-radio">
-                        <div class="panel-heading">
-                            <p class="panel-title">
-                                <input type="radio" name="mode" value="reset"
-                                       data-parent="#reset"
-                                       id="input_mode_reset"
-                                       data-toggle="radiocollapse" data-target="#mode_reset"/>
-                                <label for="input_mode_reset"><strong>{% trans "Reset to organizer settings" %}</strong></label>
-                            </p>
-                        </div>
-                    </div>
-                    <div id="mode_reset"
-                         class="panel-collapse collapsed {% if mode == "reset" %}in{% endif %}">
-                    </div>
-                </div>
-            {% endif %}
-        </div>
-
-        <div class="form-group submit-group">
-            <button type="submit" class="btn btn-primary btn-save">
-                {% trans "Continue" %}
-            </button>
-        </div>
-    </form>
-{% endblock %}

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

@@ -1,79 +0,0 @@
-{% extends basetpl %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load hierarkey_form %}
-{% load static %}
-{% block title %}{% trans "Organizer" %}{% endblock %}
-{% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% for k, v in request.POST.items %}
-            <input type="hidden" name="{{ k }}" value="{{ v }}">
-        {% endfor %}
-        <input type="hidden" name="state" value="save">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <p class="panel-title">
-                    <strong>{% trans "Use system email server with a custom sender address" %}</strong>
-                </p>
-            </div>
-            <div class="panel-body form-horizontal">
-                {% if spf_warning %}
-                    <div class="alert alert-warning">
-                        <p>
-                            {{ spf_warning }}
-                        </p>
-                        {% if spf_record %}
-                            <p>
-                                {% trans "This is the SPF record we found on your domain:" %}
-                            </p>
-                            <pre><code>{{ spf_record }}</code></pre>
-                            <p>
-                                {% trans "To fix this, include the following part before the last word:" %}
-                            </p>
-                            <pre><code>{{ spf_key }}</code></pre>
-                        {% else %}
-                            <p>
-                                {% trans "Your new SPF record could look like this:" %}
-                            </p>
-                            <pre><code>v=spf1 a mx {{ spf_key }} ~all</code></pre>
-                        {% endif %}
-                        <p>
-                            {% trans "Please keep in mind that updates to DNS might require multiple hours to take effect." %}
-                        </p>
-                    </div>
-                {% elif spf_key %}
-                    <div class="alert alert-success">
-                        {% blocktrans trimmed %}
-                            We found an SPF record on your domain that includes this system. Great!
-                        {% endblocktrans %}
-                    </div>
-                {% endif %}
-                {% if verification %}
-                    <h3>{% trans "Verification" %}</h3>
-                    <p>
-                        {% blocktrans trimmed with recp=recp %}
-                            We've sent an email to {{ recp }} with a confirmation code to verify that this email address
-                            is owned by you. Please enter the verification code below:
-                        {% endblocktrans %}
-                    </p>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label" for="id_verification">
-                            {% trans "Verification code" %}
-                        </label>
-                        <div class="col-md-9">
-                            <input type="text" name="verification" class="form-control">
-                        </div>
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-
-        <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/email_setup_smtp.html

@@ -1,42 +0,0 @@
-{% extends basetpl %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% load hierarkey_form %}
-{% load static %}
-{% block title %}{% trans "Organizer" %}{% endblock %}
-{% block content %}
-    <h1>{% trans "E-mail sending" %}</h1>
-    <form action="" method="post" class="form-horizontal">
-        {% csrf_token %}
-        {% for k, v in request.POST.items %}
-            <input type="hidden" name="{{ k }}" value="{{ v }}">
-        {% endfor %}
-        <input type="hidden" name="state" value="save">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <p class="panel-title">
-                    <strong>{% trans "Use a custom SMTP server" %}</strong>
-                </p>
-            </div>
-            <div class="panel-body form-horizontal">
-                <div class="alert alert-success">
-                    {% blocktrans trimmed %}
-                        A test connection to your SMTP server was successful. You can now save your new settings
-                        to put them in use.
-                    {% endblocktrans %}
-                </div>
-                {% if known_host_problem %}
-                    <div class="alert alert-warning">
-                        {{ known_host_problem }}
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-
-        <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/event/mail.html

@@ -12,55 +12,17 @@
         <div class="tabbed-form">
             <fieldset>
                 <legend>{% trans "General" %}</legend>
-                {% bootstrap_field form.mail_prefix layout="control" %}
-                {% bootstrap_field form.mail_attach_tickets layout="control" %}
                 {% url "control:organizer.settings.mail" organizer=request.organizer.slug as org_url %}
-                {% propagated request.event org_url "mail_from" "smtp_use_custom" "smtp_host" "smtp_port" "smtp_username" "smtp_password" "smtp_use_tls" "smtp_use_ssl" %}
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">
-                            {% trans "Sending method" %}
-                        </label>
-                        <div class="col-md-9 static-form-row-with-btn">
-                            {% if request.event.settings.smtp_use_custom %}
-                                {% trans "Custom SMTP server" %}: {{ request.event.settings.smtp_host }}
-                            {% else %}
-                                {% trans "System-provided email server" %}
-                            {% endif %}
-                            &nbsp;&nbsp;
-                            <a href="{% url "control:event.settings.mail.setup" organizer=request.organizer.slug event=request.event.slug %}"
-                               class="btn btn-default">
-                                <span class="fa fa-edit"></span>
-                                {% trans "Edit" %}
-                            </a>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">
-                            {% trans "Sender address" %}
-                        </label>
-                        <div class="col-md-9 static-form-row-with-btn">
-                            {{ request.event.settings.mail_from }}
-                            &nbsp;&nbsp;
-                            <a href="{% url "control:event.settings.mail.setup" organizer=request.organizer.slug event=request.event.slug %}"
-                               class="btn btn-default">
-                                <span class="fa fa-edit"></span>
-                                {% trans "Edit" %}
-                            </a>
-                        </div>
-                    </div>
-                {% endpropagated %}
-                {% propagated request.event org_url "mail_from_name" "mail_text_signature" "mail_bcc" %}
+                {% propagated request.event org_url "mail_from" "mail_from_name" "mail_text_signature" "mail_bcc" %}
+                    {% bootstrap_field form.mail_from layout="control" %}
                     {% bootstrap_field form.mail_from_name layout="control" %}
                     {% bootstrap_field form.mail_text_signature layout="control" %}
                     {% bootstrap_field form.mail_bcc layout="control" %}
                 {% endpropagated %}
-                {% bootstrap_field form.mail_sales_channel_placed_paid layout="control" %}
-            </fieldset>
-            <fieldset>
-                <legend>{% trans "Calendar invites" %}</legend>
+                {% bootstrap_field form.mail_prefix layout="control" %}
+                {% bootstrap_field form.mail_attach_tickets layout="control" %}
                 {% bootstrap_field form.mail_attach_ical layout="control" %}
-                {% bootstrap_field form.mail_attach_ical_paid_only layout="control" %}
-                {% bootstrap_field form.mail_attach_ical_description layout="control" %}
+                {% bootstrap_field form.mail_sales_channel_placed_paid layout="control" %}
             </fieldset>
             <fieldset>
                 <legend>{% trans "E-mail design" %}</legend>
@@ -123,11 +85,26 @@
                 <h4>{% trans "Attachments" %}</h4>
                 {% bootstrap_field form.mail_attachment_new_order layout="control" %}
             </fieldset>
+            <fieldset>
+                <legend>{% trans "SMTP settings" %}</legend>
+                {% propagated request.event org_url "smtp_use_custom" "smtp_host" "smtp_port" "smtp_username" "smtp_password" "smtp_use_tls" "smtp_use_ssl" %}
+                    {% bootstrap_field form.smtp_use_custom layout="control" %}
+                    {% bootstrap_field form.smtp_host layout="control" %}
+                    {% bootstrap_field form.smtp_port layout="control" %}
+                    {% bootstrap_field form.smtp_username layout="control" %}
+                    {% bootstrap_field form.smtp_password layout="control" %}
+                    {% bootstrap_field form.smtp_use_tls layout="control" %}
+                    {% bootstrap_field form.smtp_use_ssl layout="control" %}
+                {% endpropagated %}
+            </fieldset>
         </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
             </button>
+            <button type="submit" class="btn btn-default btn-save pull-left" name="test" value="1">
+                {% trans "Save and test custom SMTP connection" %}
+            </button>
         </div>
     </form>
 {% endblock %}

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

@@ -32,9 +32,9 @@
                                                 {% endblocktrans %}</p>
                                         {% endif %}
                                         <p>{{ plugin.description }}</p>
-                                        {% if plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
+                                        {% if plugin.restricted and not request.user.is_staff %}
                                             <span class="text-muted">
-                                                {% trans "This plugin needs to be enabled by a system administrator for your account." %}
+                                                {% trans "This plugin needs to be enabled by a system administrator for your event." %}
                                             </span>
                                         {% endif %}
                                         {% if plugin.app.compatibility_errors %}
@@ -62,7 +62,7 @@
                                         {% if plugin.app.compatibility_errors %}
                                             <button class="btn disabled btn-block btn-default"
                                                     disabled="disabled">{% trans "Incompatible" %}</button>
-                                            {% elif plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}
+                                            {% elif plugin.restricted and not staff_session %}
                                             <button class="btn disabled btn-block btn-default"
                                                     disabled="disabled">{% trans "Not available" %}</button>
                                             {% elif plugin.module in plugins_active %}

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

@@ -46,7 +46,7 @@
                 {% for c in cat_list %}
                     <tbody data-dnd-url="{% url "control:event.items.reorder" organizer=request.event.organizer.slug event=request.event.slug %}">
                     {% for i in c.list %}
-                        {% if forloop.counter0 == 0 and i.category %}<tr class="sortable-disabled"><th colspan="8" scope="colgroup" class="text-muted">{{ i.category }}</th></tr>{% endif %}
+                        {% if forloop.counter0 == 0 and i.category %}<tr class="sortable-disabled"><th colspan="8" scope="colgroup" class="text-muted">{{ i.category.name }}</th></tr>{% endif %}
                         <tr data-dnd-id="{{ i.id }}" {% if not i.active %}class="row-muted"{% endif %}>
                             <td><strong>
                                 {% if not i.active %}<strike>{% endif %}

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

@@ -13,7 +13,7 @@
                 <ul>
                     {% for item in dependent %}
                         <li>
-                            <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item }}</a>
+                            <a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a>
                         </li>
                     {% endfor %}
                 </ul>

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

@@ -36,9 +36,6 @@
                         {% bootstrap_field sform.contact_mail layout="control" %}
                         {% bootstrap_field sform.organizer_info_text layout="control" %}
                         {% bootstrap_field sform.event_team_provisioning layout="control" %}
-                        {% if sform.allowed_restricted_plugins %}
-                            {% bootstrap_field sform.allowed_restricted_plugins layout="control" %}
-                        {% endif %}
                     </fieldset>
                     <fieldset>
                         <legend>{% trans "Organizer page" %}</legend>

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

@@ -11,45 +11,13 @@
     <h1>{% trans "E-mail settings" %}</h1>
 
     <form action="" method="post" class="form-horizontal" enctype="multipart/form-data"
-          mail-preview-url="{% url "control:organizer.settings.mail.preview" organizer=request.organizer.slug %}">
+            mail-preview-url="{% url "control:organizer.settings.mail.preview" organizer=request.organizer.slug %}">
         {% csrf_token %}
         {% bootstrap_form_errors form %}
         <div class="tabbed-form">
             <fieldset>
                 <legend>{% trans "General" %}</legend>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">
-                        {% trans "Sending method" %}
-                    </label>
-                    <div class="col-md-9 static-form-row-with-btn">
-                        {% if request.organizer.settings.smtp_use_custom %}
-                            {% trans "Custom SMTP server" %}: {{ request.organizer.settings.smtp_host }}
-                        {% else %}
-                            {% trans "System-provided email server" %}
-                        {% endif %}
-                        &nbsp;&nbsp;
-                        <a href="{% url "control:organizer.settings.mail.setup" organizer=request.organizer.slug %}"
-                           class="btn btn-default">
-                            <span class="fa fa-edit"></span>
-                            {% trans "Edit" %}
-                        </a>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">
-                        {% trans "Sender address" %}
-                    </label>
-                    <div class="col-md-9 static-form-row-with-btn">
-                        {{ request.organizer.settings.mail_from }}
-                        &nbsp;&nbsp;
-                        <a href="{% url "control:organizer.settings.mail.setup" organizer=request.organizer.slug %}"
-                           class="btn btn-default">
-                            <span class="fa fa-edit"></span>
-                            {% trans "Edit" %}
-                        </a>
-                    </div>
-                </div>
-
+                {% bootstrap_field form.mail_from layout="control" %}
                 {% bootstrap_field form.mail_from_name layout="control" %}
                 {% bootstrap_field form.mail_text_signature layout="control" %}
                 {% bootstrap_field form.mail_bcc layout="control" %}
@@ -67,11 +35,24 @@
                     {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_text_customer_reset" %}
                 </div>
             </fieldset>
+            <fieldset>
+                <legend>{% trans "SMTP settings" %}</legend>
+                {% bootstrap_field form.smtp_use_custom layout="control" %}
+                {% bootstrap_field form.smtp_host layout="control" %}
+                {% bootstrap_field form.smtp_port layout="control" %}
+                {% bootstrap_field form.smtp_username layout="control" %}
+                {% bootstrap_field form.smtp_password layout="control" %}
+                {% bootstrap_field form.smtp_use_tls layout="control" %}
+                {% bootstrap_field form.smtp_use_ssl layout="control" %}
+            </fieldset>
         </div>
         <div class="form-group submit-group">
             <button type="submit" class="btn btn-primary btn-save">
                 {% trans "Save" %}
             </button>
+            <button type="submit" class="btn btn-default btn-save pull-left" name="test" value="1">
+                {% trans "Save and test custom SMTP connection" %}
+            </button>
         </div>
     </form>
 {% endblock %}

src/pretix/control/templates/pretixcontrol/users/form.html

@@ -38,14 +38,6 @@
                             <input name="text" value="{{ backend }}" class="form-control" disabled>
                         </div>
                     </div>
-                    {% if user.auth_backend_identifier %}
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">{% trans "External identifier" %}</label>
-                            <div class="col-md-9">
-                                <input name="text" value="{{ user.auth_backend_identifier }}" class="form-control" disabled>
-                            </div>
-                        </div>
-                    {% endif %}
                     {% bootstrap_field form.email layout='control' %}
                     {% if form.new_pw %}
                         {% bootstrap_field form.new_pw layout='control' %}

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

@@ -39,15 +39,17 @@
                     <legend>{% trans "Voucher details" %}</legend>
                     {% bootstrap_field form.code layout="control" %}
                     {% if voucher.pk %}
-                        <div class="form-group">
-                            <label class="col-md-3 control-label" for="id_url">{% trans "Voucher link" %}</label>
-                            <div class="col-md-9">
-                                <input type="text" name="url"
-                                        value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code|urlencode }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
-                                        class="form-control"
-                                        id="id_url" readonly>
+                        {% if not request.event.has_subevents or voucher.subevent %}
+                            <div class="form-group">
+                                <label class="col-md-3 control-label" for="id_url">{% trans "Voucher link" %}</label>
+                                <div class="col-md-9">
+                                    <input type="text" name="url"
+                                            value="{% abseventurl request.event "presale:event.redeem" %}?voucher={{ voucher.code|urlencode }}{% if voucher.subevent_id %}&subevent={{ voucher.subevent_id }}{% endif %}"
+                                            class="form-control"
+                                            id="id_url" readonly>
+                                </div>
                             </div>
-                        </div>
+                        {% endif %}
                     {% endif %}
                     {% bootstrap_field form.max_usages layout="control" %}
                     {% bootstrap_field form.valid_until layout="control" %}

src/pretix/control/templatetags/getitem.py

@@ -29,9 +29,4 @@ def getitem_filter(value, itemname):
     if not value:
         return ''
 
-    try:
-        return value[itemname]
-    except KeyError:
-        return ''
-    except TypeError:
-        return ''
+    return value[itemname]

src/pretix/control/templatetags/hierarkey_form.py

@@ -45,8 +45,7 @@ class PropagatedNode(Node):
             <div class="propagated-settings-box locked panel panel-default">
                 <div class="panel-heading">
                     <input type="hidden" name="_settings_ignore" value="{fnames}">
-                    <input type="hidden" name="decouple" value="">
-                    <button type="button" class="btn btn-default pull-right btn-xs" value="{fnames}" data-action="unlink">
+                    <button class="btn btn-default pull-right btn-xs" name="decouple" value="{fnames}" data-action="unlink">
                         <span class="fa fa-unlock"></span> {text_unlink}
                     </button>
                     <h4 class="panel-title">

src/pretix/control/urls.py

@@ -112,8 +112,6 @@ urlpatterns = [
     re_path(r'^organizer/(?P<organizer>[^/]+)/edit$', organizer.OrganizerUpdate.as_view(), name='organizer.edit'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email$',
             organizer.OrganizerMailSettings.as_view(), name='organizer.settings.mail'),
-    re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email/setup$',
-            organizer.MailSettingsSetup.as_view(), name='organizer.settings.mail.setup'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/settings/email/preview$',
             organizer.MailSettingsPreview.as_view(), name='organizer.settings.mail.preview'),
     re_path(r'^organizer/(?P<organizer>[^/]+)/delete$', organizer.OrganizerDelete.as_view(), name='organizer.delete'),
@@ -216,7 +214,6 @@ urlpatterns = [
         re_path(r'^settings/tickets/preview/(?P<output>[^/]+)$', event.TicketSettingsPreview.as_view(),
                 name='event.settings.tickets.preview'),
         re_path(r'^settings/email$', event.MailSettings.as_view(), name='event.settings.mail'),
-        re_path(r'^settings/email/setup$', event.MailSettingsSetup.as_view(), name='event.settings.mail.setup'),
         re_path(r'^settings/email/preview$', event.MailSettingsPreview.as_view(), name='event.settings.mail.preview'),
         re_path(r'^settings/email/layoutpreview$', event.MailSettingsRendererPreview.as_view(),
                 name='event.settings.mail.preview.layout'),

src/pretix/control/views/event.py

@@ -65,7 +65,9 @@ from i18nfield.utils import I18nJSONEncoder
 from pytz import timezone
 
 from pretix.base.channels import get_all_sales_channels
-from pretix.base.email import get_available_placeholders
+from pretix.base.email import (
+    get_available_placeholders, test_custom_smtp_backend,
+)
 from pretix.base.models import Event, LogEntry, Order, TaxRule, Voucher
 from pretix.base.models.event import EventMetaValue
 from pretix.base.services import tickets
@@ -81,7 +83,6 @@ from pretix.control.forms.event import (
     TicketSettingsForm, WidgetCodeForm,
 )
 from pretix.control.permissions import EventPermissionRequiredMixin
-from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.control.views.user import RecentAuthenticationRequiredMixin
 from pretix.helpers.database import rolledback_transaction
 from pretix.multidomain.urlreverse import get_event_domain
@@ -354,17 +355,19 @@ class EventPlugins(EventSettingsViewMixin, EventPermissionRequiredMixin, Templat
         }
 
         with transaction.atomic():
+            allow_restricted = request.user.has_active_staff_session(request.session.session_key)
+
             for key, value in request.POST.items():
                 if key.startswith("plugin:"):
                     module = key.split(":")[1]
                     if value == "enable" and module in plugins_available:
                         if getattr(plugins_available[module], 'restricted', False):
-                            if module not in request.event.settings.allowed_restricted_plugins:
+                            if not allow_restricted:
                                 continue
 
                         self.request.event.log_action('pretix.event.plugins.enabled', user=self.request.user,
                                                       data={'plugin': module})
-                        self.object.enable_plugin(module, allow_restricted=request.event.settings.allowed_restricted_plugins)
+                        self.object.enable_plugin(module, allow_restricted=allow_restricted)
                     else:
                         self.request.event.log_action('pretix.event.plugins.disabled', user=self.request.user,
                                                       data={'plugin': module})
@@ -636,29 +639,29 @@ class MailSettings(EventSettingsViewMixin, EventSettingsFormView):
                         k: form.cleaned_data.get(k) for k in form.changed_data
                     }
                 )
-            messages.success(self.request, _('Your changes have been saved.'))
+
+            if request.POST.get('test', '0').strip() == '1':
+                backend = self.request.event.get_mail_backend(force_custom=True, timeout=10)
+                try:
+                    test_custom_smtp_backend(backend, self.request.event.settings.mail_from)
+                except Exception as e:
+                    messages.warning(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
+                else:
+                    if form.cleaned_data.get('smtp_use_custom'):
+                        messages.success(self.request, _('Your changes have been saved and the connection attempt to '
+                                                         'your SMTP server was successful.'))
+                    else:
+                        messages.success(self.request, _('We\'ve been able to contact the SMTP server you configured. '
+                                                         'Remember to check the "use custom SMTP server" checkbox, '
+                                                         'otherwise your SMTP server will not be used.'))
+            else:
+                messages.success(self.request, _('Your changes have been saved.'))
             return redirect(self.get_success_url())
         else:
             messages.error(self.request, _('We could not save your changes. See below for details.'))
             return self.get(request)
 
 
-class MailSettingsSetup(EventPermissionRequiredMixin, MailSettingsSetupView):
-    permission = 'can_change_event_settings'
-    basetpl = 'pretixcontrol/event/base.html'
-
-    def get_success_url(self) -> str:
-        return reverse('control:event.settings.mail', kwargs={
-            'organizer': self.request.event.organizer.slug,
-            'event': self.request.event.slug
-        })
-
-    def log_action(self, data):
-        self.request.event.log_action(
-            'pretix.event.settings', user=self.request.user, data=data
-        )
-
-
 class MailSettingsPreview(EventPermissionRequiredMixin, View):
     permission = 'can_change_event_settings'
 
@@ -1413,7 +1416,7 @@ class QuickSetupView(FormView):
             })
             quota.items.add(*items)
 
-        self.request.event.set_active_plugins(plugins_active, allow_restricted=plugins_active)
+        self.request.event.set_active_plugins(plugins_active, allow_restricted=True)
         self.request.event.save()
         messages.success(self.request, _('Your changes have been saved. You can now go on with looking at the details '
                                          'or take your event live to start selling!'))

src/pretix/control/views/mailsetup.py

@@ -1,279 +0,0 @@
-#
-# This file is part of pretix (Community Edition).
-#
-# Copyright (C) 2014-2020 Raphael Michel and contributors
-# Copyright (C) 2020-2021 rami.io GmbH and contributors
-#
-# This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General
-# Public License as published by the Free Software Foundation in version 3 of the License.
-#
-# ADDITIONAL TERMS APPLY: Pursuant to Section 7 of the GNU Affero General Public License, additional terms are
-# applicable granting you additional permissions and placing additional restrictions on your usage of this software.
-# Please refer to the pretix LICENSE file to obtain the full terms applicable to this work. If you did not receive
-# this file, see <https://pretix.eu/about/en/license>.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
-# details.
-#
-# 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 logging
-
-import dns.resolver
-from django.conf import settings
-from django.contrib import messages
-from django.core.mail import get_connection
-from django.shortcuts import redirect
-from django.utils.crypto import get_random_string
-from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import TemplateView
-
-from pretix.base import email
-from pretix.base.models import Event
-from pretix.base.services.mail import mail
-from pretix.control.forms.filter import OrganizerFilterForm
-from pretix.control.forms.mailsetup import SimpleMailForm, SMTPMailForm
-
-logger = logging.getLogger(__name__)
-
-
-def get_spf_record(hostname):
-    try:
-        r = dns.resolver.Resolver()
-        for resp in r.query(hostname, 'TXT'):
-            data = b''.join(resp.strings).decode()
-            if data.lower().strip().startswith('v=spf1 '):  # RFC7208, section 4.5
-                return data
-    except:
-        logger.exception("Could not fetch SPF record")
-
-
-def _check_spf_record(not_found_lookup_parts, spf_record, depth):
-    if depth > 10:  # prevent infinite loops
-        return
-
-    parts = spf_record.lower().split(" ")  # RFC 7208, section 4.6.1
-
-    for p in parts:
-        try:
-            not_found_lookup_parts.remove(p)
-        except KeyError:
-            pass
-
-    if not not_found_lookup_parts:  # save some DNS requests if we already found everything
-        return
-
-    for p in parts:
-        if p.startswith('include:') or p.startswith('+include:'):
-            _, hostname = p.split(':')
-            rec_record = get_spf_record(hostname)
-            if rec_record:
-                _check_spf_record(not_found_lookup_parts, rec_record, depth + 1)
-
-
-def check_spf_record(lookup, spf_record):
-    """
-    Check that all parts of lookup appear somewhere in the given SPF record, resolving
-    include: directives recursively
-    """
-    not_found_lookup_parts = set(lookup.split(" "))
-    _check_spf_record(not_found_lookup_parts, spf_record, 0)
-    return not not_found_lookup_parts
-
-
-class MailSettingsSetupView(TemplateView):
-    template_name = 'pretixcontrol/email_setup.html'
-    basetpl = None
-
-    @cached_property
-    def object(self):
-        return getattr(self.request, 'event', self.request.organizer)
-
-    @cached_property
-    def smtp_form(self):
-        return SMTPMailForm(
-            obj=self.object,
-            prefix='smtp',
-            data=self.request.POST if (self.request.method == "POST" and self.request.POST.get("mode") == "smtp") else None,
-        )
-
-    @cached_property
-    def simple_form(self):
-        return SimpleMailForm(
-            obj=self.object,
-            prefix='simple',
-            data=self.request.POST if (self.request.method == "POST" and self.request.POST.get("mode") == "simple") else None,
-        )
-
-    def get_context_data(self, **kwargs):
-        ctx = super().get_context_data(**kwargs)
-        ctx['basetpl'] = self.basetpl
-        ctx['object'] = self.object
-        ctx['smtp_form'] = self.smtp_form
-        ctx['simple_form'] = self.simple_form
-        ctx['default_sender_address'] = settings.MAIL_FROM_ORGANIZERS
-        if 'mode' in self.request.POST:
-            ctx['mode'] = self.request.POST.get('mode')
-        elif self.object.settings.smtp_use_custom:
-            ctx['mode'] = 'smtp'
-        elif self.object.settings.mail_from not in (settings.MAIL_FROM_ORGANIZERS, settings.MAIL_FROM):
-            ctx['mode'] = 'simple'
-        else:
-            ctx['mode'] = 'system'
-        return ctx
-
-    @cached_property
-    def filter_form(self):
-        return OrganizerFilterForm(data=self.request.GET, request=self.request)
-
-    def post(self, request, *args, **kwargs):
-        if request.POST.get('mode') == 'system':
-            if isinstance(self.object, Event) and 'mail_from' in self.object.organizer.settings._cache():
-                self.object.settings.mail_from = settings.MAIL_FROM_ORGANIZERS
-            else:
-                del self.object.settings.mail_from
-            self.object.settings.smtp_use_custom = False
-            del self.object.settings.smtp_host
-            del self.object.settings.smtp_port
-            del self.object.settings.smtp_username
-            del self.object.settings.smtp_password
-            del self.object.settings.smtp_use_tls
-            del self.object.settings.smtp_use_ssl
-            messages.success(request, _('Your changes have been saved.'))
-            return redirect(self.get_success_url())
-
-        elif request.POST.get('mode') == 'reset':
-            del self.object.settings.mail_from
-            del self.object.settings.smtp_use_custom
-            del self.object.settings.smtp_host
-            del self.object.settings.smtp_port
-            del self.object.settings.smtp_username
-            del self.object.settings.smtp_password
-            del self.object.settings.smtp_use_tls
-            del self.object.settings.smtp_use_ssl
-            messages.success(request, _('Your changes have been saved.'))
-            return redirect(self.get_success_url())
-
-        elif request.POST.get('mode') == 'simple':
-            if not self.simple_form.is_valid():
-                return super().get(request, *args, **kwargs)
-
-            session_key = f'sender_mail_verification_code_{self.request.path}_{self.simple_form.cleaned_data.get("mail_from")}'
-            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 settings.MAIL_CUSTOM_SENDER_SPF_STRING or self.request.POST.get('state') == 'save')
-            )
-
-            if allow_save:
-                for k, v in self.simple_form.cleaned_data.items():
-                    self.object.settings.set(k, v)
-                self.log_action(self.simple_form.cleaned_data)
-                if session_key in request.session:
-                    del request.session[session_key]
-                messages.success(request, _('Your changes have been saved.'))
-                return redirect(self.get_success_url())
-
-            spf_warning = None
-            spf_record = None
-            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 = _(
-                        'We could not find an SPF record set for the domain you are trying to use. You can still '
-                        'proceed, but it will increase the chance of emails going to spam or being rejected. We '
-                        'strongly recommend setting an SPF record on the domain. You can do so through the DNS '
-                        'settings at the provider you registered your domain with.'
-                    )
-                elif not check_spf_record(settings.MAIL_CUSTOM_SENDER_SPF_STRING, spf_record):
-                    spf_warning = _(
-                        'We found an SPF record set for the domain you are trying to use, but it does not include this '
-                        'system\'s email server. 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 to include '
-                        'this system in the SPF record.'
-                    )
-
-            if settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED:
-                if 'verification' in self.request.POST:
-                    messages.error(request, _('The verification code was incorrect, please try again.'))
-                else:
-                    self.request.session[session_key] = get_random_string(length=6, allowed_chars='1234567890')
-                    mail(
-                        self.simple_form.cleaned_data.get('mail_from'),
-                        _('Sender address verification'),
-                        'pretixcontrol/email/email_setup.txt',
-                        {
-                            'code': self.request.session[session_key],
-                            'address': self.simple_form.cleaned_data.get('mail_from'),
-                            'instance': settings.PRETIX_INSTANCE_NAME,
-                        },
-                        None,
-                        locale=self.request.LANGUAGE_CODE,
-                        user=self.request.user
-                    )
-
-            return self.response_class(
-                request=self.request,
-                template='pretixcontrol/email_setup_simple.html',
-                context={
-                    'basetpl': self.basetpl,
-                    'object': self.object,
-                    'verification': settings.MAIL_CUSTOM_SENDER_VERIFICATION_REQUIRED,
-                    'spf_warning': spf_warning,
-                    'spf_record': spf_record,
-                    'spf_key': settings.MAIL_CUSTOM_SENDER_SPF_STRING,
-                    'recp': self.simple_form.cleaned_data.get('mail_from')
-                },
-                using=self.template_engine,
-            )
-
-        elif request.POST.get('mode') == 'smtp':
-            if not self.smtp_form.is_valid():
-                return super().get(request, *args, **kwargs)
-
-            if request.POST.get('state') == 'save':
-                for k, v in self.smtp_form.cleaned_data.items():
-                    self.object.settings.set(k, v)
-                self.object.settings.smtp_use_custom = True
-                self.log_action({**self.smtp_form.cleaned_data, 'smtp_use_custom': True})
-                messages.success(request, _('Your changes have been saved.'))
-                return redirect(self.get_success_url())
-            else:
-                backend = get_connection(
-                    backend=settings.EMAIL_CUSTOM_SMTP_BACKEND,
-                    host=self.smtp_form.cleaned_data['smtp_host'],
-                    port=self.smtp_form.cleaned_data['smtp_port'],
-                    username=self.smtp_form.cleaned_data.get('smtp_username', ''),
-                    password=self.smtp_form.cleaned_data.get('smtp_password', ''),
-                    use_tls=self.smtp_form.cleaned_data.get('smtp_use_tls', False),
-                    use_ssl=self.smtp_form.cleaned_data.get('smtp_use_ssl', False),
-                    fail_silently=False,
-                    timeout=10,
-                )
-                try:
-                    email.test_custom_smtp_backend(backend, self.smtp_form.cleaned_data.get('mail_from'))
-                except Exception as e:
-                    messages.error(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
-                    return self.get(request, *args, **kwargs)
-
-                return self.response_class(
-                    request=self.request,
-                    template='pretixcontrol/email_setup_smtp.html',
-                    context={
-                        'basetpl': self.basetpl,
-                        'object': self.object,
-                        'known_host_problem': {
-                            'smtp.gmail.com': _(
-                                'We recommend not using Google Mail for transactional emails. If you try sending many '
-                                'emails in a short amount of time, e.g. when sending information to all your ticket '
-                                'buyers, there is a high chance Google will not deliver all of your emails since they '
-                                'impose a maximum number of emails per time period.'
-                            ),
-                        }.get(self.smtp_form.cleaned_data['smtp_host']),
-                    },
-                    using=self.template_engine,
-                )

src/pretix/control/views/main.py

@@ -265,7 +265,7 @@ class EventWizard(SafeSessionWizardView):
             event.has_subevents = foundation_data['has_subevents']
             event.testmode = True
             form_dict['basics'].save()
-            event.set_active_plugins(settings.PRETIX_PLUGINS_DEFAULT.split(","), allow_restricted=settings.PRETIX_PLUGINS_DEFAULT.split(","))
+            event.set_active_plugins(settings.PRETIX_PLUGINS_DEFAULT.split(","), allow_restricted=True)
             event.save(update_fields=['plugins'])
             event.log_action(
                 'pretix.event.added',

src/pretix/control/views/orders.py

@@ -2215,10 +2215,12 @@ class OrderGo(EventPermissionRequiredMixin, View):
             return redirect('control:event.order', event=request.event.slug, organizer=request.event.organizer.slug,
                             code=order.code)
         except Order.DoesNotExist:
-            i = self.request.event.invoices.filter(Q(invoice_no=code) | Q(full_invoice_no=code)).first()
-            if i:
+            try:
+                i = self.request.event.invoices.get(Q(invoice_no=code) | Q(full_invoice_no=code))
                 return redirect('control:event.order', event=request.event.slug, organizer=request.event.organizer.slug,
                                 code=i.order.code)
+            except Invoice.DoesNotExist:
+                pass
 
             messages.error(request, _('There is no order with the given order code.'))
             return redirect('control:event.orders', event=request.event.slug, organizer=request.event.organizer.slug)
@@ -2229,7 +2231,7 @@ class ExportMixin:
     def exporters(self):
         exporters = []
         responses = register_data_exporters.send(self.request.event)
-        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses if response], key=lambda ex: str(ex.verbose_name)):
+        for ex in sorted([response(self.request.event, self.request.organizer) for r, response in responses], key=lambda ex: str(ex.verbose_name)):
             if self.request.GET.get("identifier") and ex.identifier != self.request.GET.get("identifier"):
                 continue
 

src/pretix/control/views/organizer.py

@@ -64,6 +64,7 @@ from django.views.generic import (
 from pretix.api.models import WebHook
 from pretix.base.auth import get_auth_backends
 from pretix.base.channels import get_all_sales_channels
+from pretix.base.email import test_custom_smtp_backend
 from pretix.base.i18n import language
 from pretix.base.models import (
     CachedFile, Customer, Device, Gate, GiftCard, Invoice, LogEntry,
@@ -101,7 +102,6 @@ from pretix.control.permissions import (
 )
 from pretix.control.signals import nav_organizer
 from pretix.control.views import PaginationMixin
-from pretix.control.views.mailsetup import MailSettingsSetupView
 from pretix.helpers.dicts import merge_dicts
 from pretix.helpers.urls import build_absolute_uri as build_global_uri
 from pretix.multidomain.urlreverse import build_absolute_uri
@@ -262,6 +262,22 @@ class OrganizerMailSettings(OrganizerSettingsFormView):
                         k: form.cleaned_data.get(k) for k in form.changed_data
                     }
                 )
+
+            if request.POST.get('test', '0').strip() == '1':
+                backend = self.request.organizer.get_mail_backend(force_custom=True, timeout=10)
+                try:
+                    test_custom_smtp_backend(backend, self.request.organizer.settings.mail_from)
+                except Exception as e:
+                    messages.warning(self.request, _('An error occurred while contacting the SMTP server: %s') % str(e))
+                else:
+                    if form.cleaned_data.get('smtp_use_custom'):
+                        messages.success(self.request, _('Your changes have been saved and the connection attempt to '
+                                                         'your SMTP server was successful.'))
+                    else:
+                        messages.success(self.request, _('We\'ve been able to contact the SMTP server you configured. '
+                                                         'Remember to check the "use custom SMTP server" checkbox, '
+                                                         'otherwise your SMTP server will not be used.'))
+            else:
                 messages.success(self.request, _('Your changes have been saved.'))
             return redirect(self.get_success_url())
         else:
@@ -269,21 +285,6 @@ class OrganizerMailSettings(OrganizerSettingsFormView):
             return self.get(request)
 
 
-class MailSettingsSetup(OrganizerPermissionRequiredMixin, MailSettingsSetupView):
-    permission = 'can_change_organizer_settings'
-    basetpl = 'pretixcontrol/base.html'
-
-    def get_success_url(self):
-        return reverse('control:organizer.settings.mail', kwargs={
-            'organizer': self.request.organizer.slug,
-        })
-
-    def log_action(self, data):
-        self.request.organizer.log_action(
-            'pretix.organizer.settings', user=self.request.user, data=data
-        )
-
-
 class MailSettingsPreview(OrganizerPermissionRequiredMixin, View):
     permission = 'can_change_organizer_settings'
 
@@ -407,7 +408,6 @@ class OrganizerUpdate(OrganizerPermissionRequiredMixin, UpdateView):
         return OrganizerSettingsForm(
             obj=self.object,
             prefix='settings',
-            is_admin=self.request.user.has_active_staff_session(self.request.session.session_key),
             data=self.request.POST if self.request.method == 'POST' else None,
             files=self.request.FILES if self.request.method == 'POST' else None
         )

src/pretix/control/views/subevents.py

@@ -1470,7 +1470,7 @@ class SubEventBulkEdit(SubEventQueryMixin, EventPermissionRequiredMixin, FormVie
             form.is_valid() and
             self.quota_formset.is_valid() and
             (not self.list_formset or self.list_formset.is_valid()) and
-            all(f.is_valid() for f in self.itemvar_forms) and
+            all(f.is_valid() for f in self.itemvar_forms)and
             all(f.is_valid() for f in self.meta_forms)
         )
         if is_valid:

src/pretix/control/views/users.py

@@ -162,12 +162,10 @@ class UserAnonymizeView(AdministratorPermissionRequiredMixin, RecentAuthenticati
         self.object = get_object_or_404(User, pk=self.kwargs.get("id"))
         self.object.log_action('pretix.user.anonymized',
                                user=request.user)
-        self.object.email = "{}.{}@disabled.pretix.eu".format(self.object.pk, self.object.auth_backend)
+        self.object.email = "{}@disabled.pretix.eu".format(self.object.pk)
         self.object.fullname = ""
         self.object.is_active = False
         self.object.notifications_send = False
-        self.object.auth_backend = None
-        self.object.auth_backend_identifier = None
         self.object.save()
         for le in self.object.all_logentries.filter(action_type="pretix.user.settings.changed"):
             d = le.parsed_data

src/pretix/control/views/vouchers.py

@@ -56,7 +56,7 @@ from django.views.generic import (
     CreateView, DeleteView, ListView, TemplateView, UpdateView, View,
 )
 
-from pretix.base.models import CartPosition, LogEntry, Voucher
+from pretix.base.models import CartPosition, LogEntry, OrderPosition, Voucher
 from pretix.base.models.vouchers import generate_codes
 from pretix.base.services.locking import NoLockManager
 from pretix.base.services.vouchers import vouchers_send
@@ -435,9 +435,7 @@ class VoucherBulkCreate(EventPermissionRequiredMixin, AsyncFormView):
         def process_batch(batch_vouchers, voucherids):
             Voucher.objects.bulk_create(batch_vouchers)
             if not connection.features.can_return_rows_from_bulk_insert:
-                from_db = list(self.request.event.vouchers.filter(code__in=[v.code for v in batch_vouchers]))
-                batch_vouchers.clear()
-                batch_vouchers += from_db
+                batch_vouchers = list(self.request.event.vouchers.filter(code__in=[v.code for v in batch_vouchers]))
 
             log_entries = []
             for v in batch_vouchers:
@@ -462,7 +460,7 @@ class VoucherBulkCreate(EventPermissionRequiredMixin, AsyncFormView):
 
             batch_vouchers = []
             for code in form.cleaned_data['codes']:
-                if len(batch_vouchers) >= batch_size:
+                if len(batch_vouchers) > batch_size:
                     process_batch(batch_vouchers, voucherids)
 
                 obj = modelcopy(form.instance, code=None)
@@ -550,7 +548,7 @@ class VoucherBulkAction(EventPermissionRequiredMixin, View):
             for obj in self.objects:
                 if obj.allow_delete():
                     obj.log_action('pretix.voucher.deleted', user=self.request.user)
-                    CartPosition.objects.filter(addon_to__voucher=obj).delete()
+                    OrderPosition.objects.filter(addon_to__voucher=obj).delete()
                     obj.cartposition_set.all().delete()
                     obj.delete()
                 else:

src/pretix/locale/ar/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-09-15 11:22+0000\n"
 "Last-Translator: Mohamed Tawfiq <mtawfiq@wafyapp.com>\n"
 "Language-Team: Arabic <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -268,8 +268,8 @@ msgstr ""
 "نعمل الآن على ارسال طلبك إلى الخادم، إذا أستغرقت العملية أكثر من دقيقة، يرجى "
 "التحقق من اتصالك بالإنترنت ثم أعد تحميل الصفحة مرة أخرى."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "أغلق الرسالة"
 
@@ -419,49 +419,49 @@ msgstr "حدث خطأ."
 msgid "Generating messages …"
 msgstr "توليد الرسائل …"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "خطأ غير معروف."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "اللون يتمتع بتباين كبير وتسهل قراءته!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr "اللون يحظى بتباين معقول ويمكن أن يكون مناسب للقراءة!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
 msgstr "تباين اللون سيئ للخلفية البيضاء، الرجاء اختيار لون غامق."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "الكل"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "لا شيء"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "البحث في الاستفسارات"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "المختارة فقط"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "قم باستخدم اسم مختلف داخليا"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "اضغط لاغلاق الصفحة"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "لم تقم بحفظ التعديلات!"
 

src/pretix/locale/ca/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2020-12-19 07:00+0000\n"
 "Last-Translator: albert <albert.serra.monner@gmail.com>\n"
 "Language-Team: Catalan <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -253,8 +253,8 @@ msgid ""
 "page and try again."
 msgstr ""
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr ""
 
@@ -404,49 +404,49 @@ msgstr ""
 msgid "Generating messages …"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr ""
 

src/pretix/locale/cs/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-12-06 23:00+0000\n"
 "Last-Translator: Ondřej Sokol <osokol@treesoft.cz>\n"
 "Language-Team: Czech <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -265,8 +265,8 @@ msgstr ""
 "prosím zkontrolujte své internetové připojení a znovu načtěte stránku a "
 "zkuste to znovu."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Zavřít zprávu"
 
@@ -416,20 +416,20 @@ msgstr "Vyskytla se chyba."
 msgid "Generating messages …"
 msgstr "Vytváření zpráv…"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "Tato barva má velmi dobrý kontrast a je velmi dobře čitelná!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "Tato barva má slušný kontrast a pravděpodobně je dostatečně dobře čitelná!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -437,31 +437,31 @@ msgstr ""
 "Tato barva je pro text na bílém pozadí špatně kontrastní, zvolte prosím "
 "tmavší odstín."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Všechny"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Žádný"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "Hledaný výraz"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "Pouze vybrané"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Interně používat jiný název"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Kliknutím zavřete"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Máte neuložené změny!"
 

src/pretix/locale/da/LC_MESSAGES/djangojs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-09-13 09:48+0000\n"
 "Last-Translator: Mie Frydensbjerg <mif@aarhus.dk>\n"
 "Language-Team: Danish <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -290,8 +290,8 @@ msgstr ""
 "Din forespørgsel bliver sendt til serveren. Hvis det tager mere end et "
 "minut, så tjek din internetforbindelse, genindlæs siden og prøv igen."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Luk besked"
 
@@ -447,49 +447,49 @@ msgstr "Der er sket en fejl."
 msgid "Generating messages …"
 msgstr "Opretter beskeder …"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Ukendt fejl."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Alle"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Ingen"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Klik for at lukke"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Du har ændringer, der ikke er gemt!"
 

src/pretix/locale/de/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-10-25 15:40+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -268,8 +268,8 @@ msgstr ""
 "dauert, prüfen Sie bitte Ihre Internetverbindung. Danach können Sie diese "
 "Seite neu laden und es erneut versuchen."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Schließen"
 
@@ -421,21 +421,21 @@ msgstr "Ein Fehler ist aufgetreten."
 msgid "Generating messages …"
 msgstr "Generiere Nachrichten…"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "Diese Farbe hat einen sehr guten Kontrast und ist sehr gut zu lesen!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "Diese Farbe hat einen ausreichenden Kontrast und ist wahrscheinlich gut zu "
 "lesen!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -443,31 +443,31 @@ msgstr ""
 "Diese Farbe hat einen schlechten Kontrast für Text auf einem weißen "
 "Hintergrund. Bitte wählen Sie eine dunklere Farbe."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Alle"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Keine"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "Suchbegriff"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "Nur ausgewählte"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Intern einen anderen Namen verwenden"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Klicken zum Schließen"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Sie haben ungespeicherte Änderungen!"
 

src/pretix/locale/de/wordlist.txt

@@ -1,7 +1,6 @@
 2FA
 ABN
 Absenderadresse
-Absenderinformation
 Absendername
 Admin
 Adminbereich
@@ -63,7 +62,6 @@ csv
 Customer
 Debug
 deliverability
-DNS
 Di
 Do
 Doe
@@ -230,7 +228,6 @@ Sofort
 SOFORT
 Sorry
 Source
-SPF
 SSL
 STARTTLS
 Steuerschuldnerschaft
@@ -258,7 +255,6 @@ TODO
 TOTP
 Trace
 Tracking
-transaktionale
 Turnover
 txt
 überbuchen

src/pretix/locale/de_Informal/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-10-25 15:40+0000\n"
 "Last-Translator: Raphael Michel <michel@rami.io>\n"
 "Language-Team: German (informal) <https://translate.pretix.eu/projects/"
@@ -267,8 +267,8 @@ msgstr ""
 "dauert, prüfe bitte deine Internetverbindung. Danach kannst du diese Seite "
 "neu laden und es erneut versuchen."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Schließen"
 
@@ -420,21 +420,21 @@ msgstr "Ein Fehler ist aufgetreten."
 msgid "Generating messages …"
 msgstr "Generiere Nachrichten…"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "Diese Farbe hat einen sehr guten Kontrast und ist sehr gut zu lesen!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "Diese Farbe hat einen ausreichenden Kontrast und ist wahrscheinlich gut zu "
 "lesen!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -442,31 +442,31 @@ msgstr ""
 "Diese Farbe hat einen schlechten Kontrast für Text auf einem weißen "
 "Hintergrund. Bitte wähle eine dunklere Farbe."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Alle"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Keine"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "Suchbegriff"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "Nur ausgewählte"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Intern einen anderen Namen verwenden"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Klicken zum Schließen"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Du hast ungespeicherte Änderungen!"
 

src/pretix/locale/de_Informal/wordlist.txt

@@ -1,7 +1,6 @@
 2FA
 ABN
 Absenderadresse
-Absenderinformation
 Absendername
 Admin
 Adminbereich
@@ -63,7 +62,6 @@ csv
 Customer
 Debug
 deliverability
-DNS
 Di
 Do
 Doe
@@ -230,7 +228,6 @@ Sofort
 SOFORT
 Sorry
 Source
-SPF
 SSL
 STARTTLS
 Steuerschuldnerschaft
@@ -258,7 +255,6 @@ TODO
 TOTP
 Trace
 Tracking
-transaktionale
 Turnover
 txt
 überbuchen

src/pretix/locale/djangojs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -252,8 +252,8 @@ msgid ""
 "page and try again."
 msgstr ""
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr ""
 
@@ -403,49 +403,49 @@ msgstr ""
 msgid "Generating messages …"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr ""
 

src/pretix/locale/el/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2019-10-03 19:00+0000\n"
 "Last-Translator: Chris Spy <chrispiropoulou@hotmail.com>\n"
 "Language-Team: Greek <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -297,8 +297,8 @@ msgstr ""
 "περισσότερο από ένα λεπτό, ελέγξτε τη σύνδεσή σας στο διαδίκτυο και στη "
 "συνέχεια επαναλάβετε τη φόρτωση αυτής της σελίδας και δοκιμάστε ξανά."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Κλείσιμο μηνύματος"
 
@@ -456,22 +456,22 @@ msgstr "Παρουσιάστηκε σφάλμα."
 msgid "Generating messages …"
 msgstr "Δημιουργία μηνυμάτων …"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Άγνωστο σφάλμα."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 "Το χρώμα σας έχει μεγάλη αντίθεση και είναι πολύ εύκολο να το διαβάσετε!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "Το χρώμα σας έχει αξιοπρεπή αντίθεση και είναι ίσως αρκετά καλό για να "
 "διαβάσετε!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -479,31 +479,31 @@ msgstr ""
 "Το χρώμα σας έχει κακή αντίθεση για κείμενο σε λευκό φόντο, επιλέξτε μια πιο "
 "σκούρα σκιά."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Όλα"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Κανένας"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Χρησιμοποιήστε διαφορετικό όνομα εσωτερικά"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Κάντε κλικ για να κλείσετε"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr ""
 

src/pretix/locale/es/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-11-25 21:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Spanish <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -265,8 +265,8 @@ msgstr ""
 "minuto, por favor, revise su conexión a Internet, recargue la página e "
 "intente nuevamente."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Cerrar mensaje"
 
@@ -419,21 +419,21 @@ msgstr "Ha ocurrido un error."
 msgid "Generating messages …"
 msgstr "Generando mensajes…"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Error desconocido."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "¡Tu color tiene gran contraste y es muy fácil de leer!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "¡Tu color tiene un contraste decente y es probablemente lo suficientemente "
 "legible!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -441,31 +441,31 @@ msgstr ""
 "Tu color tiene mal contraste para un texto con fondo blanco, por favor, "
 "escoge un tono más oscuro."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Todos"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Ninguno"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "Consultar búsqueda"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "Solamente seleccionados"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Usar un nombre diferente internamente"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Click para cerrar"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "¡Tienes cambios sin guardar!"
 

src/pretix/locale/fi/LC_MESSAGES/djangojs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-11-10 05:00+0000\n"
 "Last-Translator: Jaakko Rinta-Filppula <jaakko@r-f.fi>\n"
 "Language-Team: Finnish <https://translate.pretix.eu/projects/pretix/pretix-"
@@ -267,8 +267,8 @@ msgid ""
 "page and try again."
 msgstr ""
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Sulje viesti"
 
@@ -422,49 +422,49 @@ msgstr "Tapahtui virhe."
 msgid "Generating messages …"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Kaikki"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Käytä toista nimeä sisäisesti"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Sulje klikkaamalla"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Sinulla on tallentamattomia muutoksia!"
 

src/pretix/locale/fr/LC_MESSAGES/djangojs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
 "PO-Revision-Date: 2021-12-04 01:00+0000\n"
 "Last-Translator: Eva-Maria Obermann <obermann@rami.io>\n"
 "Language-Team: French <https://translate.pretix.eu/projects/pretix/pretix-js/"
@@ -290,8 +290,8 @@ msgstr ""
 "d'une minute, veuillez vérifier votre connexion Internet, puis recharger "
 "cette page et réessayer."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Fermer le message"
 
@@ -450,20 +450,20 @@ msgstr "Une erreur s'est produite."
 msgid "Generating messages …"
 msgstr "Création de messages …"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "Votre choix couleur a un bon contraste et il est très facile à lire!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "Votre choix de couleur est assez bon pour la lecture et a un bon contraste !"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -471,31 +471,31 @@ msgstr ""
 "Votre choix de couleur n'a pas un bon contraste avec du texte sur un fond "
 "blanc, SVP choisissez un ton plus sombre."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Tous"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Aucun"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr ""
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Utiliser un nom différent en interne"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Cliquez pour fermer"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Vous avez des modifications non sauvegardées !"
 

src/pretix/locale/gl/LC_MESSAGES/djangojs.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-25 10:05+0000\n"
-"PO-Revision-Date: 2022-02-22 22:00+0000\n"
+"POT-Creation-Date: 2022-01-14 14:33+0000\n"
+"PO-Revision-Date: 2021-11-25 21:00+0000\n"
 "Last-Translator: Ismael Menéndez Fernández <ismael.menendez@balidea.com>\n"
 "Language-Team: Galician <https://translate.pretix.eu/projects/pretix/pretix-"
 "js/gl/>\n"
@@ -37,7 +37,7 @@ msgstr "Pedidos enviados"
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:15
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:39
 msgid "Paid orders"
-msgstr "Pedidos pagados"
+msgstr "Ordes pagadas"
 
 #: pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js:27
 msgid "Total revenue"
@@ -265,8 +265,8 @@ msgstr ""
 "dun minuto, por favor, revise a súa conexión a Internet, recargue a páxina e "
 "inténteo de novo."
 
-#: pretix/static/pretixbase/js/asynctask.js:270
-#: pretix/static/pretixcontrol/js/ui/main.js:71
+#: pretix/static/pretixbase/js/asynctask.js:264
+#: pretix/static/pretixcontrol/js/ui/main.js:34
 msgid "Close message"
 msgstr "Cerrar mensaxe"
 
@@ -417,21 +417,21 @@ msgstr "Houbo un erro."
 msgid "Generating messages …"
 msgstr "Xerando mensaxes…"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:107
+#: pretix/static/pretixcontrol/js/ui/main.js:70
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:308
+#: pretix/static/pretixcontrol/js/ui/main.js:271
 msgid "Your color has great contrast and is very easy to read!"
 msgstr "A túa cor ten moito contraste e é moi doada de ler!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:312
+#: pretix/static/pretixcontrol/js/ui/main.js:275
 msgid "Your color has decent contrast and is probably good-enough to read!"
 msgstr ""
 "A túa cor ten un contraste axeitado e probablemente sexa suficientemente "
 "lexible!"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:316
+#: pretix/static/pretixcontrol/js/ui/main.js:279
 msgid ""
 "Your color has bad contrast for text on white background, please choose a "
 "darker shade."
@@ -439,31 +439,31 @@ msgstr ""
 "A túa cor ten mal contraste para un texto con fondo branco. Por favor, "
 "escolle un ton máis escuro."
 
-#: pretix/static/pretixcontrol/js/ui/main.js:454
+#: pretix/static/pretixcontrol/js/ui/main.js:417
 msgid "All"
 msgstr "Todos"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:455
+#: pretix/static/pretixcontrol/js/ui/main.js:418
 msgid "None"
 msgstr "Ningún"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:456
+#: pretix/static/pretixcontrol/js/ui/main.js:419
 msgid "Search query"
 msgstr "Consultar unha procura"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:459
+#: pretix/static/pretixcontrol/js/ui/main.js:422
 msgid "Selected only"
 msgstr "Soamente seleccionados"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:886
+#: pretix/static/pretixcontrol/js/ui/main.js:834
 msgid "Use a different name internally"
 msgstr "Usar un nome diferente internamente"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:922
+#: pretix/static/pretixcontrol/js/ui/main.js:870
 msgid "Click to close"
 msgstr "Click para cerrar"
 
-#: pretix/static/pretixcontrol/js/ui/main.js:963
+#: pretix/static/pretixcontrol/js/ui/main.js:911
 msgid "You have unsaved changes!"
 msgstr "Tes cambios sen gardar!"