diff options
| author | Mario <mario@mariovavti.com> | 2021-04-09 09:49:36 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-04-09 09:49:36 +0000 |
| commit | 01b081d809d128e0922fb404921f452c51c2ddb2 (patch) | |
| tree | db100aa4c3b257943b95ab192514a8a93cfa6ba9 /Zotlabs/Module/Register.php | |
| parent | a34d8852b6695086ef3c9f5ff882d0d033f7d4a5 (diff) | |
| download | volse-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/Register.php')
| -rw-r--r-- | Zotlabs/Module/Register.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index 9d2a8aa96..4eece60b3 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -214,7 +214,8 @@ class Register extends Controller { if ($invonly || $invalso) { $reg = q("SELECT * from register WHERE reg_vital = 1 AND reg_didx = 'i' AND reg_hash = '%s'", - dbesc($invite_code)); + dbesc($invite_code) + ); if ($reg && count($reg) == 1) { $reg = $reg[0]; @@ -222,16 +223,6 @@ class Register extends Controller { if ($reg['reg_startup'] <= $now && $reg['reg_expires'] >= $now) { - // is invitor admin - $isa = get_account_by_id($reg['reg_uid']); - $isa = ( $isa && ($isa['account_roles'] && ACCOUNT_ROLE_ADMIN) ); - - // FIXME: set the correct flags if invitee is admin so we do not need to approve anyway if approve is on - // approve contra invite by admin - if ($isa && $policy == REGISTER_APPROVE) - $flags &= $flags ^ ACCOUNT_PENDING; - - if ($auto_create) { $reonar['chan.name'] = notags(trim($arr['name'])); $reonar['chan.did1'] = notags(trim($arr['nickname'])); |