tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge branch 'master' into uikit

This commit is contained in:
Tomasz Sowa 2021-01-25 18:45:07 +01:00
parent 1e345f5010 4625451c85
commit 9476bcc7b6
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winixd/core/winixrequest.cpp
View File

@ -94,11 +94,9 @@ void WinixRequest::set_dependency(WinixSystem * winix_system)
void WinixRequest::set_dependency(WinixRequest * winix_request) void WinixRequest::set_dependency(WinixRequest * winix_request)
{ {
WinixSystem::set_dependency(winix_request); WinixSystem::set_dependency(winix_request);
cur = winix_request->cur; set_cur(winix_request->cur);
locale = winix_request->locale; set_locale(winix_request->locale);
session_manager = winix_request->session_manager; set_session_manager(winix_request->session_manager);
// CHECK ME what about slog
} }

5
winixd/functions/adduser.cpp
View File

@ -264,6 +264,11 @@ void AddUser::MakePost()
const std::wstring & email = cur->request->PostVar(L"email"); const std::wstring & email = cur->request->PostVar(L"email");
bool autoactivate = false; 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) || if( !IsLoginCorrect(login, true) ||
!IsEmailCorrect(email, true) || !IsEmailCorrect(email, true) ||
!functions->fun_passwd.IsPasswordCorrect(pass, conf_pass, true) ) !functions->fun_passwd.IsPasswordCorrect(pass, conf_pass, true) )