nextcloud / passman

lib/Service/EncryptService.php

Braces +3 added lines, -1 removed lines

@@ -272,7 +272,9 @@
 	protected function unpad($data) {
 		$length = $this->getKeySize();
 		$last = ord($data[strlen($data) - 1]);
-		if ($last > $length) return false;
+		if ($last > $length) {
+			return false;
+		}
 		if (substr($data, -1 * $last) !== str_repeat(chr($last), $last)) {
 			return false;
 		}

Doc Comments +9 added lines, -5 removed lines

@@ -205,6 +205,10 @@ 
 		return array($cipherKey, $macKey, $iv);
 	}
 
+	/**
+	 * @param string $a
+	 * @param string $b
+	 */
 	protected function hash_equals($a, $b) {
 		if (function_exists('random_bytes')) {
 			$key = random_bytes(128);
@@ -246,7 +250,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -262,8 +266,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();
@@ -280,7 +284,7 @@ 
 	 * Encrypt a credential
 	 *
 	 * @param Credential|array $credential the credential to decrypt
-	 * @return Credential|array
+	 * @return string
 	 */
 	public function decryptCredential($credential) {
 		return $this->handleCredential($credential, EncryptService::OP_DECRYPT);
@@ -353,7 +357,7 @@ 
 	/**
 	 * Decrypt a file
 	 *
-	 * @param  File|array $file
+	 * @param  File $file
 	 * @return File|array
 	 */
 

migration/serversideencryption.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		}
 	}
 
-	private function fetchAll($sql){
+	private function fetchAll($sql) {
 		return $this->db->executeQuery($sql)->fetchAll();
 	}
 

Braces +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 		}
 	}
 
-	private function fetchAll($sql){
+	private function fetchAll($sql) {
 		return $this->db->executeQuery($sql)->fetchAll();
 	}
 

middleware/sharemiddleware.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
 			$sharing_enabled = ($this->settings->isEnabled($setting));
 
-			if(in_array($methodName, $user_pub_methods)){
+			if (in_array($methodName, $user_pub_methods)) {
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
 			}
 

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			$setting = (in_array($methodName, $publicMethods)) ? 'link_sharing_enabled' : 'user_sharing_enabled';
 			$sharing_enabled = ($this->settings->isEnabled($setting));
 
-			if(in_array($methodName, $user_pub_methods)){
+			if(in_array($methodName, $user_pub_methods)) {
 				$sharing_enabled = ($this->settings->isEnabled('link_sharing_enabled') || $this->settings->isEnabled('user_sharing_enabled'));
 			}
 

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

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -47,7 +47,7 @@ 
      * @return SharingACL[]
      */
     public function getVaultEntries($user_id, $vault_guid) {
-        $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_guid]);
     }
 
@@ -61,7 +61,7 @@ 
         $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){
+        if ($user_id !== null) {
 			$filter[] = $user_id;
         }
 
@@ -85,11 +85,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 +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         parent::__construct($db, 'passman_sharing_acl');
     }
 
