@@ -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); |
@@ -15,120 +15,120 @@ |
||
| 15 | 15 | use OCP\IDBConnection; |
| 16 | 16 | |
| 17 | 17 | class ShareRequestMapper extends Mapper { |
| 18 | - const TABLE_NAME = 'passman_share_request'; |
|
| 19 | - |
|
| 20 | - public function __construct(IDBConnection $db, Utils $utils) { |
|
| 21 | - parent::__construct($db, self::TABLE_NAME); |
|
| 22 | - $this->utils = $utils; |
|
| 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 getRequestsByItemGuid($item_guid){ |
|
| 46 | - $this->db->executeQuery("SET sql_mode = '';"); |
|
| 47 | - $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
|
| 48 | - return $this->findEntities($q, [$item_guid]); |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - /** |
|
| 52 | - * Deletes all pending requests for the given user to the given item |
|
| 53 | - * @param $item_id The item ID |
|
| 54 | - * @param $target_user_id The target user |
|
| 55 | - * @return \PDOStatement The result of running the db query |
|
| 56 | - */ |
|
| 57 | - public function cleanItemRequestsForUser($item_id, $target_user_id){ |
|
| 18 | + const TABLE_NAME = 'passman_share_request'; |
|
| 19 | + |
|
| 20 | + public function __construct(IDBConnection $db, Utils $utils) { |
|
| 21 | + parent::__construct($db, self::TABLE_NAME); |
|
| 22 | + $this->utils = $utils; |
|
| 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 getRequestsByItemGuid($item_guid){ |
|
| 46 | + $this->db->executeQuery("SET sql_mode = '';"); |
|
| 47 | + $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;"; |
|
| 48 | + return $this->findEntities($q, [$item_guid]); |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + /** |
|
| 52 | + * Deletes all pending requests for the given user to the given item |
|
| 53 | + * @param $item_id The item ID |
|
| 54 | + * @param $target_user_id The target user |
|
| 55 | + * @return \PDOStatement The result of running the db query |
|
| 56 | + */ |
|
| 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 | - return $this->execute($q, [$item_id, $target_user_id]); |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - /** |
|
| 64 | - * Obtains all pending share requests for the given user ID |
|
| 65 | - * @param $user_id |
|
| 66 | - * @return ShareRequest[] |
|
| 67 | - */ |
|
| 68 | - public function getUserPendingRequests($user_id){ |
|
| 69 | - $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
| 70 | - return $this->findEntities($q, [$user_id]); |
|
| 71 | - } |
|
| 72 | - |
|
| 73 | - /** |
|
| 74 | - * Deletes the given share request |
|
| 75 | - * @param ShareRequest $shareRequest Request to delete |
|
| 76 | - * @return ShareRequest The deleted request |
|
| 77 | - */ |
|
| 78 | - public function deleteShareRequest(ShareRequest $shareRequest){ |
|
| 79 | - return $this->delete($shareRequest); |
|
| 60 | + return $this->execute($q, [$item_id, $target_user_id]); |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + /** |
|
| 64 | + * Obtains all pending share requests for the given user ID |
|
| 65 | + * @param $user_id |
|
| 66 | + * @return ShareRequest[] |
|
| 67 | + */ |
|
| 68 | + public function getUserPendingRequests($user_id){ |
|
| 69 | + $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?"; |
|
| 70 | + return $this->findEntities($q, [$user_id]); |
|
| 80 | 71 | } |
| 81 | 72 | |
| 82 | - /** |
|
| 83 | - * Gets a share request by it's unique incremental id |
|
| 84 | - * @param $id |
|
| 85 | - * @return ShareRequest |
|
| 86 | - */ |
|
| 73 | + /** |
|
| 74 | + * Deletes the given share request |
|
| 75 | + * @param ShareRequest $shareRequest Request to delete |
|
| 76 | + * @return ShareRequest The deleted request |
|
| 77 | + */ |
|
| 78 | + public function deleteShareRequest(ShareRequest $shareRequest){ |
|
| 79 | + return $this->delete($shareRequest); |
|
| 80 | + } |
|
| 81 | + |
|
| 82 | + /** |
|
| 83 | + * Gets a share request by it's unique incremental id |
|
| 84 | + * @param $id |
|
| 85 | + * @return ShareRequest |
|
| 86 | + */ |
|
| 87 | 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 | } |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Gets all share requests by a given item GUID |
|
| 94 | - * @param $item_guid |
|
| 95 | - * @return ShareRequest[] |
|
| 96 | - */ |
|
| 92 | + /** |
|
| 93 | + * Gets all share requests by a given item GUID |
|
| 94 | + * @param $item_guid |
|
| 95 | + * @return ShareRequest[] |
|
| 96 | + */ |
|
| 97 | 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 | } |
| 101 | 101 | |
| 102 | - /** |
|
| 103 | - * Updates the given share request, |
|
| 104 | - * @param ShareRequest $shareRequest |
|
| 105 | - * @return ShareRequest |
|
| 106 | - */ |
|
| 102 | + /** |
|
| 103 | + * Updates the given share request, |
|
| 104 | + * @param ShareRequest $shareRequest |
|
| 105 | + * @return ShareRequest |
|
| 106 | + */ |
|
| 107 | 107 | public function updateShareRequest(ShareRequest $shareRequest){ |
| 108 | 108 | return $this->update($shareRequest); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - /** |
|
| 112 | - * Finds pending requests sent to the given user to the given item. |
|
| 113 | - * @param $item_guid |
|
| 114 | - * @param $user_id |
|
| 115 | - * @return ShareRequest[] |
|
| 116 | - */ |
|
| 111 | + /** |
|
| 112 | + * Finds pending requests sent to the given user to the given item. |
|
| 113 | + * @param $item_guid |
|
| 114 | + * @param $user_id |
|
| 115 | + * @return ShareRequest[] |
|
| 116 | + */ |
|
| 117 | 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 | } |
| 121 | 121 | |
| 122 | - /** |
|
| 123 | - * Updates all pending requests with the given permissions |
|
| 124 | - * @param $item_guid The item for which to update the requests |
|
| 125 | - * @param $user_id The user for which to update the requests |
|
| 126 | - * @param $permissions The new permissions to apply |
|
| 127 | - * @return \PDOStatement The result of the operation |
|
| 128 | - */ |
|
| 122 | + /** |
|
| 123 | + * Updates all pending requests with the given permissions |
|
| 124 | + * @param $item_guid The item for which to update the requests |
|
| 125 | + * @param $user_id The user for which to update the requests |
|
| 126 | + * @param $permissions The new permissions to apply |
|
| 127 | + * @return \PDOStatement The result of the operation |
|
| 128 | + */ |
|
| 129 | 129 | public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){ |
| 130 | - $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
|
| 131 | - return $this->execute($q, [$permissions, $item_guid, $user_id]); |
|
| 132 | - } |
|
| 130 | + $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?"; |
|
| 131 | + return $this->execute($q, [$permissions, $item_guid, $user_id]); |
|
| 132 | + } |
|
| 133 | 133 | |
| 134 | 134 | } |
| 135 | 135 | \ No newline at end of file |
@@ -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 | } |
@@ -49,14 +49,14 @@ discard block |
||
| 49 | 49 | * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result |
| 50 | 50 | * @return Vault |
| 51 | 51 | */ |
| 52 | - public function findVaultsFromUser($userId){ |
|
| 52 | + public function findVaultsFromUser($userId) { |
|
| 53 | 53 | $sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' . |
| 54 | 54 | 'WHERE `user_id` = ? '; |
| 55 | 55 | $params = [$userId]; |
| 56 | 56 | return $this->findEntities($sql, $params); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function create($vault_name, $userId){ |
|
| 59 | + public function create($vault_name, $userId) { |
|
| 60 | 60 | $vault = new Vault(); |
| 61 | 61 | $vault->setName($vault_name); |
| 62 | 62 | $vault->setUserId($userId); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | return parent::insert($vault); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function setLastAccess($vault_id, $user_id){ |
|
| 69 | + public function setLastAccess($vault_id, $user_id) { |
|
| 70 | 70 | $vault = new Vault(); |
| 71 | 71 | $vault->setId($vault_id); |
| 72 | 72 | $vault->setUserId($user_id); |
@@ -74,11 +74,11 @@ discard block |
||
| 74 | 74 | $this->update($vault); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function updateVault(Vault $vault){ |
|
| 77 | + public function updateVault(Vault $vault) { |
|
| 78 | 78 | $this->update($vault); |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function updateSharingKeys($vault_id, $privateKey, $publicKey){ |
|
| 81 | + public function updateSharingKeys($vault_id, $privateKey, $publicKey) { |
|
| 82 | 82 | $vault = new Vault(); |
| 83 | 83 | $vault->setId($vault_id); |
| 84 | 84 | $vault->setPrivateSharingKey($privateKey); |
@@ -37,58 +37,58 @@ |
||
| 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'); |
|
| 56 | - } |
|
| 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 | + } |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * Specify data which should be serialized to JSON |
|
| 60 | - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 61 | - * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 62 | - * which is a value of any type other than a resource. |
|
| 63 | - * @since 5.4.0 |
|
| 64 | - */ |
|
| 65 | - function jsonSerialize() |
|
| 66 | - { |
|
| 67 | - return [ |
|
| 68 | - 'req_id' => $this->getId(), |
|
| 69 | - 'item_id' => $this->getItemId(), |
|
| 70 | - 'item_guid' => $this->getItemGuid(), |
|
| 71 | - 'target_user_id' => $this->getTargetUserId(), |
|
| 72 | - 'target_vault_id' => $this->getTargetVaultId(), |
|
| 73 | - 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
| 74 | - 'from_user_id' => $this->getFromUserId(), |
|
| 75 | - 'shared_key' => $this->getSharedKey(), |
|
| 76 | - 'permissions' => $this->getPermissions(), |
|
| 77 | - 'created' => $this->getCreated(), |
|
| 78 | - ]; |
|
| 79 | - } |
|
| 58 | + /** |
|
| 59 | + * Specify data which should be serialized to JSON |
|
| 60 | + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php |
|
| 61 | + * @return mixed data which can be serialized by <b>json_encode</b>, |
|
| 62 | + * which is a value of any type other than a resource. |
|
| 63 | + * @since 5.4.0 |
|
| 64 | + */ |
|
| 65 | + function jsonSerialize() |
|
| 66 | + { |
|
| 67 | + return [ |
|
| 68 | + 'req_id' => $this->getId(), |
|
| 69 | + 'item_id' => $this->getItemId(), |
|
| 70 | + 'item_guid' => $this->getItemGuid(), |
|
| 71 | + 'target_user_id' => $this->getTargetUserId(), |
|
| 72 | + 'target_vault_id' => $this->getTargetVaultId(), |
|
| 73 | + 'target_vault_guid' => $this->getTargetVaultGuid(), |
|
| 74 | + 'from_user_id' => $this->getFromUserId(), |
|
| 75 | + 'shared_key' => $this->getSharedKey(), |
|
| 76 | + 'permissions' => $this->getPermissions(), |
|
| 77 | + 'created' => $this->getCreated(), |
|
| 78 | + ]; |
|
| 79 | + } |
|
| 80 | 80 | |
| 81 | - function asACLJson(){ |
|
| 82 | - return [ |
|
| 83 | - 'item_id' => $this->getItemId(), |
|
| 84 | - 'item_guid' => $this->getItemGuid(), |
|
| 85 | - 'user_id' => $this->getTargetUserId(), |
|
| 86 | - 'created' => $this->getCreated(), |
|
| 87 | - 'permissions' => $this->getPermissions(), |
|
| 88 | - 'vault_id' => $this->getTargetUserId(), |
|
| 89 | - 'vault_guid' => $this->getTargetVaultGuid(), |
|
| 90 | - 'shared_key' => $this->getSharedKey(), |
|
| 91 | - 'pending' => true, |
|
| 92 | - ]; |
|
| 93 | - } |
|
| 81 | + function asACLJson(){ |
|
| 82 | + return [ |
|
| 83 | + 'item_id' => $this->getItemId(), |
|
| 84 | + 'item_guid' => $this->getItemGuid(), |
|
| 85 | + 'user_id' => $this->getTargetUserId(), |
|
| 86 | + 'created' => $this->getCreated(), |
|
| 87 | + 'permissions' => $this->getPermissions(), |
|
| 88 | + 'vault_id' => $this->getTargetUserId(), |
|
| 89 | + 'vault_guid' => $this->getTargetVaultGuid(), |
|
| 90 | + 'shared_key' => $this->getSharedKey(), |
|
| 91 | + 'pending' => true, |
|
| 92 | + ]; |
|
| 93 | + } |
|
| 94 | 94 | } |
| 95 | 95 | \ No newline at end of file |
@@ -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(), |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | namespace OCA\Passman\Db; |
| 9 | 9 | |
| 10 | 10 | use OCA\Passman\Utility\PermissionEntity; |
| 11 | -use OCP\AppFramework\Db\Entity; |
|
| 12 | 11 | |
| 13 | 12 | /** |
| 14 | 13 | * @method void setId(integer $value) |
@@ -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,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 |
@@ -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 |
@@ -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 | { |