@@ -33,12 +33,18 @@ |
||
33 | 33 | return $this->findEntities($sql, [$user_id, $vault_id]); |
34 | 34 | } |
35 | 35 | |
36 | + /** |
|
37 | + * @param integer $vault_id |
|
38 | + */ |
|
36 | 39 | public function getRandomCredentialByVaultId($vault_id, $user_id) { |
37 | 40 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
38 | 41 | 'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL ORDER BY RAND() LIMIT 1'; |
39 | 42 | return $this->findEntities($sql, [$user_id, $vault_id]); |
40 | 43 | } |
41 | 44 | |
45 | + /** |
|
46 | + * @param integer $timestamp |
|
47 | + */ |
|
42 | 48 | public function getExpiredCredentials($timestamp) { |
43 | 49 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
44 | 50 | 'WHERE `expire_time` > 0 AND `expire_time` < ?'; |
@@ -50,28 +50,28 @@ discard block |
||
50 | 50 | * @param null $user_id |
51 | 51 | * @return Credential |
52 | 52 | */ |
53 | - public function getCredentialById($credential_id, $user_id = null){ |
|
53 | + public function getCredentialById($credential_id, $user_id = null) { |
|
54 | 54 | $sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' . |
55 | 55 | 'WHERE `id` = ?'; |
56 | 56 | // If we want to check the owner, add it to the query |
57 | 57 | $params = [$credential_id]; |
58 | - if ($user_id !== null){ |
|
58 | + if ($user_id !== null) { |
|
59 | 59 | $sql .= ' and `user_id` = ? '; |
60 | 60 | array_push($params, $user_id); |
61 | 61 | } |
62 | - return $this->findEntity($sql,$params); |
|
62 | + return $this->findEntity($sql, $params); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | 66 | * @param integer $credential_id |
67 | 67 | */ |
68 | - public function getCredentialLabelById($credential_id){ |
|
68 | + public function getCredentialLabelById($credential_id) { |
|
69 | 69 | $sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' . |
70 | 70 | 'WHERE `id` = ? '; |
71 | - return $this->findEntity($sql,[$credential_id]); |
|
71 | + return $this->findEntity($sql, [$credential_id]); |
|
72 | 72 | } |
73 | 73 | |
74 | - public function create($raw_credential){ |
|
74 | + public function create($raw_credential) { |
|
75 | 75 | $credential = new Credential(); |
76 | 76 | |
77 | 77 | $credential->setGuid($this->utils->GUID()); |
@@ -144,10 +144,10 @@ discard block |
||
144 | 144 | * @param $credential_guid |
145 | 145 | * @return Credential |
146 | 146 | */ |
147 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
147 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
148 | 148 | $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? '; |
149 | 149 | $params = [$credential_guid]; |
150 | - if ($user_id !== null){ |
|
150 | + if ($user_id !== null) { |
|
151 | 151 | $q .= ' and `user_id` = ? '; |
152 | 152 | array_push($params, $user_id); |
153 | 153 | } |
@@ -255,21 +255,18 @@ |
||
255 | 255 | public function getRevision($credential_guid) { |
256 | 256 | try { |
257 | 257 | $credential = $this->credentialService->getCredentialByGUID($credential_guid); |
258 | - } |
|
259 | - catch (DoesNotExistException $ex) { |
|
258 | + } catch (DoesNotExistException $ex) { |
|
260 | 259 | return new NotFoundJSONResponse(); |
261 | 260 | } |
262 | 261 | |
263 | 262 | // If the request was made by the owner of the credential |
264 | 263 | if ($this->userId === $credential->getUserId()) { |
265 | 264 | $result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId); |
266 | - } |
|
267 | - else { |
|
265 | + } else { |
|
268 | 266 | $acl = $this->sharingService->getACL($this->userId, $credential_guid); |
269 | 267 | if ($acl->hasPermission(SharingACL::HISTORY)) { |
270 | 268 | $result = $this->credentialRevisionService->getRevisions($credential->getId()); |
271 | - } |
|
272 | - else { |
|
269 | + } else { |
|
273 | 270 | return new NotFoundJSONResponse(); |
274 | 271 | } |
275 | 272 | } |
@@ -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); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | $this->utils = $utils; |
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,7 +42,7 @@ discard block |
||
42 | 42 | * @param $item_guid |
43 | 43 | * @return ShareRequest[] |
44 | 44 | */ |
45 | - public function getRequestsByItemGuid($item_guid){ |
|
45 | + public function getRequestsByItemGuid($item_guid) { |
|
46 | 46 | $this->db->executeQuery("SET sql_mode = '';"); |
47 | 47 | $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
48 | 48 | return $this->findEntities($q, [$item_guid]); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * @param $target_user_id The target user |
55 | 55 | * @return \PDOStatement The result of running the db query |
56 | 56 | */ |
57 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
57 | + public function cleanItemRequestsForUser($item_id, $target_user_id) { |
|
58 | 58 | $q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?"; |
59 | 59 | $this->execute($q, [$item_id, $target_user_id]); |
60 | 60 | return $this->execute($q, [$item_id, $target_user_id]); |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | * @param $user_id |
66 | 66 | * @return ShareRequest[] |
67 | 67 | */ |
68 | - public function getUserPendingRequests($user_id){ |
|
69 | - $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
68 | + public function getUserPendingRequests($user_id) { |
|
69 | + $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?"; |
|
70 | 70 | return $this->findEntities($q, [$user_id]); |
71 | 71 | } |
72 | 72 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * @param ShareRequest $shareRequest Request to delete |
76 | 76 | * @return ShareRequest The deleted request |
77 | 77 | */ |
78 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
78 | + public function deleteShareRequest(ShareRequest $shareRequest) { |
|
79 | 79 | return $this->delete($shareRequest); |
80 | 80 | } |
81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * @param $id |
85 | 85 | * @return ShareRequest |
86 | 86 | */ |
87 | - public function getShareRequestById($id){ |
|
87 | + public function getShareRequestById($id) { |
|
88 | 88 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?"; |
89 | 89 | return $this->findEntity($q, [$id]); |
90 | 90 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param $item_guid |
95 | 95 | * @return ShareRequest[] |
96 | 96 | */ |
97 | - public function getShareRequestsByItemGuid($item_guid){ |
|
97 | + public function getShareRequestsByItemGuid($item_guid) { |
|
98 | 98 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ?"; |
99 | 99 | return $this->findEntities($q, [$item_guid]); |
100 | 100 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param ShareRequest $shareRequest |
105 | 105 | * @return ShareRequest |
106 | 106 | */ |
107 | - public function updateShareRequest(ShareRequest $shareRequest){ |
|
107 | + public function updateShareRequest(ShareRequest $shareRequest) { |
|
108 | 108 | return $this->update($shareRequest); |
109 | 109 | } |
110 | 110 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | * @param $user_id |
115 | 115 | * @return ShareRequest[] |
116 | 116 | */ |
117 | - public function getPendingShareRequests($item_guid, $user_id){ |
|
117 | + public function getPendingShareRequests($item_guid, $user_id) { |
|
118 | 118 | $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? and target_user_id= ?"; |
119 | 119 | return $this->findEntities($q, [$item_guid, $user_id]); |
120 | 120 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @param $permissions The new permissions to apply |
127 | 127 | * @return \PDOStatement The result of the operation |
128 | 128 | */ |
129 | - public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){ |
|
129 | + public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) { |
|
130 | 130 | $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
131 | 131 | return $this->execute($q, [$permissions, $item_guid, $user_id]); |
132 | 132 | } |
@@ -77,7 +77,7 @@ |
||
77 | 77 | ]; |
78 | 78 | } |
79 | 79 | |
80 | - function asACLJson(){ |
|
80 | + function asACLJson() { |
|
81 | 81 | return [ |
82 | 82 | 'item_id' => $this->getItemId(), |
83 | 83 | 'item_guid' => $this->getItemGuid(), |
@@ -95,11 +95,11 @@ |
||
95 | 95 | /** |
96 | 96 | * @param integer $credential_id |
97 | 97 | */ |
98 | - public function getCredentialLabelById($credential_id){ |
|
98 | + public function getCredentialLabelById($credential_id) { |
|
99 | 99 | return $this->credentialMapper->getCredentialLabelById($credential_id); |
100 | 100 | } |
101 | 101 | |
102 | - public function getCredentialByGUID($credential_guid, $user_id = null){ |
|
102 | + public function getCredentialByGUID($credential_guid, $user_id = null) { |
|
103 | 103 | return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id); |
104 | 104 | } |
105 | 105 | } |
106 | 106 | \ No newline at end of file |