@@ -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 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | 'WHERE `credential_id` = ?'; |
| 33 | 33 | $params = [$credential_id]; |
| 34 | 34 | if ($user_id !== null) { |
| 35 | - $sql.= ' and `user_id` = ? '; |
|
| 35 | + $sql .= ' and `user_id` = ? '; |
|
| 36 | 36 | $params[] = $user_id; |
| 37 | 37 | } |
| 38 | 38 | return $this->findEntities($sql, $params); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | 'WHERE `id` = ?'; |
| 49 | 49 | $params = [$revision_id]; |
| 50 | 50 | if ($user_id !== null) { |
| 51 | - $sql.= ' and `user_id` = ? '; |
|
| 51 | + $sql .= ' and `user_id` = ? '; |
|
| 52 | 52 | $params[] = $user_id; |
| 53 | 53 | } |
| 54 | 54 | return $this->findEntity($sql, $params); |
@@ -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); |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | ]; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - function asACLJson(){ |
|
| 81 | + function asACLJson() { |
|
| 82 | 82 | return [ |
| 83 | 83 | 'item_id' => $this->getItemId(), |
| 84 | 84 | 'item_guid' => $this->getItemGuid(), |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | trait EntityJSONSerializer { |
| 13 | 13 | public function serializeFields($properties) { |
| 14 | 14 | $result = []; |
| 15 | - foreach($properties as $property) { |
|
| 15 | + foreach ($properties as $property) { |
|
| 16 | 16 | $result[$property] = $this->$property; |
| 17 | 17 | } |
| 18 | 18 | return $result; |
@@ -13,11 +13,11 @@ |
||
| 13 | 13 | use OCP\AppFramework\Db\Entity; |
| 14 | 14 | |
| 15 | 15 | class PermissionEntity extends Entity { |
| 16 | - CONST READ = 0b00000001; |
|
| 17 | - CONST WRITE = 0b00000010; |
|
| 18 | - CONST FILES = 0b00000100; |
|
| 16 | + CONST READ = 0b00000001; |
|
| 17 | + CONST WRITE = 0b00000010; |
|
| 18 | + CONST FILES = 0b00000100; |
|
| 19 | 19 | CONST HISTORY = 0b00001000; |
| 20 | - CONST OWNER = 0b10000000; |
|
| 20 | + CONST OWNER = 0b10000000; |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * Checks wether a user matches one or more permissions at once |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | ); |
| 85 | 85 | $credential = $this->credentialService->createCredential($credential); |
| 86 | 86 | $link = ''; // @TODO create direct link to credential |
| 87 | - if(!$credential->getHidden()) { |
|
| 87 | + if (!$credential->getHidden()) { |
|
| 88 | 88 | $this->activityService->add( |
| 89 | 89 | Activity::SUBJECT_ITEM_CREATED_SELF, array($label, $this->userId), |
| 90 | 90 | '', array(), |
@@ -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,15 +217,15 @@ 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 | } |
| 228 | - if(!$skip_revision) { |
|
| 228 | + if (!$skip_revision) { |
|
| 229 | 229 | $this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId); |
| 230 | 230 | } |
| 231 | 231 | $credential = $this->credentialService->updateCredential($credential); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | try { |
| 259 | 259 | $credential = $this->credentialService->getCredentialByGUID($credential_guid); |
| 260 | 260 | } |
| 261 | - catch (DoesNotExistException $ex){ |
|
| 261 | + catch (DoesNotExistException $ex) { |
|
| 262 | 262 | return new NotFoundJSONResponse(); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | else { |
| 270 | 270 | $acl = $this->sharingService->getACL($this->userId, $credential_guid); |
| 271 | - if ($acl->hasPermission(SharingACL::HISTORY)){ |
|
| 271 | + if ($acl->hasPermission(SharingACL::HISTORY)) { |
|
| 272 | 272 | $result = $this->credentialRevisionService->getRevisions($credential->getId()); |
| 273 | 273 | } |
| 274 | 274 | else { |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | /** |
| 291 | 291 | * @NoAdminRequired |
| 292 | 292 | */ |
| 293 | - public function updateRevision($credential_guid, $revision_id, $credential_data){ |
|
| 293 | + public function updateRevision($credential_guid, $revision_id, $credential_data) { |
|
| 294 | 294 | $revision = null; |
| 295 | 295 | try { |
| 296 | 296 | $credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId); |
@@ -298,9 +298,9 @@ discard block |
||
| 298 | 298 | return new NotFoundJSONResponse(); |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - try{ |
|
| 301 | + try { |
|
| 302 | 302 | $revision = $this->credentialRevisionService->getRevision($revision_id); |
| 303 | - } catch(DoesNotExistException $exception){ |
|
| 303 | + } catch (DoesNotExistException $exception) { |
|
| 304 | 304 | return new NotFoundJSONResponse(); |
| 305 | 305 | } |
| 306 | 306 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | return $this->credentialMapper->upd($credential); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function deleteCredential($credential){ |
|
| 50 | + public function deleteCredential($credential) { |
|
| 51 | 51 | return $this->credentialMapper->deleteCredential($credential); |
| 52 | 52 | } |
| 53 | 53 | |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | return $this->credentialMapper->getExpiredCredentials($timestamp); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function getCredentialById($credential_id, $user_id){ |
|
| 67 | + public function getCredentialById($credential_id, $user_id) { |
|
| 68 | 68 | $credential = $this->credentialMapper->getCredentialById($credential_id); |
| 69 | - if ($credential->getUserId() === $user_id){ |
|
| 69 | + if ($credential->getUserId() === $user_id) { |
|
| 70 | 70 | return $credential; |
| 71 | 71 | } |
| 72 | 72 | else { |
@@ -77,11 +77,11 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | throw new DoesNotExistException("Did expect one result but found none when executing"); |
| 79 | 79 | } |
| 80 | - public function getCredentialLabelById($credential_id){ |
|
| 80 | + public function getCredentialLabelById($credential_id) { |
|
| 81 | 81 | return $this->credentialMapper->getCredentialLabelById($credential_id); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
| 84 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
| 85 | 85 | return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id); |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | \ No newline at end of file |