webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#125 include email_confirmed in session user

Browse Source
This commit is contained in:
Ulf Gebhardt 2016-06-06 05:19:14 +02:00
parent dca8e12f57
commit b7637f426c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/User.php
View File

@ -14,8 +14,9 @@ class User {
public $rights = NULL; public $rights = NULL;
public $locale = NULL; public $locale = NULL;
public $base_url = NULL; public $base_url = NULL;
public $email_confirmed = NULL;
public function __construct($id, $username, $email, $creationDate, $lastLoginDate, $lastLoginIP, $passwordWrongCount, $rights, $locale, $base_url){ public function __construct($id, $username, $email, $creationDate, $lastLoginDate, $lastLoginIP, $passwordWrongCount, $rights, $locale, $base_url, $email_confirmed){
$this->id = $id; $this->id = $id;
$this->username = $username; $this->username = $username;
$this->email = $email; $this->email = $email;
@ -26,5 +27,6 @@ class User {
$this->rights = $rights; $this->rights = $rights;
$this->locale = $locale; $this->locale = $locale;
$this->base_url = $base_url; $this->base_url = $base_url;
$this->email_confirmed = $email_confirmed;
} }
} }

3
security/security.php
View File

@ -32,7 +32,8 @@ class security {
0, 0,
NULL, NULL,
$row[\SYSTEM\SQL\system_user::FIELD_LOCALE], $row[\SYSTEM\SQL\system_user::FIELD_LOCALE],
\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL)); \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL),
$row[\SYSTEM\SQL\system_user::FIELD_EMAIL_CONFIRMED]);
if(isset($locale)){ if(isset($locale)){
\SYSTEM\locale::set($locale);} \SYSTEM\locale::set($locale);}
\SYSTEM\SQL\SYS_SECURITY_UPDATE_LASTACTIVE::QI(array($row[\SYSTEM\SQL\system_user::FIELD_ID])); \SYSTEM\SQL\SYS_SECURITY_UPDATE_LASTACTIVE::QI(array($row[\SYSTEM\SQL\system_user::FIELD_ID]));