diff options
Diffstat (limited to 'apps/encryption/lib/Controller/RecoveryController.php')
| -rw-r--r-- | apps/encryption/lib/Controller/RecoveryController.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/encryption/lib/Controller/RecoveryController.php b/apps/encryption/lib/Controller/RecoveryController.php index 801ae42e033..6455700cd9b 100644 --- a/apps/encryption/lib/Controller/RecoveryController.php +++ b/apps/encryption/lib/Controller/RecoveryController.php @@ -75,36 +75,36 @@ class RecoveryController extends Controller { public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) { // Check if both passwords are the same if (empty($recoveryPassword)) { - $errorMessage = (string)$this->l->t('Missing recovery key password'); + $errorMessage = $this->l->t('Missing recovery key password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if (empty($confirmPassword)) { - $errorMessage = (string)$this->l->t('Please repeat the recovery key password'); + $errorMessage = $this->l->t('Please repeat the recovery key password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if ($recoveryPassword !== $confirmPassword) { - $errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password'); + $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') { if ($this->recovery->enableAdminRecovery($recoveryPassword)) { - return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]); + return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]); } - return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST); + return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST); } elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') { if ($this->recovery->disableAdminRecovery($recoveryPassword)) { - return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]); + return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]); } - return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST); + return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST); } // this response should never be sent but just in case. - return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST); + return new DataResponse(['data' => ['message' => $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST); } /** @@ -116,22 +116,22 @@ class RecoveryController extends Controller { public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) { //check if both passwords are the same if (empty($oldPassword)) { - $errorMessage = (string)$this->l->t('Please provide the old recovery password'); + $errorMessage = $this->l->t('Please provide the old recovery password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if (empty($newPassword)) { - $errorMessage = (string)$this->l->t('Please provide a new recovery password'); + $errorMessage = $this->l->t('Please provide a new recovery password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if (empty($confirmPassword)) { - $errorMessage = (string)$this->l->t('Please repeat the new recovery password'); + $errorMessage = $this->l->t('Please repeat the new recovery password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } if ($newPassword !== $confirmPassword) { - $errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password'); + $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password'); return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST); } @@ -142,14 +142,14 @@ class RecoveryController extends Controller { return new DataResponse( [ 'data' => [ - 'message' => (string)$this->l->t('Password successfully changed.')] + 'message' => $this->l->t('Password successfully changed.')] ] ); } return new DataResponse( [ 'data' => [ - 'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.') + 'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.') ] ], Http::STATUS_BAD_REQUEST); } @@ -169,14 +169,14 @@ class RecoveryController extends Controller { return new DataResponse( [ 'data' => [ - 'message' => (string)$this->l->t('Recovery Key disabled')] + 'message' => $this->l->t('Recovery Key disabled')] ] ); } return new DataResponse( [ 'data' => [ - 'message' => (string)$this->l->t('Recovery Key enabled')] + 'message' => $this->l->t('Recovery Key enabled')] ] ); } @@ -184,7 +184,7 @@ class RecoveryController extends Controller { return new DataResponse( [ 'data' => [ - 'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator') + 'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator') ] ], Http::STATUS_BAD_REQUEST); } |