nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-02-26 08:24:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove group search, check if an user has vaults

Browse source
This commit is contained in:
brantje 2016-10-02 10:53:15 +02:00
parent 42b73148e6
commit 966b74651d
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
1 changed files with 4 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
controller/sharecontroller.php
View file

@ -38,8 +38,6 @@ class ShareController extends ApiController {
private $limit = 50; private $limit = 50;
private $offset = 0; private $offset = 0;
private $result = [];
public function __construct($AppName, public function __construct($AppName,
IRequest $request, IRequest $request,
$UserId, $UserId,
@ -67,7 +65,7 @@ class ShareController extends ApiController {
$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset); $usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
foreach ($usersTmp as $user) { foreach ($usersTmp as $user) {
if($this->userId != $user->getUID()) { if($this->userId != $user->getUID() && count($this->vaultService->getByUser($user->getUID())) >= 1) {
$users[] = array( $users[] = array(
'text' => $user->getDisplayName(), 'text' => $user->getDisplayName(),
'uid' => $user->getUID(), 'uid' => $user->getUID(),
@ -75,46 +73,16 @@ class ShareController extends ApiController {
); );
} }
} }
$this->result = array_merge($this->result, $users); return $users;
} }
public function searchGroups($search){
$groups = array();
$groupsTmp = $this->groupManager->search($search, $this->limit, $this->offset);
foreach ($groupsTmp as $group) {
$group_users = $group->getUsers();
$final_users = [];
foreach ($group_users as $user){
$final_users[] = [
'text' => $user->getDisplayName(),
'uid' => $user->getUID(),
'type' => 'user'
];
}
$groups[] = array(
'text' => $group->getGID(),
'uid' => $group->getGID(),
'users' => $final_users,
'type' => 'group'
);
}
$this->result = array_merge($this->result, $groups);
}
/** /**
* @NoAdminRequired * @NoAdminRequired
*/ */
public function search($search) { public function search($search) {
$this->searchUsers($search); $user_search = $this->searchUsers($search);
$this->searchGroups($search); return new JSONResponse($user_search);
return new JSONResponse($this->result);
} }