nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-09-20 14:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups

Browse source
This commit is contained in:
brantje 2016-10-02 22:04:00 +02:00
parent 82be2a19f4 762b5e6af2
commit 326f9dcac7
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Db/SharingACLMapper.php
View file

@ -42,7 +42,7 @@ class SharingACLMapper extends Mapper {
* Gets the currently accepted share requests from the given user for the given vault guid
* @param $user_id
* @param $vault_id
*
* @return SharingACL[]
*/
public function getVaultEntries($user_id, $vault_id) {
$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";

3
lib/Service/ShareService.php
View file

@ -98,6 +98,9 @@ class ShareService {
$return = [];
foreach ($entries as $entry){
// Check if the user can read the credential, probably unnecesary, but just to be sure
if (!$entry->hasPermission(SharingACL::READ)) continue;
$tmp = $entry->jsonSerialize();
$tmp['credential_data'] = $this->credential->getCredentialById($entry->getItemId())->jsonSerialize();
unset($tmp['credential_data']['shared_key']);