@@ -49,6 +49,7 @@ discard block |
||
49 | 49 | * @param $target_item_guid string The shared item GUID |
50 | 50 | * @param $request_array array |
51 | 51 | * @param $permissions integer Must be created with a bitmask from options on the ShareRequest class |
52 | + * @param string $credential_owner |
|
52 | 53 | * @return array Array of sharing requests |
53 | 54 | */ |
54 | 55 | public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) { |
@@ -253,7 +254,6 @@ discard block |
||
253 | 254 | /** |
254 | 255 | * Delete ACL |
255 | 256 | * |
256 | - * @param ShareRequest $request |
|
257 | 257 | * @return \OCA\Passman\Db\ShareRequest[] |
258 | 258 | */ |
259 | 259 | public function deleteShareACL(SharingACL $ACL) { |
@@ -277,7 +277,6 @@ discard block |
||
277 | 277 | /** |
278 | 278 | * Get pending share requests by guid and uid |
279 | 279 | * |
280 | - * @param ShareRequest $request |
|
281 | 280 | * @return \OCA\Passman\Db\ShareRequest[] |
282 | 281 | */ |
283 | 282 | public function getPendingShareRequestsForCredential($item_guid, $user_id) { |
@@ -25,18 +25,18 @@ discard block |
||
25 | 25 | $this->manager = \OC::$server->getNotificationManager(); |
26 | 26 | } |
27 | 27 | |
28 | - function credentialExpiredNotification($credential){ |
|
28 | + function credentialExpiredNotification($credential) { |
|
29 | 29 | $urlGenerator = \OC::$server->getURLGenerator(); |
30 | - $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/vault/'. $credential->getVaultId() .'/edit/'. $credential->getId())); |
|
30 | + $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/vault/' . $credential->getVaultId() . '/edit/' . $credential->getId())); |
|
31 | 31 | $api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); |
32 | 32 | $notification = $this->manager->createNotification(); |
33 | 33 | $remindAction = $notification->createAction(); |
34 | 34 | $remindAction->setLabel('remind') |
35 | - ->setLink($api. '/api/internal/notifications/remind/'. $credential->getId() , 'POST'); |
|
35 | + ->setLink($api . '/api/internal/notifications/remind/' . $credential->getId(), 'POST'); |
|
36 | 36 | |
37 | 37 | $declineAction = $notification->createAction(); |
38 | 38 | $declineAction->setLabel('ignore') |
39 | - ->setLink($api . '/api/internal/notifications/read/'. $credential->getId(), 'DELETE'); |
|
39 | + ->setLink($api . '/api/internal/notifications/read/' . $credential->getId(), 'DELETE'); |
|
40 | 40 | |
41 | 41 | $notification->setApp('passman') |
42 | 42 | ->setUser($credential->getUserId()) |
@@ -51,15 +51,15 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | |
54 | - function credentialSharedNotification($data){ |
|
54 | + function credentialSharedNotification($data) { |
|
55 | 55 | $urlGenerator = \OC::$server->getURLGenerator(); |
56 | - $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('','index.php/apps/passman/#/')); |
|
56 | + $link = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman/#/')); |
|
57 | 57 | $api = $urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'index.php/apps/passman')); |
58 | 58 | $notification = $this->manager->createNotification(); |
59 | 59 | |
60 | 60 | $declineAction = $notification->createAction(); |
61 | 61 | $declineAction->setLabel('decline') |
62 | - ->setLink($api . '/api/v2/sharing/decline/'. $data['req_id'], 'DELETE'); |
|
62 | + ->setLink($api . '/api/v2/sharing/decline/' . $data['req_id'], 'DELETE'); |
|
63 | 63 | |
64 | 64 | $notification->setApp('passman') |
65 | 65 | ->setUser($data['target_user']) |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | - function credentialDeclinedSharedNotification($data){ |
|
76 | + function credentialDeclinedSharedNotification($data) { |
|
77 | 77 | $notification = $this->manager->createNotification(); |
78 | 78 | $notification->setApp('passman') |
79 | 79 | ->setUser($data['target_user']) |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | - function credentialAcceptedSharedNotification($data){ |
|
87 | + function credentialAcceptedSharedNotification($data) { |
|
88 | 88 | $notification = $this->manager->createNotification(); |
89 | 89 | $notification->setApp('passman') |
90 | 90 | ->setUser($data['target_user']) |
@@ -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 |
@@ -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); |
@@ -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 |