diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-04-14 10:34:40 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-16 09:50:22 +0200 |
commit | 45f1efe95391b09fbf3e4880eb4000f25a529ce3 (patch) | |
tree | a96168786066f22dc61feb648236c38cc94b8b05 /settings/Controller | |
parent | 2963fdc879de8c84311eae66812317e6c455ca0b (diff) | |
download | nextcloud-server-45f1efe95391b09fbf3e4880eb4000f25a529ce3.tar.gz nextcloud-server-45f1efe95391b09fbf3e4880eb4000f25a529ce3.zip |
Continued the upgrade to proper router link and added navigationItem router linkTo capability
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/Controller')
-rw-r--r-- | settings/Controller/GroupsController.php | 157 | ||||
-rw-r--r-- | settings/Controller/UsersController.php | 28 |
2 files changed, 14 insertions, 171 deletions
diff --git a/settings/Controller/GroupsController.php b/settings/Controller/GroupsController.php deleted file mode 100644 index 19b7c53f8b9..00000000000 --- a/settings/Controller/GroupsController.php +++ /dev/null @@ -1,157 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Joas Schilling <coding@schilljs.com> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Morris Jobke <hey@morrisjobke.de> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -namespace OC\Settings\Controller; - -use OC\AppFramework\Http; -use OC\Group\MetaData; -use OCP\AppFramework\Controller; -use OCP\AppFramework\Http\DataResponse; -use OCP\IGroup; -use OCP\IGroupManager; -use OCP\IL10N; -use OCP\IRequest; -use OCP\IUserSession; - -/** - * @package OC\Settings\Controller - */ -class GroupsController extends Controller { - /** @var IGroupManager */ - private $groupManager; - /** @var IL10N */ - private $l10n; - /** @var IUserSession */ - private $userSession; - /** @var bool */ - private $isAdmin; - - /** - * @param string $appName - * @param IRequest $request - * @param IGroupManager $groupManager - * @param IUserSession $userSession - * @param bool $isAdmin - * @param IL10N $l10n - */ - public function __construct($appName, - IRequest $request, - IGroupManager $groupManager, - IUserSession $userSession, - $isAdmin, - IL10N $l10n) { - parent::__construct($appName, $request); - $this->groupManager = $groupManager; - $this->userSession = $userSession; - $this->isAdmin = $isAdmin; - $this->l10n = $l10n; - } - - /** - * @NoAdminRequired - * - * @param string $pattern - * @param bool $filterGroups - * @param int $sortGroups - * @return DataResponse - */ - public function index($pattern = '', $filterGroups = false, $sortGroups = MetaData::SORT_USERCOUNT) { - $groupPattern = $filterGroups ? $pattern : ''; - - $groupsInfo = new MetaData( - $this->userSession->getUser()->getUID(), - $this->isAdmin, - $this->groupManager, - $this->userSession - ); - $groupsInfo->setSorting($sortGroups); - list($adminGroups, $groups) = $groupsInfo->get($groupPattern, $pattern); - - return new DataResponse( - array( - 'data' => array('adminGroups' => $adminGroups, 'groups' => $groups) - ) - ); - } - - /** - * @PasswordConfirmationRequired - * @param string $id - * @return DataResponse - */ - public function create($id) { - if($this->groupManager->groupExists($id)) { - return new DataResponse( - array( - 'message' => (string)$this->l10n->t('Group already exists.') - ), - Http::STATUS_CONFLICT - ); - } - $group = $this->groupManager->createGroup($id); - if($group instanceof IGroup) { - return new DataResponse(['groupname' => $group->getDisplayName()], Http::STATUS_CREATED); - } - - return new DataResponse( - array( - 'status' => 'error', - 'data' => array( - 'message' => (string)$this->l10n->t('Unable to add group.') - ) - ), - Http::STATUS_FORBIDDEN - ); - } - - /** - * @PasswordConfirmationRequired - * @param string $id - * @return DataResponse - */ - public function destroy($id) { - $group = $this->groupManager->get($id); - if ($group) { - if ($group->delete()) { - return new DataResponse( - array( - 'status' => 'success', - 'data' => ['groupname' => $group->getDisplayName()] - ), - Http::STATUS_NO_CONTENT - ); - } - } - return new DataResponse( - array( - 'status' => 'error', - 'data' => array( - 'message' => (string)$this->l10n->t('Unable to delete group.') - ), - ), - Http::STATUS_FORBIDDEN - ); - } - -} diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php index b64a1241b08..89e86ddfc8c 100644 --- a/settings/Controller/UsersController.php +++ b/settings/Controller/UsersController.php @@ -170,15 +170,16 @@ class UsersController extends Controller { public function usersListByGroup() { return $this->usersList(); } - /** - * @NoCSRFRequired - * @NoAdminRequired - * - * Display users list template - * - * @return TemplateResponse - */ - public function usersList() { + + /** + * @NoCSRFRequired + * @NoAdminRequired + * + * Display users list template + * + * @return TemplateResponse + */ + public function usersList() { $user = $this->userSession->getUser(); $uid = $user->getUID(); @@ -243,7 +244,7 @@ class UsersController extends Controller { $disabledUsers = $isLDAPUsed ? 0 : $this->userManager->countDisabledUsers(); $disabledUsersGroup = [ - 'id' => '_disabled', + 'id' => 'disabled', 'name' => 'Disabled users', 'usercount' => $disabledUsers ]; @@ -261,10 +262,9 @@ class UsersController extends Controller { \OC::$server->getEventDispatcher()->dispatch('OC\Settings\Users::loadAdditionalScripts'); /* TOTAL USERS COUNT */ - function addition($v, $w) { - return $v+$w; - } - $userCount = array_reduce($this->userManager->countUsers(), 'addition', 0); + $userCount = array_reduce($this->userManager->countUsers(), function($v, $w) { + return $v + (int)$w; + }, 0); /* LANGUAGES */ $languages = $this->l10nFactory->getLanguages(); |