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

47
winixd/core/users.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2022, Tomasz Sowa
* Copyright (c) 2008-2024, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,6 @@
#include <arpa/inet.h>
#include "users.h"
#include "sessionmanager.h"
#include "slog.h"
namespace Winix
@@ -87,7 +86,7 @@ void Users::Clear()
void Users::ReadUsers(Db * db)
void Users::ReadUsers()
{
Clear();
@@ -195,11 +194,10 @@ return result;
// private
bool Users::LoginUserCheckSession(bool use_ses_log)
bool Users::LoginUserCheckSession()
{
Session * session = get_session();
Log * log = get_logger();
SLog * slog = get_session_logger();
if( !session )
return false;
@@ -209,8 +207,8 @@ bool Users::LoginUserCheckSession(bool use_ses_log)
if( log )
(*log) << log1 << "Users: I cannot login a user on a temporary session" << logend;
if( slog && use_ses_log )
(*slog) << logerror << T(L"service_unavailable") << logend;
// if( slog && use_ses_log )
// (*slog) << logerror << T(L"service_unavailable") << logend;
return false;
}
@@ -220,19 +218,18 @@ return true;
// private
User * Users::LoginUserCheckStatus(long user_id, bool use_ses_log)
User * Users::LoginUserCheckStatus(long user_id)
{
User * puser = GetUser(user_id);
Log * log = get_logger();
SLog * slog = get_session_logger();
if( !puser )
{
if( log )
(*log) << log1 << "Users: user id: " << user_id << " is not in system.users table" << logend;
if( slog && use_ses_log )
(*slog) << logerror << T(L"service_unavailable") << logend;
// if( slog && use_ses_log )
// (*slog) << logerror << T(L"service_unavailable") << logend;
return 0;
}
@@ -242,17 +239,17 @@ User * Users::LoginUserCheckStatus(long user_id, bool use_ses_log)
(*log) << log1 << "Users: user id: " << user_id << " is not ready for logging in (status: "
<< puser->status << ")" << logend;
if( slog && use_ses_log )
{
if( puser->status == WINIX_ACCOUNT_NOT_ACTIVATED )
(*slog) << logerror << T(L"account_not_activated") << logend;
else
if( puser->status == WINIX_ACCOUNT_SUSPENDED )
(*slog) << logerror << T(L"account_suspended") << logend;
else
if( puser->status == WINIX_ACCOUNT_BLOCKED )
(*slog) << logerror << T(L"account_banned") << logend;
}
// if( slog && use_ses_log )
// {
// if( puser->status == WINIX_ACCOUNT_NOT_ACTIVATED )
// (*slog) << logerror << T(L"account_not_activated") << logend;
// else
// if( puser->status == WINIX_ACCOUNT_SUSPENDED )
// (*slog) << logerror << T(L"account_suspended") << logend;
// else
// if( puser->status == WINIX_ACCOUNT_BLOCKED )
// (*slog) << logerror << T(L"account_banned") << logend;
// }
return 0;
}
@@ -262,17 +259,17 @@ return puser;
bool Users::LoginUser(long user_id, bool remember_me, bool use_ses_log)
bool Users::LoginUser(long user_id, bool remember_me)
{
Config * config = get_config();
if( !config || !config->use_internal_loggin_mechanism )
return false;
if( !LoginUserCheckSession(use_ses_log) )
if( !LoginUserCheckSession() )
return false;
User * puser = LoginUserCheckStatus(user_id, use_ses_log);
User * puser = LoginUserCheckStatus(user_id);
Log * log = get_logger();
Session * session = get_session();
SessionManager * session_manager = get_session_manager();