| @@ -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 | 
| @@ -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 | 
| @@ -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 updatePendinRequestPermissions($item_guid, $user_id, $permissions){ | |
| 132 | +	public function updatePendinRequestPermissions($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 updatePendinRequestPermissions($item_guid, $user_id, $permissions){ | |
| 132 | +	public function updatePendinRequestPermissions($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 | } |