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

WIP: remove the old database abstraction layer

Browse Source 
remove such classes:
- DbBase
- DbConn
- DbTextStream
- Db

while here:
- remove: TextStream, SLog, TexTextStream
This commit is contained in:
Tomasz Sowa
2024-06-22 18:03:54 +02:00
parent 5d457f3d4b
commit 6aa100f12c
138 changed files with 6658 additions and 12402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
winixd/functions/account.cpp
View File

@@ -35,7 +35,6 @@
#include "account.h"
#include "core/log.h"
#include "core/misc.h"
#include "functions/functions.h"
@@ -53,7 +52,7 @@ Account::Account()
bool Account::ActivateAccount(User * puser, long code, bool use_ses_log)
bool Account::ActivateAccount(User * puser, long code)
{
pt::Space * user_code_space = puser->admin_env.get_space(L"activation_code");
@@ -68,8 +67,8 @@ bool Account::ActivateAccount(User * puser, long code, bool use_ses_log)
{
log << log2 << "Account: account: " << puser->login << " activated" << logend;
if( use_ses_log )
slog << loginfo << T(L"account_activated") << logend;
// if( use_ses_log )
// slog << loginfo << T(L"account_activated") << logend;
return true;
}
@@ -85,23 +84,23 @@ bool Account::ActivateAccount(User * puser, long code, bool use_ses_log)
log << log2 << "Account: incorrect activation code" << logend;
if( use_ses_log )
slog << logerror << T(L"incorrect_activation_code") << logend;
// if( use_ses_log )
// slog << logerror << T(L"incorrect_activation_code") << logend;
}
}
else
{
log << log1 << "Account: there is no activation_code value in an admin environment" << logend;
if( use_ses_log )
slog << loginfo << T(L"account_cannot_be_activated") << logend;
// if( use_ses_log )
// slog << loginfo << T(L"account_cannot_be_activated") << logend;
}
return false;
}
bool Account::ActivateAccount(const std::wstring & login, long code, bool use_ses_log)
bool Account::ActivateAccount(const std::wstring & login, long code)
{
bool result = false;
User * puser = system->users.GetUser(login);
@@ -110,14 +109,14 @@ bool Account::ActivateAccount(const std::wstring & login, long code, bool use_se
{
if( puser->status == WINIX_ACCOUNT_NOT_ACTIVATED )
{
result = ActivateAccount(puser, code, use_ses_log);
result = ActivateAccount(puser, code);
}
else
{
log << log2 << "Account: this account is already activated" << logend;
if( use_ses_log )
slog << loginfo << T(L"account_already_activated") << logend;
// if( use_ses_log )
// slog << loginfo << T(L"account_already_activated") << logend;
}
}
else
@@ -137,7 +136,7 @@ void Account::ActivateAccount()
if( !login.empty() )
{
ActivateAccount(login, code, true);
ActivateAccount(login, code);
system->RedirectToLastItem();
}
}