bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Add @TODO comments per @nupplaphil review in various Admin modules

Browse source
This commit is contained in:
Hypolite Petovan 2019-05-02 10:20:02 -04:00
parent 92b415bc36
commit b4b8c61daf
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Module/Admin/Queue.php
View file

@ -39,6 +39,7 @@ class Queue extends BaseAdminModule
$info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
} }
// @TODO Move to Model\WorkerQueue::getEntries()
$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]);
$r = []; $r = [];

1
src/Module/Admin/Site.php
View file

@ -483,6 +483,7 @@ class Site extends BaseAdminModule
]; ];
/* get user names to make the install a personal install of X */ /* get user names to make the install a personal install of X */
// @TODO Move to Model\User::getNames()
$user_names = []; $user_names = [];
$user_names['---'] = L10n::t('Multi user instance'); $user_names['---'] = L10n::t('Multi user instance');

8
src/Module/Admin/Users.php
View file

@ -91,11 +91,13 @@ class Users extends BaseAdminModule
} }
if (!empty($_POST['page_users_block'])) { if (!empty($_POST['page_users_block'])) {
// @TODO Move this to Model\User:block($users);
DBA::update('user', ['blocked' => 1], ['uid' => $users]); DBA::update('user', ['blocked' => 1], ['uid' => $users]);
notice(L10n::tt('%s user blocked', '%s users blocked', count($users))); notice(L10n::tt('%s user blocked', '%s users blocked', count($users)));
} }
if (!empty($_POST['page_users_unblock'])) { if (!empty($_POST['page_users_unblock'])) {
// @TODO Move this to Model\User:unblock($users);
DBA::update('user', ['blocked' => 0], ['uid' => $users]); DBA::update('user', ['blocked' => 0], ['uid' => $users]);
notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users))); notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users)));
} }
@ -139,7 +141,7 @@ class Users extends BaseAdminModule
// @TODO: Replace with parameter from router // @TODO: Replace with parameter from router
$action = $a->argv[2]; $action = $a->argv[2];
$uid = $a->argv[3]; $uid = $a->argv[3];
$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); $user = User::getById($uid, ['username', 'blocked']);
if (!DBA::isResult($user)) { if (!DBA::isResult($user)) {
notice('User not found' . EOL); notice('User not found' . EOL);
$a->internalRedirect('admin/users'); $a->internalRedirect('admin/users');
@ -160,11 +162,13 @@ class Users extends BaseAdminModule
break; break;
case 'block': case 'block':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
// @TODO Move this to Model\User:block([$uid]);
DBA::update('user', ['blocked' => 1], ['uid' => $uid]); DBA::update('user', ['blocked' => 1], ['uid' => $uid]);
notice(L10n::t('User "%s" blocked', $user['username'])); notice(L10n::t('User "%s" blocked', $user['username']));
break; break;
case 'unblock': case 'unblock':
parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
// @TODO Move this to Model\User:unblock([$uid]);
DBA::update('user', ['blocked' => 0], ['uid' => $uid]); DBA::update('user', ['blocked' => 0], ['uid' => $uid]);
notice(L10n::t('User "%s" unblocked', $user['username'])); notice(L10n::t('User "%s" unblocked', $user['username']));
break; break;
@ -178,7 +182,7 @@ class Users extends BaseAdminModule
$pager = new Pager($a->query_string, 100); $pager = new Pager($a->query_string, 100);
/* ordering */ // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+')
$valid_orders = [ $valid_orders = [
'contact.name', 'contact.name',
'user.email', 'user.email',