-    public function createACLEntry(SharingACL $acl){
+    public function createACLEntry(SharingACL $acl) {
         return $this->insert($acl);
     }
 
@@ -61,7 +61,7 @@ 
         $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){
+        if ($user_id !== null) {
 			$filter[] = $user_id;
         }
 
@@ -89,7 +89,7 @@ 
         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

controller/internalcontroller.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function remind($credential_id) {
 		$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
-		if($credential) {
+		if ($credential) {
 			$credential->setExpireTime(time() + (24 * 60 * 60));
 			$this->credentialService->upd($credential);
 
@@ -59,7 +59,7 @@ 
 	public function read($credential_id) {
 
 		$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
-		if($credential) {
+		if ($credential) {
 			$credential->setExpireTime(0);
 			$this->credentialService->upd($credential);
 

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

controller/vaultcontroller.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 			foreach ($vaults as $vault) {
 				$credential = $this->credentialService->getRandomCredentialByVaultId($vault->getId(), $this->userId);
 				$secret_field = $protected_credential_fields[array_rand($protected_credential_fields)];
-				if(isset($credential)) {
+				if (isset($credential)) {
 					array_push($result, array(
 						'vault_id' => $vault->getId(),
 						'guid' => $vault->getGuid(),

lib/Db/VaultMapper.php

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 	 * @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];
@@ -75,7 +75,7 @@ 
 	 * @param $userId
 	 * @return Vault
 	 */
-	public function create($vault_name, $userId){
+	public function create($vault_name, $userId) {
 		$vault = new Vault();
 		$vault->setName($vault_name);
 		$vault->setUserId($userId);
@@ -90,7 +90,7 @@ 
 	 * @param $vault_id
 	 * @param $user_id
 	 */
-	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);
@@ -102,7 +102,7 @@ 
 	 * Update vault
 	 * @param Vault $vault
 	 */
-	public function updateVault(Vault $vault){
+	public function updateVault(Vault $vault) {
 		$this->update($vault);
 	}
 
@@ -112,7 +112,7 @@ 
 	 * @param $privateKey
 	 * @param $publicKey
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		$vault = new Vault();
 		$vault->setId($vault_id);
 		$vault->setPrivateSharingKey($privateKey);
@@ -125,7 +125,7 @@ 
 	 * Delete a vault
 	 * @param Vault $vault
 	 */
-	public function deleteVault(Vault $vault){
+	public function deleteVault(Vault $vault) {
 		$this->delete($vault);
 	}
 }
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 	 * @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];
@@ -75,7 +75,7 @@ 
 	 * @param $userId
 	 * @return Vault
 	 */
-	public function create($vault_name, $userId){
+	public function create($vault_name, $userId) {
 		$vault = new Vault();
 		$vault->setName($vault_name);
 		$vault->setUserId($userId);
@@ -90,7 +90,7 @@ 
 	 * @param $vault_id
 	 * @param $user_id
 	 */
-	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);
@@ -102,7 +102,7 @@ 
 	 * Update vault
 	 * @param Vault $vault
 	 */
-	public function updateVault(Vault $vault){
+	public function updateVault(Vault $vault) {
 		$this->update($vault);
 	}
 
@@ -112,7 +112,7 @@ 
 	 * @param $privateKey
 	 * @param $publicKey
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		$vault = new Vault();
 		$vault->setId($vault_id);
 		$vault->setPrivateSharingKey($privateKey);
@@ -125,7 +125,7 @@ 
 	 * Delete a vault
 	 * @param Vault $vault
 	 */
-	public function deleteVault(Vault $vault){
+	public function deleteVault(Vault $vault) {
 		$this->delete($vault);
 	}
 }
\ No newline at end of file

lib/Service/VaultService.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
 	 * @param $vault_id
 	 * @param $user_id
 	 */
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
@@ -102,7 +102,7 @@ 
 	 * @param $privateKey
 	 * @param $publicKey
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 
@@ -111,9 +111,9 @@ 
 	 * @param string $vault_guid
 	 * @param string $user_id
 	 */
-	public function deleteVault($vault_guid, $user_id){
+	public function deleteVault($vault_guid, $user_id) {
 		$vault = $this->getByGuid($vault_guid, $user_id);
-		if($vault instanceof Vault) {
+		if ($vault instanceof Vault) {
 			$this->vaultMapper->deleteVault($vault);
 		}
 	}

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	 * @param $vault_id
 	 * @param $user_id
 	 */
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
@@ -102,7 +102,7 @@ 
 	 * @param $privateKey
 	 * @param $publicKey
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 
@@ -111,7 +111,7 @@ 
 	 * @param string $vault_guid
 	 * @param string $user_id
 	 */
-	public function deleteVault($vault_guid, $user_id){
+	public function deleteVault($vault_guid, $user_id) {
 		$vault = $this->getByGuid($vault_guid, $user_id);
 		if($vault instanceof Vault) {
 			$this->vaultMapper->deleteVault($vault);