mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 12:19:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Feature#765 now it's possible to login with your email address (#770)

Browse source 
First we check for the username, if not found we check among email addresses.
This commit is contained in:
Maxime BOURMAUD 2020-09-30 10:51:29 +02:00 • committed by GitHub
parent b24c6c48f1
commit 32ff00caec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/functions_user.inc.php
View file

@ -1099,6 +1099,8 @@ function pwg_login($success, $username, $password, $remember_me)
pwg_session_gc(); pwg_session_gc();
global $conf; global $conf;
$user_found = false;
// retrieving the encrypted password of the login submitted // retrieving the encrypted password of the login submitted
$query = ' $query = '
SELECT '.$conf['user_fields']['id'].' AS id, SELECT '.$conf['user_fields']['id'].' AS id,
@ -1106,8 +1108,31 @@ SELECT '.$conf['user_fields']['id'].' AS id,
FROM '.USERS_TABLE.' FROM '.USERS_TABLE.'
WHERE '.$conf['user_fields']['username'].' = \''.pwg_db_real_escape_string($username).'\' WHERE '.$conf['user_fields']['username'].' = \''.pwg_db_real_escape_string($username).'\'
;'; ;';
$row = pwg_db_fetch_assoc(pwg_query($query)); $row = pwg_db_fetch_assoc(pwg_query($query));
if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id'])) if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id']))
{
$user_found = true;
}
// If we didn't find a matching user name, we search for email address
if (!$user_found)
{
$query = '
SELECT '.$conf['user_fields']['id'].' AS id,
'.$conf['user_fields']['password'].' AS password
FROM '.USERS_TABLE.'
WHERE '.$conf['user_fields']['email'].' = \''.pwg_db_real_escape_string($username).'\'
;';
$row = pwg_db_fetch_assoc(pwg_query($query));
if (isset($row['id']) and $conf['password_verify']($password, $row['password'], $row['id']))
{
$user_found = true;
}
}
if ($user_found)
{ {
log_user($row['id'], $remember_me); log_user($row['id'], $remember_me);
trigger_notify('login_success', stripslashes($username)); trigger_notify('login_success', stripslashes($username));