@@ -107,15 +107,15 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
| 110 | - $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
|
| 111 | - foreach ($credentials as &$value) { |
|
| 112 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 113 | - return new JSONResponse($value); |
|
| 114 | - } |
|
| 115 | - } |
|
| 116 | - |
|
| 117 | - //return old value as fallback |
|
| 118 | - return new JSONResponse($credentials); |
|
| 110 | + $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
|
| 111 | + foreach ($credentials as &$value) { |
|
| 112 | + if($value->getGuid() == $credential->getGuid()){ |
|
| 113 | + return new JSONResponse($value); |
|
| 114 | + } |
|
| 115 | + } |
|
| 116 | + |
|
| 117 | + //return old value as fallback |
|
| 118 | + return new JSONResponse($credentials); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -270,15 +270,15 @@ discard block |
||
| 270 | 270 | $credential = $this->credentialService->updateCredential($credential); |
| 271 | 271 | |
| 272 | 272 | |
| 273 | - //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
|
| 274 | - $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
|
| 275 | - foreach ($credentials as &$value) { |
|
| 276 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 277 | - return new JSONResponse($value); |
|
| 278 | - } |
|
| 279 | - } |
|
| 273 | + //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
|
| 274 | + $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
|
| 275 | + foreach ($credentials as &$value) { |
|
| 276 | + if($value->getGuid() == $credential->getGuid()){ |
|
| 277 | + return new JSONResponse($value); |
|
| 278 | + } |
|
| 279 | + } |
|
| 280 | 280 | |
| 281 | - //return old value as fallback |
|
| 281 | + //return old value as fallback |
|
| 282 | 282 | return new JSONResponse($credential); |
| 283 | 283 | } |
| 284 | 284 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
| 110 | 110 | $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
| 111 | 111 | foreach ($credentials as &$value) { |
| 112 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 112 | + if ($value->getGuid() == $credential->getGuid()) { |
|
| 113 | 113 | return new JSONResponse($value); |
| 114 | 114 | } |
| 115 | 115 | } |
@@ -185,13 +185,13 @@ discard block |
||
| 185 | 185 | $activity . '_self', array($label, $this->userId, $revision_created), |
| 186 | 186 | '', array(), |
| 187 | 187 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 188 | - } else if (($storedCredential->getDeleteTime() === 0) && (int)$delete_time > 0) { |
|
| 188 | + } else if (($storedCredential->getDeleteTime() === 0) && (int) $delete_time > 0) { |
|
| 189 | 189 | $activity = 'item_deleted'; |
| 190 | 190 | $this->activityService->add( |
| 191 | 191 | $activity . '_self', array($label, $this->userId), |
| 192 | 192 | '', array(), |
| 193 | 193 | $link, $this->userId, Activity::TYPE_ITEM_ACTION); |
| 194 | - } else if (($storedCredential->getDeleteTime() > 0) && (int)$delete_time === 0) { |
|
| 194 | + } else if (($storedCredential->getDeleteTime() > 0) && (int) $delete_time === 0) { |
|
| 195 | 195 | $activity = 'item_recovered'; |
| 196 | 196 | $this->activityService->add( |
| 197 | 197 | $activity . '_self', array($label, $this->userId), |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
| 274 | 274 | $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
| 275 | 275 | foreach ($credentials as &$value) { |
| 276 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 276 | + if ($value->getGuid() == $credential->getGuid()) { |
|
| 277 | 277 | return new JSONResponse($value); |
| 278 | 278 | } |
| 279 | 279 | } |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | $this->sharingService->unshareCredential($credential->getGuid()); |
| 315 | 315 | foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) { |
| 316 | 316 | $id = $revision['revision_id']; |
| 317 | - if(isset($id)){ |
|
| 317 | + if (isset($id)) { |
|
| 318 | 318 | $this->credentialRevisionService->deleteRevision($id, $this->userId); |
| 319 | 319 | } |
| 320 | 320 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
| 110 | 110 | $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
| 111 | 111 | foreach ($credentials as &$value) { |
| 112 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 112 | + if($value->getGuid() == $credential->getGuid()) { |
|
| 113 | 113 | return new JSONResponse($value); |
| 114 | 114 | } |
| 115 | 115 | } |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | //fetch the proper credentialelement, the returned element from createCredential is not usable in the frontend. |
| 274 | 274 | $credentials = $this->credentialService->getCredentialsByVaultId($vault_id, $this->userId); |
| 275 | 275 | foreach ($credentials as &$value) { |
| 276 | - if($value->getGuid() == $credential->getGuid()){ |
|
| 276 | + if($value->getGuid() == $credential->getGuid()) { |
|
| 277 | 277 | return new JSONResponse($value); |
| 278 | 278 | } |
| 279 | 279 | } |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | $this->sharingService->unshareCredential($credential->getGuid()); |
| 315 | 315 | foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) { |
| 316 | 316 | $id = $revision['revision_id']; |
| 317 | - if(isset($id)){ |
|
| 317 | + if(isset($id)) { |
|
| 318 | 318 | $this->credentialRevisionService->deleteRevision($id, $this->userId); |
| 319 | 319 | } |
| 320 | 320 | } |
@@ -140,8 +140,8 @@ discard block |
||
| 140 | 140 | 'password.r' => $this->trans->t('Repeat password'), |
| 141 | 141 | 'add.tag' => $this->trans->t('Add tag'), |
| 142 | 142 | 'pick.icon' => $this->trans->t('Pick an icon'), |
| 143 | - 'pick.icon.search' => $this->trans->t('Search icons'), |
|
| 144 | - 'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'), |
|
| 143 | + 'pick.icon.search' => $this->trans->t('Search icons'), |
|
| 144 | + 'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'), |
|
| 145 | 145 | 'use.icon' => $this->trans->t('Use this icon'), |
| 146 | 146 | 'selected.icon' => $this->trans->t('Selected icon'), |
| 147 | 147 | |
@@ -349,15 +349,15 @@ discard block |
||
| 349 | 349 | 'decline' => $this->trans->t('Decline'), |
| 350 | 350 | 'session.time.left' => $this->trans->t('You have {{session_time}} left before logout.'), |
| 351 | 351 | 'vault.locked' => $this->trans->t('Your vault has been locked for {{time}} because of {{tries}} failed attempts!'), |
| 352 | - 'vault.hint.hello' => $this->trans->t('Hello there!'), |
|
| 353 | - 'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'), |
|
| 354 | - 'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'), |
|
| 355 | - 'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'), |
|
| 356 | - 'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'), |
|
| 357 | - 'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'), |
|
| 358 | - 'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'), |
|
| 359 | - 'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'), |
|
| 360 | - 'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'), |
|
| 352 | + 'vault.hint.hello' => $this->trans->t('Hello there!'), |
|
| 353 | + 'vault.hint.hello.add' => $this->trans->t('It does not seem that you have any passwords. Do you want to add one?'), |
|
| 354 | + 'vault.hint.list.nogood' => $this->trans->t('You don\'t have good credentials'), |
|
| 355 | + 'vault.hint.list.nomedium' => $this->trans->t('You don\'t have medium credentials'), |
|
| 356 | + 'vault.hint.list.nobad' => $this->trans->t('You don\'t have bad credentials'), |
|
| 357 | + 'vault.hint.list.noexpired' => $this->trans->t('You don\'t have expired credentials'), |
|
| 358 | + 'vault.hint.list.nodeleted' => $this->trans->t('You don\'t have deleted credentials'), |
|
| 359 | + 'vault.hint.list.notags' => $this->trans->t('There are no credentials with your selected tags'), |
|
| 360 | + 'vault.hint.list.nosearch' => $this->trans->t('There are no credentials matching'), |
|
| 361 | 361 | |
| 362 | 362 | |
| 363 | 363 | // templates/views/vaults.html |
@@ -403,15 +403,15 @@ discard block |
||
| 403 | 403 | 'deleted.credentials' => $this->trans->t('Deleted credentials'), |
| 404 | 404 | 'logout' => $this->trans->t('Logout'), |
| 405 | 405 | 'donate' => $this->trans->t('Donate'), |
| 406 | - 'navigation.show.all' => $this->trans->t('Show All'), |
|
| 407 | - 'navigation.tags' => $this->trans->t('Tags'), |
|
| 408 | - 'navigation.tags.search' => $this->trans->t('Search Tags'), |
|
| 409 | - 'navigation.strength.good' => $this->trans->t('Good Strength'), |
|
| 410 | - 'navigation.strength.medium' => $this->trans->t('Medium Strength'), |
|
| 411 | - 'navigation.strength.bad' => $this->trans->t('Bad Strength'), |
|
| 412 | - 'navigation.expired' => $this->trans->t('Expired'), |
|
| 413 | - 'navigation.advanced.filter' => $this->trans->t('Filter Tags'), |
|
| 414 | - 'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'), |
|
| 406 | + 'navigation.show.all' => $this->trans->t('Show All'), |
|
| 407 | + 'navigation.tags' => $this->trans->t('Tags'), |
|
| 408 | + 'navigation.tags.search' => $this->trans->t('Search Tags'), |
|
| 409 | + 'navigation.strength.good' => $this->trans->t('Good Strength'), |
|
| 410 | + 'navigation.strength.medium' => $this->trans->t('Medium Strength'), |
|
| 411 | + 'navigation.strength.bad' => $this->trans->t('Bad Strength'), |
|
| 412 | + 'navigation.expired' => $this->trans->t('Expired'), |
|
| 413 | + 'navigation.advanced.filter' => $this->trans->t('Filter Tags'), |
|
| 414 | + 'navigation.advanced.checkbox' => $this->trans->t('Simple Navigation'), |
|
| 415 | 415 | |
| 416 | 416 | |
| 417 | 417 | // templates/public_share.php |