Cleanup Middleware, Fix locale
This commit is contained in:
parent
587e071b87
commit
5e46bbbe7e
|
@ -119,16 +119,20 @@ class SettingsController extends Controller
|
||||||
$rp = new \ReflectionProperty($settingsClass, $key);
|
$rp = new \ReflectionProperty($settingsClass, $key);
|
||||||
$rpType = $rp->getType();
|
$rpType = $rp->getType();
|
||||||
|
|
||||||
|
|
||||||
if ($rpType == 'bool') {
|
if ($rpType == 'bool') {
|
||||||
$settingsClass->$key = $request->has($key);
|
$settingsClass->$key = $request->has($key);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if ($rp->name == 'available') {
|
||||||
|
$settingsClass->$key = implode(",",$request->$key);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$nullable = $rpType->allowsNull();
|
$nullable = $rpType->allowsNull();
|
||||||
if ($nullable) $settingsClass->$key = $request->input($key) ?? null;
|
if ($nullable) $settingsClass->$key = $request->input($key) ?? null;
|
||||||
else $settingsClass->$key = $request->input($key);
|
else $settingsClass->$key = $request->input($key);
|
||||||
}
|
}
|
||||||
|
|
||||||
$settingsClass->save();
|
$settingsClass->save();
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ namespace App\Http;
|
||||||
|
|
||||||
use App\Http\Middleware\ApiAuthToken;
|
use App\Http\Middleware\ApiAuthToken;
|
||||||
use App\Http\Middleware\CheckSuspended;
|
use App\Http\Middleware\CheckSuspended;
|
||||||
use App\Http\Middleware\GlobalNames;
|
|
||||||
use App\Http\Middleware\isAdmin;
|
use App\Http\Middleware\isAdmin;
|
||||||
use App\Http\Middleware\isMod;
|
use App\Http\Middleware\isMod;
|
||||||
use App\Http\Middleware\LastSeen;
|
use App\Http\Middleware\LastSeen;
|
||||||
|
@ -44,14 +43,12 @@ class Kernel extends HttpKernel
|
||||||
\App\Http\Middleware\VerifyCsrfToken::class,
|
\App\Http\Middleware\VerifyCsrfToken::class,
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
LastSeen::class,
|
LastSeen::class,
|
||||||
GlobalNames::class,
|
|
||||||
\App\Http\Middleware\SetLocale::class,
|
\App\Http\Middleware\SetLocale::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
'api' => [
|
'api' => [
|
||||||
'throttle:api',
|
'throttle:api',
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
GlobalNames::class,
|
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -132,11 +132,11 @@
|
||||||
|
|
||||||
@case($value['type'] == 'multiselect')
|
@case($value['type'] == 'multiselect')
|
||||||
<select id="{{ $key }}"
|
<select id="{{ $key }}"
|
||||||
class="custom-select w-100" name="{{ $key }}"
|
class="custom-select w-100" name="{{ $key }}[]"
|
||||||
multiple>
|
multiple>
|
||||||
@foreach ($value['options'] as $option)
|
@foreach ($value['options'] as $option)
|
||||||
<option value="{{ $option }}"
|
<option value="{{ $option }}"
|
||||||
{{ $value['value'] == $option ? 'selected' : '' }}>
|
{{ strpos($value['value'],$option) !== false ? 'selected' : '' }}>
|
||||||
{{ __($option) }}
|
{{ __($option) }}
|
||||||
</option>
|
</option>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
Loading…
Reference in a new issue