From 5e46bbbe7e75109b581126d2ac877f9bc68c68db Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Sun, 7 May 2023 18:43:28 +0200
Subject: [PATCH] Cleanup Middleware, Fix locale

---
 .../Controllers/Admin/SettingsController.php  |  6 +++-
 app/Http/Kernel.php                           |  3 --
 app/Http/Middleware/GlobalNames.php           | 25 -----------------
 app/Http/Middleware/isAdmin.php               | 28 -------------------
 app/Http/Middleware/isMod.php                 | 27 ------------------
 .../views/admin/settings/index.blade.php      |  4 +--
 6 files changed, 7 insertions(+), 86 deletions(-)
 delete mode 100644 app/Http/Middleware/GlobalNames.php
 delete mode 100644 app/Http/Middleware/isAdmin.php
 delete mode 100644 app/Http/Middleware/isMod.php

diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 5b05db2b..7d1657f1 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -119,16 +119,20 @@ class SettingsController extends Controller
             $rp = new \ReflectionProperty($settingsClass, $key);
             $rpType = $rp->getType();
 
+
             if ($rpType == 'bool') {
                 $settingsClass->$key = $request->has($key);
                 continue;
             }
+            if ($rp->name == 'available') {
+                $settingsClass->$key = implode(",",$request->$key);
+                continue;
+            }
 
             $nullable = $rpType->allowsNull();
             if ($nullable) $settingsClass->$key = $request->input($key) ?? null;
             else $settingsClass->$key = $request->input($key);
         }
-
         $settingsClass->save();
 
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index a6fb149b..d0b1c7f7 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -4,7 +4,6 @@ namespace App\Http;
 
 use App\Http\Middleware\ApiAuthToken;
 use App\Http\Middleware\CheckSuspended;
-use App\Http\Middleware\GlobalNames;
 use App\Http\Middleware\isAdmin;
 use App\Http\Middleware\isMod;
 use App\Http\Middleware\LastSeen;
@@ -44,14 +43,12 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             LastSeen::class,
-            GlobalNames::class,
             \App\Http\Middleware\SetLocale::class,
         ],
 
         'api' => [
             'throttle:api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            GlobalNames::class,
         ],
     ];
 
diff --git a/app/Http/Middleware/GlobalNames.php b/app/Http/Middleware/GlobalNames.php
deleted file mode 100644
index 9250f23b..00000000
--- a/app/Http/Middleware/GlobalNames.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class GlobalNames
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param  Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $unsupported_lang_array = explode(',', config('app.unsupported_locales'));
-        $unsupported_lang_array = array_map('strtolower', $unsupported_lang_array);
-        define('UNSUPPORTED_LANGS', $unsupported_lang_array);
-
-        return $next($request);
-    }
-}
diff --git a/app/Http/Middleware/isAdmin.php b/app/Http/Middleware/isAdmin.php
deleted file mode 100644
index 6e8202a4..00000000
--- a/app/Http/Middleware/isAdmin.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Providers\RouteServiceProvider;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class isAdmin
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param  Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        //if (Auth::user() && Auth::user()->hasRole("Admin")) {
-        if (Auth::user() && Auth::user()->hasRole(1)) {
-            return $next($request);
-        }
-
-        return redirect(RouteServiceProvider::HOME);
-    }
-}
diff --git a/app/Http/Middleware/isMod.php b/app/Http/Middleware/isMod.php
deleted file mode 100644
index 51d6db85..00000000
--- a/app/Http/Middleware/isMod.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use App\Providers\RouteServiceProvider;
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class isMod
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  Request  $request
-     * @param  Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if (Auth::user() && Auth::user()->role == 'moderator' || Auth::user() && Auth::user()->hasRole(1)) {
-            return $next($request);
-        }
-
-        return redirect(RouteServiceProvider::HOME);
-    }
-}
diff --git a/themes/default/views/admin/settings/index.blade.php b/themes/default/views/admin/settings/index.blade.php
index 2c63d428..db4344b6 100644
--- a/themes/default/views/admin/settings/index.blade.php
+++ b/themes/default/views/admin/settings/index.blade.php
@@ -132,11 +132,11 @@
 
                                                                     @case($value['type'] == 'multiselect')
                                                                         <select id="{{ $key }}"
-                                                                            class="custom-select w-100" name="{{ $key }}"
+                                                                            class="custom-select w-100" name="{{ $key }}[]"
                                                                             multiple>
                                                                             @foreach ($value['options'] as $option)
                                                                                 <option value="{{ $option }}"
-                                                                                    {{ $value['value'] == $option ? 'selected' : '' }}>
+                                                                                    {{ strpos($value['value'],$option) !== false  ? 'selected' : '' }}>
                                                                                     {{ __($option) }}
                                                                                 </option>
                                                                             @endforeach