From cd370fb6c3961e9407d9add0e0c7caa047e926a7 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Fri, 2 Sep 2022 20:00:53 +0800
Subject: [PATCH] installer

---
 app/Http/Kernel.php                    |  2 --
 app/Http/Middleware/CheckInstalled.php | 24 ------------------------
 public/index.php                       |  4 ++++
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 app/Http/Middleware/CheckInstalled.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 09b2a11a..3bf4ab8c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -29,7 +29,6 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'shop' => [
-            \App\Http\Middleware\CheckInstalled::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
@@ -41,7 +40,6 @@ class Kernel extends HttpKernel
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
         'admin' => [
-            \App\Http\Middleware\CheckInstalled::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
diff --git a/app/Http/Middleware/CheckInstalled.php b/app/Http/Middleware/CheckInstalled.php
deleted file mode 100644
index fbf95a6c..00000000
--- a/app/Http/Middleware/CheckInstalled.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class CheckInstalled
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param Request $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if(!installed()) {
-            return redirect(route('installer.welcome'));
-        }
-        return $next($request);
-    }
-}
diff --git a/public/index.php b/public/index.php
index e9f8d91e..f3e708a8 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,6 +3,10 @@
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
 
+if (!file_exists( __DIR__.'/../storage/installed') && (!isset($_SERVER['REDIRECT_URL']) || substr($_SERVER['REDIRECT_URL'], 0, 10) != '/installer')) {
+    header("Location: /installer");
+}
+
 if (version_compare(PHP_VERSION, '8.0.2', '<') == true) {
     exit('PHP8.0.2+ Required');
 }