harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not include pending registrations in accounts and goaway to /admin/accounts after approval or denial of an pending registration

Browse Source
This commit is contained in:
Mario Vavti 2018-03-17 21:52:56 +01:00
parent b5cc26fe76
commit 0009f7f051
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Module/Admin/Accounts.php
View File

@ -133,12 +133,13 @@ class Accounts {
$base = z_root() . '/admin/accounts?f='; $base = z_root() . '/admin/accounts?f=';
$odir = (($dir === 'asc') ? '0' : '1'); $odir = (($dir === 'asc') ? '0' : '1');
$users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked, $users = q("SELECT account_id , account_email, account_lastlog, account_created, account_expires, account_service_class, ( account_flags & %d ) > 0 as blocked,
(SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac (SELECT %s FROM channel as ch WHERE ch.channel_account_id = ac.account_id and ch.channel_removed = 0 ) as channels FROM account as ac
where true $serviceclass order by $key $dir limit %d offset %d ", where true $serviceclass and account_flags != %d order by $key $dir limit %d offset %d ",
intval(ACCOUNT_BLOCKED), intval(ACCOUNT_BLOCKED),
db_concat('ch.channel_address', ' '), db_concat('ch.channel_address', ' '),
intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING),
intval(\App::$pager['itemspage']), intval(\App::$pager['itemspage']),
intval(\App::$pager['start']) intval(\App::$pager['start'])
); );
@ -203,4 +204,4 @@ class Accounts {
} }
} }

2
Zotlabs/Module/Regmod.php
View File

@ -35,6 +35,8 @@ class Regmod extends \Zotlabs\Web\Controller {
if($cmd === 'allow') { if($cmd === 'allow') {
if (! account_allow($hash)) killme(); if (! account_allow($hash)) killme();
} }
goaway('/admin/accounts');
} }
} }