@@ -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']) |
@@ -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 |
@@ -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 |
@@ -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(), |
@@ -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 |