From b361e2e5d5bdb6cc6256d50f8292c910fc4d3de0 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Fri, 11 Jan 2019 18:09:55 +0100 Subject: user hash fix update --- app/class/controlleruser.php | 3 +++ app/class/user.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/class/controlleruser.php b/app/class/controlleruser.php index 8240d55..65fb2bc 100644 --- a/app/class/controlleruser.php +++ b/app/class/controlleruser.php @@ -72,6 +72,9 @@ class Controlleruser extends Controller } elseif ($user->level() === 10 && $userupdate->level() !== 10 && $this->user->id() === $user->id()) { $this->routedirectget('user', ['error' => 'cant_edit_yourself']); } else { + if($userupdate->password() !== $user->password() && $user->passwordhashed()) { + $userupdate->setpasswordhashed(false); + } if($userupdate->passwordhashed() && !$user->passwordhashed()) { $userupdate->hashpassword(); } diff --git a/app/class/user.php b/app/class/user.php index 2627d3d..9bfc071 100644 --- a/app/class/user.php +++ b/app/class/user.php @@ -82,7 +82,7 @@ class User public function setpassword(string $password) { - if (is_string($password)) { + if (is_string($password) && !empty($password)) { $this->password = $password; } -- cgit v1.2.3