nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-09 04:56:58 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove double if check

Browse source
This commit is contained in:
brantje 2016-10-07 13:01:57 +02:00
parent c94df47a9f
commit 6672cfa2a8
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
controller/vaultcontroller.php
View file

@ -42,9 +42,9 @@ class VaultController extends ApiController {
$result = array(); $result = array();
$vaults = $this->vaultService->getByUser($this->userId); $vaults = $this->vaultService->getByUser($this->userId);
$protected_credential_fields = array('getDescription','getEmail','getUsername','getPassword'); $protected_credential_fields = array('getDescription', 'getEmail', 'getUsername', 'getPassword');
foreach($vaults as $vault){ foreach ($vaults as $vault) {
$credential = $this->credentialService->getRandomCredentialByVaultId($vault->getId(), $this->userId); $credential = $this->credentialService->getRandomCredentialByVaultId($vault->getId(), $this->userId);
$secret_field = $protected_credential_fields[array_rand($protected_credential_fields)]; $secret_field = $protected_credential_fields[array_rand($protected_credential_fields)];
array_push($result, array( array_push($result, array(
@ -75,34 +75,32 @@ class VaultController extends ApiController {
public function get($vault_guid) { public function get($vault_guid) {
//$vault_guid //$vault_guid
$vault = null; $vault = null;
try{ try {
$vault = $this->vaultService->getByGuid($vault_guid, $this->userId); $vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
} catch(DoesNotExistException $e){ } catch (DoesNotExistException $e) {
} }
$result = array(); $result = array();
if($vault){ if ($vault) {
$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $this->userId); $credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $this->userId);
if($vault) {
$result = array(
'vault_id' => $vault->getId(),
'guid' => $vault->getGuid(),
'name' => $vault->getName(),
'created' => $vault->getCreated(),
'private_sharing_key' => $vault->getPrivateSharingKey(),
'public_sharing_key' => $vault->getPublicSharingKey(),
'sharing_keys_generated' => $vault->getSharingKeysGenerated(),
'vault_settings' => $vault->getVaultSettings(),
'last_access' => $vault->getlastAccess()
);
$result['credentials'] = $credentials;
$this->vaultService->setLastAccess($vault->getId(), $this->userId); $result = array(
} else { 'vault_id' => $vault->getId(),
$result = array(); 'guid' => $vault->getGuid(),
} 'name' => $vault->getName(),
'created' => $vault->getCreated(),
'private_sharing_key' => $vault->getPrivateSharingKey(),
'public_sharing_key' => $vault->getPublicSharingKey(),
'sharing_keys_generated' => $vault->getSharingKeysGenerated(),
'vault_settings' => $vault->getVaultSettings(),
'last_access' => $vault->getlastAccess()
);
$result['credentials'] = $credentials;
$this->vaultService->setLastAccess($vault->getId(), $this->userId);
} }
return new JSONResponse($result); return new JSONResponse($result);
} }
@ -111,10 +109,10 @@ class VaultController extends ApiController {
*/ */
public function update($vault_guid, $name, $vault_settings) { public function update($vault_guid, $name, $vault_settings) {
$vault = $this->vaultService->getByGuid($vault_guid, $this->userId); $vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
if($name) { if ($name) {
$vault->setName($name); $vault->setName($name);
} }
if($vault_settings) { if ($vault_settings) {
$vault->setVaultSettings($vault_settings); $vault->setVaultSettings($vault_settings);
} }
$this->vaultService->updateVault($vault); $this->vaultService->updateVault($vault);
@ -125,9 +123,9 @@ class VaultController extends ApiController {
*/ */
public function updateSharingKeys($vault_guid, $private_sharing_key, $public_sharing_key) { public function updateSharingKeys($vault_guid, $private_sharing_key, $public_sharing_key) {
$vault = null; $vault = null;
try{ try {
$vault = $this->vaultService->getByGuid($vault_guid, $this->userId); $vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
} catch(DoesNotExistException $e){ } catch (DoesNotExistException $e) {
} }