|
|
|
@ -192,7 +192,12 @@ class Login |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if ($result == 1) { |
|
|
|
if ($result == 1) { |
|
|
|
return get_lang('YourPasswordHasBeenEmailed'); |
|
|
|
$passwordEncryption = api_get_configuration_value('password_encryption'); |
|
|
|
|
|
|
|
if ($passwordEncryption === 'none') { |
|
|
|
|
|
|
|
return get_lang('YourPasswordHasBeenEmailed'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return get_lang('AnEmailToResetYourPasswordHasBeenSent'); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
$admin_email = Display:: encrypted_mailto_link( |
|
|
|
$admin_email = Display:: encrypted_mailto_link( |
|
|
|
api_get_setting('emailAdministrator'), |
|
|
|
api_get_setting('emailAdministrator'), |
|
|
|
@ -840,17 +845,17 @@ class Login |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
|
|
$tbl_user = Database::get_main_table(TABLE_MAIN_USER); |
|
|
|
$query = "SELECT |
|
|
|
$query = "SELECT |
|
|
|
user_id AS uid, |
|
|
|
user_id AS uid, |
|
|
|
lastname AS lastName, |
|
|
|
lastname AS lastName, |
|
|
|
firstname AS firstName, |
|
|
|
firstname AS firstName, |
|
|
|
username AS loginName, |
|
|
|
username AS loginName, |
|
|
|
password, |
|
|
|
password, |
|
|
|
email, |
|
|
|
email, |
|
|
|
status AS status, |
|
|
|
status AS status, |
|
|
|
official_code, |
|
|
|
official_code, |
|
|
|
phone, |
|
|
|
phone, |
|
|
|
picture_uri, |
|
|
|
picture_uri, |
|
|
|
creator_id, |
|
|
|
creator_id, |
|
|
|
auth_source |
|
|
|
auth_source |
|
|
|
FROM $tbl_user |
|
|
|
FROM $tbl_user |
|
|
|
|