modified users table, class and sign in class
This commit is contained in:
+11
-12
@@ -8,10 +8,10 @@ class SignIn extends Base {
|
||||
|
||||
// Variables
|
||||
|
||||
private $current_user_id = "";
|
||||
private $current_user_serial = "";
|
||||
private $current_user_name = "";
|
||||
private $current_user_email = "";
|
||||
private $current_user_serial = "";
|
||||
private $current_user_name = "";
|
||||
private $current_user_full_name = "";
|
||||
private $current_user_email = "";
|
||||
|
||||
// ===============================
|
||||
// __construct : Class Constructor
|
||||
@@ -23,9 +23,9 @@ class SignIn extends Base {
|
||||
|
||||
date_default_timezone_set(self::TIMEZONE);
|
||||
|
||||
$this->current_user_id = $_SESSION[self::USER_ID] ?? "";
|
||||
$this->current_user_name = $_SESSION[self::USER_NAME] ?? "";
|
||||
$this->current_user_email = $_SESSION[self::USER_EMAIL] ?? "";
|
||||
$this->current_user_name = $_SESSION[self::USER_NAME] ?? "";
|
||||
$this->current_user_full_name = $_SESSION[self::USER_FULL_NAME] ?? "";
|
||||
$this->current_user_email = $_SESSION[self::USER_EMAIL] ?? "";
|
||||
}
|
||||
|
||||
// ========================
|
||||
@@ -63,12 +63,12 @@ class SignIn extends Base {
|
||||
die();
|
||||
}
|
||||
|
||||
if ((int) $user->record->user_active === 0) {
|
||||
if ((string) $user->record->user_status !== 'active') {
|
||||
echo $this->applyXSL("", $this->getXSL("signIn"), $XSLParms);
|
||||
die();
|
||||
}
|
||||
|
||||
$stored_hashed_password = $user->record->user_password;
|
||||
$stored_hashed_password = $user->record->user_password_hash;
|
||||
|
||||
if (!password_verify($user_password, $stored_hashed_password)) {
|
||||
|
||||
@@ -79,13 +79,12 @@ class SignIn extends Base {
|
||||
session_regenerate_id(true);
|
||||
|
||||
$_SESSION[self::USER_AUTHENTICATED] = true;
|
||||
$_SESSION[self::USER_SERIAL] = (int) $user->record->user_serial;
|
||||
$_SESSION[self::USER_ID] = (string) $user->record->user_id;
|
||||
$_SESSION[self::USER_SERIAL] = (int) $user->record->user_serial;
|
||||
$_SESSION[self::USER_NAME] = (string) $user->record->user_name;
|
||||
$_SESSION[self::USER_FULL_NAME] = (string) $user->record->user_full_name;
|
||||
$_SESSION[self::USER_EMAIL] = (string) $user->record->user_email;
|
||||
$_SESSION[self::USER_ROLE] = (string) $user->record->user_role;
|
||||
|
||||
$this->current_user_id = $_SESSION[self::USER_ID] ?? "";
|
||||
$this->current_user_serial = $_SESSION[self::USER_SERIAL] ?? 0;
|
||||
$this->current_user_name = $_SESSION[self::USER_NAME] ?? "";
|
||||
$this->current_user_email = $_SESSION[self::USER_EMAIL] ?? "";
|
||||
|
||||
Reference in New Issue
Block a user