sven/ulogger-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Localize error messages

Browse Source
This commit is contained in:
Bartek Fabiszewski 2020-11-11 18:29:06 +01:00
parent 7113021950
commit 9ee0509fcf
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/en.php
View File

@ -101,9 +101,14 @@ $lang["edituser"] = "Edit user";
$lang["servererror"] = "Server error"; $lang["servererror"] = "Server error";
$lang["allrequired"] = "All fields are required"; $lang["allrequired"] = "All fields are required";
$lang["passnotmatch"] = "Passwords don't match"; $lang["passnotmatch"] = "Passwords don't match";
$lang["oldpassinvalid"] = "Wrong old password";
$lang["passempty"] = "Empty password";
$lang["loginempty"] = "Empty login";
$lang["passstrengthwarn"] = "Invalid password strength";
$lang["actionsuccess"] = "Action completed successfully"; $lang["actionsuccess"] = "Action completed successfully";
$lang["actionfailure"] = "Something went wrong"; $lang["actionfailure"] = "Something went wrong";
$lang["notauthorized"] = "User not authorized"; $lang["notauthorized"] = "User not authorized";
$lang["userunknown"] = "User unknown";
$lang["userdelwarn"] = "Warning!\n\nYou are going to permanently delete user %s, together with all their routes and positions.\n\nAre you sure?"; // substitutes user login $lang["userdelwarn"] = "Warning!\n\nYou are going to permanently delete user %s, together with all their routes and positions.\n\nAre you sure?"; // substitutes user login
$lang["editinguser"] = "You are editing user %s"; // substitutes user login $lang["editinguser"] = "You are editing user %s"; // substitutes user login
$lang["selfeditwarn"] = "Your can't edit your own user with this tool"; $lang["selfeditwarn"] = "Your can't edit your own user with this tool";

19
utils/changepass.php
View File

@ -20,12 +20,15 @@
require_once(dirname(__DIR__) . "/helpers/auth.php"); require_once(dirname(__DIR__) . "/helpers/auth.php");
require_once(ROOT_DIR . "/helpers/config.php"); require_once(ROOT_DIR . "/helpers/config.php");
require_once(ROOT_DIR . "/helpers/utils.php"); require_once(ROOT_DIR . "/helpers/utils.php");
require_once(ROOT_DIR . "/helpers/lang.php");
$auth = new uAuth(); $auth = new uAuth();
$config = uConfig::getInstance(); $config = uConfig::getInstance();
$lang = (new uLang($config))->getStrings();
if (!$auth->isAuthenticated()) { if (!$auth->isAuthenticated()) {
$auth->sendUnauthorizedHeader(); $auth->sendUnauthorizedHeader();
uUtils::exitWithError("Unauthorized"); uUtils::exitWithError($lang["notauthorized"]);
} }
$login = uUtils::postString('login'); $login = uUtils::postString('login');
@ -33,31 +36,31 @@ $oldpass = uUtils::postPass('oldpass');
$pass = uUtils::postPass('pass'); $pass = uUtils::postPass('pass');
// FIXME: strings need to be localized // FIXME: strings need to be localized
if (empty($pass)) { if (empty($pass)) {
uUtils::exitWithError("Empty password"); uUtils::exitWithError($lang["passempty"]);
} }
if (!$config->validPassStrength($pass)) { if (!$config->validPassStrength($pass)) {
uUtils::exitWithError("Invalid password strength"); uUtils::exitWithError($lang["passstrengthwarn"]);
} }
if (empty($login)) { if (empty($login)) {
uUtils::exitWithError("Empty login"); uUtils::exitWithError($lang["loginempty"]);
} }
if ($auth->user->login === $login) { if ($auth->user->login === $login) {
// current user // current user
$passUser = $auth->user; $passUser = $auth->user;
if (!$passUser->validPassword($oldpass)) { if (!$passUser->validPassword($oldpass)) {
uUtils::exitWithError("Wrong old password"); uUtils::exitWithError($lang["oldpassinvalid"]);
} }
} else if ($auth->isAdmin()) { } else if ($auth->isAdmin()) {
// different user, only admin // different user, only admin
$passUser = new uUser($login); $passUser = new uUser($login);
if (!$passUser->isValid) { if (!$passUser->isValid) {
uUtils::exitWithError("User unknown"); uUtils::exitWithError($lang["userunknown"]);
} }
} else { } else {
uUtils::exitWithError("Unauthorized"); uUtils::exitWithError($lang["notauthorized"]);
} }
if ($passUser->setPass($pass) === false) { if ($passUser->setPass($pass) === false) {
uUtils::exitWithError("Server error"); uUtils::exitWithError($lang["servererror"]);
} }
$auth->updateSession(); $auth->updateSession();
uUtils::exitWithSuccess(); uUtils::exitWithSuccess();