nextcloud / passman

lib/Service/ShareService.php

Doc Comments +1 added lines, -2 removed lines

@@ -49,6 +49,7 @@ 
 	 * @param $target_item_guid string      The shared item GUID
 	 * @param $request_array    array
 	 * @param $permissions      integer     Must be created with a bitmask from options on the ShareRequest class
+	 * @param string $credential_owner
 	 * @return array                        Array of sharing requests
 	 */
 	public function createBulkRequests($target_item_id, $target_item_guid, $request_array, $permissions, $credential_owner) {
@@ -253,7 +254,6 @@ 
 	/**
 	 * Delete ACL
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function deleteShareACL(SharingACL $ACL) {
@@ -277,7 +277,6 @@ 
 	/**
 	 * Get pending share requests by guid and uid
 	 *
-	 * @param  ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
 	public function getPendingShareRequestsForCredential($item_guid, $user_id) {

lib/Db/SharingACL.php

Indentation +42 added lines, -42 removed lines

@@ -38,50 +38,50 @@
 class SharingACL extends PermissionEntity implements \JsonSerializable
 {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $userId,
-        $created,
-        $expire,
+	protected
+		$itemId,
+		$itemGuid,
+		$userId,
+		$created,
+		$expire,
 		$expireViews,
-        $permissions,
-        $vaultId,
-        $vaultGuid,
-        $sharedKey;
+		$permissions,
+		$vaultId,
+		$vaultGuid,
+		$sharedKey;
 
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('created', 'integer');
-        $this->addType('expire', 'integer');
-        $this->addType('expireViews', 'integer');
-        $this->addType('permissions', 'integer');
-    }
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('created', 'integer');
+		$this->addType('expire', 'integer');
+		$this->addType('expireViews', 'integer');
+		$this->addType('permissions', 'integer');
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'acl_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getUserId(),
-            'created' => $this->getCreated(),
-            'expire' => $this->getExpire(),
-            'expire_views' => $this->getExpireViews(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getVaultId(),
-            'vault_guid' => $this->getVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending' => false,
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'acl_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getUserId(),
+			'created' => $this->getCreated(),
+			'expire' => $this->getExpire(),
+			'expire_views' => $this->getExpireViews(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getVaultId(),
+			'vault_guid' => $this->getVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending' => false,
+		];
+	}
 }
\ No newline at end of file

lib/Db/CredentialRevisionMapper.php

Indentation +10 added lines, -10 removed lines

@@ -30,11 +30,11 @@ 
 	public function getRevisions($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `credential_id` = ?';
-        $params = [$credential_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$credential_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntities($sql, $params);
 	}
 
@@ -46,11 +46,11 @@ 
 	public function getRevision($revision_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_revisions` ' .
 			'WHERE `id` = ?';
-        $params = [$revision_id];
-        if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
-            $params[] = $user_id;
-        }
+		$params = [$revision_id];
+		if ($user_id !== null) {
+			$sql.= ' and `user_id` = ? ';
+			$params[] = $user_id;
+		}
 		return $this->findEntity($sql, $params);
 	}
 

lib/Db/CredentialRevision.php

Indentation +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	protected $userId;
 	protected $created;
 	protected $credentialData;
-    protected $editedBy;
+	protected $editedBy;
 
 
 	public function __construct() {
@@ -56,7 +56,7 @@ 
 			'guid' => $this->getGuid(),
 			'created' => $this->getCreated(),
 			'credential_data' => json_decode(base64_decode($this->getCredentialData())),
-            'edited_by' => $this->getEditedBy(),
+			'edited_by' => $this->getEditedBy(),
 		];
 	}
 }
\ No newline at end of file

lib/Utility/NotFoundJSONResponse.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 
 class NotFoundJSONResponse extends JSONResponse {
 
-    /**
-     * Creates a new json response with a not found status code.
-     * @param array $response_data
-     */
-    public function __construct($response_data = []) {
-        parent::__construct($response_data, Http::STATUS_NOT_FOUND);
-    }
+	/**
+	 * Creates a new json response with a not found status code.
+	 * @param array $response_data
+	 */
+	public function __construct($response_data = []) {
+		parent::__construct($response_data, Http::STATUS_NOT_FOUND);
+	}
 }
