Make subscription work
This commit is contained in:
@@ -337,7 +337,7 @@ class Spot extends Main
|
||||
$asUserInfo = $this->oUser->getUserInfo();
|
||||
|
||||
//Send Confirmation Email
|
||||
if($asResult['result'] && $asResult['desc']=='lang:newsletter.subscribed') {
|
||||
if($asResult['result'] && $asResult['desc']=='lang:newsletter.subscribed' && !Settings::DEBUG) {
|
||||
$oConfEmail = new Email($this->asContext['serv_name'], 'email.confirmation');
|
||||
$oConfEmail->setDestInfo($asUserInfo);
|
||||
$oConfEmail->send();
|
||||
@@ -348,7 +348,7 @@ class Spot extends Main
|
||||
|
||||
public function unsubscribe() {
|
||||
$asResult = $this->oUser->removeUser();
|
||||
return self::getJsonResult($asResult['result'], $asResult['desc'], $asResult['data']);
|
||||
return self::getJsonResult($asResult['result'], $asResult['desc'], User::DEFAULT_USER);
|
||||
}
|
||||
|
||||
public function unsubscribeFromEmail($iUserId) {
|
||||
|
||||
22
lib/User.php
22
lib/User.php
@@ -21,6 +21,17 @@ class User extends PhpObject {
|
||||
const COOKIE_ID_USER = 'subscriber';
|
||||
const COOKIE_DURATION = 60 * 60 * 24 * 365; //1 year
|
||||
|
||||
const DEFAULT_USER = array(
|
||||
'id' => 0,
|
||||
'id_user' => 0,
|
||||
'name' => '',
|
||||
'email' => '',
|
||||
'language' => '',
|
||||
'timezone' => '',
|
||||
'active' => self::USER_INACTIVE,
|
||||
'clearance' => self::CLEARANCE_USER
|
||||
);
|
||||
|
||||
/**
|
||||
* Database Handle
|
||||
* @var Db
|
||||
@@ -35,16 +46,7 @@ class User extends PhpObject {
|
||||
parent::__construct(__CLASS__);
|
||||
$this->oDb = &$oDb;
|
||||
$this->setUserId(0);
|
||||
$this->asUserInfo = array(
|
||||
'id' => 0,
|
||||
Db::getId(self::USER_TABLE) => 0,
|
||||
'name' => '',
|
||||
'email' => '',
|
||||
'language' => '',
|
||||
'timezone' => '',
|
||||
'active' => self::USER_INACTIVE,
|
||||
'clearance' => self::CLEARANCE_USER
|
||||
);
|
||||
$this->asUserInfo = self::DEFAULT_USER;
|
||||
$this->checkUserCookie();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user