Move mod/maintenance to src/Module/Maintenance

diff --git a/mod/maintenance.php b/mod/maintenance.php
deleted file mode 100644 (file)
index 8e0197b..0000000
--- a/mod/maintenance.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @file mod/maintenance.php
- */
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\Renderer;
-use Friendica\Util\Strings;
-
-function maintenance_content(App $a)
-{
-       $reason = Config::get('system', 'maintenance_reason');
-
-       if (substr(Strings::normaliseLink($reason), 0, 7) == 'http://') {
-               header("HTTP/1.1 307 Temporary Redirect");
-               header("Location:".$reason);
-               return;
-       }
-
-       header('HTTP/1.1 503 Service Temporarily Unavailable');
-       header('Status: 503 Service Temporarily Unavailable');
-       header('Retry-After: 600');
-
-       return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
-               '$sysdown' => L10n::t('System down for maintenance'),
-               '$reason' => $reason
-       ]);
-}

diff --git a/src/App.php b/src/App.php
index 017661c4ca666081ad997b5e5d97ad7ce3ed4d08..32e9fa876300988fc5ae09bc90cad5cce0cf40c7 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -1077,10 +1077,10 @@ class App
 
                // in install mode, any url loads install module
                // but we need "view" module for stylesheet
-               if ($this->getMode()->isInstall() && $this->module != 'view') {
-                       $this->module = 'install';
-               } elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module != 'view') {
-                       $this->module = 'maintenance';
+               if ($this->getMode()->isInstall() && $this->module !== 'install') {
+                       $this->internalRedirect('install');
+               } elseif (!$this->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $this->module !== 'maintenance') {
+                       $this->internalRedirect('maintenance');
                } else {
                        $this->checkURL();
                        Core\Update::check($this->getBasePath(), false, $this->getMode());

diff --git a/src/App/Router.php b/src/App/Router.php
index b94c0bb58dbe47439cdb32c2cc1f8b242d51f001..ac701a0786a942507cb83e976cab4455f67daf7d 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -138,6 +138,7 @@ class Router
                $this->routeCollector->addRoute(['GET', 'POST'], '/login',               Module\Login::class);
                $this->routeCollector->addRoute(['GET', 'POST'], '/logout',              Module\Logout::class);
                $this->routeCollector->addRoute(['GET'],         '/magic',               Module\Magic::class);
+               $this->routeCollector->addRoute(['GET'],         '/maintenance',         Module\Maintenance::class);
                $this->routeCollector->addRoute(['GET'],         '/manifest',            Module\Manifest::class);
                $this->routeCollector->addRoute(['GET'],         '/nodeinfo/1.0',        Module\NodeInfo::class);
                $this->routeCollector->addRoute(['GET'],         '/nogroup',             Module\Group::class);

diff --git a/src/Core/System.php b/src/Core/System.php
index 31934af5a73e055474b035561690f067bd872201..42587577dae573105a9f6ce462a0556fb7d8d5d2 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -242,6 +242,9 @@ class System extends BaseObject
                        case 301:
                                header('HTTP/1.1 301 Moved Permanently');
                                break;
+                       case 307:
+                               header('HTTP/1.1 307 Temporary Redirect');
+                               break;
                }
 
                header("Location: $url");

diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
new file mode 100644 (file)
index 0000000..e7dc5a0
--- /dev/null
+++ b/src/Module/Maintenance.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Util\Strings;
+
+/**
+ * Shows the maintenance reason
+ * or redirects to the alternate location
+ */
+class Maintenance extends BaseModule
+{
+       public static function content()
+       {
+               $config = self::getApp()->getConfig();
+
+               $reason = $config->get('system', 'maintenance_reason');
+
+               if ((substr(Strings::normaliseLink($reason), 0, 7) === 'http://') ||
+                       (substr(Strings::normaliseLink($reason), 0, 8) === 'https://')) {
+                       System::externalRedirect($reason, 307);
+               }
+
+               header('HTTP/1.1 503 Service Temporarily Unavailable');
+               header('Status: 503 Service Temporarily Unavailable');
+               header('Retry-After: 600');
+
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
+                       '$sysdown' => L10n::t('System down for maintenance'),
+                       '$reason' => $reason
+               ]);
+       }
+}