nextcloud / passman

lib/Db/CredentialMapper.php

Doc Comments +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
 	 * Update a credential
 	 *
 	 * @param $raw_credential array An array containing all the credential fields
-	 * @param $useRawUser bool
+	 * @param boolean $useRawUser bool
 	 * @return Credential The updated credential
 	 */
 	public function updateCredential($raw_credential, $useRawUser) {

controller/credentialcontroller.php

Spacing +3 added lines, -3 removed lines

@@ -174,13 +174,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),
@@ -293,7 +293,7 @@ 
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
 				$id = $revision['revision_id'];
-				if(isset($id)){
+				if (isset($id)) {
 					$this->credentialRevisionService->deleteRevision($id, $this->userId);
 				}
 		}

Braces +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
 				$id = $revision['revision_id'];
-				if(isset($id)){
+				if(isset($id)) {
 					$this->credentialRevisionService->deleteRevision($id, $this->userId);
 				}
 		}

Indentation +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 				$link, $this->userId, Activity::TYPE_ITEM_ACTION);
 		}
 
-        return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
+		return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 
 		$credential = $this->credentialService->updateCredential($credential);
 
-        return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
+		return new JSONResponse($this->credentialService->getCredentialByGUID($credential->getGuid()));
 	}
 
 	/**

lib/Service/FileService.php

Spacing +2 added lines, -2 removed lines

@@ -107,10 +107,10 @@
 	 * @param string $userId
 	 * @return File[]
 	 */
-	public function getFilesFromUser($userId){
+	public function getFilesFromUser($userId) {
 		$files = $this->fileMapper->getFilesFromUser($userId);
 		$results = array();
-		foreach ($files as $file){
+		foreach ($files as $file) {
 			array_push($results, $this->encryptService->decryptFile($file));
 		}
 		return $results;

Braces +2 added lines, -2 removed lines

@@ -107,10 +107,10 @@
 	 * @param string $userId
 	 * @return File[]
 	 */
-	public function getFilesFromUser($userId){
+	public function getFilesFromUser($userId) {
 		$files = $this->fileMapper->getFilesFromUser($userId);
 		$results = array();
-		foreach ($files as $file){
+		foreach ($files as $file) {
 			array_push($results, $this->encryptService->decryptFile($file));
 		}
 		return $results;

lib/Db/DeleteVaultRequest.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  */
 
 
-class DeleteVaultRequest extends Entity implements  \JsonSerializable{
+class DeleteVaultRequest extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  */
 
 
-class DeleteVaultRequest extends Entity implements  \JsonSerializable{
+class DeleteVaultRequest extends Entity implements  \JsonSerializable {
 
 	use EntityJSONSerializer;
 

controller/admincontroller.php

Spacing +12 added lines, -12 removed lines

@@ -109,10 +109,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());
 			array_push($results, $r);
@@ -120,28 +120,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);
 		}
 
@@ -153,7 +153,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);
@@ -178,7 +178,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

@@ -109,10 +109,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());
 			array_push($results, $r);
@@ -120,7 +120,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);
@@ -128,14 +128,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);
 				}
 			}
@@ -153,7 +153,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);

lib/Db/DeleteVaultRequestMapper.php