\ No newline at end of file

lib/Utility/PermissionEntity.php

Indentation +33 added lines, -33 removed lines

@@ -13,40 +13,40 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-    CONST READ  =   0b00000001;
-    CONST WRITE =   0b00000010;
-    CONST FILES =   0b00000100;
-    CONST HISTORY = 0b00001000;
-    CONST OWNER =   0b10000000;
+	CONST READ  =   0b00000001;
+	CONST WRITE =   0b00000010;
+	CONST FILES =   0b00000100;
+	CONST HISTORY = 0b00001000;
+	CONST OWNER =   0b10000000;
 
-    /**
-     * Checks wether a user matches one or more permissions at once
-     * @param $permission
-     * @return bool
-     */
-    public function hasPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & $permission;
-        return $tmp === $permission;
-    }
+	/**
+	 * Checks wether a user matches one or more permissions at once
+	 * @param $permission
+	 * @return bool
+	 */
+	public function hasPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & $permission;
+		return $tmp === $permission;
+	}
 
-    /**
-     * Adds the given permission or permissions set to the user current permissions
-     * @param $permission
-     */
-    public function addPermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp | $permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Adds the given permission or permissions set to the user current permissions
+	 * @param $permission
+	 */
+	public function addPermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp | $permission;
+		$this->setPermissions($tmp);
+	}
 
-    /**
-     * Takes the given permission or permissions out from the user
-     * @param $permission
-     */
-    public function removePermission($permission) {
-        $tmp = $this->getPermissions();
-        $tmp = $tmp & ~$permission;
-        $this->setPermissions($tmp);
-    }
+	/**
+	 * Takes the given permission or permissions out from the user
+	 * @param $permission
+	 */
+	public function removePermission($permission) {
+		$tmp = $this->getPermissions();
+		$tmp = $tmp & ~$permission;
+		$this->setPermissions($tmp);
+	}
 }
\ No newline at end of file

lib/Db/ShareRequest.php

Indentation +50 added lines, -50 removed lines

