vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

User can now change password

This commit is contained in:
Anders 2020-07-27 13:09:51 +02:00
parent 01b556faba
commit 52a9c6ba1a
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
skolehjem/app/Http/Controllers/UserController.php
View File

@ -7,6 +7,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Spatie\Permission\Models\Role;
@ -151,26 +152,38 @@ class UserController extends Controller
// else if(Auth::user()->hasPermissionTo("user.edit")) {
$user = User::find($id);
if ($request->roles != null) {
/** @var User $user */
$user->update($data);
if ($request->roles != null) {
$user->roles()->detach();
$user->forgetCachedPermissions();
foreach ($request->roles as $role){
$user->assignRole($role);
}
//$user->save();
} else {
if ($request->input('password') != $request->input('confirmpassword')) {
return Response::detect("users.editpass");
} elseif (!Hash::check($request->input('oldpassword'), $user->password)) {
return Response::detect("users.editpass");
} else {
/** @var User $user */
$user->update($data);
Auth::logout();
return redirect()->route("users.login");
}
}
$user->save();
// }
$users = User::query()->paginate(20);
//$users = User::query()->paginate(20);
return Response::detect("users.index", [
"users" => $users
]);
//return Response::detect("users.index", [
// "users" => $users
//]);
}
/**