@@ -79,7 +79,7 @@ |
||
| 79 | 79 | try { |
| 80 | 80 | $vault = $this->vaultService->getByGuid($vault_guid, $this->userId); |
| 81 | 81 | } catch (DoesNotExistException $e) { |
| 82 | - return new NotFoundJSONResponse(); |
|
| 82 | + return new NotFoundJSONResponse(); |
|
| 83 | 83 | } |
| 84 | 84 | $result = array(); |
| 85 | 85 | if ($vault) { |
@@ -409,11 +409,11 @@ |
||
| 409 | 409 | //@TODO Check expire date |
| 410 | 410 | $acl = $this->shareService->getACL(null, $credential_guid); |
| 411 | 411 | |
| 412 | - if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) { |
|
| 412 | + if ($acl->getExpire() > 0 && Utils::getTime() > $acl->getExpire()) { |
|
| 413 | 413 | return new NotFoundJSONResponse(); |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - $views = $acl->getExpireViews(); |
|
| 416 | + $views = $acl->getExpireViews(); |
|
| 417 | 417 | if ($views === 0) { |
| 418 | 418 | return new NotFoundJSONResponse(); |
| 419 | 419 | } else if ($views != -1) { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * @NoCSRFRequired |
| 86 | 86 | */ |
| 87 | 87 | public function createPublicShare($item_id, $item_guid, $permissions, $expire_timestamp, $expire_views) { |
| 88 | - if($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0'){ |
|
| 88 | + if($this->config->getAppValue('passman', 'link_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'link_sharing_enabled', 1) === '0') { |
|
| 89 | 89 | return new JSONResponse(array()); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | * @NoCSRFRequired |
| 127 | 127 | */ |
| 128 | 128 | public function applyIntermediateShare($item_id, $item_guid, $vaults, $permissions) { |
| 129 | - if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){ |
|
| 129 | + if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') { |
|
| 130 | 130 | return new JSONResponse(array()); |
| 131 | 131 | } |
| 132 | 132 | /** |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @NoCSRFRequired |
| 222 | 222 | */ |
| 223 | 223 | public function unshareCredential($item_guid) { |
| 224 | - if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){ |
|
| 224 | + if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') { |
|
| 225 | 225 | return new JSONResponse(array()); |
| 226 | 226 | } |
| 227 | 227 | $acl_list = $this->shareService->getCredentialAclList($item_guid); |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | |
| 245 | - public function unshareCredentialFromUser($item_guid, $user_id){ |
|
| 245 | + public function unshareCredentialFromUser($item_guid, $user_id) { |
|
| 246 | 246 | $acl = null; |
| 247 | 247 | $sr = null; |
| 248 | 248 | try { |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | - if($sr){ |
|
| 259 | + if($sr) { |
|
| 260 | 260 | $this->shareService->cleanItemRequestsForUser($sr); |
| 261 | 261 | $manager = \OC::$server->getNotificationManager(); |
| 262 | 262 | $notification = $manager->createNotification(); |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | ->setUser($user_id); |
| 266 | 266 | $manager->markProcessed($notification); |
| 267 | 267 | } |
| 268 | - if($acl){ |
|
| 268 | + if($acl) { |
|
| 269 | 269 | $this->shareService->deleteShareACL($acl); |
| 270 | 270 | } |
| 271 | 271 | return new JSONResponse(array('result' => true)); |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | * @NoCSRFRequired |
| 375 | 375 | */ |
| 376 | 376 | public function getVaultItems($vault_guid) { |
| 377 | - if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){ |
|
| 377 | + if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') { |
|
| 378 | 378 | return new JSONResponse(array()); |
| 379 | 379 | } |
| 380 | 380 | |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | * @PublicPage |
| 429 | 429 | */ |
| 430 | 430 | public function getPublicCredentialData($credential_guid) { |
| 431 | - if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0'){ |
|
| 431 | + if($this->config->getAppValue('passman', 'user_sharing_enabled', 1) === 0 || $this->config->getAppValue('passman', 'user_sharing_enabled', 1) === '0') { |
|
| 432 | 432 | return new NotFoundJSONResponse(); |
| 433 | 433 | } |
| 434 | 434 | //@TODO Check expire date |
@@ -489,7 +489,7 @@ discard block |
||
| 489 | 489 | * @return JSONResponse |
| 490 | 490 | * @return NotFoundResponse |
| 491 | 491 | */ |
| 492 | - public function getFile($item_guid, $file_guid){ |
|
| 492 | + public function getFile($item_guid, $file_guid) { |
|
| 493 | 493 | try { |
| 494 | 494 | $credential = $this->credentialService->getCredentialByGUID($item_guid); |
| 495 | 495 | } catch (DoesNotExistException $e){ |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | } |
| 498 | 498 | $userId = ($this->userId) ? $this->userId->getUID() : null; |
| 499 | 499 | $acl = $this->shareService->getACL($userId, $credential->getGuid()); |
| 500 | - if (!$acl->hasPermission(SharingACL::FILES)){ |
|
| 500 | + if (!$acl->hasPermission(SharingACL::FILES)) { |
|
| 501 | 501 | return new NotFoundJSONResponse(); |
| 502 | 502 | } else { |
| 503 | 503 | return $this->fileService->getFileByGuid($file_guid); |
@@ -38,50 +38,50 @@ |
||
| 38 | 38 | class SharingACL extends PermissionEntity implements \JsonSerializable |
| 39 | 39 | { |
| 40 | 40 | |
| 41 | - protected |
|
| 42 | - $itemId, |
|
| 43 | - $itemGuid, |
|
| 44 | - $userId, |
|
| 45 | - $created, |
|
| 46 | - $expire, |
|
| 41 | + protected |
|
| 42 | + $itemId, |
|
| 43 | + $itemGuid, |
|
| 44 | + $userId, |
|
| 45 | + $created, |
|
| 46 | + $expire, |
|
| 47 | 47 | $expireViews, |
| 48 | - $permissions, |
|
| 49 | - $vaultId, |
|
| 50 | - $vaultGuid, |
|
| 51 | - $sharedKey; |
|
| 48 | + $permissions, |
|
| 49 | + $vaultId, |
|
| 50 | + $vaultGuid, |
|
| 51 | + $sharedKey; |
|
| 52 | 52 | |
| 53 | 53 | |
| 54 | - public function __construct() { |
|
| 55 | - // add types in constructor |
|
| 56 | - $this->addType('itemId', 'integer'); |
|
| 57 | - $this->addType('created', 'integer'); |
|
| 58 | - $this->addType('expire', 'integer'); |
|
| 59 | - $this->addType('expireViews', 'integer'); |
|
| 60 | - $this->addType('permissions', 'integer'); |
|
| 61 | - } |
|
| 54 | + public function __construct() { |
|
| 55 | + // add types in constructor |
|
| 56 | + $this->addType('itemId', 'integer'); |
|
| 57 | + $this->addType('created', 'integer'); |
|
| 58 | + $this->addType('expire', 'integer'); |
|
| 59 | + $this->addType('expireViews', 'integer'); |
|
| 60 | + $this->addType('permissions', 'integer'); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * Specify data which should be serialized to JSON |
|
| 65 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 66 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 67 | - * which is a value of any type other than a resource. |
|
| 68 | - * @since 5.4.0 |
|
| 69 | - */ |
|
| 70 | - function jsonSerialize() |
|
| 71 | - { |
|
| 72 | - return [ |
|
| 73 | - 'acl_id' => $this->getId(), |
|
| 74 | - 'item_id' => $this->getItemId(), |
|
| 75 | - 'item_guid' => $this->getItemGuid(), |
|
| 76 | - 'user_id' => $this->getUserId(), |
|
| 77 | - 'created' => $this->getCreated(), |
|
| 78 | - 'expire' => $this->getExpire(), |
|
| 79 | - 'expire_views' => $this->getExpireViews(), |
|
| 80 | - 'permissions' => $this->getPermissions(), |
|
| 81 | - 'vault_id' => $this->getVaultId(), |
|
| 82 | - 'vault_guid' => $this->getVaultGuid(), |
|
| 83 | - 'shared_key' => $this->getSharedKey(), |
|
| 84 | - 'pending' => false, |
|
| 85 | - ]; |
|
| 86 | - } |
|
| 63 | + /** |
|
| 64 | + * Specify data which should be serialized to JSON |
|
| 65 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 66 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 67 | + * which is a value of any type other than a resource. |
|
| 68 | + * @since 5.4.0 |
|
| 69 | + */ |
|
| 70 | + function jsonSerialize() |
|
| 71 | + { |
|
| 72 | + return [ |
|
| 73 | + 'acl_id' => $this->getId(), |
|
| 74 | + 'item_id' => $this->getItemId(), |
|
| 75 | + 'item_guid' => $this->getItemGuid(), |
|
| 76 | + 'user_id' => $this->getUserId(), |
|
| 77 | + 'created' => $this->getCreated(), |
|
| 78 | + 'expire' => $this->getExpire(), |
|
| 79 | + 'expire_views' => $this->getExpireViews(), |
|
| 80 | + 'permissions' => $this->getPermissions(), |
|
| 81 | + 'vault_id' => $this->getVaultId(), |
|
| 82 | + 'vault_guid' => $this->getVaultGuid(), |
|
| 83 | + 'shared_key' => $this->getSharedKey(), |
|
| 84 | + 'pending' => false, |
|
| 85 | + ]; |
|
| 86 | + } |
|
| 87 | 87 | } |
| 88 | 88 | \ No newline at end of file |
@@ -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(), |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * @method integer getId() |
| 17 | 17 | * @method void setId(integer $value) |
| 18 | - * @method void setGuid(string $value) |
|
| 18 | + * @method void setGuid(string $value) |
|
| 19 | 19 | * @method string getGuid() |
| 20 | 20 | * @method void setUserId(string $value) |
| 21 | 21 | * @method string getUserid() |
@@ -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 | |
@@ -57,9 +57,6 @@ |
||
| 57 | 57 | * @method string getHidden() |
| 58 | 58 | * @method void setSharedKey(string $value) |
| 59 | 59 | * @method string getSharedKey() |
| 60 | - |
|
| 61 | - |
|
| 62 | - |
|
| 63 | 60 | */ |
| 64 | 61 | |
| 65 | 62 | |
@@ -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 | |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | public function getRevisions($credential_id, $user_id = null) { |
| 31 | 31 | $sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' . |
| 32 | 32 | 'WHERE `credential_id` = ?'; |
| 33 | - $params = [$credential_id]; |
|
| 34 | - if ($user_id !== null) { |
|
| 35 | - $sql.= ' and `user_id` = ? '; |
|
| 36 | - $params[] = $user_id; |
|
| 37 | - } |
|
| 33 | + $params = [$credential_id]; |
|
| 34 | + if ($user_id !== null) { |
|
| 35 | + $sql.= ' and `user_id` = ? '; |
|
| 36 | + $params[] = $user_id; |
|
| 37 | + } |
|
| 38 | 38 | return $this->findEntities($sql, $params); |
| 39 | 39 | } |
| 40 | 40 | |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | public function getRevision($revision_id, $user_id = null) { |
| 47 | 47 | $sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' . |
| 48 | 48 | 'WHERE `id` = ?'; |
| 49 | - $params = [$revision_id]; |
|
| 50 | - if ($user_id !== null) { |
|
| 51 | - $sql.= ' and `user_id` = ? '; |
|
| 52 | - $params[] = $user_id; |
|
| 53 | - } |
|
| 49 | + $params = [$revision_id]; |
|
| 50 | + if ($user_id !== null) { |
|
| 51 | + $sql.= ' and `user_id` = ? '; |
|
| 52 | + $params[] = $user_id; |
|
| 53 | + } |
|
| 54 | 54 | return $this->findEntity($sql, $params); |
| 55 | 55 | } |
| 56 | 56 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | protected $userId; |
| 39 | 39 | protected $created; |
| 40 | 40 | protected $credentialData; |
| 41 | - protected $editedBy; |
|
| 41 | + protected $editedBy; |
|
| 42 | 42 | |
| 43 | 43 | |
| 44 | 44 | public function __construct() { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | 'guid' => $this->getGuid(), |
| 57 | 57 | 'created' => $this->getCreated(), |
| 58 | 58 | 'credential_data' => json_decode(base64_decode($this->getCredentialData())), |
| 59 | - 'edited_by' => $this->getEditedBy(), |
|
| 59 | + 'edited_by' => $this->getEditedBy(), |
|
| 60 | 60 | ]; |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | \ No newline at end of file |
@@ -14,11 +14,11 @@ |
||
| 14 | 14 | |
| 15 | 15 | class NotFoundJSONResponse extends JSONResponse { |
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Creates a new json response with a not found status code. |
|
| 19 | - * @param array $response_data |
|
| 20 | - */ |
|
| 21 | - public function __construct($response_data = []) { |
|
| 22 | - parent::__construct($response_data, Http::STATUS_NOT_FOUND); |
|
| 23 | - } |
|
| 17 | + /** |
|
| 18 | + * Creates a new json response with a not found status code. |
|
| 19 | + * @param array $response_data |
|
| 20 | + */ |
|
| 21 | + public function __construct($response_data = []) { |
|
| 22 | + parent::__construct($response_data, Http::STATUS_NOT_FOUND); |
|
| 23 | + } |
|
| 24 | 24 | } |
| 25 | 25 | \ No newline at end of file |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | namespace OCA\Passman\Utility; |
| 13 | 13 | |
| 14 | 14 | class Utils { |
| 15 | - /** |
|
| 16 | - * Gets the unix epoch UTC timestamp |
|
| 17 | - * @return int |
|
| 18 | - */ |
|
| 15 | + /** |
|
| 16 | + * Gets the unix epoch UTC timestamp |
|
| 17 | + * @return int |
|
| 18 | + */ |
|
| 19 | 19 | public static function getTime() { |
| 20 | 20 | return (new \DateTime())->getTimestamp(); |
| 21 | 21 | } |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | return $secs . substr($millisecs, 2, 6); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * Generates a Globally Unique ID |
|
| 32 | - * @return string |
|
| 33 | - */ |
|
| 30 | + /** |
|
| 31 | + * Generates a Globally Unique ID |
|
| 32 | + * @return string |
|
| 33 | + */ |
|
| 34 | 34 | public static function GUID() { |
| 35 | 35 | if (function_exists('com_create_guid') === true) |
| 36 | 36 | { |
@@ -32,8 +32,7 @@ |
||
| 32 | 32 | * @return string |
| 33 | 33 | */ |
| 34 | 34 | public static function GUID() { |
| 35 | - if (function_exists('com_create_guid') === true) |
|
| 36 | - { |
|
| 35 | + if (function_exists('com_create_guid') === true) { |
|
| 37 | 36 | return trim(com_create_guid(), '{}'); |
| 38 | 37 | } |
| 39 | 38 | |