nextcloud / passman

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

middleware/apimiddleware.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
 	}
 
 	public function afterController($controller, $methodName, Response $response) {
-		if($response instanceof JSONResponse){
-			if(isset($this->request->server['HTTP_ORIGIN'])) {
+		if ($response instanceof JSONResponse) {
+			if (isset($this->request->server['HTTP_ORIGIN'])) {
 				$response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']);
 			}
 		}

Braces +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	}
 
 	public function afterController($controller, $methodName, Response $response) {
-		if($response instanceof JSONResponse){
+		if($response instanceof JSONResponse) {
 			if(isset($this->request->server['HTTP_ORIGIN'])) {
 				$response->addHeader('Access-Control-Allow-Origin', $this->request->server['HTTP_ORIGIN']);
 			}

lib/Utility/Utils.php

Indentation +8 added lines, -8 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -55,20 +55,20 @@
 	 * @param $uid
 	 * @return string
 	 */
-	public static function getNameByUid($uid){
+	public static function getNameByUid($uid) {
 		$um = \OC::$server->getUserManager();
 		$u = $um->get($uid);
 		return $u->getDisplayName();
 	}
 
-	public static function getDirContents($dir, &$results = array()){
+	public static function getDirContents($dir, &$results = array()) {
 		$files = scandir($dir);
 
-		foreach($files as $value){
-			$path = realpath($dir.DIRECTORY_SEPARATOR.$value);
-			if(!is_dir($path)) {
+		foreach ($files as $value) {
+			$path = realpath($dir . DIRECTORY_SEPARATOR . $value);
+			if (!is_dir($path)) {
 				$results[] = $path;
-			} else if($value != "." && $value != "..") {
+			} else if ($value != "." && $value != "..") {
 				Utils::getDirContents($path, $results);
 				$results[] = $path;
 			}

Braces +4 added lines, -5 removed lines

@@ -43,8 +43,7 @@ 
      * @return string
      */
 	public static function GUID() {
-		if (function_exists('com_create_guid') === true)
-		{
+		if (function_exists('com_create_guid') === true) {
 			return trim(com_create_guid(), '{}');
 		}
 
@@ -55,16 +54,16 @@ 
 	 * @param $uid
 	 * @return string
 	 */
-	public static function getNameByUid($uid){
+	public static function getNameByUid($uid) {
 		$um = \OC::$server->getUserManager();
 		$u = $um->get($uid);
 		return $u->getDisplayName();
 	}
 
-	public static function getDirContents($dir, &$results = array()){
+	public static function getDirContents($dir, &$results = array()) {
 		$files = scandir($dir);
 
-		foreach($files as $value){
+		foreach($files as $value) {
 			$path = realpath($dir.DIRECTORY_SEPARATOR.$value);
 			if(!is_dir($path)) {
 				$results[] = $path;

appinfo/routes.php

Indentation +13 added lines, -13 removed lines

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

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,
@@ -65,20 +65,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,
@@ -65,20 +65,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));
 			}
 		}

lib/Activity.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
 
 	protected $URLGenerator;
 
-	public function __construct( IURLGenerator $URLGenerator) {
+	public function __construct(IURLGenerator $URLGenerator) {
 		$this->URLGenerator = $URLGenerator;
 	}
 
@@ -261,7 +261,7 @@ 
 		$l = \OC::$server->getL10N(self::APP_NAME);
 		return array(
 			'top' => array(),
-			'apps' => array( self::FILTER_PASSMAN =>
+			'apps' => array(self::FILTER_PASSMAN =>
 				array(
 					'id' => 'passman',
 					'name' => (string) $l->t('Passwords'),
@@ -278,7 +278,7 @@ 
 	 * @return boolean
 	 */
 	public function isFilterValid($filterValue) {
-		return $filterValue ===  self::FILTER_PASSMAN;
+		return $filterValue === self::FILTER_PASSMAN;
 	}
 
 	/**