diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-17 21:52:56 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-17 21:52:56 +0100 |
| commit | 0009f7f05133a74bbe3206a5b4d0223ba9dea4bc (patch) | |
| tree | 5f257032110ad0488468ce165c1eea8e4b90936a /Zotlabs | |
| parent | b5cc26fe76cb43727a1e42755e1d89bbc48e0f8a (diff) | |
| download | volse-hubzilla-0009f7f05133a74bbe3206a5b4d0223ba9dea4bc.tar.gz volse-hubzilla-0009f7f05133a74bbe3206a5b4d0223ba9dea4bc.tar.bz2 volse-hubzilla-0009f7f05133a74bbe3206a5b4d0223ba9dea4bc.zip | |
do not include pending registrations in accounts and goaway to /admin/accounts after approval or denial of an pending registration
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Admin/Accounts.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Module/Regmod.php | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Zotlabs/Module/Admin/Accounts.php b/Zotlabs/Module/Admin/Accounts.php index 2e417edd1..0c7e089be 100644 --- a/Zotlabs/Module/Admin/Accounts.php +++ b/Zotlabs/Module/Admin/Accounts.php @@ -133,12 +133,13 @@ class Accounts { $base = z_root() . '/admin/accounts?f='; $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, (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), db_concat('ch.channel_address', ' '), + intval(ACCOUNT_BLOCKED | ACCOUNT_PENDING), intval(\App::$pager['itemspage']), intval(\App::$pager['start']) ); @@ -203,4 +204,4 @@ class Accounts { } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Regmod.php b/Zotlabs/Module/Regmod.php index c7e5c44aa..70635d707 100644 --- a/Zotlabs/Module/Regmod.php +++ b/Zotlabs/Module/Regmod.php @@ -35,6 +35,8 @@ class Regmod extends \Zotlabs\Web\Controller { if($cmd === 'allow') { if (! account_allow($hash)) killme(); } + + goaway('/admin/accounts'); } } |