From 62d898173a0795f3ab3101e14b59d58e2ed37454 Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Thu, 29 Jan 2026 22:33:43 +0100 Subject: [PATCH] Account/Fixup * fix referencing nonexistent error message if password validation fails * fixes #488 --- endpoints/account/signup.php | 2 +- endpoints/account/update-password.php | 2 +- setup/tools/clisetup/account.us.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/endpoints/account/signup.php b/endpoints/account/signup.php index 5fd827b5..af3181dd 100644 --- a/endpoints/account/signup.php +++ b/endpoints/account/signup.php @@ -99,7 +99,7 @@ class AccountSignupResponse extends TemplateResponse // check password if (!Util::validatePassword($this->_post['password'], $e)) - return Lang::account($e == 1 ? 'errPassLength' : 'errPassChars'); + return $e == 1 ? Lang::account('errPassLength') : Lang::main('intError'); if ($this->_post['password'] !== $this->_post['c_password']) return Lang::account('passMismatch'); diff --git a/endpoints/account/update-password.php b/endpoints/account/update-password.php index b9c82b04..04916542 100644 --- a/endpoints/account/update-password.php +++ b/endpoints/account/update-password.php @@ -48,7 +48,7 @@ class AccountUpdatepasswordResponse extends TextResponse return Lang::main('intError'); if (!Util::validatePassword($this->_post['newPassword'], $e)) - return Lang::account($e == 1 ? 'errPassLength' : 'errPassChars'); + return $e == 1 ? Lang::account('errPassLength') : Lang::main('intError'); if ($this->_post['newPassword'] !== $this->_post['confirmPassword']) return Lang::account('passMismatch'); diff --git a/setup/tools/clisetup/account.us.php b/setup/tools/clisetup/account.us.php index f0844cfd..9ac77d0b 100644 --- a/setup/tools/clisetup/account.us.php +++ b/setup/tools/clisetup/account.us.php @@ -74,7 +74,7 @@ CLISetup::registerUtility(new class extends UtilityScript $name = $uiAccount['name']; if (!$passw && !Util::validatePassword($uiAccount['pass1'], $e)) - CLI::write(Lang::account($e == 1 ? 'errPassLength' : 'errPassChars'), CLI::LOG_ERROR); + CLI::write($e == 1 ? Lang::account('errPassLength') : Lang::main('intError'), CLI::LOG_ERROR); else if (!$passw && $uiAccount['pass1'] != $uiAccount['pass2']) CLI::write(Lang::account('passMismatch'), CLI::LOG_ERROR); else if (!$passw)