Fix value assignment for users.active
This commit is contained in:
10
inc/user.php
10
inc/user.php
@@ -22,7 +22,7 @@ class User extends PhpObject {
|
|||||||
parent::__construct(__CLASS__, Settings::DEBUG);
|
parent::__construct(__CLASS__, Settings::DEBUG);
|
||||||
$this->oDb = &$oDb;
|
$this->oDb = &$oDb;
|
||||||
$this->iUserId = 0;
|
$this->iUserId = 0;
|
||||||
$this->asUserInfo = array('name'=>'', 'email'=>'', 'language'=>'', 'active'=>0);
|
$this->asUserInfo = array('name'=>'', 'email'=>'', 'language'=>'', 'active'=>'0');
|
||||||
$this->checkUserCookie();
|
$this->checkUserCookie();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,12 +36,12 @@ class User extends PhpObject {
|
|||||||
$sEmail = trim($sEmail);
|
$sEmail = trim($sEmail);
|
||||||
|
|
||||||
//Check Email availability
|
//Check Email availability
|
||||||
$iUserId = $this->oDb->selectValue(self::USER_TABLE, Db::getId(self::USER_TABLE), array('email'=>$sEmail, 'active'=>true));
|
$iUserId = $this->oDb->selectValue(self::USER_TABLE, Db::getId(self::USER_TABLE), array('email'=>$sEmail, 'active'=>'1'));
|
||||||
|
|
||||||
if($iUserId > 0) $sDesc = 'lang:nl_email_exists';
|
if($iUserId > 0) $sDesc = 'lang:nl_email_exists';
|
||||||
else {
|
else {
|
||||||
//Add/Reactivate user
|
//Add/Reactivate user
|
||||||
$iUserId = $this->oDb->insertUpdateRow(self::USER_TABLE, array('email'=>$sEmail, 'language'=>$sLang, 'active'=>true), array('email'));
|
$iUserId = $this->oDb->insertUpdateRow(self::USER_TABLE, array('email'=>$sEmail, 'language'=>$sLang, 'active'=>'1'), array('email'));
|
||||||
if($iUserId==0) $sDesc = 'lang:error_commit_db';
|
if($iUserId==0) $sDesc = 'lang:error_commit_db';
|
||||||
else $bSuccess = true;
|
else $bSuccess = true;
|
||||||
}
|
}
|
||||||
@@ -60,7 +60,7 @@ class User extends PhpObject {
|
|||||||
$sDesc = '';
|
$sDesc = '';
|
||||||
|
|
||||||
if($this->iUserId > 0) {
|
if($this->iUserId > 0) {
|
||||||
$iUserId = $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('active'=>false));
|
$iUserId = $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('active'=>'0'));
|
||||||
if($iUserId==0) $sDesc = 'lang:error_commit_db';
|
if($iUserId==0) $sDesc = 'lang:error_commit_db';
|
||||||
else $bSuccess = true;
|
else $bSuccess = true;
|
||||||
}
|
}
|
||||||
@@ -95,7 +95,7 @@ class User extends PhpObject {
|
|||||||
public function setUserId($iUserId) {
|
public function setUserId($iUserId) {
|
||||||
$this->iUserId = 0;
|
$this->iUserId = 0;
|
||||||
|
|
||||||
$asUser = $this->oDb->selectRow(self::USER_TABLE, array(Db::getId(self::USER_TABLE)=>$iUserId, 'active'=>true), array_keys($this->asUserInfo));
|
$asUser = $this->oDb->selectRow(self::USER_TABLE, array(Db::getId(self::USER_TABLE)=>$iUserId, 'active'=>'1'), array_keys($this->asUserInfo));
|
||||||
if(!empty($asUser)) {
|
if(!empty($asUser)) {
|
||||||
$this->iUserId = $iUserId;
|
$this->iUserId = $iUserId;
|
||||||
$this->asUserInfo = $asUser;
|
$this->asUserInfo = $asUser;
|
||||||
|
|||||||
Reference in New Issue
Block a user