SH/PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Add email to create user, in setting edit user permission and emailmanager file

Browse Source
This commit is contained in:
haitem
2020-10-17 18:03:55 +02:00
parent 740a2debf7
commit 6b7bd911f7
8 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/managers/UserManager.php
View File

@@ -43,7 +43,7 @@ class UserManager
public static function login ($username, $password, $rememberMe) {
try {
if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($username))) {
if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?) OR LOWER(email)=LOWER(?)', array ($username, $username))) {
if ($user['password'] == UserManager::getHashPassword($password)) {
if (isset($rememberMe) && $rememberMe == 'true') {
setcookie ("rememberMe", self::setEncryptedCookie($user['username']), time () + (30 * 24 * 60 * 60 * 1000), BASEDIR, $_SERVER['HTTP_HOST'], 1);
@@ -69,7 +69,7 @@ class UserManager
public static function loginNew ($username, $password) {
try {
if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?)', array ($username))) {
if ($user = Db::loadOne ('SELECT * FROM users WHERE LOWER(username)=LOWER(?) OR LOWER(email)=LOWER(?)', array ($username, $username))) {
if ($user['password'] == UserManager::getHashPassword($password)) {
return $user['user_id'];
} else {
@@ -152,6 +152,12 @@ class UserManager
}
}
public static function setUserDataAdmin ($type, $value, $id) {
if ($id) {
Db::command ('UPDATE users SET ' . $type . '=? WHERE user_id=?', array ($value, $id));
}
}
public static function getHashPassword ($password) {
$salt = "s0mRIdlKvI";
$hashPassword = hash('sha512', ($password . $salt));
@@ -181,8 +187,9 @@ class UserManager
}
}
public static function createUser($userName, $password){
$userId = Db::loadOne('SELECT * FROM users WHERE username = ?;', array($userName))['user_id'];
public static function createUser ($userName, $password, $email) {
$email = strtolower ($email);
$userId = Db::loadOne ('SELECT * FROM users WHERE LOWER (username) = LOWER (?) OR LOWER (email) = LOWER (?);', array ($userName, $email))['user_id'];
if ($userId != null) {
return false;
};
@@ -190,6 +197,7 @@ class UserManager
$user = [
'username' => $userName,
'password' => self::getHashPassword($password),
'email' => $email,
];
return Db::add ('users', $user);
} catch(PDOException $error) {