nextcloud / passman

lib/Db/VaultMapper.php

Spacing +5 added lines, -5 removed lines

@@ -49,14 +49,14 @@ 
 	 * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
 	 * @return Vault
 	 */
-	public function findVaultsFromUser($userId){
+	public function findVaultsFromUser($userId) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
 			'WHERE `user_id` = ? ';
 		$params = [$userId];
 		return $this->findEntities($sql, $params);
 	}
 
-	public function create($vault_name, $userId){
+	public function create($vault_name, $userId) {
 		$vault = new Vault();
 		$vault->setName($vault_name);
 		$vault->setUserId($userId);
@@ -66,7 +66,7 @@ 
 		return parent::insert($vault);
 	}
 
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		$vault = new Vault();
 		$vault->setId($vault_id);
 		$vault->setUserId($user_id);
@@ -74,11 +74,11 @@ 
 		$this->update($vault);
 	}
 
-	public function updateVault(Vault $vault){
+	public function updateVault(Vault $vault) {
 		$this->update($vault);
 	}
 
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		$vault = new Vault();
 		$vault->setId($vault_id);
 		$vault->setPrivateSharingKey($privateKey);

lib/Db/ShareRequest.php

Indentation +50 added lines, -50 removed lines

@@ -37,58 +37,58 @@
 
 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');
+	}
 
-    /**
-     * 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->getTargetUserId(),
-            '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->getTargetUserId(),
+			'vault_guid' => $this->getTargetVaultGuid(),
+			'shared_key' => $this->getSharedKey(),
+			'pending'   => true,
+		];
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
         ];
     }
 
-    function asACLJson(){
+    function asACLJson() {
         return [
             'item_id' => $this->getItemId(),
             'item_guid' => $this->getItemGuid(),

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 namespace OCA\Passman\Db;
 
 use OCA\Passman\Utility\PermissionEntity;
-use OCP\AppFramework\Db\Entity;
 
 /**
  * @method void setId(integer $value)

lib/Db/EntityJSONSerializer.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 trait EntityJSONSerializer {
 	public function serializeFields($properties) {
 		$result = [];
-		foreach($properties as $property) {
+		foreach ($properties as $property) {
 			$result[$property] = $this->$property;
 		}
 		return $result;

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/Utils.php

Indentation +8 added lines, -8 removed lines

@@ -12,10 +12,10 @@ 
 namespace OCA\Passman\Utility;
 
 class Utils {
-    /**
-     * Gets the unix epoch UTC timestamp
-     * @return int
-     */
+	/**
+	 * Gets the unix epoch UTC timestamp
+	 * @return int
+	 */
 	public static function getTime() {
 		return (new \DateTime())->getTimestamp();
 	}
@@ -27,10 +27,10 @@ 
 		return $secs . substr($millisecs, 2, 6);
 	}
 
-    /**
-     * Generates a Globally Unique ID
-     * @return string
-     */
+	/**
+	 * Generates a Globally Unique ID
+	 * @return string
+	 */
 	public static function GUID() {
 		if (function_exists('com_create_guid') === true)
 		{

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

@@ -52,19 +52,19 @@
 		//Sharing stuff
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
-        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
-        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
-        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
-        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
-        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
-        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
-        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
-        ['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
-        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
-        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
-        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
-        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
+		['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
+		['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+		['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
+		['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
+		['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
+		['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
+		['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
+		['name' => 'share#unshareCredentialFromUser', 'url' => '/api/v2/sharing/credential/{item_guid}/{user_id}', 'verb' => 'DELETE'],
+		['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
+		['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
+		['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
+		['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
 
 		//Internal API
 		['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'],

lib/Utility/PermissionEntity.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@
 use OCP\AppFramework\Db\Entity;
 
 class PermissionEntity extends Entity {
-	CONST READ  =   0b00000001;
-	CONST WRITE =   0b00000010;
-	CONST FILES =   0b00000100;
+	CONST READ  = 0b00000001;
+	CONST WRITE = 0b00000010;
+	CONST FILES = 0b00000100;
 	CONST HISTORY = 0b00001000;
-	CONST OWNER =   0b10000000;
+	CONST OWNER = 0b10000000;
 
 	/**
 	 * Checks wether a user matches one or more permissions at once

lib/Db/SharingACLMapper.php

Spacing +7 added lines, -7 removed lines

@@ -29,13 +29,13 @@ 
 	 * @param $item_guid
 	 * @return SharingACL[]
 	 */
-	public function getCredentialPermissions(IUser $userId, $item_guid){
-		$sql = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND item_guid = ?";
+	public function getCredentialPermissions(IUser $userId, $item_guid) {
+		$sql = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND item_guid = ?";
 
 		return $this->findEntities($sql, [$userId, $item_guid]);
 	}
 
-	public function createACLEntry(SharingACL $acl){
+	public function createACLEntry(SharingACL $acl) {
 		return $this->insert($acl);
 	}
 
@@ -46,7 +46,7 @@ 
 	 * @return SharingACL[]
 	 */
 	public function getVaultEntries($user_id, $vault_id) {
-		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE user_id = ? AND vault_guid = ?";
 		return $this->findEntities($q, [$user_id, $vault_id]);
 	}
 
@@ -59,7 +59,7 @@ 
 	public function getItemACL($user_id, $item_guid) {
 		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ? AND ";
 		$filter = [$item_guid];
-		if ($user_id === null){
+		if ($user_id === null) {
 			$q .= 'user_id is null';
 		}
 		else {
@@ -86,11 +86,11 @@ 
 	 * @return SharingACL[]
 	 */
 	public function getCredentialAclList($item_guid) {
-		$q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+		$q = "SELECT * FROM " . self::TABLE_NAME . " WHERE item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
 
-	public function deleteShareACL(SharingACL $ACL){
+	public function deleteShareACL(SharingACL $ACL) {
 		return $this->delete($ACL);
 	}
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 		$filter = [$item_guid];
 		if ($user_id === null){
 			$q .= 'user_id is null';
-		}
-		else {
+		} else {
 			$q .= 'user_id = ? ';
 			$filter[] = $user_id;
 		}