@@ -37,60 +37,60 @@
 
 class ShareRequest extends PermissionEntity implements \JsonSerializable {
 
-    protected
-        $itemId,
-        $itemGuid,
-        $targetUserId,
-        $targetVaultId,
-        $targetVaultGuid,
-        $sharedKey,
-        $permissions,
-        $created,
+	protected
+		$itemId,
+		$itemGuid,
+		$targetUserId,
+		$targetVaultId,
+		$targetVaultGuid,
+		$sharedKey,
+		$permissions,
+		$created,
 		$fromUserId;
 
-    public function __construct() {
-        // add types in constructor
-        $this->addType('itemId', 'integer');
-        $this->addType('vaultId', 'integer');
-        $this->addType('permissions', 'integer');
+	public function __construct() {
+		// add types in constructor
+		$this->addType('itemId', 'integer');
+		$this->addType('vaultId', 'integer');
+		$this->addType('permissions', 'integer');
 		$this->addType('created', 'integer');
 		$this->addType('targetVaultId', 'integer');
-    }
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return [
-            'req_id' => $this->getId(),
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'target_user_id' => $this->getTargetUserId(),
-            'target_vault_id' => $this->getTargetVaultId(),
-            'target_vault_guid' => $this->getTargetVaultGuid(),
-            'from_user_id' => $this->getFromUserId(),
-            'shared_key' => $this->getSharedKey(),
-            'permissions' => $this->getPermissions(),
-            'created' => $this->getCreated(),
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 * which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize()
+	{
+		return [
+			'req_id' => $this->getId(),
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'target_user_id' => $this->getTargetUserId(),
+			'target_vault_id' => $this->getTargetVaultId(),
+			'target_vault_guid' => $this->getTargetVaultGuid(),
+			'from_user_id' => $this->getFromUserId(),
+			'shared_key' => $this->getSharedKey(),
+			'permissions' => $this->getPermissions(),
+			'created' => $this->getCreated(),
+		];
+	}
 
-    function asACLJson(){
-        return [
-            'item_id' => $this->getItemId(),
-            'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getTargetUserId(),
-            'created' => $this->getCreated(),
-            'permissions' => $this->getPermissions(),
-            'vault_id' => $this->getTargetVaultId(),
-            'vault_guid' => $this->getTargetVaultGuid(),
-            'shared_key' => $this->getSharedKey(),
-            'pending'   => true,
-        ];
-    }
+	function asACLJson(){
+		return [
+			'item_id' => $this->getItemId(),
+			'item_guid' => $this->getItemGuid(),
+			'user_id' => $this->getTargetUserId(),
+			'created' => $this->getCreated(),
+			'permissions' => $this->getPermissions(),
+			'vault_id' => $this->getTargetVaultId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

lib/Db/SharingACLMapper.php

Indentation +52 added lines, -52 removed lines

@@ -30,66 +30,66 @@
 use OCA\Passman\Utility\Utils;
 
 class SharingACLMapper extends Mapper {
-    const TABLE_NAME = '*PREFIX*passman_sharing_acl';
+	const TABLE_NAME = '*PREFIX*passman_sharing_acl';
 
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'passman_sharing_acl');
-    }
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'passman_sharing_acl');
+	}
 
-    public function createACLEntry(SharingACL $acl){
-        return $this->insert($acl);
-    }
+	public function createACLEntry(SharingACL $acl){
+		return $this->insert($acl);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_guid
-     * @return SharingACL[]
-     */
-    public function getVaultEntries($user_id, $vault_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
-        return $this->findEntities($q, [$user_id, $vault_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_guid
+	 * @return SharingACL[]
+	 */
+	public function getVaultEntries($user_id, $vault_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		return $this->findEntities($q, [$user_id, $vault_guid]);
+	}
 
-    /**
-     * Gets the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function getItemACL($user_id, $item_guid) {
-        $q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
-        $filter = [$item_guid];
-        $q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? ';
-        if ($user_id !== null){
+	/**
+	 * Gets the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function getItemACL($user_id, $item_guid) {
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
+		$filter = [$item_guid];
+		$q .= ($user_id === null) ? 'user_id is null' : 'user_id = ? ';
+		if ($user_id !== null){
 			$filter[] = $user_id;
-        }
+		}
 
-        return $this->findEntity($q, $filter);
-    }
+		return $this->findEntity($q, $filter);
+	}
 
-    /**
-     * Update the acl for a given item guid
-     * @param $user_id
-     * @param $item_guid
-     * @return SharingACL
-     */
-    public function updateCredentialACL(SharingACL $sharingACL) {
-        return $this->update($sharingACL);
-    }
+	/**
+	 * Update the acl for a given item guid
+	 * @param $user_id
+	 * @param $item_guid
+	 * @return SharingACL
+	 */
+	public function updateCredentialACL(SharingACL $sharingACL) {
+		return $this->update($sharingACL);
+	}
 
-    /**
-     * Gets the currently accepted share requests from the given user for the given vault guid
-     * @param $user_id
-     * @param $vault_id
-     * @return SharingACL[]
-     */
-    public function getCredentialAclList($item_guid) {
-        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
-        return $this->findEntities($q, [$item_guid]);
-    }
+	/**
+	 * Gets the currently accepted share requests from the given user for the given vault guid
+	 * @param $user_id
+	 * @param $vault_id
+	 * @return SharingACL[]
+	 */
+	public function getCredentialAclList($item_guid) {
+		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+		return $this->findEntities($q, [$item_guid]);
+	}
 
-    public function deleteShareACL(SharingACL $ACL){
-    	return $this->delete($ACL);
+	public function deleteShareACL(SharingACL $ACL){
+		return $this->delete($ACL);
 	}
 }
\ No newline at end of file

lib/Service/SettingsService.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * Check if an setting is enabled (value of 1)
 	 *
-	 * @param $setting
+	 * @param string $setting
 	 * @return bool
 	 */
 	public function isEnabled($setting) {