beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup Middleware, Fix locale (#816)

Browse source
This commit is contained in:
Dennis 2023-05-07 18:43:49 +02:00 committed by GitHub
parent c807476ff6 5e46bbbe7e
commit 519a13bc2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Admin/SettingsController.php
View file

@ -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();

3
app/Http/Kernel.php
View file

@ -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,
],
];

25
app/Http/Middleware/GlobalNames.php
View file

@ -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);
}
}

28
app/Http/Middleware/isAdmin.php
View file

@ -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);
}
}

27
app/Http/Middleware/isMod.php
View file

@ -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);
}
}

4
themes/default/views/admin/settings/index.blade.php
View file

@ -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