app/models/Data/PasswordLink.php: rename to UserActivation
+ Confirm to the database changes.
This commit is contained in:
parent
bdf16e6fbb
commit
a52fc99ded
2 changed files with 34 additions and 24 deletions
|
|
@ -6,7 +6,7 @@ use Httpcb\Mvc\Model\Behavior\RandomId as RandomIdBehavior;
|
|||
use Phalcon\Forms\Element\Date;
|
||||
use Phalcon\Mvc\Model\Behavior\SoftDelete;
|
||||
|
||||
class PasswordLink extends Base
|
||||
class UserActivation extends Base
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
|
|
@ -16,13 +16,18 @@ class PasswordLink extends Base
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $public_id;
|
||||
protected $activation_key;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $user_id;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
protected $used;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
|
|
@ -38,7 +43,7 @@ class PasswordLink extends Base
|
|||
*/
|
||||
public function initialize()
|
||||
{
|
||||
$this->setSource('password_link');
|
||||
$this->setSource('user_activation');
|
||||
$this->useDynamicUpdate(true);
|
||||
|
||||
// Relationships
|
||||
|
|
@ -46,15 +51,20 @@ class PasswordLink extends Base
|
|||
|
||||
// Behaviour
|
||||
$this->addBehavior(new RandomIdBehavior(array(
|
||||
'field' => 'public_id',
|
||||
'length' => 12,
|
||||
'expression' => '(password IS NULL OR HOUR(TIMEDIFF(date, NOW())) = 0)'
|
||||
'field' => 'activation_key',
|
||||
'length' => 40,
|
||||
'expression' => '(used = 0 OR HOUR(TIMEDIFF(date, NOW())) = 0)'
|
||||
)));
|
||||
|
||||
$this->addBehavior(new SoftDelete([
|
||||
'field' => 'password',
|
||||
'value' => null
|
||||
]));
|
||||
|
||||
$this->addBehavior(new SoftDelete([
|
||||
'field' => 'used',
|
||||
'value' => 1
|
||||
]));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -69,7 +79,7 @@ class PasswordLink extends Base
|
|||
* @param int $id
|
||||
* @return PasswordLink
|
||||
*/
|
||||
public function setId(int $id) : PasswordLink
|
||||
public function setId(int $id) : UserActivation
|
||||
{
|
||||
$this->id = $id;
|
||||
return $this;
|
||||
|
|
@ -78,18 +88,18 @@ class PasswordLink extends Base
|
|||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getPublicId()
|
||||
public function getActivationKey()
|
||||
{
|
||||
return $this->public_id;
|
||||
return $this->activation_key;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $public_id
|
||||
* @return PasswordLink
|
||||
* @return UserActivation
|
||||
*/
|
||||
public function setPublicId(string $public_id) : PasswordLink
|
||||
public function setActivationKey(string $key) : UserActivation
|
||||
{
|
||||
$this->public_id = $public_id;
|
||||
$this->activation_key = $key;
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
|
@ -103,9 +113,9 @@ class PasswordLink extends Base
|
|||
|
||||
/**
|
||||
* @param int $user_id
|
||||
* @return PasswordLink
|
||||
* @return UserActivation
|
||||
*/
|
||||
public function setUserId(int $user_id) : PasswordLink
|
||||
public function setUserId(int $user_id) : UserActivation
|
||||
{
|
||||
$this->user_id = $user_id;
|
||||
return $this;
|
||||
|
|
@ -121,9 +131,9 @@ class PasswordLink extends Base
|
|||
|
||||
/**
|
||||
* @param string $password
|
||||
* @return PasswordLink
|
||||
* @return UserActivation
|
||||
*/
|
||||
public function setPassword(string $password) : PasswordLink
|
||||
public function setPassword(string $password) : UserActivation
|
||||
{
|
||||
$this->password = $password;
|
||||
return $this;
|
||||
|
|
@ -136,7 +146,7 @@ class PasswordLink extends Base
|
|||
*/
|
||||
public function isUsed() : bool
|
||||
{
|
||||
return strlen($this->password) < 1;
|
||||
return (bool) $this->used;
|
||||
}
|
||||
|
||||
/**
|
||||
Reference in a new issue