summaryrefslogtreecommitdiff
path: root/app/frontend
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-03-14 19:49:38 +0100
committeremkael <emkael@tlen.pl>2017-03-14 19:49:38 +0100
commitffa472d81caecae933000d58033de7b0a99cdb5a (patch)
tree357bf20c50961e3f42817603d52d28144d297d39 /app/frontend
parent90e9bb090d8d4cc9099a15b925ccd2f19b5d31c8 (diff)
* model for user registration confirmation process
Diffstat (limited to 'app/frontend')
-rw-r--r--app/frontend/model/MailQueue.php4
-rw-r--r--app/frontend/model/User.php12
2 files changed, 13 insertions, 3 deletions
diff --git a/app/frontend/model/MailQueue.php b/app/frontend/model/MailQueue.php
index d7110f2..9a42e05 100644
--- a/app/frontend/model/MailQueue.php
+++ b/app/frontend/model/MailQueue.php
@@ -16,6 +16,7 @@ class MailQueue extends ActiveRecord {
public $SendAttempts = 0;
public $CreateTime;
public $LastAttemptTime;
+ public $LastErrorInfo;
public static $COLUMN_MAPPING = [
'id' => 'ID',
@@ -27,7 +28,8 @@ class MailQueue extends ActiveRecord {
'is_sent' => 'IsSent',
'send_attempts' => 'SendAttempts',
'create_time' => 'CreateTime',
- 'last_attempt_time' => 'LastAttemptTime'
+ 'last_attempt_time' => 'LastAttemptTime',
+ 'last_error_info' => 'LastErrorInfo'
];
}
diff --git a/app/frontend/model/User.php b/app/frontend/model/User.php
index 21335e2..57f49b9 100644
--- a/app/frontend/model/User.php
+++ b/app/frontend/model/User.php
@@ -10,21 +10,29 @@ class User extends ActiveRecord {
public $ID;
public $Login;
public $Password;
+ public $EMail;
+ public $ActivationHash;
+ public $IsActive;
+ public $ActivationDate;
+ public $LastLogin;
public $IsAdmin;
public $Timezone;
public $Language;
public $GroupedView;
- public $LastLogin;
public static $COLUMN_MAPPING = [
'id' => 'ID',
'login' => 'Login',
'password' => 'Password',
+ 'e_mail' => 'EMail',
+ 'activation_hash' => 'ActivationHash',
+ 'is_active' => 'IsActive',
+ 'activation_date' => 'ActivationDate',
+ 'last_login' => 'LastLogin',
'is_admin' => 'IsAdmin',
'timezone' => 'Timezone',
'language' => 'Language',
'grouped_view' => 'GroupedView',
- 'last_login' => 'LastLogin'
];
public static $RELATIONS = [