[pull] develop from LibreBooking:develop

.github/workflows/docs.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7.0.1
       - name: Set up Python
-        uses: actions/setup-python@v6.3.0
+        uses: actions/setup-python@v7.0.0
         with:
           python-version: "3.13"
       - name: Install dependencies

.github/workflows/lint-and-analyse-php.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v7.0.1
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v6.3.0
+      - uses: actions/setup-python@v7.0.0
         with:
           python-version: "3.13"
       - run: pip install --upgrade tox

Presenters/Admin/ManageConfigurationPresenter.php

@@ -224,6 +224,10 @@ public function Update()
             }
         }
 
+        if (!$isPluginConfig) {
+            $mergedSettings = $this->EnableIcsSubscriptionIfNeeded($mergedSettings);
+        }
+
         Log::Debug('Saving %s settings', count($configSettings));
 
         // WriteSettings will handle the proper nesting based on file type
@@ -242,6 +246,42 @@ public function SetHomepage()
         ServiceLocator::GetDatabase()->Execute($command);
     }
 
+    /**
+     * Generates and stores an ICS subscription key when the admin enables ICS
+     * through this settings page without setting a key, so subscription links
+     * do not remain broken until an unrelated schedule/resource/user toggle
+     * triggers key generation.
+     *
+     * @param array $mergedSettings
+     * @return array
+     */
+    private function EnableIcsSubscriptionIfNeeded(array $mergedSettings): array
+    {
+        if (!isset($mergedSettings['ics']) || !is_array($mergedSettings['ics'])) {
+            return $mergedSettings;
+        }
+
+        if (ConfigKeys::hasEnv(ConfigKeys::ICS_SUBSCRIPTION_KEY)) {
+            return $mergedSettings;
+        }
+
+        $icsEnabled = filter_var(
+            $mergedSettings['ics']['enabled'] ?? ConfigKeys::ICS_ENABLED['default'],
+            FILTER_VALIDATE_BOOLEAN
+        );
+
+        $newKey = ConfigurationFile::GenerateSubscriptionKeyIfNeeded(
+            $icsEnabled,
+            $mergedSettings['ics']['subscription.key'] ?? ''
+        );
+
+        if ($newKey !== null) {
+            $mergedSettings['ics']['subscription.key'] = $newKey;
+        }
+
+        return $mergedSettings;
+    }
+
     private function ShouldBeSkipped(string $key, ?ConfigKey $meta): bool
     {
         if ($meta === null) {