banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #85 from julywind/master

Browse Source 
fix invalid value for token_validity
pull/108/head
David Goodwin 7 years ago committed by GitHub
parent 8bd435039b 5f1ac12d72
commit bdade520f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
model/AdminHandler.php
Unescape Escape View File

@ -79,7 +79,7 @@ class AdminHandler extends PFAHandler {
'phone' => pacol( 1, $passwordReset, 0, 'text', 'pCreate_mailbox_phone', 'pCreate_mailbox_phone_desc', ''),
'email_other' => pacol( 1, $passwordReset, 0, 'mail', 'pCreate_mailbox_email', 'pCreate_mailbox_email_desc', ''),
'token' => pacol( 1, 0, 0, 'text', '' , '' ),
'token_validity' => pacol( 1, 0, 0, 'ts', '' , '' ),
'token_validity' => pacol( 1, 0, 0, 'ts', '' , '', date("Y-m-d H:i:s",time())),
'created' => pacol( 0, 0, 0, 'ts', 'created' , '' ),
'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ),
);

2
model/MailboxHandler.php
Unescape Escape View File

@ -42,7 +42,7 @@ class MailboxHandler extends PFAHandler {
'phone' => pacol( 1, $passwordReset, 0, 'text', 'pCreate_mailbox_phone' , 'pCreate_mailbox_phone_desc' , ''),
'email_other' => pacol( 1, $passwordReset, 0, 'mail', 'pCreate_mailbox_email' , 'pCreate_mailbox_email_desc' , ''),
'token' => pacol( 1, 0, 0, 'text', '' , '' ),
'token_validity'=> pacol( 1, 0, 0, 'ts', '' , '' ),
'token_validity'=> pacol( 1, 0, 0, 'ts', '' , '', date("Y-m-d H:i:s",time())),
'created' => pacol( 0, 0, 1, 'ts', 'created' , '' ),
'modified' => pacol( 0, 0, 1, 'ts', 'last_modified' , '' ),
# TODO: add virtual 'notified' column and allow to display who received a vacation response?

Write Preview
Loading…
Cancel
Save