@@ -148,7 +148,7 @@ |
||
| 148 | 148 | * Update a credential |
| 149 | 149 | * |
| 150 | 150 | * @param $raw_credential array An array containing all the credential fields |
| 151 | - * @param $useRawUser bool |
|
| 151 | + * @param boolean $useRawUser bool |
|
| 152 | 152 | * @return Credential The updated credential |
| 153 | 153 | */ |
| 154 | 154 | public function updateCredential($raw_credential, $useRawUser) { |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * Deletes the given delete request |
| 70 | - * @param DeleteVaultRequest $shareRequest Request to delete |
|
| 70 | + * @param DeleteVaultRequest $request Request to delete |
|
| 71 | 71 | * @return DeleteVaultRequest The deleted request |
| 72 | 72 | */ |
| 73 | 73 | public function removeDeleteVaultRequest(DeleteVaultRequest $request){ |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param DeleteVaultRequest $request |
| 43 | 43 | * @return \OCP\AppFramework\Db\Entity |
| 44 | 44 | */ |
| 45 | - public function createRequest(DeleteVaultRequest $request){ |
|
| 45 | + public function createRequest(DeleteVaultRequest $request) { |
|
| 46 | 46 | return $this->insert($request); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * Get all delete requests |
| 51 | 51 | * @return \OCP\AppFramework\Db\Entity |
| 52 | 52 | */ |
| 53 | - public function getDeleteRequests(){ |
|
| 53 | + public function getDeleteRequests() { |
|
| 54 | 54 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME; |
| 55 | 55 | return $this->findEntities($q); |
| 56 | 56 | } |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | * @param $vault_id integer The vault id |
| 61 | 61 | * @return \OCP\AppFramework\Db\Entity |
| 62 | 62 | */ |
| 63 | - public function getDeleteRequestsForVault($vault_guid){ |
|
| 64 | - $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME .' WHERE `vault_guid` = ?'; |
|
| 63 | + public function getDeleteRequestsForVault($vault_guid) { |
|
| 64 | + $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . ' WHERE `vault_guid` = ?'; |
|
| 65 | 65 | return $this->findEntity($q, [$vault_guid]); |
| 66 | 66 | } |
| 67 | 67 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @param DeleteVaultRequest $shareRequest Request to delete |
| 71 | 71 | * @return DeleteVaultRequest The deleted request |
| 72 | 72 | */ |
| 73 | - public function removeDeleteVaultRequest(DeleteVaultRequest $request){ |
|
| 73 | + public function removeDeleteVaultRequest(DeleteVaultRequest $request) { |
|
| 74 | 74 | return $this->delete($request); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * @param DeleteVaultRequest $request |
| 43 | 43 | * @return \OCP\AppFramework\Db\Entity |
| 44 | 44 | */ |
| 45 | - public function createRequest(DeleteVaultRequest $request){ |
|
| 45 | + public function createRequest(DeleteVaultRequest $request) { |
|
| 46 | 46 | return $this->insert($request); |
| 47 | 47 | } |
| 48 | 48 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | * Get all delete requests |
| 51 | 51 | * @return \OCP\AppFramework\Db\Entity |
| 52 | 52 | */ |
| 53 | - public function getDeleteRequests(){ |
|
| 53 | + public function getDeleteRequests() { |
|
| 54 | 54 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME; |
| 55 | 55 | return $this->findEntities($q); |
| 56 | 56 | } |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * @param $vault_id integer The vault id |
| 61 | 61 | * @return \OCP\AppFramework\Db\Entity |
| 62 | 62 | */ |
| 63 | - public function getDeleteRequestsForVault($vault_guid){ |
|
| 63 | + public function getDeleteRequestsForVault($vault_guid) { |
|
| 64 | 64 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME .' WHERE `vault_guid` = ?'; |
| 65 | 65 | return $this->findEntity($q, [$vault_guid]); |
| 66 | 66 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | * @param DeleteVaultRequest $shareRequest Request to delete |
| 71 | 71 | * @return DeleteVaultRequest The deleted request |
| 72 | 72 | */ |
| 73 | - public function removeDeleteVaultRequest(DeleteVaultRequest $request){ |
|
| 73 | + public function removeDeleteVaultRequest(DeleteVaultRequest $request) { |
|
| 74 | 74 | return $this->delete($request); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -174,13 +174,13 @@ discard block |
||
| 174 | 174 | $activity . '_self', array($label, $this->userId, $revision_created), |
| 175 | 175 | '', array(), |
| 176 | 176 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 177 | - } else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) { |
|
| 177 | + } else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) { |
|
| 178 | 178 | $activity = 'item_deleted'; |
| 179 | 179 | $this->activityService->add( |
| 180 | 180 | $activity . '_self', array($label, $this->userId), |
| 181 | 181 | '', array(), |
| 182 | 182 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 183 | - } else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) { |
|
| 183 | + } else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) { |
|
| 184 | 184 | $activity = 'item_recovered'; |
| 185 | 185 | $this->activityService->add( |
| 186 | 186 | $activity . '_self', array($label, $this->userId), |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | $this->sharingService->unshareCredential($credential->getGuid()); |
| 294 | 294 | foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) { |
| 295 | 295 | $id = $revision['revision_id']; |
| 296 | - if(isset($id)){ |
|
| 296 | + if (isset($id)) { |
|
| 297 | 297 | $this->credentialRevisionService->deleteRevision($id, $this->userId); |
| 298 | 298 | } |
| 299 | 299 | } |
@@ -293,7 +293,7 @@ |
||
| 293 | 293 | $this->sharingService->unshareCredential($credential->getGuid()); |
| 294 | 294 | foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) { |
| 295 | 295 | $id = $revision['revision_id']; |
| 296 | - if(isset($id)){ |
|
| 296 | + if(isset($id)) { |
|
| 297 | 297 | $this->credentialRevisionService->deleteRevision($id, $this->userId); |
| 298 | 298 | } |
| 299 | 299 | } |
@@ -109,10 +109,10 @@ discard block |
||
| 109 | 109 | return new JSONResponse(array('success' => true)); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - public function listRequests(){ |
|
| 112 | + public function listRequests() { |
|
| 113 | 113 | $requests = $this->deleteVaultRequestService->getDeleteRequests(); |
| 114 | 114 | $results = array(); |
| 115 | - foreach($requests as $request){ |
|
| 115 | + foreach($requests as $request) { |
|
| 116 | 116 | $r = $request->jsonSerialize(); |
| 117 | 117 | $r['displayName'] = Utils::getNameByUid($request->getRequestedBy()); |
| 118 | 118 | array_push($results, $r); |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | return new JSONResponse($results); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - public function acceptRequestDeletion($vault_guid, $requested_by){ |
|
| 123 | + public function acceptRequestDeletion($vault_guid, $requested_by) { |
|
| 124 | 124 | $req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid); |
| 125 | 125 | try{ |
| 126 | 126 | $vault = $this->vaultService->getByGuid($vault_guid, $requested_by); |
@@ -128,12 +128,12 @@ discard block |
||
| 128 | 128 | //Ignore |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - if(isset($vault)){ |
|
| 131 | + if(isset($vault)) { |
|
| 132 | 132 | $credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by); |
| 133 | 133 | |
| 134 | - foreach($credentials as $credential){ |
|
| 134 | + foreach($credentials as $credential) { |
|
| 135 | 135 | $revisions = $this->revisionService->getRevisions($credential->getId()); |
| 136 | - foreach($revisions as $revision){ |
|
| 136 | + foreach($revisions as $revision) { |
|
| 137 | 137 | $this->revisionService->deleteRevision($revision['revision_id'], $requested_by); |
| 138 | 138 | } |
| 139 | 139 | $this->credentialService->deleteCredential($credential); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | */ |
| 151 | 151 | public function requestDeletion($vault_guid, $reason) { |
| 152 | 152 | $req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid); |
| 153 | - if($req){ |
|
| 153 | + if($req) { |
|
| 154 | 154 | return new JSONResponse('Already exists'); |
| 155 | 155 | } |
| 156 | 156 | $vault = $this->vaultService->getByGuid($vault_guid, $this->userId); |
@@ -109,10 +109,10 @@ discard block |
||
| 109 | 109 | return new JSONResponse(array('success' => true)); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - public function listRequests(){ |
|
| 112 | + public function listRequests() { |
|
| 113 | 113 | $requests = $this->deleteVaultRequestService->getDeleteRequests(); |
| 114 | 114 | $results = array(); |
| 115 | - foreach($requests as $request){ |
|
| 115 | + foreach ($requests as $request) { |
|
| 116 | 116 | $r = $request->jsonSerialize(); |
| 117 | 117 | $r['displayName'] = Utils::getNameByUid($request->getRequestedBy()); |
| 118 | 118 | array_push($results, $r); |
@@ -120,27 +120,27 @@ discard block |
||
| 120 | 120 | return new JSONResponse($results); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - public function acceptRequestDeletion($vault_guid, $requested_by){ |
|
| 123 | + public function acceptRequestDeletion($vault_guid, $requested_by) { |
|
| 124 | 124 | $req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid); |
| 125 | - try{ |
|
| 125 | + try { |
|
| 126 | 126 | $vault = $this->vaultService->getByGuid($vault_guid, $requested_by); |
| 127 | - } catch (\Exception $e){ |
|
| 127 | + } catch (\Exception $e) { |
|
| 128 | 128 | //Ignore |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - if(isset($vault)){ |
|
| 131 | + if (isset($vault)) { |
|
| 132 | 132 | $credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by); |
| 133 | 133 | |
| 134 | - foreach($credentials as $credential){ |
|
| 134 | + foreach ($credentials as $credential) { |
|
| 135 | 135 | $revisions = $this->revisionService->getRevisions($credential->getId()); |
| 136 | - foreach($revisions as $revision){ |
|
| 136 | + foreach ($revisions as $revision) { |
|
| 137 | 137 | $this->revisionService->deleteRevision($revision['revision_id'], $requested_by); |
| 138 | 138 | } |
| 139 | 139 | $this->credentialService->deleteCredential($credential); |
| 140 | 140 | } |
| 141 | 141 | $this->vaultService->deleteVault($vault_guid, $requested_by); |
| 142 | 142 | } |
| 143 | - if(isset($req)) { |
|
| 143 | + if (isset($req)) { |
|
| 144 | 144 | $this->deleteVaultRequestService->removeDeleteRequestForVault($req); |
| 145 | 145 | } |
| 146 | 146 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | */ |
| 153 | 153 | public function requestDeletion($vault_guid, $reason) { |
| 154 | 154 | $req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid); |
| 155 | - if($req){ |
|
| 155 | + if ($req) { |
|
| 156 | 156 | return new JSONResponse('Already exists'); |
| 157 | 157 | } |
| 158 | 158 | $vault = $this->vaultService->getByGuid($vault_guid, $this->userId); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | $result = false; |
| 178 | 178 | try { |
| 179 | 179 | $delete_request = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid); |
| 180 | - } catch (\Exception $exception){ |
|
| 180 | + } catch (\Exception $exception) { |
|
| 181 | 181 | // Ignore it |
| 182 | 182 | } |
| 183 | 183 | |
@@ -107,10 +107,10 @@ |
||
| 107 | 107 | * @param string $userId |
| 108 | 108 | * @return File[] |
| 109 | 109 | */ |
| 110 | - public function getFilesFromUser($userId){ |
|
| 110 | + public function getFilesFromUser($userId) { |
|
| 111 | 111 | $files = $this->fileMapper->getFilesFromUser($userId); |
| 112 | 112 | $results = array(); |
| 113 | - foreach ($files as $file){ |
|
| 113 | + foreach ($files as $file) { |
|
| 114 | 114 | array_push($results, $this->encryptService->decryptFile($file)); |
| 115 | 115 | } |
| 116 | 116 | return $results; |
@@ -107,10 +107,10 @@ |
||
| 107 | 107 | * @param string $userId |
| 108 | 108 | * @return File[] |
| 109 | 109 | */ |
| 110 | - public function getFilesFromUser($userId){ |
|
| 110 | + public function getFilesFromUser($userId) { |
|
| 111 | 111 | $files = $this->fileMapper->getFilesFromUser($userId); |
| 112 | 112 | $results = array(); |
| 113 | - foreach ($files as $file){ |
|
| 113 | + foreach ($files as $file) { |
|
| 114 | 114 | array_push($results, $this->encryptService->decryptFile($file)); |
| 115 | 115 | } |
| 116 | 116 | return $results; |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | |
| 40 | 40 | |
| 41 | -class DeleteVaultRequest extends Entity implements \JsonSerializable{ |
|
| 41 | +class DeleteVaultRequest extends Entity implements \JsonSerializable { |
|
| 42 | 42 | |
| 43 | 43 | use EntityJSONSerializer; |
| 44 | 44 | |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | |
| 40 | 40 | |
| 41 | -class DeleteVaultRequest extends Entity implements \JsonSerializable{ |
|
| 41 | +class DeleteVaultRequest extends Entity implements \JsonSerializable { |
|
| 42 | 42 | |
| 43 | 43 | use EntityJSONSerializer; |
| 44 | 44 | |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | * @param $uid |
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | - public static function getNameByUid($uid){ |
|
| 58 | + public static function getNameByUid($uid) { |
|
| 59 | 59 | $um = \OC::$server->getUserManager(); |
| 60 | 60 | $u = $um->get($uid); |
| 61 | 61 | return $u->getDisplayName(); |
@@ -43,8 +43,7 @@ discard block |
||
| 43 | 43 | * @return string |
| 44 | 44 | */ |
| 45 | 45 | public static function GUID() { |
| 46 | - if (function_exists('com_create_guid') === true) |
|
| 47 | - { |
|
| 46 | + if (function_exists('com_create_guid') === true) { |
|
| 48 | 47 | return trim(com_create_guid(), '{}'); |
| 49 | 48 | } |
| 50 | 49 | |
@@ -55,7 +54,7 @@ discard block |
||
| 55 | 54 | * @param $uid |
| 56 | 55 | * @return string |
| 57 | 56 | */ |
| 58 | - public static function getNameByUid($uid){ |
|
| 57 | + public static function getNameByUid($uid) { |
|
| 59 | 58 | $um = \OC::$server->getUserManager(); |
| 60 | 59 | $u = $um->get($uid); |
| 61 | 60 | return $u->getDisplayName(); |