miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "merge 1"

Browse Source 
This reverts commit 0bc6c20a6d.
This commit is contained in:
Miguel Nogueira
2022-10-24 01:03:43 +01:00
parent 0bc6c20a6d
commit 0c463d1f10
166 changed files with 1849 additions and 4266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Middleware/Bancheck.php
View File

@@ -21,21 +21,12 @@
namespace App\Http\Middleware;
use App\Services\AccountSuspensionService;
use Closure;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\View;
class Bancheck
{
private $suspensionService;
public function __construct(AccountSuspensionService $suspensionService) {
$this->suspensionService = $suspensionService;
}
/**
* Handle an incoming request.
*
@@ -46,11 +37,11 @@ class Bancheck
public function handle($request, Closure $next)
{
$userIP = $request->ip();
$anonymousUser = User::where('currentIp', $userIP)->get();
$anonymousUser = User::where('ipAddress', $userIP)->get();
if (Auth::check() && $this->suspensionService->isSuspended($anonymousUser)) {
if (Auth::check() && Auth::user()->isBanned()) {
View::share('isBanned', true);
} elseif (! $anonymousUser->isEmpty() && $this->suspensionService->isSuspended(User::find($anonymousUser->id))) {
} elseif (! $anonymousUser->isEmpty() && User::find($anonymousUser->id)->isBanned()) {
View::share('isBanned', true);
} else {
View::share('isBanned', false);