aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Admin
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-04-09 09:49:36 +0000
committerMario <mario@mariovavti.com>2021-04-09 09:49:36 +0000
commit01b081d809d128e0922fb404921f452c51c2ddb2 (patch)
treedb100aa4c3b257943b95ab192514a8a93cfa6ba9 /Zotlabs/Module/Admin
parenta34d8852b6695086ef3c9f5ff882d0d033f7d4a5 (diff)
downloadvolse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.tar.gz
volse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.tar.bz2
volse-hubzilla-01b081d809d128e0922fb404921f452c51c2ddb2.zip
register: only return verified registrations in get_pending_accounts(), more invite handling fixes
Diffstat (limited to 'Zotlabs/Module/Admin')
-rw-r--r--Zotlabs/Module/Admin/Accounts.php13
1 files changed, 4 insertions, 9 deletions
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php
index ac46c43aa..9971fd213 100644
--- a/Zotlabs/Module/Admin/Accounts.php
+++ b/Zotlabs/Module/Admin/Accounts.php
@@ -217,18 +217,13 @@ class Accounts {
$tao .= 'tao.zar.zarar = {';
foreach ($pending as $n => $v) {
- if (array_key_exists($v['reg_atip'], $atipn)) {
+ $pending[$n]['status'] = t('Verified');
+
+ if (array_key_exists($v['reg_atip'], $atipn)) {
$pending[$n]['reg_atip'] = $v['reg_atip'] . ' ◄' . $atipn[ $v['reg_atip'] ] . '×';
}
- $pending[$n]['status'] = t('Not verified');
- if($pending[$n]['reg_vfd'])
- $pending[$n]['status'] = t('Verified');
-
- 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']);
@@ -300,7 +295,7 @@ class Accounts {
'$sel_aprv' => t('Approve selected'),
'$h_pending' => t('Registrations waiting for confirm'),
'$th_pending' => array( t('Request date'), t('Verification status'), t('Timeframe'), 'dId2', t('specified,atip') ),
- '$no_pending' => t('No registrations.'),
+ '$no_pending' => t('No verified registrations.'),
'$approve' => t('Approve'),
'$deny' => t('Deny'),
'$delete' => t('Delete'),