FriendsOfREDAXO · alxndr-w · Aug 20, 2024 · Aug 18, 2024 · Aug 18, 2024 · Aug 18, 2024
diff --git a/assets/css/maintenance-frontend.css b/assets/css/maintenance-frontend.css
@@ -0,0 +1,86 @@
+html, body {
+    height: 100%;
+    background-color: #f7f7f7;
+}
+body {
+    display: flex;
+    align-items: center;
+}
+.maintenance-container {
+    max-width: 500px;
+    min-width: 300px;
+    width: 50%;
+    margin: 0 auto;
+    color: #999;
+    font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Arial, sans-serif;
+    font-size: 15px;
+    line-height: 1.5;
+    text-align: center;
+}
+.maintenance-error a {
+    color: #666;
+}
+.maintenance-error a:hover {
+    color: #111;
+}
+.maintenance-error-title {
+    margin: 0;
+    font-size: 40px;
+    font-weight: 700;
+    color: #5b98d7;
+    text-shadow: 0 4px 2px rgba(255, 255, 255, 1);
+    line-height: 1.2em;
+}
+.maintenance-error-message {
+    padding: 0 20px;
+}
+
+.maintenance-login a {
+    color: #666;
+}
+.maintenance-login a:hover {
+    color: #111;
+}
+.maintenance-login-title {
+    margin: 0;
+    font-size: 40px;
+    font-weight: 700;
+    color: #5b98d7;
+    text-shadow: 0 4px 2px rgba(255, 255, 255, 1);
+    line-height: 1.2em;
+}
+.maintenance-login-message {
+    padding: 0 20px;
+}
+
+.maintenance-pw-input {
+    margin: 1em 1em 1em 1em;
+    padding: 1em 2em 1em 1em;
+    background: rgba(255,255,255,1);
+    border-radius: 30px;
+    border: none;
+    font-size: 1em;
+}
+
+.maintenance-pw-btn {
+    margin: 1em 1em 1em 1em;
+    padding: 1em 1em 1em 1em;
+    background: #5b98d7;
+    border-radius: 10px;
+    color: #ffffff;
+    border: none;
+    font-size: 1em;
+    cursor: pointer;
+}	
+
+.maintenance-btn {
+    display: inline-block;
+    text-decoration: none;
+    margin: 1em 1em 1em 1em;
+    padding: 1em 1em 1em 1em;
+    background: #5b98d7;
+    border-radius: 10px;
+    color: #ffffff;
+    border: none;
+    font-size: 1em;
+    }	
diff --git a/fragments/maintenance/announcement.php b/fragments/maintenance/announcement.php
@@ -0,0 +1,12 @@
+<?php
+$announcement = rex_config::get('maintenance', 'announcement', '');
+$start_date = rex_config::get('maintenance', 'announcement_start_date');
+$end_date = rex_config::get('maintenance', 'announcement_end_date');
+$current_date = date('Y-m-d H:i:s');
+
+if ($announcement !== '' && $start_date <= $current_date && $end_date >= $current_date) {
+    ?>
+<div class="maintenance-announcement">
+    <?php echo $announcement; ?>
+</div>
+<?php } ?>
diff --git a/fragments/maintenance/frontend.php b/fragments/maintenance/frontend.php
@@ -3,53 +3,22 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Maintenance</title>
-    <style type="text/css">
-        html, body {
-            height: 100%;
-            background-color: #f7f7f7;
-        }
-        body {
-            display: flex;
-            align-items: center;
-        }
-        .maintenance-container {
-            max-width: 500px;
-            min-width: 300px;
-            width: 50%;
-            margin: 0 auto;
-            color: #999;
-            font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Arial, sans-serif;
-            font-size: 15px;
-            line-height: 1.5;
-            text-align: center;
-        }
-        .maintenance-error a {
-            color: #666;
-        }
-        .maintenance-error a:hover {
-            color: #111;
-        }
-        .maintenance-error-title {
-            margin: 0;
-            font-size: 40px;
-            font-weight: 700;
-            color: #5b98d7;
-            text-shadow: 0 4px 2px rgba(255, 255, 255, 1);
-            line-height: 1.2em;
-        }
-        .maintenance-error-message {
-            padding: 0 20px;
-        }
-    </style>
+    <title><?= rex::getServerName() ?> - Maintenance</title>
+    <link rel="stylesheet" href="<?= rex_url::addonAssets('maintenance', 'css/maintenance-frontend.css') ?>" />
 </head>
 <body>
     <div class="maintenance-container">
         <div class="maintenance-error">
