refactor: code style changes

Signed-off-by: miguel456 <me@nogueira.codes>
This commit is contained in:
2023-01-15 00:04:00 +00:00
parent 25155bff2e
commit 3727c84f3e
146 changed files with 1013 additions and 1341 deletions

View File

@@ -23,7 +23,6 @@ namespace App\Http\Middleware;
use App\Application;
use App\User;
use Carbon\Carbon;
use Closure;
use Exception;
use Illuminate\Http\Request;
@@ -38,9 +37,11 @@ class ApplicationEligibility
*
* @deprecated Deprecated in 0.9.0
* @see User::isEligible()
* @param Request $request
* @param Closure $next
*
* @param Request $request
* @param Closure $next
* @return mixed
*
* @throws Exception
*/
public function handle($request, Closure $next)
@@ -49,7 +50,6 @@ class ApplicationEligibility
$daysRemaining = __('N/A');
if (Auth::check()) {
$lastApplication = Application::where('applicantUserID', Auth::user()->id)->latest()->first();
if (is_null($lastApplication)) {
@@ -61,7 +61,6 @@ class ApplicationEligibility
$daysRemaining = $lastApplication->created_at->addMonth()->diffInDays(now());
if ($lastApplication->created_at->diffInMonths(now()) > 1 && in_array($lastApplication->applicationStatus, ['DENIED', 'APPROVED'])) {
$eligible = true;
}
@@ -69,7 +68,7 @@ class ApplicationEligibility
'eligible' => $eligible,
'daysRemaining' => $daysRemaining,
'ipAddress' => Auth::user()->originalIP,
'checkUserID' => Auth::user()->id
'checkUserID' => Auth::user()->id,
]);
View::share('isEligibleForApplication', $eligible);

View File

@@ -31,12 +31,11 @@ class Bancheck
{
private AccountSuspensionService $suspensionService;
public function __construct(AccountSuspensionService $suspensionService) {
public function __construct(AccountSuspensionService $suspensionService)
{
$this->suspensionService = $suspensionService;
}
/**
* Handle an incoming request.
*

View File

@@ -36,7 +36,6 @@ class ForceLogoutMiddleware
*/
public function handle($request, Closure $next)
{
if ((new AccountSuspensionService())->isSuspended(Auth::user())) {
Auth::logout();
$request->session()->flash('error', __('Your account is suspended. If you think this was a mistake, please contact an admin.'));

View File

@@ -19,20 +19,15 @@ class PasswordExpirationMiddleware
*/
public function handle(Request $request, Closure $next)
{
if(Auth::check())
{
if (Auth::check()) {
$sinceUpdate = Carbon::parse(Auth::user()->password_last_updated)->diffInDays(now());
$updateThreshold = Options::getOption('password_expiry');
if ($updateThreshold !== 0 && $sinceUpdate > $updateThreshold)
{
if ($updateThreshold !== 0 && $sinceUpdate > $updateThreshold) {
session()->put('passwordExpired', true);
}
else
{
} else {
session()->put('passwordExpired', false);
}
}
return $next($request);

View File

@@ -17,8 +17,7 @@ class PasswordExpirationRedirectMiddleware
*/
public function handle(Request $request, Closure $next)
{
if (Auth::check() && session('passwordExpired'))
{
if (Auth::check() && session('passwordExpired')) {
// WARNING!! Routes under the profile group must not have this middleware, because it'll result in an infinite redirect loop.
return redirect(route('showAccountSettings'));
}

View File

@@ -24,7 +24,6 @@ namespace App\Http\Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
@@ -45,5 +44,4 @@ class TrustProxies extends Middleware
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
}