Merge branch 'master' into feature/stimulus

.github/workflows/deploy.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.3
+          php-version: 7.4
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress

composer.json

@@ -1,7 +1,4 @@
 {
-  "repositories": [
-    { "type": "composer", "url": "https://composer.typo3.org/" }
-  ],
   "name": "dpn/ep-reisen-web",
   "description" : "EP Reisen TYPO3 website package",
   "license": "GPL-2.0+",
@@ -14,52 +11,50 @@
     "ext-pdo": "*",
     "ext-simplexml": "*",
     "b13/container": "^1.3",
-    "christophlehmann/imageoptimizer": "^2.0",
+    "christophlehmann/imageoptimizer": "^3.0",
-    "fluidtypo3/vhs": "^5.2",
+    "fluidtypo3/vhs": "^6.0",
-    "georgringer/news": "^7.2",
+    "georgringer/news": "^8.5",
-    "gridelementsteam/gridelements": "^9.2",
+    "gridelementsteam/gridelements": "^10.0",
-    "helhum/typo3-console": "^5.6",
+    "helhum/typo3-console": "^6.4",
     "kigkonsult/icalcreator": "^2.29",
     "league/csv": "^9.2",
     "league/period": "^4.9",
-    "ssch/typo3-encore": "^2.0",
+    "ssch/typo3-encore": "^3.0",
     "symfony/http-client": "^4.3",
     "symfony/options-resolver": "^4.2",
     "symfony/property-access": "^4.3",
     "symfony/serializer": "^4.2",
     "tritum/form-element-linked-checkbox": "^2.1",
-    "typo3/cms-adminpanel": "^9.5",
+    "typo3/cms-adminpanel": "^10.4",
-    "typo3/cms-backend": "^9.5",
+    "typo3/cms-backend": "^10.4",
-    "typo3/cms-belog": "^9.5",
+    "typo3/cms-belog": "^10.4",
-    "typo3/cms-beuser": "^9.5",
+    "typo3/cms-beuser": "^10.4",
-    "typo3/cms-core": "^9.5",
+    "typo3/cms-core": "^10.4",
-    "typo3/cms-extbase": "^9.5",
+    "typo3/cms-extbase": "^10.4",
-    "typo3/cms-extensionmanager": "^9.5",
+    "typo3/cms-extensionmanager": "^10.4",
-    "typo3/cms-felogin": "^9.5",
+    "typo3/cms-felogin": "^10.4",
-    "typo3/cms-filelist": "^9.5",
+    "typo3/cms-filelist": "^10.4",
-    "typo3/cms-filemetadata": "^9.5",
+    "typo3/cms-filemetadata": "^10.4",
-    "typo3/cms-fluid": "^9.5",
+    "typo3/cms-fluid": "^10.4",
-    "typo3/cms-fluid-styled-content": "^9.5",
+    "typo3/cms-fluid-styled-content": "^10.4",
-    "typo3/cms-form": "^9.5",
+    "typo3/cms-form": "^10.4",
-    "typo3/cms-frontend": "^9.5",
+    "typo3/cms-frontend": "^10.4",
-    "typo3/cms-info": "^9.5",
+    "typo3/cms-info": "^10.4",
-    "typo3/cms-install": "^9.5",
+    "typo3/cms-install": "^10.4",
-    "typo3/cms-lowlevel": "^9.5",
+    "typo3/cms-lowlevel": "^10.4",
-    "typo3/cms-recordlist": "^9.5",
+    "typo3/cms-recordlist": "^10.4",
-    "typo3/cms-recycler": "^9.5",
+    "typo3/cms-recycler": "^10.4",
-    "typo3/cms-redirects": "^9.5",
+    "typo3/cms-redirects": "^10.4",
-    "typo3/cms-reports": "^9.5",
+    "typo3/cms-reports": "^10.4",
-    "typo3/cms-rte-ckeditor": "^9.5",
+    "typo3/cms-rte-ckeditor": "^10.4",
-    "typo3/cms-scheduler": "^9.5",
+    "typo3/cms-scheduler": "^10.4",
-    "typo3/cms-seo": "^9.5",
+    "typo3/cms-seo": "^10.4",
-    "typo3/cms-setup": "^9.5",
+    "typo3/cms-setup": "^10.4",
-    "typo3/cms-t3editor": "^9.5",
+    "typo3/cms-t3editor": "^10.4",
-    "typo3/cms-taskcenter": "^9.5",
+    "typo3/cms-tstemplate": "^10.4",
-    "typo3/cms-tstemplate": "^9.5",
+    "typo3/cms-viewpage": "^10.4",
-    "typo3/cms-viewpage": "^9.5",
     "wazum/pagetree-resizable": "^1.2",
-    "wazum/sluggi": "^1.11.0",
+    "yoast-seo-for-typo3/yoast_seo": "^7.2",
-    "yoast-seo-for-typo3/yoast_seo": "^5.1",
     "yohang/calendr": "^2.1"
   },
   "scripts": {
@@ -85,7 +80,7 @@
   "require-dev": {
     "deployer/deployer": "^6.8",
     "deployer/recipes": "^6.2",
-    "ichhabrecht/filefill": "^2.0"
+    "ichhabrecht/filefill": "^3.3"
   },
   "config": {
     "sort-packages": true,

public/typo3conf/ext/ep_events/Classes/Controller/ActivityController.php

@@ -50,7 +50,6 @@ class ActivityController extends ActionController
      */
     public function __construct(ActivityRepository $activityRepository, OfferRepository $offerRepository)
     {
-        parent::__construct();
         $this->activityRepository = $activityRepository;
         $this->offerRepository = $offerRepository;
     }

public/typo3conf/ext/ep_events/Classes/Controller/AjaxFormController.php

@@ -48,8 +48,6 @@ class AjaxFormController extends ActionController
 
     public function __construct(EmailService $emailService, ConfigurationService $configurationService)
     {
-        parent::__construct();
-
         $this->emailService = $emailService;
         $this->configurationService = $configurationService;
     }

public/typo3conf/ext/ep_events/Classes/Controller/AjaxOfferController.php

@@ -40,8 +40,6 @@ class AjaxOfferController extends ActionController
         FileRepository $fileRepository,
         ImageService $imageService
     ) {
-        parent::__construct();
-
         $this->offerRepository = $offerRepository;
         $this->fileRepository = $fileRepository;
         $this->imageService = $imageService;
@@ -104,7 +102,7 @@ class AjaxOfferController extends ActionController
             ->uriBuilder
             ->reset()
             ->setCreateAbsoluteUri(true)
-            ->setTargetPageUid($detailPageUid)
+            ->setTargetPageUid((int)$detailPageUid)
             ->buildFrontendUri();
     }
 

public/typo3conf/ext/ep_events/Classes/Controller/FormController.php

@@ -44,8 +44,6 @@ class FormController extends ActionController
      */
     public function __construct(ConfigurationService $configurationService)
     {
-        parent::__construct();
-
         $this->configurationService = $configurationService;
     }
 
@@ -123,7 +121,7 @@ class FormController extends ActionController
         return $this->uriBuilder
             ->reset()
             ->setCreateAbsoluteUri(true)
-            ->setTargetPageUid($pageUid)
+            ->setTargetPageUid((int)$pageUid)
             ->build()
         ;
     }

