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/Regate.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/Regate.php')
| -rw-r--r-- | Zotlabs/Module/Regate.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 0c32ebd25..0bca68a0b 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -99,16 +99,28 @@ class Regate extends \Zotlabs\Web\Controller { if ( $acpin && ($r['reg_hash'] == $acpin )) { $flags = $r['reg_flags']; - if ( ($flags & ACCOUNT_UNVERIFIED ) == ACCOUNT_UNVERIFIED) { + if (($flags & ACCOUNT_UNVERIFIED) == ACCOUNT_UNVERIFIED) { // verification success $msg = 'ZAR1237I' . ' ' . t('Verify successfull'); $reonar = json_decode( $r['reg_stuff'], true); $reonar['valid'] = $now . ',' . $ip . ' ' . $did2 . ' ' . $msg; + // clear flag $flags &= $flags ^ ACCOUNT_UNVERIFIED; + + // are we invited by the admin? + $isa = get_account_by_id($r['reg_uid']); + $isa = ($isa && ($isa['account_roles'] && ACCOUNT_ROLE_ADMIN)); + + // approve contra invite by admin + if ($isa && get_config('system','register_policy') == REGISTER_APPROVE) { + $flags &= $flags ^ ACCOUNT_PENDING; + } + // sth todo? $vital = $flags == 0 ? 0 : 1; + // set flag $flags |= REGISTER_AGREED; zar_log($msg . ' ' . $did2 . ':flags' . $flags . ',rid' . $r['reg_id']); @@ -123,8 +135,8 @@ class Regate extends \Zotlabs\Web\Controller { intval($r['reg_id']) ); - if ( ($flags & ACCOUNT_PENDING ) == ACCOUNT_PENDING ) { + if ( ($flags & ACCOUNT_PENDING ) == ACCOUNT_PENDING ) { $msg .= "\n".t('Last step will be by an instance admin to agree your account request'); $nextpage = 'regate/' . bin2hex($did2) . $didx; q("COMMIT"); |