From 4625451c855177311546f81734d53dfc63804920 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Mon, 25 Jan 2021 18:41:28 +0100 Subject: [PATCH] fixed: messages about password validity in adduser function were not shown, slog and locale for functions->fun_passwd were not set --- winixd/core/winixrequest.cpp | 8 +++----- winixd/functions/adduser.cpp | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/winixd/core/winixrequest.cpp b/winixd/core/winixrequest.cpp index a4304a3..0dc594d 100644 --- a/winixd/core/winixrequest.cpp +++ b/winixd/core/winixrequest.cpp @@ -94,11 +94,9 @@ void WinixRequest::set_dependency(WinixSystem * winix_system) void WinixRequest::set_dependency(WinixRequest * winix_request) { WinixSystem::set_dependency(winix_request); - cur = winix_request->cur; - locale = winix_request->locale; - session_manager = winix_request->session_manager; - - // CHECK ME what about slog + set_cur(winix_request->cur); + set_locale(winix_request->locale); + set_session_manager(winix_request->session_manager); } diff --git a/winixd/functions/adduser.cpp b/winixd/functions/adduser.cpp index cb3b6d0..92222de 100644 --- a/winixd/functions/adduser.cpp +++ b/winixd/functions/adduser.cpp @@ -264,6 +264,11 @@ void AddUser::MakePost() const std::wstring & email = cur->request->PostVar(L"email"); bool autoactivate = false; + // for slog and locale from fun_passwd to work correctly + // but in the future IsPasswordCorrect will be moved to User class + // or some other place + functions->fun_passwd.set_dependency(this); + if( !IsLoginCorrect(login, true) || !IsEmailCorrect(email, true) || !functions->fun_passwd.IsPasswordCorrect(pass, conf_pass, true) )