public/typo3conf/ext/ep_events/Classes/Controller/OfferController.php

@@ -45,7 +45,6 @@ class OfferController extends ActionController
      */
     public function __construct(OfferRepository $offerRepository)
     {
-        parent::__construct();
         $this->offerRepository = $offerRepository;
     }
 

public/typo3conf/ext/ep_events/Classes/Controller/SearchController.php

@@ -45,7 +45,6 @@ class SearchController extends ActionController
      */
     public function __construct(OfferRepository $offerRepository)
     {
-        parent::__construct();
         $this->offerRepository = $offerRepository;
     }
 

public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php

@@ -24,7 +24,7 @@ call_user_func(function() {
                 ],
             ],
             'types' => [
-                (string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
+                (string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT],
             ]
         ]
     );
@@ -48,9 +48,9 @@ call_user_func(function() {
                 ],
             ],
             'types' => [
-                (string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
+                (string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT],
+            ],
         ],
-        ]
     );
 
     $temporaryColumns = [
@@ -119,7 +119,6 @@ call_user_func(function() {
 
     $GLOBALS['TCA']['pages']['columns']['media']['config']['behaviour'] = [
         'allowLanguageSynchronization' => true,
-        'localizeChildrenAtParentLocalization' => true,
     ];
 
     $GLOBALS['TCA']['pages']['columns']['media']['config']['overrideChildTca']['columns']['crop']['config']['cropVariants'] = [

public/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages_language_overlay.php

@@ -1,119 +0,0 @@
-<?php
-
-defined('TYPO3_MODE') or die ();
-
-call_user_func(function() {
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'pages_language_overlay',
-        'doktype',
-        [
-            'Kategorie-Seite',
-            \EP\EpEvents\Constants::PAGETYPE_CATEGORY,
-            'apps-pagetree-category-page',
-        ],
-        '1',
-        'after'
-    );
-    \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
-        $GLOBALS['TCA']['pages_language_overlay'],
-        [
-            'ctrl' => [
-                'typeicon_classes' => [
-                    \EP\EpEvents\Constants::PAGETYPE_CATEGORY => 'apps-pagetree-category-page',
-                ],
-            ],
-            'types' => [
-                (string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
-            ]
-        ]
-    );
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTcaSelectItem(
-        'pages_language_overlay',
-        'doktype',
-        [
-            'Beispiel-Seite',
-            \EP\EpEvents\Constants::PAGETYPE_OFFER,
-            'apps-pagetree-example-page',
-        ],
-        '1',
-        'after'
-    );
-    \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule(
-        $GLOBALS['TCA']['pages_language_overlay'],
-        [
-            'ctrl' => [
-                'typeicon_classes' => [
-                    \EP\EpEvents\Constants::PAGETYPE_OFFER => 'apps-pagetree-example-page',
-                ],
-            ],
-            'types' => [
-                (string) \EP\EpEvents\Constants::PAGETYPE_OFFER => $GLOBALS['TCA']['pages']['types'][\TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT],
-            ],
-        ]
-    );
-
-    $temporaryColumns = [
-        'tx_epevents_traveltype' => [
-            'exclude' => 0,
-            'label' => 'Reiseart',
-            'config' => [
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => [
-                    ['Keine Zuordnung', 0],
-                ],
-                'foreign_table' => 'tx_epevents_domain_model_traveltype',
-                'foreign_table_where' => 'AND tx_epevents_domain_model_traveltype.sys_language_uid IN (0, -1)',
-                'minitems' => 0,
-                'maxitems' => 1,
-            ]
-        ],
-        'tx_epevents_offer' => [
-            'exclude' => 0,
-            'label' => 'Angebot/Beispielangebot',
-            'config' => [
-                'type' => 'select',
-                'renderType' => 'selectSingle',
-                'items' => [
-                    ['Keine Zuordnung', 0],
-                ],
-                'foreign_table' => 'tx_epevents_domain_model_offer',
-                'foreign_table_where' => 'AND tx_epevents_domain_model_offer.type = 1 AND tx_epevents_domain_model_offer.sys_language_uid IN (0, -1) ORDER BY tx_epevents_domain_model_offer.name_internal',
-                'minitems' => 0,
-                'maxitems' => 1,
-            ]
-        ],
-    ];
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTCAcolumns(
-        'pages_language_overlay',
-        $temporaryColumns
-    );
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-        'pages_language_overlay',
-        '--div--;Konfigurator,
-            tx_epevents_traveltype',
-        (string) \EP\EpEvents\Constants::PAGETYPE_CATEGORY
-    );
-
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes(
-        'pages_language_overlay',
-        '--div--;Konfigurator,
-            tx_epevents_offer',
-        (string) \EP\EpEvents\Constants::PAGETYPE_OFFER
-    );
-
-    $GLOBALS['TCA']['pages_language_overlay']['columns']['media']['config']['overrideChildTca']['columns']['crop']['config']['cropVariants'] = [
-        'default' => [
-            'title' => 'Alle Geräte',
-            'allowedAspectRatios' => [
-                'header' => [
-                    'title' => 'Header Startseite',
-                    'value' => 1440 / 700,
-                ],
-            ],
-        ],
-    ];
-});

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_activity.php

@@ -20,11 +20,6 @@ return [
         ],
 		'searchFields' => 'name,name_internal,description,image_teaser,image_header,image_offer,configurator_type',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_activity.gif'
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, name_internal, 
-		keywords, description, bannertext, footertext, image_teaser, image_header, image_offer, configurator_type, 
-		path_segment',
     ],
 	'types' => [
 		'1' => [
@@ -55,7 +50,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php

@@ -21,9 +21,6 @@ return [
         ],
 		'searchFields' => 'name,email,phone,image,',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_contact.gif'
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, position, email, phone, image',
     ],
 	'types' => [
 		'1' => [
@@ -50,7 +47,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php

@@ -20,10 +20,6 @@ return [
         ],
 		'searchFields' => 'name,name_internal,description,image_teaser,image_offer,configurator_type,',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_hotel.gif'
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, name_internal, 
-		    description, image_teaser, image_offer, configurator_type',
     ],
 	'types' => [
 		'1' => [
@@ -52,7 +48,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php

@@ -22,11 +22,6 @@ return [
 		    configurator_type,configurator_distance,footer_text1,footer_text2,footer_text3,',
         'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_location.gif'
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description_short, 
-		    description_long, season, image_header, image_teaser, image_offer, configurator_type, configurator_distance, 
-		    footer_text1, footer_text2, footer_text3',
-    ],
     'types' => [
         '1' => [
             'showitem' => 'hidden, --palette--;;configurator, 
@@ -54,7 +49,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 1,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php

@@ -22,13 +22,6 @@ return [
 		    booking_form,configurator_type,contact,hotel,location,activities,',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_offer.gif',
         'type' => 'type',
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, type, name, name_internal, 
-		    groupname, price, headline, header, arrival, schedule, services, guidelines, image_teaser, 
-		    image_teaser_mobile, image_header, booking_form, configurator_type, configurator_budget, 
-		    configurator_pax, configurator_period, contact, hotel, location, activities, detail_page, url, 
-		    url_rendered',
     ],
 	'types' => [
 		'1' => [
@@ -68,7 +61,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php

@@ -20,10 +20,6 @@ return [
         ],
 		'searchFields' => 'client_name,client_image,quote,',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_testimonial.gif'
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, client_name, client_image, 
-		    quote',
     ],
 	'types' => [
 		'1' => [
@@ -50,7 +46,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php

@@ -20,10 +20,6 @@ return [
         ],
 		'searchFields' => 'title,subtitle,headertext,subheadline,description',
 		'iconfile' => 'EXT:ep_events/Resources/Public/images/tx_epevents_domain_model_traveltype.gif',
-    ],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, type, title, subtitle, 
-		headertext, subheadline, bannertext, description, buttonlabel, configurator_type, image_header, image_banner',
     ],
 	'types' => [
 		'1' => [
@@ -53,7 +49,6 @@ return [
         ],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 1,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/ActivityEpEvents.tsconfig

@@ -0,0 +1,21 @@
+mod.web_layout.BackendLayouts {
+    activityEpEvents {
+        title = EP Events: Programmpunkt
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 1
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 0
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/CategoryEpEvents.tsconfig

@@ -0,0 +1,29 @@
+mod.web_layout.BackendLayouts {
+    categoryEpEvents {
+        title = EP Events: Kategorie
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 2
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content (Slider etc.)
+                                colPos = 0
+                            }
+                        }
+                    }
+                    2 {
+                        columns {
+                            1 {
+                                name = Footer Content
+                                colPos = 2
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/FrontpageEpEvents.tsconfig

@@ -0,0 +1,64 @@
+mod.web_layout.BackendLayouts {
+    frontpageEpEvents {
+        title = EP Events: Startseite
+        config {
+            backend_layout {
+                colCount = 2
+                rowCount = 5
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 3
+                                colspan = 2
+                            }
+                        }
+                    }
+                    2 {
+                        columns {
+                            1 {
+                                name = Kachel
+                                colPos = 10
+                            }
+                            2 {
+                                name = Kachel
+                                colPos = 11
+                            }
+                        }
+                    }
+                    3 {
+                        columns {
+                            1 {
+                                name = Kachel
+                                colPos = 12
+                            }
+                            2 {
+                                name = Kachel
+                                colPos = 13
+                            }
+                        }
+                    }
+                    4 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 0
+                                colspan = 2
+                            }
+                        }
+                    }
+                    5 {
+                        columns {
+                            1 {
+                                name = Footer Content
+                                colPos = 4
+                                colspan = 2
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/OfferEpEvents.tsconfig

@@ -0,0 +1,21 @@
+mod.web_layout.BackendLayouts {
+    offerEpEvents {
+        title = EP Events: Beispielangebot
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 1
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content (Slider etc.)
+                                colPos = 2
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_events/Configuration/TSConfig/Page/Mod/WebLayout/BackendLayouts/SubpageEpEvents.tsconfig

@@ -0,0 +1,45 @@
+mod.web_layout.BackendLayouts {
+    subpageEpEvents {
+        title = EP Events: Unterseite
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 4
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Header
+                                colPos = 1
+                            }
+                        }
+                    }
+                    2 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 0
+                            }
+                        }
+                    }
+                    3 {
+                        columns {
+                            1 {
+                                name = Content volle Breite
+                                colPos = 4
+                            }
+                        }
+                    }
+                    4 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 2
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_events/Configuration/TSconfig/Page/Main.tsconfig

@@ -1,5 +1,5 @@
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
 @import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
-@import 'EXT:ep_events/Configuration/TSconfig/Page/Wizards/NewContentElement.tsconfig'
+@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'
 @import 'EXT:ep_events/Configuration/TSconfig/Page/RTE.tsconfig'
 @import 'EXT:ep_events/Configuration/TSconfig/Page/TCEFORM.tsconfig'
-@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'

public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript

@@ -1,4 +1,4 @@
-@import "EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript"
+@import 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript'
 
 lib.contentElement {
     layoutRootPaths.20 = EXT:ep_events/Resources/Private/Layouts/FluidStyledContent

public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript

@@ -1 +1 @@
-@import "EXT:form/Configuration/TypoScript/setup.typoscript"
+@import 'EXT:form/Configuration/TypoScript/setup.typoscript'

public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.typoscript

@@ -1,4 +1,4 @@
-@import "EXT:news/Configuration/TypoScript/setup.txt"
+@import 'EXT:news/Configuration/TypoScript/setup.txt'
 
 plugin.tx_news {
     view {

public/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Seo.typoscript

@@ -1 +1 @@
-@import "EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript"
+@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/setup.typoscript'

public/typo3conf/ext/ep_events/Configuration/TypoScript/constants.typoscript

@@ -59,6 +59,6 @@ plugin.tx_epevents {
     }
 }
 
-@import "EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript"
+@import 'EXT:fluid_styled_content/Configuration/TypoScript/constants.typoscript'
-@import "EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript"
+@import 'EXT:seo/Configuration/TypoScript/XmlSitemap/constants.typoscript'
-@import "EXT:news/Configuration/TypoScript/constants.txt"
+@import 'EXT:news/Configuration/TypoScript/constants.txt'

public/typo3conf/ext/ep_events/Configuration/TypoScript/setup.typoscript

@@ -1,18 +1,6 @@
-@import "EXT:ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript"
+@import 'EXT:ep_events/Configuration/TypoScript/Extensions/*'
-@import "EXT:ep_events/Configuration/TypoScript/Extensions/Form.typoscript"
+@import 'EXT:ep_events/Configuration/TypoScript/Library/*'
-@import "EXT:ep_events/Configuration/TypoScript/Extensions/News.typoscript"
+@import 'EXT:ep_events/Configuration/TypoScript/ContentElements/*'
-@import "EXT:ep_events/Configuration/TypoScript/Extensions/Seo.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/Extensions/Typo3Encore.typoscript"
-
-@import "EXT:ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/Library/SearchForm.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/Library/Configurator.typoscript"
-
-@import "EXT:ep_events/Configuration/TypoScript/ContentElements/banner.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/ContentElements/statement.typoscript"
-@import "EXT:ep_events/Configuration/TypoScript/ContentElements/tile.typoscript"
 
 plugin.tx_epevents {
     features {
@@ -83,8 +71,7 @@ lib.parseFunc_RTE {
 tt_content.stdWrap.innerWrap >
 lib.stdheader.3.headerClass >
 
-@import "EXT:ep_events/Configuration/TypoScript/Page/Main.typoscript"
+@import 'EXT:ep_events/Configuration/TypoScript/Page/*'
-@import "EXT:ep_events/Configuration/TypoScript/Page/Ajax.typoscript"
 
 config {
     removeDefaultCSS = 1

public/typo3conf/ext/ep_products/Classes/Controller/AjaxCalendarController.php

@@ -46,7 +46,6 @@ class AjaxCalendarController extends ActionController
      */
     public function __construct(ContingentRepository $contingentRepository)
     {
-        parent::__construct();
         $this->contingentRepository = $contingentRepository;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/AjaxContingentController.php

@@ -54,7 +54,6 @@ class AjaxContingentController extends ActionController
         ContingentDataService $contingentDataService
     )
     {
-        parent::__construct();
         $this->contingentRepository = $contingentRepository;
         $this->contingentDataService = $contingentDataService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/AjaxDateController.php

@@ -77,7 +77,6 @@ class AjaxDateController extends ActionController
         ProductRepository $productRepository
     )
     {
-        parent::__construct();
         $this->filterService = $filterService;
         $this->dateService = $dateService;
         $this->resellerDataService = $resellerDataService;

public/typo3conf/ext/ep_products/Classes/Controller/AjaxGroupsPriceController.php

@@ -49,8 +49,6 @@ class AjaxGroupsPriceController extends ActionController
 
     public function __construct(GroupsPriceOptionRepository $groupsPriceOptionRepository, EmailService $emailService)
     {
-        parent::__construct();
-
         $this->groupsPriceOptionRepository = $groupsPriceOptionRepository;
         $this->emailService = $emailService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php

@@ -55,8 +55,6 @@ class AjaxSearchController extends ActionController
      */
     public function __construct(FilterService $filterService, SearchResultService $searchResultService)
     {
-        parent::__construct();
-
         $this->filterService = $filterService;
         $this->searchResultService = $searchResultService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchbarController.php

@@ -0,0 +1 @@
+

public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php

@@ -85,7 +85,6 @@ class AjaxTableController extends ActionController
         ResellerDataService $resellerDataService,
         ContingentDataService $contingentDataService
     ) {
-        parent::__construct();
         $this->productRepository = $productRepository;
         $this->dateService = $dateService;
         $this->filterService = $filterService;

public/typo3conf/ext/ep_products/Classes/Controller/AjaxWatchlistController.php

@@ -63,8 +63,6 @@ class AjaxWatchlistController extends ActionController
         FilterService $filterService
     )
     {
-        parent::__construct();
-
         $this->productRepository = $productRepository;
         $this->searchResultService = $searchResultService;
         $this->filterService = $filterService;

public/typo3conf/ext/ep_products/Classes/Controller/BackendController.php

@@ -83,8 +83,6 @@ class BackendController extends ActionController
         LogService $logService
     )
     {
-        parent::__construct();
-
         $this->dateImportService = $dateImportService;
         $this->contingentImportService = $contingentImportService;
         $this->snowreportImportService = $snowreportService;

public/typo3conf/ext/ep_products/Classes/Controller/CityController.php

@@ -44,7 +44,6 @@ class CityController extends ActionController
      */
     public function __construct(CityRepository $cityRepository)
     {
-        parent::__construct();
         $this->cityRepository = $cityRepository;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php

@@ -52,7 +52,6 @@ class ConceptController extends ActionController
      */
     public function __construct(ConceptRepository $conceptRepository, ProductDataService $productDataService)
     {
-        parent::__construct();
         $this->conceptRepository = $conceptRepository;
         $this->productDataService = $productDataService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/CountryController.php

@@ -52,7 +52,6 @@ class CountryController extends ActionController
      */
     public function __construct(CountryRepository $countryRepository, ProductDataService $productDataService)
     {
-        parent::__construct();
         $this->countryRepository = $countryRepository;
         $this->productDataService = $productDataService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/FaqController.php

@@ -43,7 +43,6 @@ class FaqController extends ActionController
      */
     public function __construct(FaqRepository $faqRepository)
     {
-        parent::__construct();
         $this->faqRepository = $faqRepository;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/HotelController.php

@@ -72,7 +72,6 @@ class HotelController extends ActionController
         ProductDataService $productDataService
     )
     {
-        parent::__construct();
         $this->hotelRepository = $hotelRepository;
         $this->productRepository = $productRepository;
         $this->hotelDataService = $hotelDataService;

public/typo3conf/ext/ep_products/Classes/Controller/IcalController.php

@@ -40,8 +40,6 @@ class IcalController extends ActionController
 
     public function __construct(IcalService $icalService)
     {
-        parent::__construct();
-
         $this->icalService = $icalService;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/MapController.php

@@ -55,7 +55,6 @@ class MapController extends ActionController
         ProductRepository $productRepository
     )
     {
-        parent::__construct();
         $this->hotelRepository = $hotelRepository;
         $this->productRepository = $productRepository;
     }

public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php

@@ -94,7 +94,6 @@ class ProductController extends ActionController
         DateService $dateService,
         FilterService $filterService
     ) {
-        parent::__construct();
         $this->productRepository = $productRepository;
         $this->productDataService = $productDataService;
         $this->hotelRepository = $hotelRepository;

public/typo3conf/ext/ep_products/Classes/Controller/RegionController.php

@@ -52,7 +52,6 @@ class RegionController extends ActionController
      */
     public function __construct(RegionRepository $regionRepository, ProductDataService $productDataService)
     {
-        parent::__construct();
         $this->regionRepository = $regionRepository;
         $this->productDataService = $productDataService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php

@@ -44,8 +44,6 @@ class ResellerController extends ActionController
      */
     public function __construct(ResellerDataService $resellerDataService)
     {
-        parent::__construct();
-
         $this->resellerDataService = $resellerDataService;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/SearchController.php

@@ -55,8 +55,6 @@ class SearchController extends ActionController
      */
     public function __construct(FilterService $filterService, SearchResultService $searchResultService)
     {
-        parent::__construct();
-
         $this->filterService = $filterService;
         $this->searchResultService = $searchResultService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/SearchbarController.php

@@ -54,7 +54,6 @@ class SearchbarController extends ActionController
      */
     public function __construct(FilterService $filterService, SearchResultService $searchResultService)
     {
-        parent::__construct();
         $this->filterService = $filterService;
         $this->searchResultService = $searchResultService;
     }

public/typo3conf/ext/ep_products/Classes/Controller/SnowreportController.php

@@ -44,7 +44,6 @@ class SnowreportController extends ActionController
      */
     public function __construct(SnowreportRepository $snowreportRepository)
     {
-        parent::__construct();
         $this->snowreportRepository = $snowreportRepository;
     }
 

public/typo3conf/ext/ep_products/Classes/Controller/TeamController.php

@@ -44,8 +44,6 @@ class TeamController extends ActionController
      */
     public function __construct(TeammemberRepository $teammemberRepository)
     {
-        parent::__construct();
-
         $this->teammemberRepository = $teammemberRepository;
     }
 

public/typo3conf/ext/ep_products/Classes/EventListener/SystemInformationToolbarListener.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace EP\EpProducts\Backend;
+namespace EP\EpProducts\EventListener;
 
 use EP\EpProducts\Service\ImportTimestampService;
-use TYPO3\CMS\Backend\Backend\ToolbarItems\SystemInformationToolbarItem as CoreSystemInformationToolbarItem;
+use TYPO3\CMS\Backend\Backend\Event\SystemInformationToolbarCollectorEvent;
 
-class SystemInformationToolbarItemExtension
+class SystemInformationToolbarListener
 {
-    public function addBpnImportInformation(CoreSystemInformationToolbarItem $systemInformation)
+    public function __invoke(SystemInformationToolbarCollectorEvent $event): void
     {
         $timestampService = new ImportTimestampService();
         $productDataUpdatedTimestamp = $timestampService->readImportTimestamp('fileadmin/products_import.info');
         $contingentsDataUpdatedTimestamp = $timestampService->readImportTimestamp('fileadmin/contingents_import.info');
 
-        $systemInformation->addSystemInformation(
+        $event->getToolbarItem()->addSystemInformation(
             'Letzer Produktdaten-Import',
             $productDataUpdatedTimestamp ? $productDataUpdatedTimestamp->format('d.m.y H:i:s') : '-',
             'ep-logo'
         );
-        $systemInformation->addSystemInformation(
+        $event->getToolbarItem()->addSystemInformation(
             'Letzer Kontingente Import',
             $contingentsDataUpdatedTimestamp ? $contingentsDataUpdatedTimestamp->format('d.m.y H:i:s') : '-',
             'ep-logo'

public/typo3conf/ext/ep_products/Classes/Middleware/StaticSearchParamsMiddleware.php

@@ -43,9 +43,9 @@ class StaticSearchParamsMiddleware implements MiddlewareInterface
 {
     use DbConnectionTrait;
 
-    const PREFIX_PATH_SEGMENT = 'reiseauswahl';
+    public const PREFIX_PATH_SEGMENT = 'reiseauswahl';
-    const SEARCH_RESULT_URI = '/skireisen/suche/ergebnis/';
+    public const SEARCH_RESULT_URI = '/skireisen/suche/ergebnis/';
-    const REDIRECT_RESPONSE_CODE = 302;
+    public const REDIRECT_RESPONSE_CODE = 302;
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {

public/typo3conf/ext/ep_products/Classes/Utility/SessionUtility.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace EP\EpProducts\Utility;
-
-/***************************************************************
- *
- *  Copyright notice
- *
- *  (c) 2016 Björn Fromme <[email protected]>, dreipunktnull
- *
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *
- *  This script 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 General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-class SessionUtility
-{
-
-    /**
-     * @param string $key
-     * @param mixed $value
-     */
-    static public function init($key, $value)
-    {
-        if (static::get($key) === false) {
-            static::set($key, $value);
-        }
-    }
-
-    /**
-     * @param string $key
-     * @param mixed $value
-     */
-    static public function set($key, $value)
-    {
-        $serializedValue = serialize($value);
-        $GLOBALS['TSFE']->fe_user->setKey('ses', $key, $serializedValue);
-        $GLOBALS['TSFE']->fe_user->storeSessionData();
-    }
-
-    /**
-     * @param string $key
-     *
-     * @return mixed|null
-     */
-    static public function get($key)
-    {
-        $value = $GLOBALS['TSFE']->fe_user->getKey('ses', $key);
-        return unserialize($value);
-    }
-
-    /**
-     * @param string $key
-     */
-    static public function remove($key)
-    {
-        static::set($key, null);
-    }
-
-}

public/typo3conf/ext/ep_products/Configuration/RequestMiddlewares.php

@@ -5,10 +5,10 @@ return [
         'ep/staticsearch' => [
             'target' => \EP\EpProducts\Middleware\StaticSearchParamsMiddleware::class,
             'before' => [
-                'typo3/cms-frontend/preprocessing',
+                'typo3/cms-redirects/redirecthandler',
             ],
             'after' => [
-                'typo3/cms-core/normalized-params-attribute',
+                'typo3/cms-frontend/static-route-resolver',
             ],
         ],
     ],

public/typo3conf/ext/ep_products/Configuration/Services.yaml

@@ -0,0 +1,6 @@
+services:
+  EP\EpProducts\EventListener\SystemInformationToolbarListener:
+    tags:
+      - name: event.listener
+        identifier: 'epToolbarListener'
+        event: TYPO3\CMS\Backend\Backend\Event\SystemInformationToolbarCollectorEvent

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_badge.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'headline,subline',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, subtitle, link',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, title, subtitle, link',
@@ -49,7 +46,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name,headline,teaser,description,party,leisure,teaser_images,header_images, images,latitude,longitude,country,region,facts,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, exclude_from_teasergroups, name, name_internal, headline, teaser, keywords, description, party, leisure, teaser_images, images, latitude, longitude, season, country, region, facts, officetip,header_title,header_subtitle',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, teaser, keywords, description, party, leisure, facts, officetip, --div--;Bilder/Dateien, teaser_images, header_images, images',
@@ -52,7 +49,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php

@@ -22,11 +22,6 @@ return [
 		'searchFields' => 'name,description,detail_page,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, bus_pro_id, name, headline, code, 
-		    description, description_extended, teaser, detail_page, teaser_images, header_images,header_title,
-		    header_subtitle',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => '--palette--;;top, --palette--;;naming, --palette--;;header, teaser, description, description_extended, 
@@ -56,7 +51,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php

@@ -23,9 +23,6 @@ return [
 		'searchFields' => 'code',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'date,pax,available,status,min_price,hotel,room_code,room_label,groupsch_id',
-	],
 	'types' => [
 		'1' => ['showitem' => 'date, pax, available, status, min_price, hotel, room_code, room_label, groupsch_id'],
 	],
@@ -48,7 +45,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php

@@ -21,11 +21,6 @@ return [
 		'searchFields' => 'code,name,headline,teaser,description,teaser_images,images,latitude,longitude,facts,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, code, name, 
-		    name_internal, headline, teaser, keywords, description, description_extended, teaser_images, header_images, 
-		    images, latitude, longitude, season, facts, officetip, snowreport, header_title, header_subtitle',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => '
@@ -58,7 +53,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php

@@ -22,12 +22,6 @@ return [
         'searchFields' => 'bus_pro_id,code,date_start,date_end,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, bus_pro_id, hotel_bus_pro_id, 
-            code, date_start, date_end, nights, board, board_code, board_bus_pro_id, bus_included, bus_available, 
-            skipass_included, services_included, services_general, pickups, discount, min_price, pseudo_price, 
-            available',
-    ],
     'types' => [
         '1' => ['showitem' => 'hidden, bus_pro_id, hotel_bus_pro_id, code, daytrip, date_start, date_end, nights, board, 
             board_code, board_bus_pro_id, bus_included, bus_available, skipass_included, services_included, 
@@ -54,7 +48,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name,tags,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, name, keywords',
-	],
 	'types' => [
 		'1' => ['showitem' => 'hidden, label, name'],
 	],
@@ -48,7 +45,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php

@@ -20,9 +20,6 @@ return [
 		'searchFields' => 'question,answer,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, question, answer',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, label, question, answer',
@@ -49,7 +46,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceboard.php

@@ -23,9 +23,6 @@ return [
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
         'hideTable' => true,
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, price',
-    ],
     'types' => [
         '1' => [
             'showitem' => 'title, price',
@@ -51,7 +48,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceconfig.php

@@ -23,11 +23,6 @@ return [
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
         'hideTable' => true,
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, date_from, date_to, 
-            persons_included, bonus_card_included, price, price_additional_person, 
-            price_additional_person_group_1, price_additional_person_group_2, price_additional_person_group_3',
-    ],
     'types' => [
         '1' => [
             'showitem' => '--palette--;;dates, --palette--;;included, --palette--;;prices, --palette--;;prices_groups',
@@ -59,7 +54,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_groupspriceoption.php

@@ -23,10 +23,6 @@ return [
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
         'hideTable' => true,
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, price, type,
-            ignore_with_board',
-    ],
     'types' => [
         '1' => [
             'showitem' => 'title, --palette--;;priceconfig',
@@ -53,7 +49,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php

@@ -23,13 +23,6 @@ return [
             header_images,images,reseller_images,code,type,category,country,region,city,teamer,products,external_link',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, detail_page, keywords, 
-            address, longitude, latitude, headline, teaser, description, features, room_types, additional_information, 
-            teaser_images, header_images, images, reseller_images, code, type, category, country, region, city, facts, 
-            teamer, products, header_title,header_subtitle, earlybird, new, low_contingent, show_as_teaser, 
-            external_link, path_segment, groups_price_configs, groups_price_boards, groups_price_options',
-    ],
     'types' => [
         '1' => [
             'showitem' => '--palette--;;top, --palette--;;name, --palette--;;geolocation, 
@@ -66,7 +59,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
@@ -566,7 +558,6 @@ return [
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
-                'enableMultiSelectFilterTextfield' => true,
                 'foreign_table' => 'tx_epproducts_domain_model_teammember',
                 'MM' => 'tx_epproducts_hotel_teammember_mm',
                 'size' => 10,

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name,by_car,by_bus,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, by_car, by_bus, image',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, name, by_car, by_bus, image',
@@ -47,7 +44,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'code',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'code,entity_type',
-	],
 	'types' => [
 		'1' => ['showitem' => 'code'],
 	],
@@ -48,7 +45,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'text,author,product,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, text, author',
-	],
 	'types' => [
 		'1' => ['showitem' => '--palette--;;top, text'],
 	],
@@ -48,7 +45,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php

@@ -22,15 +22,6 @@ return [
         'searchFields' => 'name,headline',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, searchable, bookable,
-        season, detail_page, name, name_internal, subline, keywords, headline, code, feature, bus_pro_id, teaser,
-        teaser_long, concept_description, board_description, additional_services, programme_description,
-        ski_pass_description, rating_average, rating_votes_count, teaser_images, header_images, images, concept,
-        country, region, city, journey, facts, officetip, hotels, calendar_hotel, faqs,header_title,header_subtitle,
-        alt_product, alt_label, video, banner, additional_regions, badge, daytrip, testimonials, external_link,
-        path_segment, hide_booking_button,non_bookable_dates',
-    ],
     'types' => [
         '1' => [
             'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;header,
@@ -72,7 +63,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',
@@ -668,7 +658,6 @@ return [
             'config' => [
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
-                'enableMultiSelectFilterTextfield' => true,
                 'foreign_table' => 'tx_epproducts_domain_model_hotel',
                 'foreign_table_where' => 'AND 1=1 ORDER BY tx_epproducts_domain_model_hotel.name',
                 'MM' => 'tx_epproducts_product_hotel_mm',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php

@@ -21,13 +21,6 @@ return [
 		'searchFields' => 'name,headline,teaser,ski_area,ski_pass,description,news',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, 
-		    exclude_from_teasergroups, name, name_internal, headline, teaser, keywords, ski_area, ski_pass, 
-		    description, news, length, height, lifts, feature, teaser_images, header_images, images, region_maps, 
-		    latitude, longitude, country, facts, snowreport, webcam, officetip,header_title,header_subtitle,
-		    award_image, award_link, award_label',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, 
@@ -63,7 +56,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'name,code,pa_code,products',
-	],
 	'types' => [
 		'1' => ['showitem' => 'name, code, pa_code, products'],
 	],
@@ -46,7 +43,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name,tags,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, code, type',
-	],
 	'types' => [
 		'1' => ['showitem' => 'code, type'],
 	],
@@ -48,7 +45,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php

@@ -21,12 +21,11 @@ return [
 		'searchFields' => 'regionName,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, vendor_uid, region_name, glacier, height_max, height_min, opened, snow_level_mountain, snow_level_valley, snow_quality, last_snowfall, lifts_total, lifts_opened, last_update, season_start, season_end, webcams',
-	],
 	'types' => [
 		'1' => [
-			'showitem' => 'hidden, vendor_uid, region_name, glacier, height_max, height_min, opened, snow_level_mountain, snow_level_valley, snow_quality, last_snowfall, lifts_total, lifts_opened, last_update, season_start, season_end, --div--;Webcams, webcams',
+			'showitem' => 'hidden, vendor_uid, region_name, glacier, height_max, height_min, opened, 
+			    snow_level_mountain, snow_level_valley, snow_quality, last_snowfall, lifts_total, lifts_opened, 
+			    last_update, season_start, season_end, --div--;Webcams, webcams',
 		],
 	],
 	'columns' => [
@@ -47,7 +46,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php

@@ -21,10 +21,6 @@ return [
         'searchFields' => 'name,path_segment',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
     ],
-    'interface' => [
-        'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, path_segment,
-            country, region, concept, hotel, product, date_from, date_to, hotel_types, bus, pax',
-    ],
     'types' => [
         '1' => [
             'showitem' => 'name, path_segment, country, region, concept, hotel, product, date_from, 
@@ -50,7 +46,6 @@ return [
         ],
         'l10n_parent' => [
             'displayCond' => 'FIELD:sys_language_uid:>:0',
-            'exclude' => 0,
             'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
             'config' => [
                 'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php

@@ -23,10 +23,6 @@ return [
 		'searchFields' => 'name,email,',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, path_segment, email,
-		    phone, tasks, description, image',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, --palette--;;top, --palette--;;contact, description, image, path_segment',
@@ -54,7 +50,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php

@@ -21,9 +21,6 @@ return [
 		'searchFields' => 'name',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, url, vendor_uid, available, snowreport',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, name, url, vendor_uid, available, snowreport',
@@ -47,7 +44,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_products/ext_localconf.php

@@ -4,23 +4,23 @@ if (!defined('TYPO3_MODE')) {
 	die('Access denied.');
 }
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][$_EXTKEY] =
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['ep_products'] =
     \EP\EpProducts\Hook\Tcemain::class;
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportDatesTask::class] = [
-    'extension' => $_EXTKEY,
+    'extension' => 'ep_products',
     'title' => 'EP Reisedaten Import',
     'description' => 'Importiert Reisedaten aus busProNet',
 ];
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportContingentsTask::class] = [
-    'extension' => $_EXTKEY,
+    'extension' => 'ep_products',
     'title' => 'EP Kontingent Import',
     'description' => 'Importiert Kontingentdaten aus busProNet',
 ];
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks'][\EP\EpProducts\Task\ImportSnowreportTask::class] = [
-    'extension' => $_EXTKEY,
+    'extension' => 'ep_products',
     'title' => 'EP Schneehöhen Import',
     'description' => 'Importiert Schneehöhen',
 ];
@@ -41,7 +41,7 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'searchbar',
     [
         'Searchbar' => 'index',
@@ -52,18 +52,15 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'searchbox',
     [
         'Search' => 'searchbox',
-    ],
-    [
-        'Search' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'searchresult',
     [
         'Search' => 'searchresult,processSearch',
@@ -74,7 +71,7 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'staticresult',
     [
         'Search' => 'staticresult',
@@ -85,139 +82,103 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'product_detail',
     [
         'Product' => 'detail,hotelList',
-    ],
-    [
-        'Product' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'booking_link',
     [
         'Product' => 'detail,hotelList',
-    ],
-    [
-        'Product' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'product_teasergroup',
     [
         'Product' => 'teasergroup',
-    ],
-    [
-        'Product' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'product_pricetable',
     [
         'Product' => 'pricetable',
-    ],
-    [
-        'Product' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'country_detail',
     [
         'Country' => 'detail',
-    ],
-    [
-        'Country' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'region_teasergroup',
     [
         'Region' => 'teasergroup',
-    ],
-    [
-        'Region' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'region_detail',
     [
         'Region' => 'detail',
-    ],
-    [
-        'Region' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'city_teasergroup',
     [
         'City' => 'teasergroup',
-    ],
-    [
-        'City' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'city_detail',
     [
         'City' => 'detail',
-    ],
-    [
-        'City' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'hotel_teasergroup',
     [
         'Hotel' => 'teasergroup',
-    ],
-    [
-        'Hotel' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'hotel_teasergroup_nodate',
     [
         'Hotel' => 'dateIndependentTeasergroup',
-    ],
-    [
-        'Hotel' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'hotel_detail',
     [
         'Hotel' => 'detail',
-    ],
-    [
-        'Hotel' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'hotel_groups_price',
     [
         'GroupsPrice' => 'index',
@@ -228,73 +189,55 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'hotel_detail_event',
     [
         'Hotel' => 'detailEvent',
-    ],
-    [
-        'Hotel' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'faq',
     [
         'Faq' => 'detail',
-    ],
-    [
-        'Faq' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'concept_teasergroup',
     [
         'Concept' => 'teasergroup',
-    ],
-    [
-        'Concept' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'concept_detail',
     [
         'Concept' => 'detail',
-    ],
-    [
-        'Concept' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'snowreport_list',
     [
         'Snowreport' => 'list',
-    ],
-    [
-        'Snowreport' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'teammembers',
     [
         'Team' => 'list, show',
-    ],
-    [
-        'Team' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'newsletter',
     [
         'Newsletter' => 'index',
@@ -305,29 +248,23 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'maps',
     [
         'Map' => 'general',
-    ],
-    [
-        'Map' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'pricetable',
     [
         'Pricetable' => 'event',
-    ],
-    [
-        'Pricetable' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'reseller',
     [
         'Reseller' => 'list,copypaste',
@@ -338,29 +275,23 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'watchlist',
     [
         'Watchlist' => 'list',
-    ],
-    [
-        'Watchlist' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'password',
     [
         'Password' => 'index',
-    ],
-    [
-        'Password' => '',
     ]
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'ajax',
     [
         'AjaxSearch' => 'searchresult',
@@ -383,7 +314,7 @@ $iconRegistry->registerIcon(
 );
 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-    'EP.' . $_EXTKEY,
+    'EP.ep_products',
     'ical',
     [
         'Ical' => 'contingents',
@@ -416,13 +347,3 @@ $GLOBALS['TYPO3_CONF_VARS']['LOG']['EP']['EpProducts']['Controller']['writerConf
 
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install']['update']['teamSlug'] =
     \EP\EpProducts\Updates\TeamSlugUpdater::class;
-
-if ('BE' === TYPO3_MODE && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL)) {
-    \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class)
-        ->connect(
-            \TYPO3\CMS\Backend\Backend\ToolbarItems\SystemInformationToolbarItem::class,
-            'getSystemInformation',
-            \EP\EpProducts\Backend\SystemInformationToolbarItemExtension::class,
-            'addBpnImportInformation'
-        );
-}

public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php

@@ -51,8 +51,6 @@ class AjaxFormController extends ActionController
      */
     public function __construct(EmailService $emailService, BookingApiService $bookingApiService)
     {
-        parent::__construct();
-
         $this->emailService = $emailService;
         $this->bookingApiService = $bookingApiService;
     }

public/typo3conf/ext/ep_theme/Classes/Controller/BackendController.php

@@ -64,8 +64,6 @@ class BackendController extends ActionController
      */
     public function __construct(PageRepository $pageRepository)
     {
-        parent::__construct();
-
         $this->pageRepository = $pageRepository;
     }
 

public/typo3conf/ext/ep_theme/Classes/Domain/Model/Page.php

@@ -36,38 +36,6 @@ class Page extends AbstractEntity
      */
     protected $description;
 
-    /**
-     * @return int
-     */
-    public function getUid()
-    {
-        return $this->uid;
-    }
-
-    /**
-     * @param int $uid
-     */
-    public function setUid($uid)
-    {
-        $this->uid = $uid;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPid()
-    {
-        return $this->pid;
-    }
-
-    /**
-     * @param int $pid
-     */
-    public function setPid($pid)
-    {
-        $this->pid = $pid;
-    }
-
     /**
      * @return bool
      */

public/typo3conf/ext/ep_theme/Classes/Domain/Repository/PageRepository.php

@@ -29,7 +29,7 @@ class PageRepository extends Repository
         ;
         $query->matching($query->logicalAnd([
                 $query->equals('pid', $pid),
-                $query->equals('doktype', \TYPO3\CMS\Frontend\Page\PageRepository::DOKTYPE_DEFAULT)
+                $query->equals('doktype', \TYPO3\CMS\Core\Domain\Repository\PageRepository::DOKTYPE_DEFAULT)
         ]));
 
         return $query->execute();

public/typo3conf/ext/ep_theme/Classes/Form/AddReferrerFinisher.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace EP\EpTheme\Form;
+
+use TYPO3\CMS\Form\Domain\Finishers\AbstractFinisher;
+
+class AddReferrerFinisher extends AbstractFinisher
+{
+    protected function executeInternal()
+    {
+        // Look for key 'referrer' in frontend session
+        $referrer = $GLOBALS['TSFE']->fe_user->getKey('ses', 'referrer');
+
+        if (null === $referrer) {
+            return;
+        }
+
+        // Add textfield to form containing referrer value
+        $field = $this->finisherContext
+            ->getFormRuntime()
+            ->getFormDefinition()
+            ->getPageByIndex(0)
+            ->createElement('referrer', 'Text');
+
+        $field->setDefaultValue($referrer);
+        $field->setDataType('string');
+        $field->setLabel('Referrer');
+
+        // Add finisher variable for potential later use
+        $this->finisherContext->getFinisherVariableProvider()->add(
+            $this->shortFinisherIdentifier,
+            'referrer',
+            $referrer
+        );
+
+        // Remove session key
+        $GLOBALS['TSFE']->fe_user->setKey('ses', 'referrer', null);
+        $GLOBALS['TSFE']->fe_user->storeSessionData();
+    }
+}

public/typo3conf/ext/ep_theme/Classes/Middleware/ReferrerMiddleware.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace EP\EpTheme\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Core\Exception\SiteNotFoundException;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+class ReferrerMiddleware implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $queryParams = $request->getQueryParams();
+
+        if (!array_key_exists('ref', $queryParams)) {
+            return $handler->handle($request);
+        }
+
+        $ref = $queryParams['ref'];
+
+        if (false === is_numeric($ref)) {
+            return $handler->handle($request);
+        }
+
+        /** @var SiteFinder $siteFinder */
+        $siteFinder = GeneralUtility::makeInstance(SiteFinder::class);
+
+        try {
+            $site = $siteFinder->getSiteByPageId($ref);
+            $url = $site->getRouter()->generateUri($ref);
+            $GLOBALS['TSFE']->fe_user->setKey('ses', 'referrer', $url);
+            $GLOBALS['TSFE']->fe_user->storeSessionData();
+        }
+        catch (SiteNotFoundException $exception) {
+        }
+
+        return $handler->handle($request);
+    }
+}

public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php

@@ -86,7 +86,7 @@ class ProductViewHelper extends AbstractViewHelper
                 ->getControllerContext()
                 ->getUriBuilder()
                 ->reset()
-                ->setTargetPageUid($targetPageUid)
+                ->setTargetPageUid((int)$product['detailPage'])
                 ->uriFor('detail', $linkArguments, 'Product', 'epproducts', 'product_detail')
             ;
         } else {

public/typo3conf/ext/ep_theme/Configuration/Extbase/Persistence/Classes.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types = 1);
+
+return [
+    \EP\EpTheme\Domain\Model\Page::class => [
+        'tableName' => 'pages',
+    ],
+];

public/typo3conf/ext/ep_theme/Configuration/Forms/FormEngineSetup.yaml

@@ -1,9 +0,0 @@
-TYPO3:
-  CMS:
-    Form:
-      prototypes:
-        standard:
-          finishersDefinition:
-            BpnApiFinisher:
-              FormEngine:
-                label: 'BusPro Finisher'

public/typo3conf/ext/ep_theme/Configuration/RequestMiddlewares.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'frontend' => [
+        'ep/referrer' => [
+            'target' => \EP\EpTheme\Middleware\ReferrerMiddleware::class,
+            'after' => [
+                'typo3/cms-frontend/site',
+            ],
+        ],
+    ],
+];

public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_addresscheck.php

@@ -20,9 +20,6 @@ return [
         'searchFields' => 'name, first_name, last_name, email',
         'dividers2tabs' => 1,
     ],
-    'interface' => [
-        'showRecordFieldList' => 'first_name,last_name,address,city,zip,country,email,title'
-    ],
     'columns' => [
         'pid' => [
             'label' => 'pid',

public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_disrupter.php

@@ -21,10 +21,6 @@ return [
 		'searchFields' => 'headline,text',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, layout, headline, text, 
-		    image, pi_flexform',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'sys_language_uid, hidden, layout, headline, text, image, pi_flexform',
@@ -50,7 +46,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php

@@ -22,10 +22,6 @@ return [
 		'searchFields' => 'headline,subline',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description, image, 
-		    facebook_url, twitter_url, youtube_url, instagram_url, soundcloud_url',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => 'hidden, name, description, image, --palette--;;social',
@@ -52,7 +48,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php

@@ -22,10 +22,6 @@ return [
 		'searchFields' => 'headline,subline',
         'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg',
 	],
-	'interface' => [
-		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, headline, subline, skipass, 
-		    button, page_uid, image',
-	],
 	'types' => [
 		'1' => [
 			'showitem' => '--palette--;;top, --palette--;;headlines, --palette--;;linkbutton, image',
@@ -54,7 +50,6 @@ return [
 		],
 		'l10n_parent' => [
 			'displayCond' => 'FIELD:sys_language_uid:>:0',
-			'exclude' => 0,
 			'label' => 'LLL:EXT:lang/Resources/Private/Language/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Main.tsconfig

@@ -1,7 +1,7 @@
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig'
+@import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'
 @import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig'
 @import 'EXT:ep_theme/Configuration/TSconfig/Page/Mod/Wizards/NewContentElement.tsconfig'
-@import 'EXT:ep_theme/Configuration/TSconfig/Page/Extensions/GridElements.tsconfig'
 @import 'EXT:ep_theme/Configuration/TSconfig/Page/RTE.tsconfig'
 @import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEFORM.tsconfig'
 @import 'EXT:ep_theme/Configuration/TSconfig/Page/TCEMAIN.tsconfig'
-@import 'EXT:ep_events/Configuration/TSconfig/Page/Mod/SHARED.tsconfig'

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts.tsconfig

@@ -1,152 +0,0 @@
-mod {
-    web_layout.BackendLayouts {
-        frontpage {
-            title = Startseite
-            config {
-                backend_layout {
-                    colCount = 1
-                    rowCount = 1
-                    rows {
-                        1 {
-                            columns {
-                                1 {
-                                    name = Content
-                                    colPos = 0
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        frontpageEvent < .frontpage
-        frontpageEvent.title = Startseite Events
-        popup < .frontpage
-        popup.title = Popup
-        detail {
-            title = Detailseite
-            config {
-                backend_layout {
-                    colCount = 1
-                    rowCount = 2
-                    rows {
-                        1 {
-                            columns {
-                                1 {
-                                    name = Content
-                                    colPos = 0
-                                }
-                            }
-                        }
-                        2 {
-                            columns {
-                                1 {
-                                    name = Teaserbereich
-                                    colPos = 1
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        subpage < .detail
-        subpage.title = Unterseite
-        search < .detail
-        search.title = Suchergebnis
-        subpageSidebarLeft {
-            title = Unterseite mit Sidebar (links)
-            config {
-                backend_layout {
-                    colCount = 4
-                    rowCount = 3
-                    rows {
-                        1 {
-                            columns {
-                                1 {
-                                    name = Headline
-                                    colPos = 3
-                                    colspan = 4
-                                }
-                            }
-                        }
-                        2 {
-                            columns {
-                                1 {
-                                    name = Sidebar
-                                    colPos = 2
-                                    colspan = 1
-                                }
-                            }
-                            columns {
-                                2 {
-                                    name = Content
-                                    colPos = 4
-                                    colspan = 3
-                                }
-                            }
-                        }
-                        3 {
-                            columns {
-                                1 {
-                                    name = Teaserbereich
-                                    colPos = 1
-                                    colspan = 4
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        subpageSidebarRight {
-            title = Unterseite mit Sidebar (rechts)
-            config {
-                backend_layout {
-                    colCount = 4
-                    rowCount = 3
-                    rows {
-                        1 {
-                            columns {
-                                1 {
-                                    name = Headline
-                                    colPos = 3
-                                    colspan = 4
-                                }
-                            }
-                        }
-                        2 {
-                            columns {
-                                1 {
-                                    name = Content
-                                    colPos = 4
-                                    colspan = 3
-                                }
-                            }
-                            columns {
-                                2 {
-                                    name = Sidebar
-                                    colPos = 2
-                                    colspan = 1
-                                }
-                            }
-                        }
-                        3 {
-                            columns {
-                                1 {
-                                    name = Teaserbereich
-                                    colPos = 1
-                                    colspan = 4
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        subpageSidebarRightEvent < .subpageSidebarRight
-        subpageSidebarRightEvent.title = Unterseite Events mit Sidebar (rechts)
-        subpageSidebarLeftEvent < .subpageSidebarLeft
-        subpageSidebarLeftEvent.title = Unterseite Events mit Sidebar (links)
-    }
-}

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts/Detail.tsconfig

@@ -0,0 +1,29 @@
+mod.web_layout.BackendLayouts {
+    detail {
+        title = Detailseite
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 2
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 0
+                            }
+                        }
+                    }
+                    2 {
+                        columns {
+                            1 {
+                                name = Teaserbereich
+                                colPos = 1
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

public/typo3conf/ext/ep_theme/Configuration/TSconfig/Page/Mod/WebLayout/BackendLayouts/Frontpage.tsconfig

@@ -0,0 +1,21 @@
+mod.web_layout.BackendLayouts {
+    frontpage {
+        title = Startseite
+        config {
+            backend_layout {
+                colCount = 1
+                rowCount = 1
+                rows {
+                    1 {
+                        columns {
+                            1 {
+                                name = Content
+                                colPos = 0
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}