@@ -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(), |
@@ -49,14 +49,14 @@ discard block |
||
| 49 | 49 | * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result |
| 50 | 50 | * @return Vault[] |
| 51 | 51 | */ |
| 52 | - public function findVaultsFromUser($userId){ |
|
| 52 | + public function findVaultsFromUser($userId) { |
|
| 53 | 53 | $sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' . |
| 54 | 54 | 'WHERE `user_id` = ? '; |
| 55 | 55 | $params = [$userId]; |
| 56 | 56 | return $this->findEntities($sql, $params); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function create($vault_name, $userId){ |
|
| 59 | + public function create($vault_name, $userId) { |
|
| 60 | 60 | $vault = new Vault(); |
| 61 | 61 | $vault->setName($vault_name); |
| 62 | 62 | $vault->setUserId($userId); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | return parent::insert($vault); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function setLastAccess($vault_id, $user_id){ |
|
| 69 | + public function setLastAccess($vault_id, $user_id) { |
|
| 70 | 70 | $vault = new Vault(); |
| 71 | 71 | $vault->setId($vault_id); |
| 72 | 72 | $vault->setUserId($user_id); |
@@ -74,11 +74,11 @@ discard block |
||
| 74 | 74 | $this->update($vault); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function updateVault(Vault $vault){ |
|
| 77 | + public function updateVault(Vault $vault) { |
|
| 78 | 78 | $this->update($vault); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function updateSharingKeys($vault_id, $privateKey, $publicKey){ |
|
| 81 | + public function updateSharingKeys($vault_id, $privateKey, $publicKey) { |
|
| 82 | 82 | $vault = new Vault(); |
| 83 | 83 | $vault->setId($vault_id); |
| 84 | 84 | $vault->setPrivateSharingKey($privateKey); |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | * @param $item_guid |
| 30 | 30 | * @return SharingACL[] |
| 31 | 31 | */ |
| 32 | - public function getCredentialPermissions(IUser $userId, $item_guid){ |
|
| 32 | + public function getCredentialPermissions(IUser $userId, $item_guid) { |
|
| 33 | 33 | $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?"; |
| 34 | 34 | |
| 35 | 35 | return $this->findEntities($sql, [$userId, $item_guid]); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function createACLEntry(SharingACL $acl){ |
|
| 38 | + public function createACLEntry(SharingACL $acl) { |
|
| 39 | 39 | return $this->insert($acl); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -59,10 +59,9 @@ discard block |
||
| 59 | 59 | public function getItemACL($user_id, $item_guid) { |
| 60 | 60 | $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
| 61 | 61 | $filter = [$item_guid]; |
| 62 | - if ($user_id === null){ |
|
| 62 | + if ($user_id === null) { |
|
| 63 | 63 | $q .= 'user_id is null'; |
| 64 | - } |
|
| 65 | - else { |
|
| 64 | + } else { |
|
| 66 | 65 | $q .= 'user_id = ? '; |
| 67 | 66 | $filter[] = $user_id; |
| 68 | 67 | } |
@@ -90,7 +89,7 @@ discard block |
||
| 90 | 89 | return $this->findEntities($q, [$item_guid]); |
| 91 | 90 | } |
| 92 | 91 | |
| 93 | - public function deleteShareACL(SharingACL $ACL){ |
|
| 92 | + public function deleteShareACL(SharingACL $ACL) { |
|
| 94 | 93 | return $this->delete($ACL); |
| 95 | 94 | } |
| 96 | 95 | } |
| 97 | 96 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $this->utils = $utils; |
| 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,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param $item_guid |
| 43 | 43 | * @return ShareRequest[] |
| 44 | 44 | */ |
| 45 | - public function getRequestsByItemGuid($item_guid){ |
|
| 45 | + public function getRequestsByItemGuid($item_guid) { |
|
| 46 | 46 | $this->db->executeQuery("SET sql_mode = '';"); |
| 47 | 47 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
| 48 | 48 | return $this->findEntities($q, [$item_guid]); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * @param $target_user_id The target user |
| 55 | 55 | * @return \PDOStatement The result of running the db query |
| 56 | 56 | */ |
| 57 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
| 57 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
| 58 | 58 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
| 59 | 59 | $this->execute($q, [$item_id, $target_user_id]); |
| 60 | 60 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @param $user_id |
| 66 | 66 | * @return ShareRequest[] |
| 67 | 67 | */ |
| 68 | - public function getUserPendingRequests($user_id){ |
|
| 68 | + public function getUserPendingRequests($user_id) { |
|
| 69 | 69 | $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
| 70 | 70 | return $this->findEntities($q, [$user_id]); |
| 71 | 71 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @param ShareRequest $shareRequest Request to delete |
| 76 | 76 | * @return ShareRequest The deleted request |
| 77 | 77 | */ |
| 78 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
| 78 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
| 79 | 79 | return $this->delete($shareRequest); |
| 80 | 80 | } |
| 81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | * @param $id |
| 85 | 85 | * @return ShareRequest |
| 86 | 86 | */ |
| 87 | - public function getShareRequestById($id){ |
|
| 87 | + public function getShareRequestById($id) { |
|
| 88 | 88 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
| 89 | 89 | return $this->findEntity($q, [$id]); |
| 90 | 90 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | * @param $item_guid |
| 95 | 95 | * @return ShareRequest[] |
| 96 | 96 | */ |
| 97 | - public function getShareRequestsByItemGuid($item_guid){ |
|
| 97 | + public function getShareRequestsByItemGuid($item_guid) { |
|
| 98 | 98 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
| 99 | 99 | return $this->findEntities($q, [$item_guid]); |
| 100 | 100 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param ShareRequest $shareRequest |
| 105 | 105 | * @return ShareRequest |
| 106 | 106 | */ |
| 107 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
| 107 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
| 108 | 108 | return $this->update($shareRequest); |
| 109 | 109 | } |
| 110 | 110 | |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * @param $user_id |
| 115 | 115 | * @return ShareRequest[] |
| 116 | 116 | */ |
| 117 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
| 117 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
| 118 | 118 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
| 119 | 119 | return $this->findEntities($q, [$item_guid, $user_id]); |
| 120 | 120 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @param $permissions The new permissions to apply |
| 127 | 127 | * @return \PDOStatement The result of the operation |
| 128 | 128 | */ |
| 129 | - public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){ |
|
| 129 | + public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) { |
|
| 130 | 130 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
| 131 | 131 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
| 132 | 132 | } |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | public function __construct($AppName, |
| 24 | 24 | IRequest $request, |
| 25 | 25 | $UserId, |
| 26 | - FileService $fileService){ |
|
| 26 | + FileService $fileService) { |
|
| 27 | 27 | parent::__construct($AppName, $request); |
| 28 | 28 | $this->userId = $UserId; |
| 29 | 29 | $this->fileService = $fileService; |
@@ -56,20 +56,20 @@ discard block |
||
| 56 | 56 | return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId)); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function updateFile($file_id, $file_data, $filename, $mimetype, $size){ |
|
| 59 | + public function updateFile($file_id, $file_data, $filename, $mimetype, $size) { |
|
| 60 | 60 | try{ |
| 61 | 61 | $file = $this->fileService->getFile($file_id, $this->userId); |
| 62 | 62 | } catch (DoesNotExistException $doesNotExistException){ |
| 63 | 63 | |
| 64 | 64 | } |
| 65 | - if($file){ |
|
| 65 | + if($file) { |
|
| 66 | 66 | if($file_data) { |
| 67 | 67 | $file->setFileData($file_data); |
| 68 | 68 | } |
| 69 | 69 | if($filename) { |
| 70 | 70 | $file->setFilename($filename); |
| 71 | 71 | } |
| 72 | - if($filename || $file_data){ |
|
| 72 | + if($filename || $file_data) { |
|
| 73 | 73 | new JSONResponse($this->fileService->updateFile($file)); |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | foreach ($acl_list as $sharingACL) { |
| 204 | 204 | $target_user = $sharingACL->getUserId(); |
| 205 | - if($target_user === $this->userId){ |
|
| 205 | + if($target_user === $this->userId) { |
|
| 206 | 206 | continue; |
| 207 | 207 | } |
| 208 | 208 | $this->activityService->add( |
@@ -217,11 +217,11 @@ discard block |
||
| 217 | 217 | $link, $storedCredential->getUserId(), Activity::TYPE_ITEM_ACTION); |
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | - if($set_share_key === true){ |
|
| 220 | + if($set_share_key === true) { |
|
| 221 | 221 | $storedCredential->setSharedKey($shared_key); |
| 222 | 222 | $credential['shared_key'] = $shared_key; |
| 223 | 223 | } |
| 224 | - if($unshare_action === true){ |
|
| 224 | + if($unshare_action === true) { |
|
| 225 | 225 | $storedCredential->setSharedKey(''); |
| 226 | 226 | $credential['shared_key'] = ''; |
| 227 | 227 | } |
@@ -257,21 +257,18 @@ discard block |
||
| 257 | 257 | public function getRevision($credential_guid) { |
| 258 | 258 | try { |
| 259 | 259 | $credential = $this->credentialService->getCredentialByGUID($credential_guid); |
| 260 | - } |
|
| 261 | - catch (DoesNotExistException $ex){ |
|
| 260 | + } catch (DoesNotExistException $ex){ |
|
| 262 | 261 | return new NotFoundJSONResponse(); |
| 263 | 262 | } |
| 264 | 263 | |
| 265 | 264 | // If the request was made by the owner of the credential |
| 266 | 265 | if ($this->userId === $credential->getUserId()) { |
| 267 | 266 | $result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId); |
| 268 | - } |
|
| 269 | - else { |
|
| 267 | + } else { |
|
| 270 | 268 | $acl = $this->sharingService->getACL($this->userId, $credential_guid); |
| 271 | - if ($acl->hasPermission(SharingACL::HISTORY)){ |
|
| 269 | + if ($acl->hasPermission(SharingACL::HISTORY)) { |
|
| 272 | 270 | $result = $this->credentialRevisionService->getRevisions($credential->getId()); |
| 273 | - } |
|
| 274 | - else { |
|
| 271 | + } else { |
|
| 275 | 272 | return new NotFoundJSONResponse(); |
| 276 | 273 | } |
| 277 | 274 | } |
@@ -290,7 +287,7 @@ discard block |
||
| 290 | 287 | /** |
| 291 | 288 | * @NoAdminRequired |
| 292 | 289 | */ |
| 293 | - public function updateRevision($credential_guid, $revision_id, $credential_data){ |
|
| 290 | + public function updateRevision($credential_guid, $revision_id, $credential_data) { |
|
| 294 | 291 | $revision = null; |
| 295 | 292 | try { |
| 296 | 293 | $credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId); |
@@ -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 | } |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | |
| 233 | - public function unshareCredentialFromUser($item_guid, $user_id){ |
|
| 233 | + public function unshareCredentialFromUser($item_guid, $user_id) { |
|
| 234 | 234 | $acl = null; |
| 235 | 235 | $sr = null; |
| 236 | 236 | try { |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - if($sr){ |
|
| 247 | + if($sr) { |
|
| 248 | 248 | $this->shareService->cleanItemRequestsForUser($sr); |
| 249 | 249 | $manager = \OC::$server->getNotificationManager(); |
| 250 | 250 | $notification = $manager->createNotification(); |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | ->setUser($user_id); |
| 254 | 254 | $manager->markProcessed($notification); |
| 255 | 255 | } |
| 256 | - if($acl){ |
|
| 256 | + if($acl) { |
|
| 257 | 257 | $this->shareService->deleteShareACL($acl); |
| 258 | 258 | } |
| 259 | 259 | return new JSONResponse(array('result' => true)); |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | * @return JSONResponse |
| 463 | 463 | * @return NotFoundResponse |
| 464 | 464 | */ |
| 465 | - public function getFile($item_guid, $file_guid){ |
|
| 465 | + public function getFile($item_guid, $file_guid) { |
|
| 466 | 466 | try { |
| 467 | 467 | $credential = $this->credentialService->getCredentialByGUID($item_guid); |
| 468 | 468 | } catch (DoesNotExistException $e){ |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | } |
| 471 | 471 | |
| 472 | 472 | $acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid()); |
| 473 | - if (!$acl->hasPermission(SharingACL::FILES)){ |
|
| 473 | + if (!$acl->hasPermission(SharingACL::FILES)) { |
|
| 474 | 474 | return new NotFoundJSONResponse(); |
| 475 | 475 | } else { |
| 476 | 476 | return $this->fileService->getFileByGuid($file_guid); |