@@ -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 |
@@ -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 | |
@@ -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 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | /** |
| 28 | 28 | * @method integer getId() |
| 29 | 29 | * @method void setId(integer $value) |
| 30 | - * @method void setGuid(string $value) |
|
| 30 | + * @method void setGuid(string $value) |
|
| 31 | 31 | * @method string getGuid() |
| 32 | 32 | * @method void setUserId(string $value) |
| 33 | 33 | * @method string getUserId() |
@@ -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 | |
@@ -72,9 +72,6 @@ |
||
| 72 | 72 | * @method string getSharedKey() |
| 73 | 73 | * @method void setCompromised(bool $value) |
| 74 | 74 | * @method bool getCompromised() |
| 75 | - |
|
| 76 | - |
|
| 77 | - |
|
| 78 | 75 | */ |
| 79 | 76 | |
| 80 | 77 | |
@@ -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(), |
@@ -37,60 +37,60 @@ |
||
| 37 | 37 | |
| 38 | 38 | class ShareRequest extends PermissionEntity implements \JsonSerializable { |
| 39 | 39 | |
| 40 | - protected |
|
| 41 | - $itemId, |
|
| 42 | - $itemGuid, |
|
| 43 | - $targetUserId, |
|
| 44 | - $targetVaultId, |
|
| 45 | - $targetVaultGuid, |
|
| 46 | - $sharedKey, |
|
| 47 | - $permissions, |
|
| 48 | - $created, |
|
| 40 | + protected |
|
| 41 | + $itemId, |
|
| 42 | + $itemGuid, |
|
| 43 | + $targetUserId, |
|
| 44 | + $targetVaultId, |
|
| 45 | + $targetVaultGuid, |
|
| 46 | + $sharedKey, |
|
| 47 | + $permissions, |
|
| 48 | + $created, |
|
| 49 | 49 | $fromUserId; |
| 50 | 50 | |
| 51 | - public function __construct() { |
|
| 52 | - // add types in constructor |
|
| 53 | - $this->addType('itemId', 'integer'); |
|
| 54 | - $this->addType('vaultId', 'integer'); |
|
| 55 | - $this->addType('permissions', 'integer'); |
|
| 51 | + public function __construct() { |
|
| 52 | + // add types in constructor |
|
| 53 | + $this->addType('itemId', 'integer'); |
|
| 54 | + $this->addType('vaultId', 'integer'); |
|
| 55 | + $this->addType('permissions', 'integer'); |
|
| 56 | 56 | $this->addType('created', 'integer'); |
| 57 | 57 | $this->addType('targetVaultId', 'integer'); |
| 58 | - } |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * Specify data which should be serialized to JSON |
|
| 62 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 63 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 64 | - * which is a value of any type other than a resource. |
|
| 65 | - * @since 5.4.0 |
|
| 66 | - */ |
|
| 67 | - function jsonSerialize() |
|
| 68 | - { |
|
| 69 | - return [ |
|
| 70 | - 'req_id' => $this->getId(), |
|
| 71 | - 'item_id' => $this->getItemId(), |
|
| 72 | - 'item_guid' => $this->getItemGuid(), |
|
| 73 | - 'target_user_id' => $this->getTargetUserId(), |
|
| 74 | - 'target_vault_id' => $this->getTargetVaultId(), |
|
| 75 | - 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
| 76 | - 'from_user_id' => $this->getFromUserId(), |
|
| 77 | - 'shared_key' => $this->getSharedKey(), |
|
| 78 | - 'permissions' => $this->getPermissions(), |
|
| 79 | - 'created' => $this->getCreated(), |
|
| 80 | - ]; |
|
| 81 | - } |
|
| 60 | + /** |
|
| 61 | + * Specify data which should be serialized to JSON |
|
| 62 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 63 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 64 | + * which is a value of any type other than a resource. |
|
| 65 | + * @since 5.4.0 |
|
| 66 | + */ |
|
| 67 | + function jsonSerialize() |
|
| 68 | + { |
|
| 69 | + return [ |
|
| 70 | + 'req_id' => $this->getId(), |
|
| 71 | + 'item_id' => $this->getItemId(), |
|
| 72 | + 'item_guid' => $this->getItemGuid(), |
|
| 73 | + 'target_user_id' => $this->getTargetUserId(), |
|
| 74 | + 'target_vault_id' => $this->getTargetVaultId(), |
|
| 75 | + 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
| 76 | + 'from_user_id' => $this->getFromUserId(), |
|
| 77 | + 'shared_key' => $this->getSharedKey(), |
|
| 78 | + 'permissions' => $this->getPermissions(), |
|
| 79 | + 'created' => $this->getCreated(), |
|
| 80 | + ]; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - function asACLJson(){ |
|
| 84 | - return [ |
|
| 85 | - 'item_id' => $this->getItemId(), |
|
| 86 | - 'item_guid' => $this->getItemGuid(), |
|
| 87 | - 'user_id' => $this->getTargetUserId(), |
|
| 88 | - 'created' => $this->getCreated(), |
|
| 89 | - 'permissions' => $this->getPermissions(), |
|
| 90 | - 'vault_id' => $this->getTargetVaultId(), |
|
| 91 | - 'vault_guid' => $this->getTargetVaultGuid(), |
|
| 92 | - 'shared_key' => $this->getSharedKey(), |
|
| 93 | - 'pending' => true, |
|
| 94 | - ]; |
|
| 95 | - } |
|
| 83 | + function asACLJson(){ |
|
| 84 | + return [ |
|
| 85 | + 'item_id' => $this->getItemId(), |
|
| 86 | + 'item_guid' => $this->getItemGuid(), |
|
| 87 | + 'user_id' => $this->getTargetUserId(), |
|
| 88 | + 'created' => $this->getCreated(), |
|
| 89 | + 'permissions' => $this->getPermissions(), |
|
| 90 | + 'vault_id' => $this->getTargetVaultId(), |
|
| 91 | + 'vault_guid' => $this->getTargetVaultGuid(), |
|
| 92 | + 'shared_key' => $this->getSharedKey(), |
|
| 93 | + 'pending' => true, |
|
| 94 | + ]; |
|
| 95 | + } |
|
| 96 | 96 | } |
| 97 | 97 | \ No newline at end of file |
@@ -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; |
@@ -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 |
@@ -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 |
@@ -13,40 +13,40 @@ |
||
| 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; |
|
| 19 | - CONST HISTORY = 0b00001000; |
|
| 20 | - CONST OWNER = 0b10000000; |
|
| 16 | + CONST READ = 0b00000001; |
|
| 17 | + CONST WRITE = 0b00000010; |
|
| 18 | + CONST FILES = 0b00000100; |
|
| 19 | + CONST HISTORY = 0b00001000; |
|
| 20 | + CONST OWNER = 0b10000000; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * Checks wether a user matches one or more permissions at once |
|
| 24 | - * @param $permission |
|
| 25 | - * @return bool |
|
| 26 | - */ |
|
| 27 | - public function hasPermission($permission) { |
|
| 28 | - $tmp = $this->getPermissions(); |
|
| 29 | - $tmp = $tmp & $permission; |
|
| 30 | - return $tmp === $permission; |
|
| 31 | - } |
|
| 22 | + /** |
|
| 23 | + * Checks wether a user matches one or more permissions at once |
|
| 24 | + * @param $permission |
|
| 25 | + * @return bool |
|
| 26 | + */ |
|
| 27 | + public function hasPermission($permission) { |
|
| 28 | + $tmp = $this->getPermissions(); |
|
| 29 | + $tmp = $tmp & $permission; |
|
| 30 | + return $tmp === $permission; |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Adds the given permission or permissions set to the user current permissions |
|
| 35 | - * @param $permission |
|
| 36 | - */ |
|
| 37 | - public function addPermission($permission) { |
|
| 38 | - $tmp = $this->getPermissions(); |
|
| 39 | - $tmp = $tmp | $permission; |
|
| 40 | - $this->setPermissions($tmp); |
|
| 41 | - } |
|
| 33 | + /** |
|
| 34 | + * Adds the given permission or permissions set to the user current permissions |
|
| 35 | + * @param $permission |
|
| 36 | + */ |
|
| 37 | + public function addPermission($permission) { |
|
| 38 | + $tmp = $this->getPermissions(); |
|
| 39 | + $tmp = $tmp | $permission; |
|
| 40 | + $this->setPermissions($tmp); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Takes the given permission or permissions out from the user |
|
| 45 | - * @param $permission |
|
| 46 | - */ |
|
| 47 | - public function removePermission($permission) { |
|
| 48 | - $tmp = $this->getPermissions(); |
|
| 49 | - $tmp = $tmp & ~$permission; |
|
| 50 | - $this->setPermissions($tmp); |
|
| 51 | - } |
|
| 43 | + /** |
|
| 44 | + * Takes the given permission or permissions out from the user |
|
| 45 | + * @param $permission |
|
| 46 | + */ |
|
| 47 | + public function removePermission($permission) { |
|
| 48 | + $tmp = $this->getPermissions(); |
|
| 49 | + $tmp = $tmp & ~$permission; |
|
| 50 | + $this->setPermissions($tmp); |
|
| 51 | + } |
|
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |