nextcloud / passman

lib/Activity.php

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
 				array(
 					'id' => 'passman',
 					'name' => (string) $l->t('Passwords'),
-					'url' => '',//FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
+					'url' => '', //FIXME: $this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
 				),
 			),
 		);

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

Braces +2 added lines, -4 removed lines

@@ -35,8 +35,7 @@ 
  * @method string getSharedKey()
  */
 
-class SharingACL extends PermissionEntity implements \JsonSerializable
-{
+class SharingACL extends PermissionEntity implements \JsonSerializable {
 
     protected
         $itemId,
@@ -67,8 +66,7 @@ 
      * which is a value of any type other than a resource.
      * @since 5.4.0
      */
-    function jsonSerialize()
-    {
+    function jsonSerialize() {
         return [
             'acl_id' => $this->getId(),
             'item_id' => $this->getItemId(),

lib/Db/CredentialMapper.php

Indentation +16 added lines, -16 removed lines

@@ -44,18 +44,18 @@ 
 		return $this->findEntities($sql, [$timestamp]);
 	}
 
-    /**
-     * @param $credential_id
-     * @param null $user_id
-     * @return Credential
-     */
+	/**
+	 * @param $credential_id
+	 * @param null $user_id
+	 * @return Credential
+	 */
 	public function getCredentialById($credential_id, $user_id = null){
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ?';
-        // If we want to check the owner, add it to the query
+		// If we want to check the owner, add it to the query
 		$params = [$credential_id];
-        if ($user_id !== null){
-        	$sql .= ' and `user_id` = ? ';
+		if ($user_id !== null){
+			$sql .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
 		return $this->findEntity($sql,$params);
@@ -135,18 +135,18 @@ 
 		$this->update($credential);
 	}
 
-    /**
-     * Finds a credential by the given guid
-     * @param $credential_guid
-     * @return Credential
-     */
+	/**
+	 * Finds a credential by the given guid
+	 * @param $credential_guid
+	 * @return Credential
+	 */
 	public function getCredentialByGUID($credential_guid, $user_id = null){
-	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
+		$q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
 		$params = [$credential_guid];
 		if ($user_id !== null){
 			$q .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
-        return $this->findEntity($q, $params);
-    }
+		return $this->findEntity($q, $params);
+	}
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -38,7 +38,7 @@ 
 		return $this->findEntities($sql, [$user_id, $vault_id]);
 	}
 
-	public function getExpiredCredentials($timestamp){
+	public function getExpiredCredentials($timestamp) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
 		return $this->findEntities($sql, [$timestamp]);
@@ -49,25 +49,25 @@ 
      * @param null $user_id
      * @return Credential
      */
-	public function getCredentialById($credential_id, $user_id = null){
+	public function getCredentialById($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ?';
         // If we want to check the owner, add it to the query
 		$params = [$credential_id];
-        if ($user_id !== null){
+        if ($user_id !== null) {
         	$sql .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
-		return $this->findEntity($sql,$params);
+		return $this->findEntity($sql, $params);
 	}
 
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ? ';
-		return $this->findEntity($sql,[$credential_id]);
+		return $this->findEntity($sql, [$credential_id]);
 	}
 
-	public function create($raw_credential){
+	public function create($raw_credential) {
 		$credential = new Credential();
 
 		$credential->setGuid($this->utils->GUID());
@@ -94,11 +94,11 @@ 
 		return parent::insert($credential);
 	}
 
-	public function updateCredential($raw_credential){
-		if(!$raw_credential['guid']){
-			$raw_credential['guid'] =  $this->utils->GUID();
+	public function updateCredential($raw_credential) {
+		if (!$raw_credential['guid']) {
+			$raw_credential['guid'] = $this->utils->GUID();
 		}
-		if(!$raw_credential['created']){
+		if (!$raw_credential['created']) {
 			$raw_credential['created'] = $this->utils->getTime();
 		}
 		$credential = new Credential();
@@ -127,11 +127,11 @@ 
 		return parent::update($credential);
 	}
 
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		$this->delete($credential);
 	}
 
-	public function upd(Credential $credential){
+	public function upd(Credential $credential) {
 		$this->update($credential);
 	}
 
@@ -140,10 +140,10 @@ 
      * @param $credential_guid
      * @return Credential
      */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
 		$params = [$credential_guid];
-		if ($user_id !== null){
+		if ($user_id !== null) {
 			$q .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}

Braces +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
 		return $this->findEntities($sql, [$user_id, $vault_id]);
 	}
 
-	public function getExpiredCredentials($timestamp){
+	public function getExpiredCredentials($timestamp) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `expire_time` > 0 AND `expire_time` < ?';
 		return $this->findEntities($sql, [$timestamp]);
@@ -49,25 +49,25 @@ 
      * @param null $user_id
      * @return Credential
      */
-	public function getCredentialById($credential_id, $user_id = null){
+	public function getCredentialById($credential_id, $user_id = null) {
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ?';
         // If we want to check the owner, add it to the query
 		$params = [$credential_id];
-        if ($user_id !== null){
+        if ($user_id !== null) {
         	$sql .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}
 		return $this->findEntity($sql,$params);
 	}
 
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		$sql = 'SELECT id, label FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `id` = ? ';
 		return $this->findEntity($sql,[$credential_id]);
 	}
 
-	public function create($raw_credential){
+	public function create($raw_credential) {
 		$credential = new Credential();
 
 		$credential->setGuid($this->utils->GUID());
@@ -94,11 +94,11 @@ 
 		return parent::insert($credential);
 	}
 
-	public function updateCredential($raw_credential){
-		if(!$raw_credential['guid']){
+	public function updateCredential($raw_credential) {
+		if(!$raw_credential['guid']) {
 			$raw_credential['guid'] =  $this->utils->GUID();
 		}
-		if(!$raw_credential['created']){
+		if(!$raw_credential['created']) {
 			$raw_credential['created'] = $this->utils->getTime();
 		}
 		$credential = new Credential();
@@ -127,11 +127,11 @@ 
 		return parent::update($credential);
 	}
 
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		$this->delete($credential);
 	}
 
-	public function upd(Credential $credential){
+	public function upd(Credential $credential) {
 		$this->update($credential);
 	}
 
@@ -140,10 +140,10 @@ 
      * @param $credential_guid
      * @return Credential
      */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 	    $q = 'SELECT * FROM `*PREFIX*passman_credentials` WHERE guid = ? ';
 		$params = [$credential_guid];
-		if ($user_id !== null){
+		if ($user_id !== null) {
 			$q .= ' and `user_id` = ? ';
 			array_push($params, $user_id);
 		}

lib/Db/Vault.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
  */
 
 
-class Vault extends Entity implements  \JsonSerializable{
+class Vault extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
  */
 
 
-class Vault extends Entity implements  \JsonSerializable{
+class Vault extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

lib/Db/File.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  * @method integer getId()
  * @method void setId(integer $value)
-  * @method void setGuid(string $value)
+ * @method void setGuid(string $value)
  * @method string getGuid()
  * @method void setUserId(string $value)
  * @method string getUserid()

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 
-class File extends Entity implements  \JsonSerializable{
+class File extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 
 
-class File extends Entity implements  \JsonSerializable{
+class File extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

lib/Db/Credential.php

Indentation -3 removed lines

@@ -57,9 +57,6 @@
  * @method string getHidden()
  * @method void setSharedKey(string $value)
  * @method string getSharedKey()
-
-
-
  */
 
 

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
  */
 
 
-class Credential extends Entity implements  \JsonSerializable{
+class Credential extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
  */
 
 
-class Credential extends Entity implements  \JsonSerializable{
+class Credential extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

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);
 	}
 

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 			'WHERE `credential_id` = ?';
         $params = [$credential_id];
         if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
+            $sql .= ' and `user_id` = ? ';
             $params[] = $user_id;
         }
 		return $this->findEntities($sql, $params);
@@ -48,7 +48,7 @@ 
 			'WHERE `id` = ?';
         $params = [$revision_id];
         if ($user_id !== null) {
-            $sql.= ' and `user_id` = ? ';
+            $sql .= ' and `user_id` = ? ';
             $params[] = $user_id;
         }
 		return $this->findEntity($sql, $params);

lib/Db/ShareRequestMapper.php

Indentation +91 added lines, -91 removed lines

@@ -15,120 +15,120 @@
 use OCP\IDBConnection;
 
 class ShareRequestMapper extends Mapper {
-    const TABLE_NAME = 'passman_share_request';
-
-    public function __construct(IDBConnection $db, Utils $utils) {
-        parent::__construct($db, self::TABLE_NAME);
-        $this->utils = $utils;
-    }
-
-    public function createRequest(ShareRequest $request){
-        return $this->insert($request);
-    }
-
-    /**
-     * Obtains a request by the given item and vault GUID pair
-     * @param $item_guid
-     * @param $target_vault_guid
-     * @return ShareRequest
-     */
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
-        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
-        return $this->findEntity($q, [$item_guid, $target_vault_guid]);
-    }
-
-    /**
-     * Get shared items for the given item_guid
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
-    public function getRequestsByItemGuid($item_guid){
-        $this->db->executeQuery("SET sql_mode = '';");
-        $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
-        return $this->findEntities($q, [$item_guid]);
-    }
-
-    /**
-     * Deletes all pending requests for the given user to the given item
-     * @param $item_id          The item ID
-     * @param $target_user_id   The target user
-     * @return \PDOStatement    The result of running the db query
-     */
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
+	const TABLE_NAME = 'passman_share_request';
+
+	public function __construct(IDBConnection $db, Utils $utils) {
+		parent::__construct($db, self::TABLE_NAME);
+		$this->utils = $utils;
+	}
+
+	public function createRequest(ShareRequest $request){
+		return $this->insert($request);
+	}
+
+	/**
+	 * Obtains a request by the given item and vault GUID pair
+	 * @param $item_guid
+	 * @param $target_vault_guid
+	 * @return ShareRequest
+	 */
+	public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
+		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
+		return $this->findEntity($q, [$item_guid, $target_vault_guid]);
+	}
+
+	/**
+	 * Get shared items for the given item_guid
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
+	public function getRequestsByItemGuid($item_guid){
+		$this->db->executeQuery("SET sql_mode = '';");
+		$q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
+		return $this->findEntities($q, [$item_guid]);
+	}
+
+	/**
+	 * Deletes all pending requests for the given user to the given item
+	 * @param $item_id          The item ID
+	 * @param $target_user_id   The target user
+	 * @return \PDOStatement    The result of running the db query
+	 */
+	public function cleanItemRequestsForUser($item_id, $target_user_id){
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
 		$this->execute($q, [$item_id, $target_user_id]);
-        return $this->execute($q, [$item_id, $target_user_id]);
-    }
-
-    /**
-     * Obtains all pending share requests for the given user ID
-     * @param $user_id
-     * @return ShareRequest[]
-     */
-    public function getUserPendingRequests($user_id){
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
-        return $this->findEntities($q, [$user_id]);
-    }
-
-    /**
-     * Deletes the given share request
-     * @param ShareRequest $shareRequest    Request to delete
-     * @return ShareRequest                 The deleted request
-     */
-    public function deleteShareRequest(ShareRequest $shareRequest){
-    	return $this->delete($shareRequest);
+		return $this->execute($q, [$item_id, $target_user_id]);
+	}
+
+	/**
+	 * Obtains all pending share requests for the given user ID
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
+	public function getUserPendingRequests($user_id){
+		$q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
+		return $this->findEntities($q, [$user_id]);
 	}
 
-    /**
-     * Gets a share request by it's unique incremental id
-     * @param $id
-     * @return ShareRequest
-     */
+	/**
+	 * Deletes the given share request
+	 * @param ShareRequest $shareRequest    Request to delete
+	 * @return ShareRequest                 The deleted request
+	 */
+	public function deleteShareRequest(ShareRequest $shareRequest){
+		return $this->delete($shareRequest);
+	}
+
+	/**
+	 * Gets a share request by it's unique incremental id
+	 * @param $id
+	 * @return ShareRequest
+	 */
 	public function getShareRequestById($id){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
 
-    /**
-     * Gets all share requests by a given item GUID
-     * @param $item_guid
-     * @return ShareRequest[]
-     */
+	/**
+	 * Gets all share requests by a given item GUID
+	 * @param $item_guid
+	 * @return ShareRequest[]
+	 */
 	public function getShareRequestsByItemGuid($item_guid){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
 
-    /**
-     * Updates the given share request,
-     * @param ShareRequest $shareRequest
-     * @return ShareRequest
-     */
+	/**
+	 * Updates the given share request,
+	 * @param ShareRequest $shareRequest
+	 * @return ShareRequest
+	 */
 	public function updateShareRequest(ShareRequest $shareRequest){
 		return $this->update($shareRequest);
 	}
 
-    /**
-     * Finds pending requests sent to the given user to the given item.
-     * @param $item_guid
-     * @param $user_id
-     * @return ShareRequest[]
-     */
+	/**
+	 * Finds pending requests sent to the given user to the given item.
+	 * @param $item_guid
+	 * @param $user_id
+	 * @return ShareRequest[]
+	 */
 	public function getPendingShareRequests($item_guid, $user_id){
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
 		return $this->findEntities($q, [$item_guid, $user_id]);
 	}
 
-    /**
-     * Updates all pending requests with the given permissions
-     * @param $item_guid        The item for which to update the requests
-     * @param $user_id          The user for which to update the requests
-     * @param $permissions      The new permissions to apply
-     * @return \PDOStatement    The result of the operation
-     */
+	/**
+	 * Updates all pending requests with the given permissions
+	 * @param $item_guid        The item for which to update the requests
+	 * @param $user_id          The user for which to update the requests
+	 * @param $permissions      The new permissions to apply
+	 * @return \PDOStatement    The result of the operation
+	 */
 	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
-	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
-        return $this->execute($q, [$permissions, $item_guid, $user_id]);
-    }
+		$q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
+		return $this->execute($q, [$permissions, $item_guid, $user_id]);
+	}
 
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
         $this->utils = $utils;
     }
 
-    public function createRequest(ShareRequest $request){
+    public function createRequest(ShareRequest $request) {
         return $this->insert($request);
     }
 
@@ -32,7 +32,7 @@ 
      * @param $target_vault_guid
      * @return ShareRequest
      */
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
+    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
         $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
         return $this->findEntity($q, [$item_guid, $target_vault_guid]);
     }
@@ -42,7 +42,7 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuid($item_guid){
+    public function getRequestsByItemGuid($item_guid) {
         $this->db->executeQuery("SET sql_mode = '';");
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
         return $this->findEntities($q, [$item_guid]);
@@ -54,7 +54,7 @@ 
      * @param $target_user_id   The target user
      * @return \PDOStatement    The result of running the db query
      */
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
 		$this->execute($q, [$item_id, $target_user_id]);
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -65,8 +65,8 @@ 
      * @param $user_id
      * @return ShareRequest[]
      */
-    public function getUserPendingRequests($user_id){
-        $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
+    public function getUserPendingRequests($user_id) {
+        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE target_user_id = ?";
         return $this->findEntities($q, [$user_id]);
     }
 
@@ -75,7 +75,7 @@ 
      * @param ShareRequest $shareRequest    Request to delete
      * @return ShareRequest                 The deleted request
      */
-    public function deleteShareRequest(ShareRequest $shareRequest){
+    public function deleteShareRequest(ShareRequest $shareRequest) {
     	return $this->delete($shareRequest);
 	}
 
@@ -84,7 +84,7 @@ 
      * @param $id
      * @return ShareRequest
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -94,7 +94,7 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-	public function getShareRequestsByItemGuid($item_guid){
+	public function getShareRequestsByItemGuid($item_guid) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
@@ -104,7 +104,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -114,7 +114,7 @@ 
      * @param $user_id
      * @return ShareRequest[]
      */
-	public function getPendingShareRequests($item_guid, $user_id){
+	public function getPendingShareRequests($item_guid, $user_id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
 		return $this->findEntities($q, [$item_guid, $user_id]);
 	}
@@ -126,7 +126,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) {
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
     }

Braces +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
         $this->utils = $utils;
     }
 
-    public function createRequest(ShareRequest $request){
+    public function createRequest(ShareRequest $request) {
         return $this->insert($request);
     }
 
@@ -32,7 +32,7 @@ 
      * @param $target_vault_guid
      * @return ShareRequest
      */
-    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid){
+    public function getRequestByItemAndVaultGuid($item_guid, $target_vault_guid) {
         $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? AND target_vault_guid = ?";
         return $this->findEntity($q, [$item_guid, $target_vault_guid]);
     }
@@ -42,7 +42,7 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuid($item_guid){
+    public function getRequestsByItemGuid($item_guid) {
         $this->db->executeQuery("SET sql_mode = '';");
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
         return $this->findEntities($q, [$item_guid]);
@@ -54,7 +54,7 @@ 
      * @param $target_user_id   The target user
      * @return \PDOStatement    The result of running the db query
      */
-    public function cleanItemRequestsForUser($item_id, $target_user_id){
+    public function cleanItemRequestsForUser($item_id, $target_user_id) {
 		$q = "DELETE FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_id = ? AND target_user_id = ?";
 		$this->execute($q, [$item_id, $target_user_id]);
         return $this->execute($q, [$item_id, $target_user_id]);
@@ -65,7 +65,7 @@ 
      * @param $user_id
      * @return ShareRequest[]
      */
-    public function getUserPendingRequests($user_id){
+    public function getUserPendingRequests($user_id) {
         $q = "SELECT * FROM *PREFIX*". self::TABLE_NAME ." WHERE target_user_id = ?";
         return $this->findEntities($q, [$user_id]);
     }
@@ -75,7 +75,7 @@ 
      * @param ShareRequest $shareRequest    Request to delete
      * @return ShareRequest                 The deleted request
      */
-    public function deleteShareRequest(ShareRequest $shareRequest){
+    public function deleteShareRequest(ShareRequest $shareRequest) {
     	return $this->delete($shareRequest);
 	}
 
@@ -84,7 +84,7 @@ 
      * @param $id
      * @return ShareRequest
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -94,7 +94,7 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-	public function getShareRequestsByItemGuid($item_guid){
+	public function getShareRequestsByItemGuid($item_guid) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
 		return $this->findEntities($q, [$item_guid]);
 	}
@@ -104,7 +104,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -114,7 +114,7 @@ 
      * @param $user_id
      * @return ShareRequest[]
      */
-	public function getPendingShareRequests($item_guid, $user_id){
+	public function getPendingShareRequests($item_guid, $user_id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ? and target_user_id= ?";
 		return $this->findEntities($q, [$item_guid, $user_id]);
 	}
@@ -126,7 +126,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendinRequestPermissions($item_guid, $user_id, $permissions) {
 	    $q = "UPDATE *PREFIX*" . self::TABLE_NAME . " SET permissions = ? WHERE item_guid = ? AND target_user_id = ?";
         return $this->execute($q, [$permissions, $item_guid, $user_id]);
     }

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);

Braces +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);