bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Code cleanup, no functional changes

Browse Source
This commit is contained in:
Deon George
2023-06-27 19:39:11 +12:00
parent b70a36003a
commit ad36da0bb1
64 changed files with 466 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -37,7 +37,7 @@ class ForgotPasswordController extends Controller
$this->credentials($request)
);
return $response == Password::RESET_LINK_SENT
return $response === Password::RESET_LINK_SENT
? $this->sendResetLinkResponse($request, $response)
: $this->sendResetLinkFailedResponse($request, $response);
}

9
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -2,13 +2,14 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\Models\User;
class RegisterController extends Controller
{
/*
@@ -60,7 +61,7 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\Models\User
* @return User
*/
protected function create(array $data)
{

10
app/Http/Controllers/SystemController.php
View File

@@ -401,7 +401,7 @@ class SystemController extends Controller
{
$ao = $o->addresses->firstWhere('id',$request->address_id);
if (($request->method() == 'POST') && $request->post()) {
if (($request->method() === 'POST') && $request->post()) {
session()->flash('accordion','echoarea');
if ($ao->trashed() && collect($request->get('id'))->diff($ao->echoareas->pluck('id'))->count())
@@ -413,7 +413,7 @@ class SystemController extends Controller
$ao->echoareas()->syncWithPivotValues($request->get('id',[]),['subscribed'=>Carbon::now()]);
return redirect()->back()->with('success','Echoareas updated');;
return redirect()->back()->with('success','Echoareas updated');
}
$eo = Echoarea::active()
@@ -438,7 +438,7 @@ class SystemController extends Controller
{
$ao = $o->addresses->firstWhere('id',$request->address_id);
if (($request->method() == 'POST') && $request->post()) {
if (($request->method() === 'POST') && $request->post()) {
session()->flash('accordion','filearea');
// Ensure we have session details for this address.
@@ -447,7 +447,7 @@ class SystemController extends Controller
$ao->fileareas()->syncWithPivotValues($request->get('id',[]),['subscribed'=>Carbon::now()]);
return redirect()->back()->with('success','Fileareas updated');;
return redirect()->back()->with('success','Fileareas updated');
}
$fo = Filearea::active()
@@ -480,7 +480,7 @@ class SystemController extends Controller
session()->flash('accordion','address');
// Quick check that this address belongs to this system
if ($so->addresses->search(function($item) use ($o) { return $item->id == $o->id; }) === FALSE)
if ($so->addresses->search(function($item) use ($o) { return $item->id === $o->id; }) === FALSE)
abort(404);
if ($request->post()) {

2
app/Http/Controllers/ZoneController.php
View File

@@ -25,7 +25,7 @@ class ZoneController extends Controller
Rule::unique('zones')->where(function ($query) use ($request,$o) {
return $query->where('zone_id',$request->post('zone_id'))
->where('default',TRUE)
->where('id','<>',$o->id);;
->where('id','<>',$o->id);
})
],
'zone_id' => [

7
app/Http/Middleware/ActiveUser.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -11,11 +10,11 @@ class ActiveUser
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
public function handle(Request $request,\Closure $next)
{
if (Auth::user()->exists && ! Auth::user()->active) {
Auth::logout();

70
app/Http/Middleware/AddUserToView.php
View File

@@ -8,43 +8,43 @@ use Illuminate\Contracts\Auth\Authenticatable;
class AddUserToView
{
/**
* The View Factory.
*
* @var \Illuminate\Contracts\View\Factory
*/
protected Factory $factory;
/**
* The View Factory.
*
* @var \Illuminate\Contracts\View\Factory
*/
protected Factory $factory;
/**
* The Authenticated user, if any.
*
* @var \Illuminate\Contracts\Auth\Authenticatable|null
*/
protected ?Authenticatable $user;
/**
* The Authenticated user, if any.
*
* @var \Illuminate\Contracts\Auth\Authenticatable|null
*/
protected ?Authenticatable $user;
/**
* Create a new Share Authenticated User instance.
*
* @param \Illuminate\Contracts\View\Factory $factory
* @param \Illuminate\Contracts\Auth\Authenticatable|null $user
*/
public function __construct(Factory $factory,Authenticatable $user=NULL)
{
$this->factory = $factory;
$this->user = $user;
}
/**
* Create a new Share Authenticated User instance.
*
* @param \Illuminate\Contracts\View\Factory $factory
* @param \Illuminate\Contracts\Auth\Authenticatable|null $user
*/
public function __construct(Factory $factory,Authenticatable $user=NULL)
{
$this->factory = $factory;
$this->user = $user;
}
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$this->factory->share('user',$this->user);
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
$this->factory->share('user',$this->user);
return $next($request);
}
return $next($request);
}
}

13
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -2,21 +2,22 @@
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Providers\RouteServiceProvider;
class RedirectIfAuthenticated
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @param Request $request
* @param \Closure $next
* @param string|null $guard
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
public function handle(Request $request,\Closure $next,?string $guard=NULL)
{
if (Auth::guard($guard)->check()) {
return redirect(RouteServiceProvider::HOME);