diff options
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Admin/Accounts.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index a8fff01a3..be93e655c 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -977,8 +977,10 @@ class Enotify { static public function format_register($rr) { $policy = intval(get_config('system','register_policy')); + $message = (($rr['reg_vfd']) ? t('verified') : t('not verified')); - $message .= (($policy == REGISTER_APPROVE) ? ', ' . t('requires approval') : ''); + if(!$rr['reg_vfd'] && $rr['reg_expires'] < datetime_convert()) + $message = t('expired'); $x = [ 'notify_link' => z_root() . '/admin/accounts', diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php index eab3f15c8..856ff9155 100644 --- a/Zotlabs/Module/Admin/Accounts.php +++ b/Zotlabs/Module/Admin/Accounts.php @@ -203,6 +203,7 @@ class Accounts { if(!$pending[$n]['reg_vfd'] && $pending[$n]['reg_expires'] < datetime_convert()) $pending[$n]['status'] = t('Expired'); + // timezone adjust date_time for display $pending[$n]['reg_created'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_created']); $pending[$n]['reg_startup'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_startup']); $pending[$n]['reg_expires'] = datetime_convert('UTC', date_default_timezone_get(), $pending[$n]['reg_expires']); @@ -272,7 +273,7 @@ class Accounts { '$sel_deny' => t('Deny selected'), '$sel_aprv' => t('Approve selected'), '$h_pending' => t('Registrations waiting for confirm'), - '$th_pending' => array( t('Request date'), t('Status'), t('Timeframe'), 'dId2', t('specified,atip') ), + '$th_pending' => array( t('Request date'), t('Verification status'), t('Timeframe'), 'dId2', t('specified,atip') ), '$no_pending' => t('No registrations.'), '$approve' => t('Approve'), '$deny' => t('Deny'), |