@@ -49,6 +49,7 @@ discard block |
||
| 49 | 49 | * @param $target_item_guid string The shared item GUID |
| 50 | 50 | * @param $request_array array |
| 51 | 51 | * @param $permissions integer Must be created with a bitmask from options on the ShareRequest class |
| 52 | + * @param string $credential_owner |
|
| 52 | 53 | * @return array Array of sharing requests |
| 53 | 54 | */ |
| 54 | 55 | public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) { |
@@ -253,7 +254,6 @@ discard block |
||
| 253 | 254 | /** |
| 254 | 255 | * Delete ACL |
| 255 | 256 | * |
| 256 | - * @param ShareRequest $request |
|
| 257 | 257 | * @return \OCA\Passman\Db\ShareRequest[] |
| 258 | 258 | */ |
| 259 | 259 | public function deleteShareACL(SharingACL $ACL) { |
@@ -277,7 +277,6 @@ discard block |
||
| 277 | 277 | /** |
| 278 | 278 | * Get pending share requests by guid and uid |
| 279 | 279 | * |
| 280 | - * @param ShareRequest $request |
|
| 281 | 280 | * @return \OCA\Passman\Db\ShareRequest[] |
| 282 | 281 | */ |
| 283 | 282 | public function getPendingShareRequestsForCredential($item_guid, $user_id) { |
@@ -90,7 +90,9 @@ discard block |
||
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public function createACLEntry(SharingACL $acl) { |
| 93 | - if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp()); |
|
| 93 | + if ($acl->getCreated() === null) { |
|
| 94 | + $acl->setCreated((new \DateTime())->getTimestamp()); |
|
| 95 | + } |
|
| 94 | 96 | return $this->sharingACL->createACLEntry($acl); |
| 95 | 97 | } |
| 96 | 98 | |
@@ -143,13 +145,17 @@ discard block |
||
| 143 | 145 | $return = []; |
| 144 | 146 | foreach ($entries as $entry) { |
| 145 | 147 | // Check if the user can read the credential, probably unnecesary, but just to be sure |
| 146 | - if (!$entry->hasPermission(SharingACL::READ)) continue; |
|
| 148 | + if (!$entry->hasPermission(SharingACL::READ)) { |
|
| 149 | + continue; |
|
| 150 | + } |
|
| 147 | 151 | $tmp = $entry->jsonSerialize(); |
| 148 | 152 | $credential = $this->credential->getCredentialById($entry->getItemId()); |
| 149 | 153 | $credential = $this->encryptService->decryptCredential($credential); |
| 150 | 154 | $tmp['credential_data'] = $credential->jsonSerialize(); |
| 151 | 155 | |
| 152 | - if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']); |
|
| 156 | + if (!$entry->hasPermission(SharingACL::FILES)) { |
|
| 157 | + unset($tmp['credential_data']['files']); |
|
| 158 | + } |
|
| 153 | 159 | unset($tmp['credential_data']['shared_key']); |
| 154 | 160 | $return[] = $tmp; |
| 155 | 161 | } |
@@ -171,7 +177,9 @@ discard block |
||
| 171 | 177 | $acl = $this->sharingACL->getItemACL($user_id, $item_guid); |
| 172 | 178 | |
| 173 | 179 | // Check if the user can read the credential, probably unnecesary, but just to be sure |
| 174 | - if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level"); |
|
| 180 | + if (!$acl->hasPermission(SharingACL::READ)) { |
|
| 181 | + throw new DoesNotExistException("Item not found or wrong access level"); |
|
| 182 | + } |
|
| 175 | 183 | |
| 176 | 184 | $tmp = $acl->jsonSerialize(); |
| 177 | 185 | $credential = $this->credential->getCredentialById($acl->getItemId()); |
@@ -179,7 +187,9 @@ discard block |
||
| 179 | 187 | |
| 180 | 188 | $tmp['credential_data'] = $credential->jsonSerialize(); |
| 181 | 189 | |
| 182 | - if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']); |
|
| 190 | + if (!$acl->hasPermission(SharingACL::FILES)) { |
|
| 191 | + unset($tmp['credential_data']['files']); |
|
| 192 | + } |
|
| 183 | 193 | unset($tmp['credential_data']['shared_key']); |
| 184 | 194 | |
| 185 | 195 | return $tmp; |
@@ -194,7 +204,9 @@ discard block |
||
| 194 | 204 | */ |
| 195 | 205 | public function getItemHistory($user_id, $item_guid) { |
| 196 | 206 | $acl = $this->sharingACL->getItemACL($user_id, $item_guid); |
| 197 | - if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return []; |
|
| 207 | + if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) { |
|
| 208 | + return []; |
|
| 209 | + } |
|
| 198 | 210 | |
| 199 | 211 | return $this->revisions->getRevisions($acl->getItemId()); |
| 200 | 212 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $this->manager = \OC::$server->getNotificationManager(); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - function credentialExpiredNotification($credential){ |
|
| 28 | + function credentialExpiredNotification($credential) { |
|
| 29 | 29 | $urlGenerator = \OC::$server->getURLGenerator(); |
| 30 | 30 | $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId())); |
| 31 | 31 | $api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - function credentialSharedNotification($data){ |
|
| 54 | + function credentialSharedNotification($data) { |
|
| 55 | 55 | $urlGenerator = \OC::$server->getURLGenerator(); |
| 56 | 56 | $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/')); |
| 57 | 57 | $api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | - function credentialDeclinedSharedNotification($data){ |
|
| 76 | + function credentialDeclinedSharedNotification($data) { |
|
| 77 | 77 | $notification = $this->manager->createNotification(); |
| 78 | 78 | $notification->setApp('passman') |
| 79 | 79 | ->setUser($data['target_user']) |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | |
| 87 | - function credentialAcceptedSharedNotification($data){ |
|
| 87 | + function credentialAcceptedSharedNotification($data) { |
|
| 88 | 88 | $notification = $this->manager->createNotification(); |
| 89 | 89 | $notification->setApp('passman') |
| 90 | 90 | ->setUser($data['target_user']) |
@@ -35,8 +35,7 @@ discard block |
||
| 35 | 35 | * @method string getSharedKey() |
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | -class SharingACL extends PermissionEntity implements \JsonSerializable |
|
| 39 | -{ |
|
| 38 | +class SharingACL extends PermissionEntity implements \JsonSerializable { |
|
| 40 | 39 | |
| 41 | 40 | protected |
| 42 | 41 | $itemId, |
@@ -67,8 +66,7 @@ discard block |
||
| 67 | 66 | * which is a value of any type other than a resource. |
| 68 | 67 | * @since 5.4.0 |
| 69 | 68 | */ |
| 70 | - function jsonSerialize() |
|
| 71 | - { |
|
| 69 | + function jsonSerialize() { |
|
| 72 | 70 | return [ |
| 73 | 71 | 'acl_id' => $this->getId(), |
| 74 | 72 | 'item_id' => $this->getItemId(), |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | |
| 34 | 34 | |
| 35 | -class File extends Entity implements \JsonSerializable{ |
|
| 35 | +class File extends Entity implements \JsonSerializable { |
|
| 36 | 36 | |
| 37 | 37 | use EntityJSONSerializer; |
| 38 | 38 | |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | */ |
| 64 | 64 | |
| 65 | 65 | |
| 66 | -class Credential extends Entity implements \JsonSerializable{ |
|
| 66 | +class Credential extends Entity implements \JsonSerializable { |
|
| 67 | 67 | |
| 68 | 68 | use EntityJSONSerializer; |
| 69 | 69 | |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | |
| 38 | 38 | |
| 39 | -class Vault extends Entity implements \JsonSerializable{ |
|
| 39 | +class Vault extends Entity implements \JsonSerializable { |
|
| 40 | 40 | |
| 41 | 41 | use EntityJSONSerializer; |
| 42 | 42 | |
@@ -62,8 +62,7 @@ discard block |
||
| 62 | 62 | * which is a value of any type other than a resource. |
| 63 | 63 | * @since 5.4.0 |
| 64 | 64 | */ |
| 65 | - function jsonSerialize() |
|
| 66 | - { |
|
| 65 | + function jsonSerialize() { |
|
| 67 | 66 | return [ |
| 68 | 67 | 'req_id' => $this->getId(), |
| 69 | 68 | 'item_id' => $this->getItemId(), |
@@ -78,7 +77,7 @@ discard block |
||
| 78 | 77 | ]; |
| 79 | 78 | } |
| 80 | 79 | |
| 81 | - function asACLJson(){ |
|
| 80 | + function asACLJson() { |
|
| 82 | 81 | return [ |
| 83 | 82 | 'item_id' => $this->getItemId(), |
| 84 | 83 | 'item_guid' => $this->getItemGuid(), |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | |
| 22 | 22 | private $userId; |
| 23 | 23 | |
| 24 | - public function __construct($AppName, IRequest $request, $UserId){ |
|
| 24 | + public function __construct($AppName, IRequest $request, $UserId) { |
|
| 25 | 25 | parent::__construct($AppName, $request); |
| 26 | 26 | $this->userId = $UserId; |
| 27 | 27 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | parent::__construct($db, self::TABLE_NAME); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function createRequest(ShareRequest $request){ |
|
| 25 | + public function createRequest(ShareRequest $request) { |
|
| 26 | 26 | return $this->insert($request); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @param $target_vault_guid |
| 33 | 33 | * @return ShareRequest |
| 34 | 34 | */ |
| 35 | - public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
| 35 | + public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) { |
|
| 36 | 36 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
| 37 | 37 | return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
| 38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | * @param $item_guid |
| 43 | 43 | * @return ShareRequest[] |
| 44 | 44 | */ |
| 45 | - public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
| 46 | - if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
| 45 | + public function getRequestsByItemGuidGroupedByUser($item_guid) { |
|
| 46 | + if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') { |
|
| 47 | 47 | $this->db->executeQuery("SET sql_mode = '';"); |
| 48 | 48 | } |
| 49 | 49 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | * @param $target_user_id The target user |
| 57 | 57 | * @return \PDOStatement The result of running the db query |
| 58 | 58 | */ |
| 59 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
| 59 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
| 60 | 60 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
| 61 | 61 | $this->execute($q, [$item_id, $target_user_id]); |
| 62 | 62 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param $user_id |
| 68 | 68 | * @return ShareRequest[] |
| 69 | 69 | */ |
| 70 | - public function getUserPendingRequests($user_id){ |
|
| 70 | + public function getUserPendingRequests($user_id) { |
|
| 71 | 71 | $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
| 72 | 72 | return $this->findEntities($q, [$user_id]); |
| 73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | * @param ShareRequest $shareRequest Request to delete |
| 78 | 78 | * @return ShareRequest The deleted request |
| 79 | 79 | */ |
| 80 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
| 80 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
| 81 | 81 | return $this->delete($shareRequest); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * @return ShareRequest |
| 88 | 88 | * @throws DoesNotExistException |
| 89 | 89 | */ |
| 90 | - public function getShareRequestById($id){ |
|
| 90 | + public function getShareRequestById($id) { |
|
| 91 | 91 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
| 92 | 92 | return $this->findEntity($q, [$id]); |
| 93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | * @param $item_guid |
| 98 | 98 | * @return ShareRequest[] |
| 99 | 99 | */ |
| 100 | - public function getShareRequestsByItemGuid($item_guid){ |
|
| 100 | + public function getShareRequestsByItemGuid($item_guid) { |
|
| 101 | 101 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
| 102 | 102 | return $this->findEntities($q, [$item_guid]); |
| 103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * @param ShareRequest $shareRequest |
| 108 | 108 | * @return ShareRequest |
| 109 | 109 | */ |
| 110 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
| 110 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
| 111 | 111 | return $this->update($shareRequest); |
| 112 | 112 | } |
| 113 | 113 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * @param $user_id |
| 118 | 118 | * @return ShareRequest[] |
| 119 | 119 | */ |
| 120 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
| 120 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
| 121 | 121 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
| 122 | 122 | return $this->findEntities($q, [$item_guid, $user_id]); |
| 123 | 123 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @param $permissions The new permissions to apply |
| 130 | 130 | * @return \PDOStatement The result of the operation |
| 131 | 131 | */ |
| 132 | - public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){ |
|
| 132 | + public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) { |
|
| 133 | 133 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
| 134 | 134 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
| 135 | 135 | } |