Commit c7a260db authored by Waterfox's avatar Waterfox
Browse files

Merge branch 'fix'

parents 4f45ddfb a301aa7f

app/Http/Controllers/AuthController.php

+6 −0
Original line number Diff line number Diff line
@@ -16,7 +16,13 @@ public function login(Request $request) 


        $user = User::where('US_EMAIL', $request->mail)->first();



        /*if ($user == null || !$user->checkPassword(hash("sha256",$request->password))) {

            return view('login', ['wrongPassword' => true]);

        }*/



        if ($user == null || !$user->checkPassword($request->password)) {

            return view('login', ['wrongPassword' => true]);

        }



        session(['user' => $user]);

        return redirect('/');

app/Http/Controllers/DivesList.php

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ function index(): View 
        $user = session()->get('user');

        $locations = DivingLocation::all();

        $levels = Prerogative::select('PRE_MAX_DEPTH')->groupby('PRE_MAX_DEPTH')->get();

        return view('dives', ['dives' => $dives, 'userPre' => Prerogative::find($user->PRE_CODE), 'locations' => $locations, 'levels' => $levels]);

        return view('dives', ['dives' => $dives, 'userPre' => Prerogative::find($user->PRE_CODE), 'locations' => $locations, 'levels' => $levels, 'user' => $user]);

    }



    function show($id) {

app/Http/Middleware/RightChecker.php

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
use Closure;

use Illuminate\Http\Request;



class rightChecker

class RightChecker

{

    /**

     * Handle an incoming request.