diff --git a/config.json b/config.json index 3118d4d6ef..4741827e3a 100644 --- a/config.json +++ b/config.json @@ -142,7 +142,7 @@ "required": false, "label": "Config.globalUserDataHashMaxAgeLabel", "options": { - "defaultValue": 24, + "defaultValue": 1, "selectBoxValues": [ { "value": 1, @@ -163,10 +163,6 @@ { "value": 168, "caption": "Config.globalMaxAge1Week" - }, - { - "value": -1, - "caption": "Config.globalMaxAgeInfinite" } ] } diff --git a/meta/documents/changelog_de.md b/meta/documents/changelog_de.md index 0b21f74832..6431a4d7a7 100644 --- a/meta/documents/changelog_de.md +++ b/meta/documents/changelog_de.md @@ -1,5 +1,11 @@ # Release Notes für plentyShop LTS +## v5.0.72 (2025-XX-XX) Übersicht aller Änderungen + +### Geändert + +- Für die Einstellung **Gültigkeit der URLs zum Ändern von Passwort bzw. E-Mail-Adresse** wurde der Wert "Immer" entfernt. Falls diese bisher genutzt wurde, greift eine maximale Gültigkeit von einer 1 Woche. + ## v5.0.71 (2024-12-12) Übersicht aller Änderungen ### TODO diff --git a/meta/documents/changelog_en.md b/meta/documents/changelog_en.md index c4ef3a6ee3..1ba783dbfc 100644 --- a/meta/documents/changelog_en.md +++ b/meta/documents/changelog_en.md @@ -1,5 +1,11 @@ # Release Notes for plentyShop LTS +## v5.0.72 (2025-XX-XX) Übersicht aller Änderungen + +### Geändert + +- We removed the Option "always" for the setting **Validity of URLs to change password and email address** in the plugin settings. The setting is now always set to 1 week. +- ## v5.0.71 (2024-12-12) Overview of all changes ### TODO diff --git a/resources/lang/de/Config.properties b/resources/lang/de/Config.properties index f9de048ce5..4db7bef7c1 100644 --- a/resources/lang/de/Config.properties +++ b/resources/lang/de/Config.properties @@ -109,7 +109,6 @@ globalMaxAge6Hours = 6 Stunden globalMaxAge12Hours = 12 Stunden globalMaxAge24Hours = 24 Stunden globalMaxAge1Week = 1 Woche -globalMaxAgeInfinite = Immer globalRegistrationRequirePrivacyPolicyConfirmation = Zustimmung zur Datenschutzerklärung bei der Kundenregistrierung voraussetzen globalBlockCookies = Nicht akzeptierte Cookies blockieren (empfohlen) diff --git a/resources/lang/de/Wizard.properties b/resources/lang/de/Wizard.properties index 3372f8f847..ea8c81cb5c 100644 --- a/resources/lang/de/Wizard.properties +++ b/resources/lang/de/Wizard.properties @@ -124,7 +124,6 @@ globalMaxAge6Hours = 6 Stunden globalMaxAge12Hours = 12 Stunden globalMaxAge24Hours = 24 Stunden globalMaxAge1Week = 1 Woche -globalMaxAgeInfinite = Immer ordersSettings = Aufträge und Retouren ordersSettingsDescription = In diesem Schritt nimmst du Einstellungen zu Artikelpaketen und Retouren vor. itemBundles = Wie möchtest du Artikelpakete im Bestellvorgang anzeigen? diff --git a/resources/lang/en/Config.properties b/resources/lang/en/Config.properties index fb75741e92..349ebb5214 100644 --- a/resources/lang/en/Config.properties +++ b/resources/lang/en/Config.properties @@ -107,7 +107,6 @@ globalMaxAge6Hours = 6 hours globalMaxAge12Hours = 12 hours globalMaxAge24Hours = 24 hours globalMaxAge1Week = 1 week -globalMaxAgeInfinite = Always globalRegistrationRequirePrivacyPolicyConfirmation = Require acceptance of privacy policy for customer registration globalBlockCookies = Block unaccepted cookies (recommended) diff --git a/resources/lang/en/Wizard.properties b/resources/lang/en/Wizard.properties index f24a7c9b62..e1918cef5f 100644 --- a/resources/lang/en/Wizard.properties +++ b/resources/lang/en/Wizard.properties @@ -124,7 +124,6 @@ globalMaxAge6Hours = 6 hours globalMaxAge12Hours = 12 hours globalMaxAge24Hours = 24 hours globalMaxAge1Week = 1 week -globalMaxAgeInfinite = Always ordersSettings = Order and returns ordersSettingsDescription = In this step, you carry out settings pertaining to your customers' orders and returns. itemBundles = How do you want to display item bundles in the checkout? diff --git a/src/Config/CeresGlobalConfig.php b/src/Config/CeresGlobalConfig.php index 7fb3a8de4c..c5a1a527c3 100644 --- a/src/Config/CeresGlobalConfig.php +++ b/src/Config/CeresGlobalConfig.php @@ -104,6 +104,7 @@ protected function load() $this->googleRecaptchaConsentGroup = $this->getTextValue('global.google_recaptcha_consentGroup', 'media'); $this->registrationRequirePrivacyPolicyConfirmation = $this->getBooleanValue( 'global.registration_require_privacy_policy_confirmation', true ); $this->blockCookies = $this->getBooleanValue( 'global.block_cookies', true ); - $this->userDataHashMaxAge = $this->getIntegerValue('global.user_data_hash_max_age', 24); + $ttl = $this->getIntegerValue('global.user_data_hash_max_age', 1); + $this->userDataHashMaxAge = $ttl == -1 ? 168 : $ttl; } } diff --git a/src/Wizard/ShopWizard/Config/OnlineStoreConfig.php b/src/Wizard/ShopWizard/Config/OnlineStoreConfig.php index 4dd72724ec..7c3ad8da6c 100644 --- a/src/Wizard/ShopWizard/Config/OnlineStoreConfig.php +++ b/src/Wizard/ShopWizard/Config/OnlineStoreConfig.php @@ -40,7 +40,6 @@ class OnlineStoreConfig 'globalMaxAge12Hours' => 12, 'globalMaxAge24Hours' => 24, 'globalMaxAge1Week' => 168, - 'globalMaxAgeInfinite' => -1 ]; private static $itemBundles = [