@@ -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(), |
@@ -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,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 |
@@ -27,11 +27,11 @@ |
||
27 | 27 | use OCP\AppFramework\Db\Entity; |
28 | 28 | |
29 | 29 | class PermissionEntity extends Entity { |
30 | - CONST READ = 0b00000001; |
|
31 | - CONST WRITE = 0b00000010; |
|
32 | - CONST FILES = 0b00000100; |
|
33 | - CONST HISTORY = 0b00001000; |
|
34 | - CONST OWNER = 0b10000000; |
|
30 | + const READ = 0b00000001; |
|
31 | + const WRITE = 0b00000010; |
|
32 | + const FILES = 0b00000100; |
|
33 | + const HISTORY = 0b00001000; |
|
34 | + const OWNER = 0b10000000; |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Checks wether a user matches one or more permissions at once |
@@ -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'], |
@@ -37,7 +37,7 @@ |
||
37 | 37 | public function expireCredentials() { |
38 | 38 | $this->logger->info('Passman cron test', array('app' => 'passman')); |
39 | 39 | $expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime()); |
40 | - foreach($expired_credentials as $credential){ |
|
40 | + foreach($expired_credentials as $credential) { |
|
41 | 41 | $link = ''; // @TODO create direct link to credential |
42 | 42 | |
43 | 43 | $sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?'; |
@@ -50,16 +50,16 @@ |
||
50 | 50 | public function expireCredentials() { |
51 | 51 | $this->logger->info('Passman cron test', array('app' => 'passman')); |
52 | 52 | $expired_credentials = $this->credentialService->getExpiredCredentials($this->utils->getTime()); |
53 | - foreach($expired_credentials as $credential){ |
|
53 | + foreach ($expired_credentials as $credential) { |
|
54 | 54 | $link = ''; // @TODO create direct link to credential |
55 | 55 | |
56 | 56 | $sql = 'SELECT count(*) as rows from `*PREFIX*notifications` WHERE `subject`= \'credential_expired\' AND object_id=?'; |
57 | 57 | $id = $credential->getId(); |
58 | 58 | $result = $this->db->executeQuery($sql, array($id)); |
59 | - $this->logger->debug($credential->getLabel() .' is expired, checking notifications!', array('app' => 'passman')); |
|
59 | + $this->logger->debug($credential->getLabel() . ' is expired, checking notifications!', array('app' => 'passman')); |
|
60 | 60 | $notifications = intval($result->fetch()['rows']); |
61 | - if($notifications === 0) { |
|
62 | - $this->logger->debug($credential->getLabel() .' is expired, adding notification!', array('app' => 'passman')); |
|
61 | + if ($notifications === 0) { |
|
62 | + $this->logger->debug($credential->getLabel() . ' is expired, adding notification!', array('app' => 'passman')); |
|
63 | 63 | $this->activityService->add( |
64 | 64 | Activity::SUBJECT_ITEM_EXPIRED, array($credential->getLabel(), $credential->getUserId()), |
65 | 65 | '', array(), |
@@ -241,7 +241,7 @@ |
||
241 | 241 | array( |
242 | 242 | 'id' => 'passman', |
243 | 243 | 'name' => (string) $l->t('Passwords'), |
244 | - 'url' => '',//FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')), |
|
244 | + 'url' => '', //FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')), |
|
245 | 245 | ), |
246 | 246 | ), |
247 | 247 | ); |