Merge pull request #133 from crydotsnake/feature/maintenance-update-interval-hinzugefuegt

Alexander Walther · web-flow · commit 6aab68bb6d5c · 2025-02-22T20:28:06.000+01:00
FEATURE: Felder für Wartungsmodus-Aktualisierungsintervall hinzugefügt
diff --git a/fragments/maintenance/backend.php b/fragments/maintenance/backend.php
@@ -1,14 +1,16 @@
 <?php
     $maintenanceBackendHeadline = rex_config::get('maintenance', 'maintenance_backend_headline', 'Maintenance / Wartung');
+    $maintenanceBackendUpdateIntervalNumber = rex_config::get('maintenance', 'maintenance_backend_update_interval', 60);
 ?>
 <!doctype html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="refresh" content="<?= $maintenanceBackendUpdateIntervalNumber > 0 ? $maintenanceBackendUpdateIntervalNumber : '' ?>">
     <title>
         <?php
-            if (rex_addon::get('yrewrite')->isAvailable() && rex_yrewrite::getCurrentDomain()?->getName() !== null) {
+            if (rex_addon::get('yrewrite')->isAvailable() && null !== rex_yrewrite::getCurrentDomain()?->getName()) {
                 echo rex_yrewrite::getCurrentDomain()->getName();
             } else {
                 echo rex::getServerName();
@@ -64,4 +66,3 @@
     </div>
 </body>
 </html>'
-
diff --git a/fragments/maintenance/frontend.php b/fragments/maintenance/frontend.php
@@ -1,14 +1,16 @@
 <?php
     $maintenanceFrontendHeadline = rex_config::get('maintenance', 'maintenance_frontend_headline', 'Maintenance / Wartung');
+    $maintenanceFrontendUpdateIntervalNumber = rex_config::get('maintenance', 'maintenance_frontend_update_interval', 60);
 ?>
 <!doctype html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="refresh" content="<?= $maintenanceFrontendUpdateIntervalNumber > 0 ? $maintenanceFrontendUpdateIntervalNumber : '' ?>">
     <title>
         <?php
-            if (rex_addon::get('yrewrite')->isAvailable() && rex_yrewrite::getCurrentDomain()?->getName() !== null) {
+            if (rex_addon::get('yrewrite')->isAvailable() && null !== rex_yrewrite::getCurrentDomain()?->getName()) {
                 echo rex_yrewrite::getCurrentDomain()->getName();
             } else {
                 echo rex::getServerName();
diff --git a/lang/de_de.lang b/lang/de_de.lang
@@ -5,6 +5,8 @@ maintenance_frontend_title = Website-Frontend
 maintenance_backend_title = REDAXO-Backend
 maintenance_docs_title = Hilfe
 
+maintenance_update_interval_field_label = Aktualisierungsintervall
+maintenance_update_interval_field_notice = Geben Sie die Sekunden ein, nach denen die Seite automatisch neu geladen werden soll. Setzen Sie 0, um die automatische Aktualisierung zu deaktivieren. Standardwert: 60 Sekunden
 
 // Console-Commands
 
diff --git a/lang/en_gb.lang b/lang/en_gb.lang
@@ -5,6 +5,8 @@ maintenance_frontend_title = Website Frontend
 maintenance_backend_title = REDAXO Backend
 maintenance_docs_title = Documentation
 
+maintenance_update_interval_field_label = Update interval
+maintenance_update_interval_field_notice = Enter the number of seconds after which the page is automatically reloaded. Set 0 to deactivate the automatic refresh. Default value: 60 seconds
 
 // Console-Commands
 
diff --git a/lib/command/maintenance_mode.php b/lib/command/maintenance_mode.php
@@ -7,15 +7,14 @@
 
 class rex_maintenance_mode_command extends rex_console_command
 {
-    
     #[Override]
     protected function configure(): void
     {
         $this
             ->setName('maintenance:mode')
             ->setDescription(rex_i18n::msg('maintenance_mode_command_description'))
             ->addArgument(
-                "state",
+                'state',
                 InputArgument::OPTIONAL,
                 rex_i18n::msg('maintenance_mode_command_state_description'),
             );
@@ -26,36 +25,33 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = $this->getStyle($input, $output);
         $io->title(rex_i18n::msg('maintenance_title'));
-        
+
         $state = $input->getArgument('state');
 
         $addon = rex_addon::get('maintenance');
         $currentBlockFrontendConfiguration = $addon->getConfig();
 
-        if ($currentBlockFrontendConfiguration['block_frontend'] === 1 && $state === "on")
-        {
+        if (1 === $currentBlockFrontendConfiguration['block_frontend'] && 'on' === $state) {
             $io->info(rex_i18n::msg('maintenance_mode_already_activated'));
             return Command::FAILURE;
         }
 
-        if ($currentBlockFrontendConfiguration['block_frontend'] === 0 && $state === "off")
-        {
+        if (0 === $currentBlockFrontendConfiguration['block_frontend'] && 'off' === $state) {
             $io->info(rex_i18n::msg('maintenance_mode_already_deactivated'));
             return Command::FAILURE;
-        }        
-        
-        if ($state === "on")
-        {
+        }
+
+        if ('on' === $state) {
             $addon->setConfig('block_frontend', 1);
             $io->success(rex_i18n::msg('maintenance_mode_activated'));
-            return Command::SUCCESS;            
-        } elseif ($state === "off") {
+            return Command::SUCCESS;
+        }
+        if ('off' === $state) {
             $addon->setConfig('block_frontend', 0);
             $io->success(rex_i18n::msg('maintenance_mode_deactivated'));
             return Command::SUCCESS;
-        } else {
-            $io->error(rex_i18n::msg('maintenance_mode_invalid'));
-            return Command::INVALID;
         }
+        $io->error(rex_i18n::msg('maintenance_mode_invalid'));
+        return Command::INVALID;
     }
 }
diff --git a/package.yml b/package.yml
@@ -57,6 +57,8 @@ default_config:
       editor: 'class="form-control redactor-editor--default"'
       maintenance_frontend_headline: 'Maintenance / Wartung'
       maintenance_backend_headline: 'Maintenance / Wartung'
+      maintenance_frontend_update_interval: 60
+      maintenance_backend_update_interval: 60
 
 installer_ignore:
     - .git
diff --git a/pages/backend.php b/pages/backend.php
@@ -19,6 +19,12 @@
 $field->setLabel($addon->i18n('maintenance_backend_headline_label'));
 $field->setNotice($addon->i18n('maintenance_backend_headline_notice'));
 
+// Automatische Aktualisierung der Seite
+$field = $form->addInputField('number', 'maintenance_backend_update_interval');
+$field->setLabel($addon->i18n('maintenance_update_interval_field_label'));
+$field->setNotice($addon->i18n('maintenance_update_interval_field_notice'));
+$field->setAttribute('class', 'form-control');
+
 $field = $form->addSelectField('block_backend');
 $field->setLabel($addon->i18n('maintenance_block_backend_label'));
 $select = $field->getSelect();
diff --git a/pages/frontend.php b/pages/frontend.php
@@ -22,6 +22,12 @@
 $field->setLabel($addon->i18n('maintenance_frontend_headline_label'));
 $field->setNotice($addon->i18n('maintenance_frontend_headline_notice'));
 
+// Automatische Aktualisierung der Seite
+$field = $form->addInputField('number', 'maintenance_frontend_update_interval');
+$field->setLabel($addon->i18n('maintenance_update_interval_field_label'));
+$field->setNotice($addon->i18n('maintenance_update_interval_field_notice'));
+$field->setAttribute('class', 'form-control');
+
 // Aktivierung/Deaktivierung des Wartungsmodus im Frontend - für alle Benutzer verfügbar
 $field = $form->addSelectField('block_frontend');
 $field->setLabel($addon->i18n('maintenance_block_frontend_label'));
diff --git a/pages/index.php b/pages/index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of the maintenance package.
  *

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* This file is part of the maintenance package.`
`4`	`5`	`*`