Spacing +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param DeleteVaultRequest $request
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function createRequest(DeleteVaultRequest $request){
+	public function createRequest(DeleteVaultRequest $request) {
 		return $this->insert($request);
 	}
 
@@ -50,7 +50,7 @@ 
 	 * Get all delete requests
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function getDeleteRequests(){
+	public function getDeleteRequests() {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME;
 		return $this->findEntities($q);
 	}
@@ -60,8 +60,8 @@ 
 	 * @param $vault_id integer The vault id
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function getDeleteRequestsForVault($vault_guid){
-		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME .' WHERE `vault_guid` = ?';
+	public function getDeleteRequestsForVault($vault_guid) {
+		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . ' WHERE `vault_guid` = ?';
 		return $this->findEntity($q, [$vault_guid]);
 	}
 
@@ -70,7 +70,7 @@ 
 	 * @param DeleteVaultRequest $request    Request to delete
 	 * @return DeleteVaultRequest                 The deleted request
 	 */
-	public function removeDeleteVaultRequest(DeleteVaultRequest $request){
+	public function removeDeleteVaultRequest(DeleteVaultRequest $request) {
 		return $this->delete($request);
 	}
 

Braces +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
 	 * @param DeleteVaultRequest $request
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function createRequest(DeleteVaultRequest $request){
+	public function createRequest(DeleteVaultRequest $request) {
 		return $this->insert($request);
 	}
 
@@ -50,7 +50,7 @@ 
 	 * Get all delete requests
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function getDeleteRequests(){
+	public function getDeleteRequests() {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME;
 		return $this->findEntities($q);
 	}
@@ -60,7 +60,7 @@ 
 	 * @param $vault_id integer The vault id
 	 * @return \OCP\AppFramework\Db\Entity
 	 */
-	public function getDeleteRequestsForVault($vault_guid){
+	public function getDeleteRequestsForVault($vault_guid) {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME .' WHERE `vault_guid` = ?';
 		return $this->findEntity($q, [$vault_guid]);
 	}
@@ -70,7 +70,7 @@ 
 	 * @param DeleteVaultRequest $request    Request to delete
 	 * @return DeleteVaultRequest                 The deleted request
 	 */
-	public function removeDeleteVaultRequest(DeleteVaultRequest $request){
+	public function removeDeleteVaultRequest(DeleteVaultRequest $request) {
 		return $this->delete($request);
 	}
 

controller/internalcontroller.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,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);
 
@@ -64,7 +64,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);
 
@@ -90,7 +90,7 @@ 
 	 * @NoAdminRequired
 	 */
 	public function generatePerson() {
-		$context = [ 'http' => [ 'method' => 'GET' ], 'ssl' => [ 'verify_peer' => false, 'allow_self_signed'=> true ] ];
+		$context = ['http' => ['method' => 'GET'], 'ssl' => ['verify_peer' => false, 'allow_self_signed'=> true]];
 		$context = stream_context_create($context);
 		$random_person = json_decode(file_get_contents('http://api.namefake.com/', false, $context));
 		return new JSONResponse($random_person);

lib/Service/IconService.php

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 	}
 
 
-	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href){
+	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href) {
 		if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
 			$link_tag = $matches[0];
 			$this->debugInfo['link_tag'] = $link_tag;

Braces +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 	}
 
 
-	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href){
+	private function parseLinkElement($htmlHead, $pageUrlInfo, $base_href) {
 		if (preg_match('#<\s*link[^>]*(rel=(["\'])[^>\2]*icon[^>\2]*\2)[^>]*>#i', $htmlHead, $matches)) {
 			$link_tag = $matches[0];
 			$this->debugInfo['link_tag'] = $link_tag;

controller/translationcontroller.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	public function getLanguageStrings() {
 		$translations = array(
 			// js/app/controllers/bookmarklet.js
-			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys ( %s / 2)','%step'),
+			'generating.sharing.keys' =>  $this->trans->t('Generating sharing keys ( %s / 2)', '%step'),
 			'invalid.vault.key' => $this->trans->t('Incorrect vault password!'),
 			'password.do.not.match' => $this->trans->t('Passwords do not match'),
 			'general' => $this->trans->t('General'),

Indentation +20 added lines, -20 removed lines

@@ -140,8 +140,8 @@ 
 			'password.r' => $this->trans->t('Repeat password'),
 			'add.tag' => $this->trans->t('Add tag'),
 			'pick.icon' => $this->trans->t('Pick an icon'),
-            'pick.icon.search' => $this->trans->t('Search icons'),
-            'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'),
+			'pick.icon.search' => $this->trans->t('Search icons'),
+			'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'),
 			'use.icon' => $this->trans->t('Use this icon'),
 			'use.icon.delete' => $this->trans->t('Delete current icon'),
 			'use.icon.refresh' => $this->trans->t('Get icon from page'),
@@ -351,15 +351,15 @@ 
 			'decline' => $this->trans->t('Decline'),
 			'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'),
 			'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'),
-            'vault.hint.hello' => $this->trans->t('Hello there!'),
-            'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
-            'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
-            'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
-            'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
-            'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
-            'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
-            'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
-            'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
+			'vault.hint.hello' => $this->trans->t('Hello there!'),
+			'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'),
+			'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'),
+			'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'),
+			'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'),
+			'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'),
+			'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'),
+			'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'),
+			'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'),
 
 
 			// templates/views/vaults.html
@@ -405,15 +405,15 @@ 
 			'deleted.credentials' => $this->trans->t('Deleted credentials'),
 			'logout' => $this->trans->t('Logout'),
 			'donate' => $this->trans->t('Donate'),
-            'navigation.show.all' => $this->trans->t('Show All'),
-            'navigation.tags' => $this->trans->t('Tags'),
-            'navigation.tags.search' => $this->trans->t('Search Tags'),
-            'navigation.strength.good' => $this->trans->t('Good Strength'),
-            'navigation.strength.medium' => $this->trans->t('Medium Strength'),
-            'navigation.strength.bad' => $this->trans->t('Bad Strength'),
-            'navigation.expired' => $this->trans->t('Expired'),
-            'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
-            'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
+			'navigation.show.all' => $this->trans->t('Show All'),
+			'navigation.tags' => $this->trans->t('Tags'),
+			'navigation.tags.search' => $this->trans->t('Search Tags'),
+			'navigation.strength.good' => $this->trans->t('Good Strength'),
+			'navigation.strength.medium' => $this->trans->t('Medium Strength'),
+			'navigation.strength.bad' => $this->trans->t('Bad Strength'),
+			'navigation.expired' => $this->trans->t('Expired'),
+			'navigation.advanced.filter' => $this->trans->t('Filter Tags'),
+			'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'),
 
 
 			// templates/public_share.php