@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct($db, 'passman_sharing_acl'); |
23 | 23 | } |
24 | 24 | |
25 | - public function createACLEntry(SharingACL $acl){ |
|
25 | + public function createACLEntry(SharingACL $acl) { |
|
26 | 26 | return $this->insert($acl); |
27 | 27 | } |
28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * @return SharingACL[] |
34 | 34 | */ |
35 | 35 | public function getVaultEntries($user_id, $vault_id) { |
36 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
36 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?"; |
|
37 | 37 | return $this->findEntities($q, [$user_id, $vault_id]); |
38 | 38 | } |
39 | 39 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | public function getItemACL($user_id, $item_guid) { |
47 | 47 | $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
48 | 48 | $filter = [$item_guid]; |
49 | - if ($user_id === null){ |
|
49 | + if ($user_id === null) { |
|
50 | 50 | $q .= 'user_id is null'; |
51 | 51 | } |
52 | 52 | else { |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | * @return SharingACL[] |
74 | 74 | */ |
75 | 75 | public function getCredentialAclList($item_guid) { |
76 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
76 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?"; |
|
77 | 77 | return $this->findEntities($q, [$item_guid]); |
78 | 78 | } |
79 | 79 | |
80 | - public function deleteShareACL(SharingACL $ACL){ |
|
80 | + public function deleteShareACL(SharingACL $ACL) { |
|
81 | 81 | return $this->delete($ACL); |
82 | 82 | } |
83 | 83 | } |
84 | 84 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct($db, 'passman_sharing_acl'); |
23 | 23 | } |
24 | 24 | |
25 | - public function createACLEntry(SharingACL $acl){ |
|
25 | + public function createACLEntry(SharingACL $acl) { |
|
26 | 26 | return $this->insert($acl); |
27 | 27 | } |
28 | 28 | |
@@ -46,10 +46,9 @@ discard block |
||
46 | 46 | public function getItemACL($user_id, $item_guid) { |
47 | 47 | $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
48 | 48 | $filter = [$item_guid]; |
49 | - if ($user_id === null){ |
|
49 | + if ($user_id === null) { |
|
50 | 50 | $q .= 'user_id is null'; |
51 | - } |
|
52 | - else { |
|
51 | + } else { |
|
53 | 52 | $q .= 'user_id = ? '; |
54 | 53 | $filter[] = $user_id; |
55 | 54 | } |
@@ -77,7 +76,7 @@ discard block |
||
77 | 76 | return $this->findEntities($q, [$item_guid]); |
78 | 77 | } |
79 | 78 | |
80 | - public function deleteShareACL(SharingACL $ACL){ |
|
79 | + public function deleteShareACL(SharingACL $ACL) { |
|
81 | 80 | return $this->delete($ACL); |
82 | 81 | } |
83 | 82 | } |
84 | 83 | \ No newline at end of file |
@@ -16,68 +16,68 @@ |
||
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) { |
|
22 | - parent::__construct($db, 'passman_sharing_acl'); |
|
23 | - } |
|
21 | + public function __construct(IDBConnection $db) { |
|
22 | + parent::__construct($db, 'passman_sharing_acl'); |
|
23 | + } |
|
24 | 24 | |
25 | - public function createACLEntry(SharingACL $acl){ |
|
26 | - return $this->insert($acl); |
|
27 | - } |
|
25 | + public function createACLEntry(SharingACL $acl){ |
|
26 | + return $this->insert($acl); |
|
27 | + } |
|
28 | 28 | |
29 | - /** |
|
30 | - * Gets the currently accepted share requests from the given user for the given vault guid |
|
31 | - * @param $user_id |
|
32 | - * @param $vault_guid |
|
33 | - * @return SharingACL[] |
|
34 | - */ |
|
35 | - public function getVaultEntries($user_id, $vault_guid) { |
|
36 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
37 | - return $this->findEntities($q, [$user_id, $vault_guid]); |
|
38 | - } |
|
29 | + /** |
|
30 | + * Gets the currently accepted share requests from the given user for the given vault guid |
|
31 | + * @param $user_id |
|
32 | + * @param $vault_guid |
|
33 | + * @return SharingACL[] |
|
34 | + */ |
|
35 | + public function getVaultEntries($user_id, $vault_guid) { |
|
36 | + $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?"; |
|
37 | + return $this->findEntities($q, [$user_id, $vault_guid]); |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * Gets the acl for a given item guid |
|
42 | - * @param $user_id |
|
43 | - * @param $item_guid |
|
44 | - * @return SharingACL |
|
45 | - */ |
|
46 | - public function getItemACL($user_id, $item_guid) { |
|
47 | - $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
|
48 | - $filter = [$item_guid]; |
|
49 | - if ($user_id === null){ |
|
50 | - $q .= 'user_id is null'; |
|
51 | - } |
|
52 | - else { |
|
53 | - $q .= 'user_id = ? '; |
|
54 | - $filter[] = $user_id; |
|
55 | - } |
|
56 | - return $this->findEntity($q, $filter); |
|
57 | - } |
|
40 | + /** |
|
41 | + * Gets the acl for a given item guid |
|
42 | + * @param $user_id |
|
43 | + * @param $item_guid |
|
44 | + * @return SharingACL |
|
45 | + */ |
|
46 | + public function getItemACL($user_id, $item_guid) { |
|
47 | + $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND "; |
|
48 | + $filter = [$item_guid]; |
|
49 | + if ($user_id === null){ |
|
50 | + $q .= 'user_id is null'; |
|
51 | + } |
|
52 | + else { |
|
53 | + $q .= 'user_id = ? '; |
|
54 | + $filter[] = $user_id; |
|
55 | + } |
|
56 | + return $this->findEntity($q, $filter); |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * Update the acl for a given item guid |
|
61 | - * @param $user_id |
|
62 | - * @param $item_guid |
|
63 | - * @return SharingACL |
|
64 | - */ |
|
65 | - public function updateCredentialACL(SharingACL $sharingACL) { |
|
66 | - return $this->update($sharingACL); |
|
67 | - } |
|
59 | + /** |
|
60 | + * Update the acl for a given item guid |
|
61 | + * @param $user_id |
|
62 | + * @param $item_guid |
|
63 | + * @return SharingACL |
|
64 | + */ |
|
65 | + public function updateCredentialACL(SharingACL $sharingACL) { |
|
66 | + return $this->update($sharingACL); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Gets the currently accepted share requests from the given user for the given vault guid |
|
71 | - * @param $user_id |
|
72 | - * @param $vault_id |
|
73 | - * @return SharingACL[] |
|
74 | - */ |
|
75 | - public function getCredentialAclList($item_guid) { |
|
76 | - $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
77 | - return $this->findEntities($q, [$item_guid]); |
|
78 | - } |
|
69 | + /** |
|
70 | + * Gets the currently accepted share requests from the given user for the given vault guid |
|
71 | + * @param $user_id |
|
72 | + * @param $vault_id |
|
73 | + * @return SharingACL[] |
|
74 | + */ |
|
75 | + public function getCredentialAclList($item_guid) { |
|
76 | + $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?"; |
|
77 | + return $this->findEntities($q, [$item_guid]); |
|
78 | + } |
|
79 | 79 | |
80 | - public function deleteShareACL(SharingACL $ACL){ |
|
81 | - return $this->delete($ACL); |
|
80 | + public function deleteShareACL(SharingACL $ACL){ |
|
81 | + return $this->delete($ACL); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | \ No newline at end of file |
@@ -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 | ); |
@@ -16,122 +16,122 @@ |
||
16 | 16 | use OCP\IDBConnection; |
17 | 17 | |
18 | 18 | class ShareRequestMapper extends Mapper { |
19 | - const TABLE_NAME = 'passman_share_request'; |
|
20 | - |
|
21 | - public function __construct(IDBConnection $db) { |
|
22 | - parent::__construct($db, self::TABLE_NAME); |
|
23 | - } |
|
24 | - |
|
25 | - public function createRequest(ShareRequest $request){ |
|
26 | - return $this->insert($request); |
|
27 | - } |
|
28 | - |
|
29 | - /** |
|
30 | - * Obtains a request by the given item and vault GUID pair |
|
31 | - * @param $item_guid |
|
32 | - * @param $target_vault_guid |
|
33 | - * @return ShareRequest |
|
34 | - */ |
|
35 | - public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
36 | - $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
|
37 | - return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
|
38 | - } |
|
39 | - |
|
40 | - /** |
|
41 | - * Get shared items for the given item_guid |
|
42 | - * @param $item_guid |
|
43 | - * @return ShareRequest[] |
|
44 | - */ |
|
45 | - public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
46 | - if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
47 | - $this->db->executeQuery("SET sql_mode = '';"); |
|
19 | + const TABLE_NAME = 'passman_share_request'; |
|
20 | + |
|
21 | + public function __construct(IDBConnection $db) { |
|
22 | + parent::__construct($db, self::TABLE_NAME); |
|
23 | + } |
|
24 | + |
|
25 | + public function createRequest(ShareRequest $request){ |
|
26 | + return $this->insert($request); |
|
27 | + } |
|
28 | + |
|
29 | + /** |
|
30 | + * Obtains a request by the given item and vault GUID pair |
|
31 | + * @param $item_guid |
|
32 | + * @param $target_vault_guid |
|
33 | + * @return ShareRequest |
|
34 | + */ |
|
35 | + public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
36 | + $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
|
37 | + return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
|
38 | + } |
|
39 | + |
|
40 | + /** |
|
41 | + * Get shared items for the given item_guid |
|
42 | + * @param $item_guid |
|
43 | + * @return ShareRequest[] |
|
44 | + */ |
|
45 | + public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
46 | + if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
47 | + $this->db->executeQuery("SET sql_mode = '';"); |
|
48 | 48 | } |
49 | - $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
|
50 | - return $this->findEntities($q, [$item_guid]); |
|
51 | - } |
|
52 | - |
|
53 | - /** |
|
54 | - * Deletes all pending requests for the given user to the given item |
|
55 | - * @param $item_id The item ID |
|
56 | - * @param $target_user_id The target user |
|
57 | - * @return \PDOStatement The result of running the db query |
|
58 | - */ |
|
59 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
49 | + $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
|
50 | + return $this->findEntities($q, [$item_guid]); |
|
51 | + } |
|
52 | + |
|
53 | + /** |
|
54 | + * Deletes all pending requests for the given user to the given item |
|
55 | + * @param $item_id The item ID |
|
56 | + * @param $target_user_id The target user |
|
57 | + * @return \PDOStatement The result of running the db query |
|
58 | + */ |
|
59 | + public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
60 | 60 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
61 | 61 | $this->execute($q, [$item_id, $target_user_id]); |
62 | - return $this->execute($q, [$item_id, $target_user_id]); |
|
63 | - } |
|
64 | - |
|
65 | - /** |
|
66 | - * Obtains all pending share requests for the given user ID |
|
67 | - * @param $user_id |
|
68 | - * @return ShareRequest[] |
|
69 | - */ |
|
70 | - public function getUserPendingRequests($user_id){ |
|
71 | - $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
72 | - return $this->findEntities($q, [$user_id]); |
|
73 | - } |
|
74 | - |
|
75 | - /** |
|
76 | - * Deletes the given share request |
|
77 | - * @param ShareRequest $shareRequest Request to delete |
|
78 | - * @return ShareRequest The deleted request |
|
79 | - */ |
|
80 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
81 | - return $this->delete($shareRequest); |
|
62 | + return $this->execute($q, [$item_id, $target_user_id]); |
|
63 | + } |
|
64 | + |
|
65 | + /** |
|
66 | + * Obtains all pending share requests for the given user ID |
|
67 | + * @param $user_id |
|
68 | + * @return ShareRequest[] |
|
69 | + */ |
|
70 | + public function getUserPendingRequests($user_id){ |
|
71 | + $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
72 | + return $this->findEntities($q, [$user_id]); |
|
82 | 73 | } |
83 | 74 | |
84 | - /** |
|
85 | - * Gets a share request by it's unique incremental id |
|
86 | - * @param $id |
|
87 | - * @return ShareRequest |
|
75 | + /** |
|
76 | + * Deletes the given share request |
|
77 | + * @param ShareRequest $shareRequest Request to delete |
|
78 | + * @return ShareRequest The deleted request |
|
79 | + */ |
|
80 | + public function deleteShareRequest(ShareRequest $shareRequest){ |
|
81 | + return $this->delete($shareRequest); |
|
82 | + } |
|
83 | + |
|
84 | + /** |
|
85 | + * Gets a share request by it's unique incremental id |
|
86 | + * @param $id |
|
87 | + * @return ShareRequest |
|
88 | 88 | * @throws DoesNotExistException |
89 | - */ |
|
89 | + */ |
|
90 | 90 | public function getShareRequestById($id){ |
91 | 91 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
92 | 92 | return $this->findEntity($q, [$id]); |
93 | 93 | } |
94 | 94 | |
95 | - /** |
|
96 | - * Gets all share requests by a given item GUID |
|
97 | - * @param $item_guid |
|
98 | - * @return ShareRequest[] |
|
99 | - */ |
|
95 | + /** |
|
96 | + * Gets all share requests by a given item GUID |
|
97 | + * @param $item_guid |
|
98 | + * @return ShareRequest[] |
|
99 | + */ |
|
100 | 100 | public function getShareRequestsByItemGuid($item_guid){ |
101 | 101 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
102 | 102 | return $this->findEntities($q, [$item_guid]); |
103 | 103 | } |
104 | 104 | |
105 | - /** |
|
106 | - * Updates the given share request, |
|
107 | - * @param ShareRequest $shareRequest |
|
108 | - * @return ShareRequest |
|
109 | - */ |
|
105 | + /** |
|
106 | + * Updates the given share request, |
|
107 | + * @param ShareRequest $shareRequest |
|
108 | + * @return ShareRequest |
|
109 | + */ |
|
110 | 110 | public function updateShareRequest(ShareRequest $shareRequest){ |
111 | 111 | return $this->update($shareRequest); |
112 | 112 | } |
113 | 113 | |
114 | - /** |
|
115 | - * Finds pending requests sent to the given user to the given item. |
|
116 | - * @param $item_guid |
|
117 | - * @param $user_id |
|
118 | - * @return ShareRequest[] |
|
119 | - */ |
|
114 | + /** |
|
115 | + * Finds pending requests sent to the given user to the given item. |
|
116 | + * @param $item_guid |
|
117 | + * @param $user_id |
|
118 | + * @return ShareRequest[] |
|
119 | + */ |
|
120 | 120 | public function getPendingShareRequests($item_guid, $user_id){ |
121 | 121 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
122 | 122 | return $this->findEntities($q, [$item_guid, $user_id]); |
123 | 123 | } |
124 | 124 | |
125 | - /** |
|
126 | - * Updates all pending requests with the given permissions |
|
127 | - * @param $item_guid The item for which to update the requests |
|
128 | - * @param $user_id The user for which to update the requests |
|
129 | - * @param $permissions The new permissions to apply |
|
130 | - * @return \PDOStatement The result of the operation |
|
131 | - */ |
|
125 | + /** |
|
126 | + * Updates all pending requests with the given permissions |
|
127 | + * @param $item_guid The item for which to update the requests |
|
128 | + * @param $user_id The user for which to update the requests |
|
129 | + * @param $permissions The new permissions to apply |
|
130 | + * @return \PDOStatement The result of the operation |
|
131 | + */ |
|
132 | 132 | public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){ |
133 | - $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
|
134 | - return $this->execute($q, [$permissions, $item_guid, $user_id]); |
|
135 | - } |
|
133 | + $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
|
134 | + return $this->execute($q, [$permissions, $item_guid, $user_id]); |
|
135 | + } |
|
136 | 136 | |
137 | 137 | } |
138 | 138 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct($db, self::TABLE_NAME); |
23 | 23 | } |
24 | 24 | |
25 | - public function createRequest(ShareRequest $request){ |
|
25 | + public function createRequest(ShareRequest $request) { |
|
26 | 26 | return $this->insert($request); |
27 | 27 | } |
28 | 28 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param $target_vault_guid |
33 | 33 | * @return ShareRequest |
34 | 34 | */ |
35 | - public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
35 | + public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) { |
|
36 | 36 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
37 | 37 | return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @param $item_guid |
43 | 43 | * @return ShareRequest[] |
44 | 44 | */ |
45 | - public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
46 | - if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
45 | + public function getRequestsByItemGuidGroupedByUser($item_guid) { |
|
46 | + if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') { |
|
47 | 47 | $this->db->executeQuery("SET sql_mode = '';"); |
48 | 48 | } |
49 | 49 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param $target_user_id The target user |
57 | 57 | * @return \PDOStatement The result of running the db query |
58 | 58 | */ |
59 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
59 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
60 | 60 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
61 | 61 | $this->execute($q, [$item_id, $target_user_id]); |
62 | 62 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | * @param $user_id |
68 | 68 | * @return ShareRequest[] |
69 | 69 | */ |
70 | - public function getUserPendingRequests($user_id){ |
|
71 | - $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
70 | + public function getUserPendingRequests($user_id) { |
|
71 | + $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?"; |
|
72 | 72 | return $this->findEntities($q, [$user_id]); |
73 | 73 | } |
74 | 74 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param ShareRequest $shareRequest Request to delete |
78 | 78 | * @return ShareRequest The deleted request |
79 | 79 | */ |
80 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
80 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
81 | 81 | return $this->delete($shareRequest); |
82 | 82 | } |
83 | 83 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @return ShareRequest |
88 | 88 | * @throws DoesNotExistException |
89 | 89 | */ |
90 | - public function getShareRequestById($id){ |
|
90 | + public function getShareRequestById($id) { |
|
91 | 91 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
92 | 92 | return $this->findEntity($q, [$id]); |
93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param $item_guid |
98 | 98 | * @return ShareRequest[] |
99 | 99 | */ |
100 | - public function getShareRequestsByItemGuid($item_guid){ |
|
100 | + public function getShareRequestsByItemGuid($item_guid) { |
|
101 | 101 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
102 | 102 | return $this->findEntities($q, [$item_guid]); |
103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @param ShareRequest $shareRequest |
108 | 108 | * @return ShareRequest |
109 | 109 | */ |
110 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
110 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
111 | 111 | return $this->update($shareRequest); |
112 | 112 | } |
113 | 113 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * @param $user_id |
118 | 118 | * @return ShareRequest[] |
119 | 119 | */ |
120 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
120 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
121 | 121 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
122 | 122 | return $this->findEntities($q, [$item_guid, $user_id]); |
123 | 123 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * @param $permissions The new permissions to apply |
130 | 130 | * @return \PDOStatement The result of the operation |
131 | 131 | */ |
132 | - public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){ |
|
132 | + public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) { |
|
133 | 133 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
134 | 134 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
135 | 135 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | parent::__construct($db, self::TABLE_NAME); |
23 | 23 | } |
24 | 24 | |
25 | - public function createRequest(ShareRequest $request){ |
|
25 | + public function createRequest(ShareRequest $request) { |
|
26 | 26 | return $this->insert($request); |
27 | 27 | } |
28 | 28 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * @param $target_vault_guid |
33 | 33 | * @return ShareRequest |
34 | 34 | */ |
35 | - public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){ |
|
35 | + public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) { |
|
36 | 36 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?"; |
37 | 37 | return $this->findEntity($q, [$item_guid, $target_vault_guid]); |
38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | * @param $item_guid |
43 | 43 | * @return ShareRequest[] |
44 | 44 | */ |
45 | - public function getRequestsByItemGuidGroupedByUser($item_guid){ |
|
46 | - if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){ |
|
45 | + public function getRequestsByItemGuidGroupedByUser($item_guid) { |
|
46 | + if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') { |
|
47 | 47 | $this->db->executeQuery("SET sql_mode = '';"); |
48 | 48 | } |
49 | 49 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param $target_user_id The target user |
57 | 57 | * @return \PDOStatement The result of running the db query |
58 | 58 | */ |
59 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
59 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
60 | 60 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
61 | 61 | $this->execute($q, [$item_id, $target_user_id]); |
62 | 62 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | * @param $user_id |
68 | 68 | * @return ShareRequest[] |
69 | 69 | */ |
70 | - public function getUserPendingRequests($user_id){ |
|
70 | + public function getUserPendingRequests($user_id) { |
|
71 | 71 | $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
72 | 72 | return $this->findEntities($q, [$user_id]); |
73 | 73 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @param ShareRequest $shareRequest Request to delete |
78 | 78 | * @return ShareRequest The deleted request |
79 | 79 | */ |
80 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
80 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
81 | 81 | return $this->delete($shareRequest); |
82 | 82 | } |
83 | 83 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @return ShareRequest |
88 | 88 | * @throws DoesNotExistException |
89 | 89 | */ |
90 | - public function getShareRequestById($id){ |
|
90 | + public function getShareRequestById($id) { |
|
91 | 91 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
92 | 92 | return $this->findEntity($q, [$id]); |
93 | 93 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | * @param $item_guid |
98 | 98 | * @return ShareRequest[] |
99 | 99 | */ |
100 | - public function getShareRequestsByItemGuid($item_guid){ |
|
100 | + public function getShareRequestsByItemGuid($item_guid) { |
|
101 | 101 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
102 | 102 | return $this->findEntities($q, [$item_guid]); |
103 | 103 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | * @param ShareRequest $shareRequest |
108 | 108 | * @return ShareRequest |
109 | 109 | */ |
110 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
110 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
111 | 111 | return $this->update($shareRequest); |
112 | 112 | } |
113 | 113 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * @param $user_id |
118 | 118 | * @return ShareRequest[] |
119 | 119 | */ |
120 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
120 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
121 | 121 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
122 | 122 | return $this->findEntities($q, [$item_guid, $user_id]); |
123 | 123 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | * @param $permissions The new permissions to apply |
130 | 130 | * @return \PDOStatement The result of the operation |
131 | 131 | */ |
132 | - public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){ |
|
132 | + public function updatePendingRequestPermissions($item_guid, $user_id, $permissions) { |
|
133 | 133 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
134 | 134 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
135 | 135 | } |
@@ -48,10 +48,10 @@ |
||
48 | 48 | * @param $type string |
49 | 49 | * @return array |
50 | 50 | */ |
51 | - public function add($subject,$subjectParams=array(), |
|
52 | - $message='',$messageParams=array(), |
|
53 | - $link='',$user=null,$type='') { |
|
54 | - if($user) { |
|
51 | + public function add($subject, $subjectParams = array(), |
|
52 | + $message = '', $messageParams = array(), |
|
53 | + $link = '', $user = null, $type = '') { |
|
54 | + if ($user) { |
|
55 | 55 | $activity = $this->manager->generateEvent(); |
56 | 56 | $activity->setType($type); |
57 | 57 | $activity->setApp('passman'); |
@@ -163,13 +163,13 @@ |
||
163 | 163 | $activity . '_self', array($label, $this->userId, $revision_created), |
164 | 164 | '', array(), |
165 | 165 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
166 | - } else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) { |
|
166 | + } else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) { |
|
167 | 167 | $activity = 'item_deleted'; |
168 | 168 | $this->activityService->add( |
169 | 169 | $activity . '_self', array($label, $this->userId), |
170 | 170 | '', array(), |
171 | 171 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
172 | - } else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) { |
|
172 | + } else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) { |
|
173 | 173 | $activity = 'item_recovered'; |
174 | 174 | $this->activityService->add( |
175 | 175 | $activity . '_self', array($label, $this->userId), |
@@ -51,17 +51,17 @@ discard block |
||
51 | 51 | parent::__construct('passman'); |
52 | 52 | $container = $this->getContainer(); |
53 | 53 | // Allow automatic DI for the View, until we migrated to Nodes API |
54 | - $container->registerService(View::class, function () { |
|
54 | + $container->registerService(View::class, function() { |
|
55 | 55 | return new View(''); |
56 | 56 | }, false); |
57 | - $container->registerService('isCLI', function () { |
|
57 | + $container->registerService('isCLI', function() { |
|
58 | 58 | return \OC::$CLI; |
59 | 59 | }); |
60 | 60 | |
61 | 61 | /** |
62 | 62 | * Middleware |
63 | 63 | */ |
64 | - $container->registerService('ShareMiddleware', function ($c) { |
|
64 | + $container->registerService('ShareMiddleware', function($c) { |
|
65 | 65 | return new ShareMiddleware($c->query('SettingsService')); |
66 | 66 | }); |
67 | 67 | $container->registerMiddleware('ShareMiddleware'); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | /** |
70 | 70 | * Controllers |
71 | 71 | */ |
72 | - $container->registerService('ShareController', function ($c) { |
|
72 | + $container->registerService('ShareController', function($c) { |
|
73 | 73 | $container = $this->getContainer(); |
74 | 74 | $server = $container->getServer(); |
75 | 75 | return new ShareController( |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | |
92 | 92 | /** Cron **/ |
93 | - $container->registerService('CronService', function ($c) { |
|
93 | + $container->registerService('CronService', function($c) { |
|
94 | 94 | return new CronService( |
95 | 95 | $c->query('CredentialService'), |
96 | 96 | $c->query('Logger'), |
@@ -101,11 +101,11 @@ discard block |
||
101 | 101 | ); |
102 | 102 | }); |
103 | 103 | |
104 | - $container->registerService('Db', function () { |
|
104 | + $container->registerService('Db', function() { |
|
105 | 105 | return new Db(); |
106 | 106 | }); |
107 | 107 | |
108 | - $container->registerService('Logger', function ($c) { |
|
108 | + $container->registerService('Logger', function($c) { |
|
109 | 109 | return $c->query('ServerContainer')->getLogger(); |
110 | 110 | }); |
111 | 111 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $c = $this->getContainer(); |
134 | 134 | /** @var \OCP\IServerContainer $server */ |
135 | 135 | $server = $c->getServer(); |
136 | - $navigationEntry = function () use ($c, $server) { |
|
136 | + $navigationEntry = function() use ($c, $server) { |
|
137 | 137 | return [ |
138 | 138 | 'id' => $c->getAppName(), |
139 | 139 | 'order' => 10, |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * Get a app setting |
71 | 71 | * |
72 | 72 | * @param $key string |
73 | - * @param null $default_value The default value if key does not exist |
|
73 | + * @param boolean $default_value The default value if key does not exist |
|
74 | 74 | * @return mixed |
75 | 75 | */ |
76 | 76 | public function getAppSetting($key, $default_value = null) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | /** |
111 | 111 | * Check if an setting is enabled (value of 1) |
112 | 112 | * |
113 | - * @param $setting |
|
113 | + * @param string $setting |
|
114 | 114 | * @return bool |
115 | 115 | */ |
116 | 116 | public function isEnabled($setting) { |
@@ -103,7 +103,7 @@ |
||
103 | 103 | $setting = $settings->getAppSetting('server_side_encryption'); |
104 | 104 | $this->cipher = $setting['cipher']; |
105 | 105 | $this->mode = $setting['mode']; |
106 | - $this->rounds = (int)100; |
|
106 | + $this->rounds = (int) 100; |
|
107 | 107 | $this->server_key = \OC::$server->getConfig()->getSystemValue('passwordsalt', ''); |
108 | 108 | ini_set('memory_limit', '1024M'); |
109 | 109 | } |
@@ -272,7 +272,9 @@ |
||
272 | 272 | protected function unpad($data) { |
273 | 273 | $length = $this->getKeySize(); |
274 | 274 | $last = ord($data[strlen($data) - 1]); |
275 | - if ($last > $length) return false; |
|
275 | + if ($last > $length) { |
|
276 | + return false; |
|
277 | + } |
|
276 | 278 | if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) { |
277 | 279 | return false; |
278 | 280 | } |