flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt at fixing detail changing

Browse source
This commit is contained in:
flash 2016-12-04 20:42:14 +01:00
parent e018549989
commit 2847589199
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Controllers/Settings/AccountController.php
View file

@ -105,7 +105,7 @@ class AccountController extends Controller
if (isset($_POST['session']) && session_check()) {
$email = $_POST['email'] ?? null;
if ($email) {
if ($email !== null && strlen($email) > 0) {
// Validate e-mail address
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
return $this->json(
@ -135,7 +135,7 @@ class AccountController extends Controller
$username = $_POST['username'] ?? null;
if ($username) {
if ($username !== null && strlen($username) > 0) {
$username_clean = clean_string($username, true);
// Check if the username is too short
@ -191,7 +191,6 @@ class AccountController extends Controller
}
if ($title !== $user->title) {
// Update database
DB::table('users')
->where('user_id', $user->id)
->update([

16
app/User.php
View file

@ -1010,11 +1010,9 @@ class User
*/
public function setPassword(string $password): void
{
// Create hash
$this->password = password_hash($password, PASSWORD_BCRYPT);
$this->passwordChan = time();
// Update userrow
DB::table('users')
->where('user_id', $this->id)
->update([
@ -1039,7 +1037,19 @@ class User
*/
public function verifyPassword(string $password): bool
{
return password_verify($password, $this->password);
$verify = password_verify($password, $this->password);
if ($verify && password_needs_rehash($this->password, PASSWORD_BCRYPT)) {
$this->password = password_hash($password, PASSWORD_BCRYPT);
DB::table('users')
->where('user_id', $this->id)
->update([
'password' => $this->password,
]);
}
return $verify;
}
/**