From a34d8852b6695086ef3c9f5ff882d0d033f7d4a5 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 8 Apr 2021 20:01:56 +0000 Subject: minor revert --- Zotlabs/Module/Register.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index c1355eba7..9d2a8aa96 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -222,9 +222,15 @@ 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 - //if (is_sys_channel($reg['reg_uid']) && $policy == REGISTER_APPROVE) - // $flags &= $flags ^ ACCOUNT_PENDING; + // approve contra invite by admin + if ($isa && $policy == REGISTER_APPROVE) + $flags &= $flags ^ ACCOUNT_PENDING; + if ($auto_create) { $reonar['chan.name'] = notags(trim($arr['name'])); -- cgit v1.2.3