@@ -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); |
@@ -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(), |
@@ -8,7 +8,6 @@ |
||
8 | 8 | namespace OCA\Passman\Db; |
9 | 9 | |
10 | 10 | use OCA\Passman\Utility\PermissionEntity; |
11 | -use OCP\AppFramework\Db\Entity; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * @method void setId(integer $value) |
@@ -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(), |
@@ -37,58 +37,58 @@ |
||
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'); |
|
56 | - } |
|
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 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * Specify data which should be serialized to JSON |
|
60 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
61 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
62 | - * which is a value of any type other than a resource. |
|
63 | - * @since 5.4.0 |
|
64 | - */ |
|
65 | - function jsonSerialize() |
|
66 | - { |
|
67 | - return [ |
|
68 | - 'req_id' => $this->getId(), |
|
69 | - 'item_id' => $this->getItemId(), |
|
70 | - 'item_guid' => $this->getItemGuid(), |
|
71 | - 'target_user_id' => $this->getTargetUserId(), |
|
72 | - 'target_vault_id' => $this->getTargetVaultId(), |
|
73 | - 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
74 | - 'from_user_id' => $this->getFromUserId(), |
|
75 | - 'shared_key' => $this->getSharedKey(), |
|
76 | - 'permissions' => $this->getPermissions(), |
|
77 | - 'created' => $this->getCreated(), |
|
78 | - ]; |
|
79 | - } |
|
58 | + /** |
|
59 | + * Specify data which should be serialized to JSON |
|
60 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
61 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
62 | + * which is a value of any type other than a resource. |
|
63 | + * @since 5.4.0 |
|
64 | + */ |
|
65 | + function jsonSerialize() |
|
66 | + { |
|
67 | + return [ |
|
68 | + 'req_id' => $this->getId(), |
|
69 | + 'item_id' => $this->getItemId(), |
|
70 | + 'item_guid' => $this->getItemGuid(), |
|
71 | + 'target_user_id' => $this->getTargetUserId(), |
|
72 | + 'target_vault_id' => $this->getTargetVaultId(), |
|
73 | + 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
74 | + 'from_user_id' => $this->getFromUserId(), |
|
75 | + 'shared_key' => $this->getSharedKey(), |
|
76 | + 'permissions' => $this->getPermissions(), |
|
77 | + 'created' => $this->getCreated(), |
|
78 | + ]; |
|
79 | + } |
|
80 | 80 | |
81 | - function asACLJson(){ |
|
82 | - return [ |
|
83 | - 'item_id' => $this->getItemId(), |
|
84 | - 'item_guid' => $this->getItemGuid(), |
|
85 | - 'user_id' => $this->getTargetUserId(), |
|
86 | - 'created' => $this->getCreated(), |
|
87 | - 'permissions' => $this->getPermissions(), |
|
88 | - 'vault_id' => $this->getTargetVaultId(), |
|
89 | - 'vault_guid' => $this->getTargetVaultGuid(), |
|
90 | - 'shared_key' => $this->getSharedKey(), |
|
91 | - 'pending' => true, |
|
92 | - ]; |
|
93 | - } |
|
81 | + function asACLJson(){ |
|
82 | + return [ |
|
83 | + 'item_id' => $this->getItemId(), |
|
84 | + 'item_guid' => $this->getItemGuid(), |
|
85 | + 'user_id' => $this->getTargetUserId(), |
|
86 | + 'created' => $this->getCreated(), |
|
87 | + 'permissions' => $this->getPermissions(), |
|
88 | + 'vault_id' => $this->getTargetVaultId(), |
|
89 | + 'vault_guid' => $this->getTargetVaultGuid(), |
|
90 | + 'shared_key' => $this->getSharedKey(), |
|
91 | + 'pending' => true, |
|
92 | + ]; |
|
93 | + } |
|
94 | 94 | } |
95 | 95 | \ 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 |
@@ -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 |
@@ -52,19 +52,19 @@ |
||
52 | 52 | //Sharing stuff |
53 | 53 | ['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'], |
54 | 54 | ['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'], |
55 | - ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], |
|
56 | - ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], |
|
57 | - ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], |
|
58 | - ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], |
|
59 | - ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], |
|
60 | - ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], |
|
61 | - ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], |
|
62 | - ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], |
|
63 | - ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], |
|
64 | - ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], |
|
65 | - ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], |
|
66 | - ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], |
|
67 | - ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], |
|
55 | + ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'], |
|
56 | + ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'], |
|
57 | + ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'], |
|
58 | + ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'], |
|
59 | + ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'], |
|
60 | + ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'], |
|
61 | + ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'], |
|
62 | + ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'], |
|
63 | + ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'], |
|
64 | + ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'], |
|
65 | + ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'], |
|
66 | + ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'], |
|
67 | + ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'], |
|
68 | 68 | |
69 | 69 | //Internal API |
70 | 70 | ['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'], |
@@ -16,81 +16,81 @@ |
||
16 | 16 | use OCA\Passman\Utility\Utils; |
17 | 17 | |
18 | 18 | class SharingACLMapper extends Mapper { |
19 | - const TABLE_NAME = '*PREFIX*passman_sharing_acl'; |
|
19 | + const TABLE_NAME = '*PREFIX*passman_sharing_acl'; |
|
20 | 20 | |
21 | - public function __construct(IDBConnection $db, Utils $utils) { |
|
22 | - parent::__construct($db, 'passman_sharing_acl'); |
|
23 | - $this->utils = $utils; |
|
24 | - } |
|
21 | + public function __construct(IDBConnection $db, Utils $utils) { |
|
22 | + parent::__construct($db, 'passman_sharing_acl'); |
|
23 | + $this->utils = $utils; |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * Gets all the credential data for the given user |
|
28 | - * @param $userId |
|
29 | - * @param $item_guid |
|
30 | - * @return SharingACL[] |
|
31 | - */ |
|
32 | - public function getCredentialPermissions(IUser $userId, $item_guid){ |
|
33 | - $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?"; |
|
26 | + /** |
|
27 | + * Gets all the credential data for the given user |
|
28 | + * @param $userId |
|
29 | + * @param $item_guid |
|
30 | + * @return SharingACL[] |
|
31 | + */ |
|
32 | + public function getCredentialPermissions(IUser $userId, $item_guid){ |
|
33 | + $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?"; |
|
34 | 34 | |
35 | - return $this->findEntities($sql, [$userId, $item_guid]); |
|
36 | - } |
|
35 | + return $this->findEntities($sql, [$userId, $item_guid]); |
|
36 | + } |
|
37 | 37 | |
38 | - public function createACLEntry(SharingACL $acl){ |
|
39 | - return $this->insert($acl); |
|
40 | - } |
|
38 | + public function createACLEntry(SharingACL $acl){ |
|
39 | + return $this->insert($acl); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Gets the currently accepted share requests from the given user for the given vault guid |
|
44 | - * @param $user_id |
|
45 | - * @param $vault_id |
|
46 | - * @return SharingACL[] |
|
47 | - */ |
|
48 | - public function getVaultEntries($user_id, $vault_id) { |
|
49 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
50 | - return $this->findEntities($q, [$user_id, $vault_id]); |
|
51 | - } |
|
42 | + /** |
|
43 | + * Gets the currently accepted share requests from the given user for the given vault guid |
|
44 | + * @param $user_id |
|
45 | + * @param $vault_id |
|
46 | + * @return SharingACL[] |
|
47 | + */ |
|
48 | + public function getVaultEntries($user_id, $vault_id) { |
|
49 | + $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
50 | + return $this->findEntities($q, [$user_id, $vault_id]); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Gets the acl for a given item guid |
|
55 | - * @param $user_id |
|
56 | - * @param $item_guid |
|
57 | - * @return SharingACL |
|
58 | - */ |
|
59 | - public function getItemACL($user_id, $item_guid) { |
|
60 | - $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
|
61 | - $filter = [$item_guid]; |
|
62 | - if ($user_id === null){ |
|
63 | - $q .= 'user_id is null'; |
|
64 | - } |
|
65 | - else { |
|
66 | - $q .= 'user_id = ? '; |
|
67 | - $filter[] = $user_id; |
|
68 | - } |
|
69 | - return $this->findEntity($q, $filter); |
|
70 | - } |
|
53 | + /** |
|
54 | + * Gets the acl for a given item guid |
|
55 | + * @param $user_id |
|
56 | + * @param $item_guid |
|
57 | + * @return SharingACL |
|
58 | + */ |
|
59 | + public function getItemACL($user_id, $item_guid) { |
|
60 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
|
61 | + $filter = [$item_guid]; |
|
62 | + if ($user_id === null){ |
|
63 | + $q .= 'user_id is null'; |
|
64 | + } |
|
65 | + else { |
|
66 | + $q .= 'user_id = ? '; |
|
67 | + $filter[] = $user_id; |
|
68 | + } |
|
69 | + return $this->findEntity($q, $filter); |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * Update the acl for a given item guid |
|
74 | - * @param $user_id |
|
75 | - * @param $item_guid |
|
76 | - * @return SharingACL |
|
77 | - */ |
|
78 | - public function updateCredentialACL(SharingACL $sharingACL) { |
|
79 | - return $this->update($sharingACL); |
|
80 | - } |
|
72 | + /** |
|
73 | + * Update the acl for a given item guid |
|
74 | + * @param $user_id |
|
75 | + * @param $item_guid |
|
76 | + * @return SharingACL |
|
77 | + */ |
|
78 | + public function updateCredentialACL(SharingACL $sharingACL) { |
|
79 | + return $this->update($sharingACL); |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * Gets the currently accepted share requests from the given user for the given vault guid |
|
84 | - * @param $user_id |
|
85 | - * @param $vault_id |
|
86 | - * @return SharingACL[] |
|
87 | - */ |
|
88 | - public function getCredentialAclList($item_guid) { |
|
89 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
90 | - return $this->findEntities($q, [$item_guid]); |
|
91 | - } |
|
82 | + /** |
|
83 | + * Gets the currently accepted share requests from the given user for the given vault guid |
|
84 | + * @param $user_id |
|
85 | + * @param $vault_id |
|
86 | + * @return SharingACL[] |
|
87 | + */ |
|
88 | + public function getCredentialAclList($item_guid) { |
|
89 | + $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
90 | + return $this->findEntities($q, [$item_guid]); |
|
91 | + } |
|
92 | 92 | |
93 | - public function deleteShareACL(SharingACL $ACL){ |
|
94 | - return $this->delete($ACL); |
|
93 | + public function deleteShareACL(SharingACL $ACL){ |
|
94 | + return $this->delete($ACL); |
|
95 | 95 | } |
96 | 96 | } |
97 | 97 | \ No newline at end of file |
@@ -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){ |
|
33 | - $sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?"; |
|
32 | + public function getCredentialPermissions(IUser $userId, $item_guid) { |
|
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 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | * @return SharingACL[] |
47 | 47 | */ |
48 | 48 | public function getVaultEntries($user_id, $vault_id) { |
49 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
49 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?"; |
|
50 | 50 | return $this->findEntities($q, [$user_id, $vault_id]); |
51 | 51 | } |
52 | 52 | |
@@ -59,7 +59,7 @@ 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 | 64 | } |
65 | 65 | else { |
@@ -86,11 +86,11 @@ discard block |
||
86 | 86 | * @return SharingACL[] |
87 | 87 | */ |
88 | 88 | public function getCredentialAclList($item_guid) { |
89 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
89 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?"; |
|
90 | 90 | return $this->findEntities($q, [$item_guid]); |
91 | 91 | } |
92 | 92 | |
93 | - public function deleteShareACL(SharingACL $ACL){ |
|
93 | + public function deleteShareACL(SharingACL $ACL) { |
|
94 | 94 | return $this->delete($ACL); |
95 | 95 | } |
96 | 96 | } |
97 | 97 | \ No newline at end of file |
@@ -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 |