-            <p class="maintenance-error-title">Maintenance<br>Wartung</p>
-            <p class="maintenance-error-message">This website is temporarily unavailable</p>
-            <p class="maintenance-error-message">Diese Website ist temporär nicht erreichbar</p>
+            <p class="maintenance-error-title">Maintenance / <span lang="de">Wartung</span></p>
+            <p class="maintenance-error-message">This website is temporarily unavailable.</p>
+            <p class="maintenance-error-message" lang="de">Diese Website ist vorübergehend nicht erreichbar.</p>
         </div>
+        <?php
+        // Subfragment announcement.php ausgeben
+        echo $this->subfragment('maintenance/announcement.php');
+        echo $this->subfragment('maintenance/login.php');
+        echo $this->subfragment('maintenance/reload.php');
+        ?>
     </div>
 </body>
 </html>
diff --git a/fragments/maintenance/frontend_password.php b/fragments/maintenance/frontend_password.php
diff --git a/fragments/maintenance/login.php b/fragments/maintenance/login.php
@@ -0,0 +1,10 @@
+<?php
+if(rex_config::get('maintenance', 'authentification_mode', '') === 'password') { ?>
+<div class="maintenance-login">
+    <form action="<?= rex_url::base(); ?>" method="post">
+    <label for="maintenance_secret">Access-Code</label>
+    <input name="maintenance_secret" class="maintenance-pw-input" type="password" placeholder=""/>
+    <button type="submit" class="maintenance-pw-btn">Login</button>
+    </form>
+</div>
+<?php } ?>
diff --git a/fragments/maintenance/reload.php b/fragments/maintenance/reload.php
@@ -0,0 +1,6 @@
+<?php
+// reload current frontend page html button
+?>
+<div class="maintenance-reload">
+    <a href="<?= $_SERVER['REQUEST_URI']; ?>" class="maintenance-btn">Reload</a>
+</div>
diff --git a/lang/de_de.lang b/lang/de_de.lang
@@ -86,3 +86,6 @@ maintenance_allowed_yrewrite_domains_label = Liste erlaubter YRewrite-Domains
 maintenance_allowed_yrewrite_domains_notice = YRewrite-Domains eintragen, die nicht gesperrt werden sollen.
 
 maintenance_copy_url_title = URL kopieren
+
+maintenance_preview_title = Vorschau
+maintenance_preview = Vorschau in neuem Fenster anzeigen
diff --git a/lib/Maintenance.php b/lib/Maintenance.php
@@ -196,9 +196,7 @@ public static function checkFrontend(): void
         $responsecode = strval($addon->getConfig('http_response_code')); // @phpstan-ignore-line
 
         $mpage = new rex_fragment();
-        if (strval($addon->getConfig('authentification_mode')) === 'password') { // @phpstan-ignore-line
-            exit($mpage->parse('maintenance/frontend_password.php'));
-        } elseif ($redirect_url !== '') {
+        if ($redirect_url !== '') {
             rex_response::setStatus(rex_response::HTTP_MOVED_TEMPORARILY);
             rex_response::sendRedirect($redirect_url);
         }

diff --git a/package.yml b/package.yml
@@ -17,6 +17,10 @@ page:
         backend:
             title: translate:maintenance_backend_title
             icon: rex-icon fa-user-gear
+        preview:
+            title: translate:maintenance_preview_title
+            icon: rex-icon fa-eye
+            hidden: true
         help:
             title: translate:maintenance_docs_title
             subPath: README.md

diff --git a/pages/frontend.php b/pages/frontend.php
@@ -136,7 +136,16 @@
 
 
 		<?php
+/* Vorschau des Wartungsmodus */
+$preview = '<a target="_blank" href="' . rex_url::backendPage('maintenance/preview') . '" class="btn btn-primary">' . rex_i18n::msg('maintenance_preview') . '</a>';
 
+$fragment = new rex_fragment();
+$fragment->setVar('class', 'info', false);
+$fragment->setVar('title', rex_i18n::msg('maintenance_preview_title'), false);
+$fragment->setVar('body', $preview, false);
+echo $fragment->parse('core/page/section.php');
+
+/* Kopieren der URL für den Wartungsmodus */
         $copy = '<ul class="list-group">';
 $url = '' . rex::getServer() . '?maintenance_secret=' . rex_config::get('maintenance', 'maintenance_secret');
 $copy .= '<li class="list-group-item"><label for="maintenance-mode-url">REDAXO config.yml</label>
@@ -172,6 +181,7 @@
 $fragment->setVar('title', rex_i18n::msg('maintenance_copy_url_title'), false);
 $fragment->setVar('body', $copy, false);
 echo $fragment->parse('core/page/section.php');
+
 ?>
 	</div>
 </div>
diff --git a/pages/preview.php b/pages/preview.php
@@ -0,0 +1,7 @@
+<?php
+
+ob_clean();
+
+$fragment = new rex_fragment();
+echo $fragment->parse('maintenance/frontend.php');
+exit;