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: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
+					'url' => '', //FIXME: Currenlty we cannot link directly to links, so this needs to be fixed... this->URLGenerator->linkToRoute('activity.Activities.showList', array('filter' => 'passman')),
 				),
 			),
 		);

lib/Db/ShareRequestMapper.php

Indentation +91 added lines, -91 removed lines

@@ -16,122 +16,122 @@
 use OCP\IDBConnection;
 
 class ShareRequestMapper extends Mapper {
-    const TABLE_NAME = 'passman_share_request';
-
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, self::TABLE_NAME);
-    }
-
-    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 getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
-    		$this->db->executeQuery("SET sql_mode = '';");
+	const TABLE_NAME = 'passman_share_request';
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, self::TABLE_NAME);
+	}
+
+	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 getRequestsByItemGuidGroupedByUser($item_guid){
+		if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+			$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 = "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
 	 * @throws DoesNotExistException
-     */
+	 */
 	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 +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, self::TABLE_NAME);
     }
 
-    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,8 +42,8 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
     		$this->db->executeQuery("SET sql_mode = '';");
 		}
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,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]);
@@ -67,8 +67,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]);
     }
 
@@ -77,7 +77,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);
 	}
 
@@ -87,7 +87,7 @@ 
      * @return ShareRequest
 	 * @throws DoesNotExistException
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -97,7 +97,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]);
 	}
@@ -107,7 +107,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -117,7 +117,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]);
 	}
@@ -129,7 +129,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendingRequestPermissions($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 +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
         parent::__construct($db, self::TABLE_NAME);
     }
 
-    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,8 +42,8 @@ 
      * @param $item_guid
      * @return ShareRequest[]
      */
-    public function getRequestsByItemGuidGroupedByUser($item_guid){
-    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql'){
+    public function getRequestsByItemGuidGroupedByUser($item_guid) {
+    	if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
     		$this->db->executeQuery("SET sql_mode = '';");
 		}
         $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
@@ -56,7 +56,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]);
@@ -67,7 +67,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]);
     }
@@ -77,7 +77,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);
 	}
 
@@ -87,7 +87,7 @@ 
      * @return ShareRequest
 	 * @throws DoesNotExistException
      */
-	public function getShareRequestById($id){
+	public function getShareRequestById($id) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
@@ -97,7 +97,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]);
 	}
@@ -107,7 +107,7 @@ 
      * @param ShareRequest $shareRequest
      * @return ShareRequest
      */
-	public function updateShareRequest(ShareRequest $shareRequest){
+	public function updateShareRequest(ShareRequest $shareRequest) {
 		return $this->update($shareRequest);
 	}
 
@@ -117,7 +117,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]);
 	}
@@ -129,7 +129,7 @@ 
      * @param $permissions      The new permissions to apply
      * @return \PDOStatement    The result of the operation
      */
-	public function updatePendingRequestPermissions($item_guid, $user_id, $permissions){
+	public function updatePendingRequestPermissions($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/CredentialMapper.php

Braces +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
 	 * @param $timestamp
 	 * @return Credential[]
 	 */
-	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]);
@@ -61,12 +61,12 @@ 
      * @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);
 		}
@@ -77,7 +77,7 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	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]);
@@ -87,7 +87,7 @@ 
 	 * @param $raw_credential
 	 * @return Credential
 	 */
-	public function create($raw_credential){
+	public function create($raw_credential) {
 		$credential = new Credential();
 
 		$credential->setGuid($this->utils->GUID());
@@ -118,7 +118,7 @@ 
 	 * @param $raw_credential array An array containing all the credential fields
 	 * @return Credential The updated credential
 	 */
-	public function updateCredential($raw_credential){
+	public function updateCredential($raw_credential) {
 		$original = $this->getCredentialByGUID($raw_credential['guid']);
 		$credential = new Credential();
 		$credential->setId($original->getId());
@@ -146,11 +146,11 @@ 
 		return parent::update($credential);
 	}
 
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->delete($credential);
 	}
 
-	public function upd(Credential $credential){
+	public function upd(Credential $credential) {
 		$this->update($credential);
 	}
 
@@ -159,10 +159,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);
 		}

Indentation +16 added lines, -16 removed lines

@@ -73,20 +73,20 @@ 
 		return $this->findEntities($sql, [$timestamp]);
 	}
 
-    /**
+	/**
 	 * Get an credential by id.
 	 * Optional user id
-     * @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);
@@ -176,18 +176,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 +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
 		$sql = 'SELECT * FROM `*PREFIX*passman_credentials` ' .
 			'WHERE `user_id` = ? and vault_id = ? AND shared_key is NULL LIMIT 20';
 		$entities = $this->findEntities($sql, [$user_id, $vault_id]);
-		$count = count($entities)-1;
+		$count = count($entities) - 1;
 		$entities = array_splice($entities, rand(0, $count), 1);
 		return $entities;
 	}
@@ -67,7 +67,7 @@ 
 	 * @param $timestamp
 	 * @return Credential[]
 	 */
