From 2c7842b3fa06e31c4bbadf3ae8764067a0611faf Mon Sep 17 00:00:00 2001
From: Graphictoria <XlXi@gtoria.net>
Date: Thu, 21 Apr 2022 22:50:06 -0400
Subject: [PATCH] Redirect to ReturnUrl when maintenance is disabled.

---
 .../PreventRequestsDuringMaintenance.php      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php
index cfab088..fb1511e 100644
--- a/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php
+++ b/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php
@@ -4,19 +4,12 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Support\Facades\Route;
-use Illuminate\Contracts\Foundation\Application;
 
 class PreventRequestsDuringMaintenance
 {
-	protected $app;
-	public function __construct(Application $app)
-    {
-        $this->app = $app;
-    }
-	
 	public function handle($request, Closure $next)
 	{
-		if($this->app->isDownForMaintenance()) {
+		if(app()->isDownForMaintenance()) {
 			if(in_array('web', $request->route()->middleware()))
 			{
 				if($request->route()->uri() != 'maintenance')
@@ -29,6 +22,18 @@ class PreventRequestsDuringMaintenance
 						->header('Content-Type', 'application/json; charset=utf-8');
 			}
 		}
+		else
+		{
+			if($request->route()->uri() == 'maintenance')
+			{
+				$returnUrl = $request->input('ReturnUrl');
+				
+				if(!$returnUrl)
+					$returnUrl = '/';
+				
+				return redirect($returnUrl);
+			}
+		}
 		
 		return $next($request);
 	}