nextcloud / passman

lib/Service/EncryptService.php

Doc Comments +7 added lines, -3 removed lines

@@ -206,6 +206,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);
@@ -247,7 +251,7 @@ 
 	/**
 	 * Pad the data with a random char chosen by the pad amount.
 	 *
-	 * @param $data
+	 * @param string $data
 	 * @return string
 	 */
 	protected function pad($data) {
@@ -263,8 +267,8 @@ 
 	/**
 	 * Unpad the the data
 	 *
-	 * @param $data
-	 * @return bool|string
+	 * @param string $data
+	 * @return false|string
 	 */
 	protected function unpad($data) {
 		$length = $this->getKeySize();

controller/admincontroller.php

Spacing +12 added lines, -12 removed lines

@@ -113,10 +113,10 @@ 
 		return new JSONResponse(array('success' => true));
 	}
 
-	public function listRequests(){
+	public function listRequests() {
 		$requests = $this->deleteVaultRequestService->getDeleteRequests();
 		$results = array();
-		foreach($requests as $request){
+		foreach ($requests as $request) {
 			$r = $request->jsonSerialize();
 			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager);
 			array_push($results, $r);
@@ -124,28 +124,28 @@ 
 		return new JSONResponse($results);
 	}
 
-	public function acceptRequestDeletion($vault_guid, $requested_by){
+	public function acceptRequestDeletion($vault_guid, $requested_by) {
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
-		try{
+		try {
 			$vault = $this->vaultService->getByGuid($vault_guid, $requested_by);
-		} catch (\Exception $e){
+		} catch (\Exception $e) {
 			//Ignore
 		}
 
-		if(isset($vault)){
+		if (isset($vault)) {
 			$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by);
-			foreach($credentials as $credential){
+			foreach ($credentials as $credential) {
 				$revisions = $this->revisionService->getRevisions($credential->getId());
-				foreach($revisions as $revision){
+				foreach ($revisions as $revision) {
 					$this->revisionService->deleteRevision($revision['revision_id'], $requested_by);
 				}
-				if($credential instanceof Credential){
+				if ($credential instanceof Credential) {
 					$this->credentialService->deleteCredential($credential);
 				}
 			}
 			$this->vaultService->deleteVault($vault_guid, $requested_by);
 		}
-		if($req instanceof DeleteVaultRequest) {
+		if ($req instanceof DeleteVaultRequest) {
 			$this->deleteVaultRequestService->removeDeleteRequestForVault($req);
 		}
 
@@ -157,7 +157,7 @@ 
 	 */
 	public function requestDeletion($vault_guid, $reason) {
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
-		if($req){
+		if ($req) {
 			return new JSONResponse('Already exists');
 		}
 		$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
@@ -182,7 +182,7 @@ 
 		$result = false;
 		try {
 			$delete_request = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
-		} catch (\Exception $exception){
+		} catch (\Exception $exception) {
 			// Ignore it
 		}
 

Braces +8 added lines, -8 removed lines

@@ -113,10 +113,10 @@ 
 		return new JSONResponse(array('success' => true));
 	}
 
-	public function listRequests(){
+	public function listRequests() {
 		$requests = $this->deleteVaultRequestService->getDeleteRequests();
 		$results = array();
-		foreach($requests as $request){
+		foreach($requests as $request) {
 			$r = $request->jsonSerialize();
 			$r['displayName'] = Utils::getNameByUid($request->getRequestedBy(), $this->userManager);
 			array_push($results, $r);
@@ -124,7 +124,7 @@ 
 		return new JSONResponse($results);
 	}
 
-	public function acceptRequestDeletion($vault_guid, $requested_by){
+	public function acceptRequestDeletion($vault_guid, $requested_by) {
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
 		try{
 			$vault = $this->vaultService->getByGuid($vault_guid, $requested_by);
@@ -132,14 +132,14 @@ 
 			//Ignore
 		}
 
-		if(isset($vault)){
+		if(isset($vault)) {
 			$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $requested_by);
-			foreach($credentials as $credential){
+			foreach($credentials as $credential) {
 				$revisions = $this->revisionService->getRevisions($credential->getId());
-				foreach($revisions as $revision){
+				foreach($revisions as $revision) {
 					$this->revisionService->deleteRevision($revision['revision_id'], $requested_by);
 				}
-				if($credential instanceof Credential){
+				if($credential instanceof Credential) {
 					$this->credentialService->deleteCredential($credential);
 				}
 			}
@@ -157,7 +157,7 @@ 
 	 */
 	public function requestDeletion($vault_guid, $reason) {
 		$req = $this->deleteVaultRequestService->getDeleteRequestForVault($vault_guid);
-		if($req){
+		if($req) {
 			return new JSONResponse('Already exists');
 		}
 		$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);

controller/internalcontroller.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
 	private $appManager;
 
 	public function __construct($AppName,
-	                            IRequest $request,
-	                            $UserId,
-	                            CredentialService $credentialService,
-	                            IConfig $config,
-	                            IManager $IManager,
-	                            IAppManager $appManager
+								IRequest $request,
+								$UserId,
+								CredentialService $credentialService,
+								IConfig $config,
+								IManager $IManager,
+								IAppManager $appManager
 	) {
 		parent::__construct(
 			$AppName,

migration/serversideencryption.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	private $fileService;
 
 	public function __construct(EncryptService $encryptService, IDBConnection $db, LoggerInterface $logger, CredentialService $credentialService, CredentialRevisionService $revisionService,
-	                            FileService $fileService, IConfig $config) {
+								FileService $fileService, IConfig $config) {
 		$this->encryptService = $encryptService;
 		$this->db = $db;
 		$this->logger = $logger;

lib/Db/CredentialMapper.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from(self::TABLE_NAME)
-			->where($qb->expr()->gt('expire_time',  $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
+			->where($qb->expr()->gt('expire_time', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->lt('expire_time', $qb->createNamedParameter($timestamp, IQueryBuilder::PARAM_INT)));
 
 		/** @var Credential[] $credentials */

lib/Service/VaultService.php

Spacing +4 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
 	 * @param $user_id
 	 * @return Vault|Entity
 	 */
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
@@ -106,7 +106,7 @@ 
 	 * @param $publicKey
 	 * @return Vault|Entity
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 
@@ -115,9 +115,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

@@ -95,7 +95,7 @@ 
 	 * @param $user_id
 	 * @return Vault|Entity
 	 */
-	public function setLastAccess($vault_id, $user_id){
+	public function setLastAccess($vault_id, $user_id) {
 		return $this->vaultMapper->setLastAccess($vault_id, $user_id);
 	}
 
@@ -106,7 +106,7 @@ 
 	 * @param $publicKey
 	 * @return Vault|Entity
 	 */
-	public function updateSharingKeys($vault_id, $privateKey, $publicKey){
+	public function updateSharingKeys($vault_id, $privateKey, $publicKey) {
 		return $this->vaultMapper->updateSharingKeys($vault_id, $privateKey, $publicKey);
 	}
 
@@ -115,7 +115,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);

lib/Service/ShareService.php

Braces +18 added lines, -6 removed lines

@@ -101,7 +101,9 @@ 
 	 * @return Entity
 	 */
 	public function createACLEntry(SharingACL $acl) {
-		if ($acl->getCreated() === null) $acl->setCreated((new \DateTime())->getTimestamp());
+		if ($acl->getCreated() === null) {
+			$acl->setCreated((new \DateTime())->getTimestamp());
+		}
 		return $this->sharingACL->createACLEntry($acl);
 	}
 
@@ -159,13 +161,17 @@ 
 		$return = [];
 		foreach ($entries as $entry) {
 			// Check if the user can read the credential, probably unnecesary, but just to be sure
-			if (!$entry->hasPermission(SharingACL::READ)) continue;
+			if (!$entry->hasPermission(SharingACL::READ)) {
+				continue;
+			}
 			$tmp = $entry->jsonSerialize();
 			$credential = $this->credential->getCredentialById($entry->getItemId());
 			$credential = $this->encryptService->decryptCredential($credential);
 			$tmp['credential_data'] = $credential->jsonSerialize();
 
-			if (!$entry->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+			if (!$entry->hasPermission(SharingACL::FILES)) {
+				unset($tmp['credential_data']['files']);
+			}
 			unset($tmp['credential_data']['shared_key']);
 			$return[] = $tmp;
 		}
@@ -194,7 +200,9 @@ 
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
 
 		// Check if the user can read the credential, probably unnecesary, but just to be sure
-		if (!$acl->hasPermission(SharingACL::READ)) throw new DoesNotExistException("Item not found or wrong access level");
+		if (!$acl->hasPermission(SharingACL::READ)) {
+			throw new DoesNotExistException("Item not found or wrong access level");
+		}
 
 		$tmp = $acl->jsonSerialize();
 		$credential = $this->credential->getCredentialById($acl->getItemId());
@@ -202,7 +210,9 @@ 
 
 		$tmp['credential_data'] = $credential->jsonSerialize();
 
-		if (!$acl->hasPermission(SharingACL::FILES)) unset($tmp['credential_data']['files']);
+		if (!$acl->hasPermission(SharingACL::FILES)) {
+			unset($tmp['credential_data']['files']);
+		}
 		unset($tmp['credential_data']['shared_key']);
 
 		return $tmp;
@@ -217,7 +227,9 @@ 
 	 */
 	public function getItemHistory(string $user_id, string $item_guid) {
 		$acl = $this->sharingACL->getItemACL($user_id, $item_guid);
-		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) return [];
+		if (!$acl->hasPermission(SharingACL::READ | SharingACL::HISTORY)) {
+			return [];
+		}
 
 		return $this->revisions->getRevisions($acl->getItemId());
 	}

lib/Settings/Admin.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				}
 
 				if ($data !== false) {
-					$version = (string)$data->version;
+					$version = (string) $data->version;
 				} else {
 					libxml_clear_errors();
 				}

lib/Activity.php

Spacing +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 			'apps' => array(self::FILTER_PASSMAN =>
 				array(
 					'id' => 'passman',
-					'name' => (string)$l->t('Passwords'),
+					'name' => (string) $l->t('Passwords'),
 					'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_PASSMAN]),
 				),
 			),