-	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]);
@@ -80,16 +80,16 @@ 
      * @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);
 	}
 
 	/**
@@ -97,10 +97,10 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	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]);
 	}
 
 	/**
@@ -108,7 +108,7 @@ 
 	 * @param $raw_credential
 	 * @return Credential
 	 */
-	public function create($raw_credential){
+	public function create($raw_credential) {
 		$credential = new Credential();
 
 		$credential->setGuid($this->utils->GUID());
@@ -131,7 +131,7 @@ 
 		$credential->setCustomFields($raw_credential['custom_fields']);
 		$credential->setOtp($raw_credential['otp']);
 		$credential->setHidden($raw_credential['hidden']);
-		if(isset($raw_credential['shared_key'])) {
+		if (isset($raw_credential['shared_key'])) {
 			$credential->setSharedKey($raw_credential['shared_key']);
 		}
 		return parent::insert($credential);
@@ -142,7 +142,7 @@ 
 	 * @param $raw_credential array An array containing all the credential fields
 	 * @return Credential The updated credential
 	 */
-	public function updateCredential($raw_credential){
+	public function updateCredential($raw_credential) {
 		$original = $this->getCredentialByGUID($raw_credential['guid']);
 		$credential = new Credential();
 		$credential->setId($original->getId());
@@ -170,11 +170,11 @@ 
 		return parent::update($credential);
 	}
 
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->delete($credential);
 	}
 
-	public function upd(Credential $credential){
+	public function upd(Credential $credential) {
 		$this->update($credential);
 	}
 
@@ -183,10 +183,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/Service/CredentialService.php

Spacing +5 added lines, -5 removed lines

@@ -75,7 +75,7 @@ 
 	 * @param Credential $credential
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -116,9 +116,9 @@ 
 	 * @return Credential
 	 * @throws DoesNotExistException
 	 */
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
         }
         else {
@@ -135,7 +135,7 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @param null $user_id
 	 * @return Credential
 	 */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
     }
 }
\ No newline at end of file

Braces +6 added lines, -7 removed lines

@@ -75,7 +75,7 @@ 
 	 * @param Credential $credential
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function deleteCredential(Credential $credential){
+	public function deleteCredential(Credential $credential) {
 		return $this->credentialMapper->deleteCredential($credential);
 	}
 
@@ -116,12 +116,11 @@ 
 	 * @return Credential
 	 * @throws DoesNotExistException
 	 */
-	public function getCredentialById($credential_id, $user_id){
+	public function getCredentialById($credential_id, $user_id) {
         $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
+        if ($credential->getUserId() === $user_id) {
             return $credential;
-        }
-        else {
+        } else {
             $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
             if ($acl->hasPermission(SharingACL::READ));
             return $credential;
@@ -135,7 +134,7 @@ 
 	 * @param $credential_id
 	 * @return Credential
 	 */
-	public function getCredentialLabelById($credential_id){
+	public function getCredentialLabelById($credential_id) {
 		return $this->credentialMapper->getCredentialLabelById($credential_id);
 	}
 
@@ -145,7 +144,7 @@ 
 	 * @param null $user_id
 	 * @return Credential
 	 */
-	public function getCredentialByGUID($credential_guid, $user_id = null){
+	public function getCredentialByGUID($credential_guid, $user_id = null) {
 	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
     }
 }
\ No newline at end of file

Indentation +12 added lines, -12 removed lines

@@ -36,11 +36,11 @@ 
 class CredentialService {
 
 	private $credentialMapper;
-    private $sharingACL;
+	private $sharingACL;
 
 	public function __construct(CredentialMapper $credentialMapper, SharingACLMapper $sharingACL) {
 		$this->credentialMapper = $credentialMapper;
-        $this->sharingACL = $sharingACL;
+		$this->sharingACL = $sharingACL;
 	}
 
 	/**
@@ -117,18 +117,18 @@ 
 	 * @throws DoesNotExistException
 	 */
 	public function getCredentialById($credential_id, $user_id){
-        $credential = $this->credentialMapper->getCredentialById($credential_id);
-        if ($credential->getUserId() === $user_id){
-            return $credential;
-        }
-        else {
-            $acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
-            if ($acl->hasPermission(SharingACL::READ)) {
+		$credential = $this->credentialMapper->getCredentialById($credential_id);
+		if ($credential->getUserId() === $user_id){
+			return $credential;
+		}
+		else {
+			$acl = $this->sharingACL->getItemACL($user_id, $credential->getGuid());
+			if ($acl->hasPermission(SharingACL::READ)) {
 				return $credential;
 			} else {
 				throw new DoesNotExistException("Did expect one result but found none when executing");
 			}
-        }
+		}
 	}
 
 	/**
@@ -147,6 +147,6 @@ 
 	 * @return Credential
 	 */
 	public function getCredentialByGUID($credential_guid, $user_id = null){
-	    return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
-    }
+		return $this->credentialMapper->getCredentialByGUID($credential_guid, $user_id);
+	}
 }
\ No newline at end of file

lib/Service/ActivityService.php

Spacing +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@
 	 * @param $type string
 	 * @return array
 	 */
-	public function add($subject,$subjectParams=array(),
-						$message='',$messageParams=array(),
-						$link='',$user=null,$type='') {
-		if($user) {
+	public function add($subject, $subjectParams = array(),
+						$message = '', $messageParams = array(),
+						$link = '', $user = null, $type = '') {
+		if ($user) {
 			$activity = $this->manager->generateEvent();
 			$activity->setType($type);
 			$activity->setApp('passman');

controller/credentialcontroller.php

Spacing +2 added lines, -2 removed lines

@@ -163,13 +163,13 @@
 				$activity . '_self', array($label, $this->userId, $revision_created),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) {
+		} else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) {
 			$activity = 'item_deleted';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),
 				'', array(),
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
-		} else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) {
+		} else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) {
 			$activity = 'item_recovered';
 			$this->activityService->add(
 				$activity . '_self', array($label, $this->userId),

templates/part.admin.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 		<h2><?php p($l->t('Passman Settings')); ?></h2>
 		<?php
 		if ($checkVersion) {
-			p($l->t('Github version:'). ' '. $githubVersion);
+			p($l->t('Github version:') . ' ' . $githubVersion);
 			print '<br />';
 		} ?>
 		Local version: <?php p($localVersion); ?><br/>

lib/AppInfo/Application.php

Spacing +8 added lines, -8 removed lines

@@ -51,17 +51,17 @@ 
 		parent::__construct('passman');
 		$container = $this->getContainer();
 		// Allow automatic DI for the View, until we migrated to Nodes API
-		$container->registerService(View::class, function () {
+		$container->registerService(View::class, function() {
 			return new View('');
 		}, false);
-		$container->registerService('isCLI', function () {
+		$container->registerService('isCLI', function() {
 			return \OC::$CLI;
 		});
 
 		/**
 		 * Middleware
 		 */
-		$container->registerService('ShareMiddleware', function ($c) {
+		$container->registerService('ShareMiddleware', function($c) {
 			return new ShareMiddleware($c->query('SettingsService'));
 		});
 		$container->registerMiddleware('ShareMiddleware');
@@ -69,7 +69,7 @@ 
 		/**
 		 * Controllers
 		 */
-		$container->registerService('ShareController', function ($c) {
+		$container->registerService('ShareController', function($c) {
 			$container = $this->getContainer();
 			$server = $container->getServer();
 			return new ShareController(
@@ -90,7 +90,7 @@ 
 
 
 		/** Cron **/
-		$container->registerService('CronService', function ($c) {
+		$container->registerService('CronService', function($c) {
 			return new CronService(
 				$c->query('CredentialService'),
 				$c->query('Logger'),
@@ -101,11 +101,11 @@ 
 			);
 		});
 
-		$container->registerService('Db', function () {
+		$container->registerService('Db', function() {
 			return new Db();
 		});
 
-		$container->registerService('Logger', function ($c) {
+		$container->registerService('Logger', function($c) {
 			return $c->query('ServerContainer')->getLogger();
 		});
 
@@ -133,7 +133,7 @@ 
 		$c = $this->getContainer();
 		/** @var \OCP\IServerContainer $server */
 		$server = $c->getServer();
-		$navigationEntry = function () use ($c, $server) {
+		$navigationEntry = function() use ($c, $server) {
 			return [
 				'id' => $c->getAppName(),
 				'order' => 10,

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 use OCA\Passman\Service\VaultService;
 use OCA\Passman\Utility\Utils;
 use OCA\Passman\Service\NotificationService;
-Use OCA\Passman\Service\SettingsService;
+use OCA\Passman\Service\SettingsService;
 use OCP\IConfig;
 use OCP\IDBConnection;
 

lib/Service/SettingsService.php

Doc Comments +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 	 * Get a app setting
 	 *
 	 * @param $key string
-	 * @param null $default_value The default value if key does not exist
+	 * @param boolean $default_value The default value if key does not exist
 	 * @return mixed
 	 */
 	public function getAppSetting($key, $default_value = null) {
@@ -110,7 +110,7 @@ 
 	/**
 	 * Check if an setting is enabled (value of 1)
 	 *
-	 * @param $setting
+	 * @param string $setting
 	 * @return bool
 	 */
 	public function isEnabled($setting) {