nextcloud / passman

lib/Service/EncryptService.php

Doc Comments +9 added lines, -5 removed lines

@@ -213,6 +213,10 @@ 
 		return array($cipherKey, $macKey, $iv);
 	}
 
+	/**
+	 * @param string $a
+	 * @param string $b
+	 */
 	function hash_equals($a, $b) {
 		$key = openssl_random_pseudo_bytes(128);
 		return hash_hmac('sha512', $a, $key) === hash_hmac('sha512', $b, $key);
@@ -250,7 +254,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -266,8 +270,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();
@@ -284,7 +288,7 @@ 
 	 * Encrypt a credential
 	 *
 	 * @param array|Credential $credential the credential to decrypt
-	 * @return Credential|array
+	 * @return string
 	 */
 	public function decryptCredential($credential) {
 
@@ -380,7 +384,7 @@ 
 	/**
 	 * Decrypt a file
 	 *
-	 * @param  File|array $file
+	 * @param  File $file
 	 * @return File|array
 	 */
 

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

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

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	public function __construct($AppName,
 								IRequest $request,
 								$UserId,
-								FileService $fileService){
+								FileService $fileService) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->fileService = $fileService;
@@ -59,20 +59,20 @@ 
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	public function updateFile($file_id, $file_data, $filename){
-		try{
+	public function updateFile($file_id, $file_data, $filename) {
+		try {
 			$file = $this->fileService->getFile($file_id, $this->userId);
-		} catch (\Exception $doesNotExistException){
+		} catch (\Exception $doesNotExistException) {
 
 		}
-		if($file){
-			if($file_data) {
+		if ($file) {
+			if ($file_data) {
 				$file->setFileData($file_data);
 			}
-			if($filename) {
+			if ($filename) {
 				$file->setFilename($filename);
 			}
-			if($filename || $file_data){
+			if ($filename || $file_data) {
 				new JSONResponse($this->fileService->updateFile($file));
 			}
 		}

Braces +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 	public function __construct($AppName,
 								IRequest $request,
 								$UserId,
-								FileService $fileService){
+								FileService $fileService) {
 		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->fileService = $fileService;
@@ -59,20 +59,20 @@ 
 		return new JSONResponse($this->fileService->deleteFile($file_id, $this->userId));
 	}
 
-	public function updateFile($file_id, $file_data, $filename){
+	public function updateFile($file_id, $file_data, $filename) {
 		try{
 			$file = $this->fileService->getFile($file_id, $this->userId);
 		} catch (\Exception $doesNotExistException){
 
 		}
-		if($file){
+		if($file) {
 			if($file_data) {
 				$file->setFileData($file_data);
 			}
 			if($filename) {
 				$file->setFilename($filename);
 			}
-			if($filename || $file_data){
+			if($filename || $file_data) {
 				new JSONResponse($this->fileService->updateFile($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/credentialcontroller.php

Braces +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
 			$credential['shared_key'] = '';
 		}
 
-		if(!isset($credential['shared_key'])){
+		if(!isset($credential['shared_key'])) {
 			$credential['shared_key'] = $storedCredential->getSharedKey();
 		}
 
@@ -267,7 +267,7 @@ 
 				'', array(),
 				'', $this->userId, Activity::TYPE_ITEM_ACTION);
 			$this->sharingService->unshareCredential($credential->getGuid());
-			foreach($this->credentialRevisionService->getRevisions($credential->getId()) as $revision){
+			foreach($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
 				$this->credentialRevisionService->deleteRevision($revision->getId(), $this->userId);
 			}
 		} else {

Spacing +5 added lines, -5 removed lines

@@ -168,13 +168,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),
@@ -242,7 +242,7 @@ 
 			$credential['shared_key'] = '';
 		}
 
-		if(!isset($credential['shared_key'])){
+		if (!isset($credential['shared_key'])) {
 			$credential['shared_key'] = $storedCredential->getSharedKey();
 		}
 
@@ -263,7 +263,7 @@ 
 		$credential = false;
 		try {
 			$credential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
-		} catch (DoesNotExistException $e){
+		} catch (DoesNotExistException $e) {
 			return new NotFoundJSONResponse();
 		}
 		if ($credential) {
@@ -273,7 +273,7 @@ 
 				'', array(),
 				'', $this->userId, Activity::TYPE_ITEM_ACTION);
 			$this->sharingService->unshareCredential($credential->getGuid());
-			foreach($this->credentialRevisionService->getRevisions($credential->getId()) as $revision){
+			foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
 				$this->credentialRevisionService->deleteRevision($revision->getId(), $this->userId);
 			}
 		} else {

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(),