the first part of reimplementing has been done
now we have app object and singletons are only: log logn plugin and app git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
#include "sessionmanager.h"
|
||||
#include "request.h"
|
||||
#include "log.h"
|
||||
#include "data.h"
|
||||
#include "session.h"
|
||||
#include "sessionparser.h"
|
||||
#include "plugin.h"
|
||||
@@ -27,6 +26,28 @@ SessionManager::SessionManager()
|
||||
}
|
||||
|
||||
|
||||
void SessionManager::SetRequest(Request * prequest)
|
||||
{
|
||||
request = prequest;
|
||||
}
|
||||
|
||||
|
||||
void SessionManager::SetConfig(Config * pconfig)
|
||||
{
|
||||
config = pconfig;
|
||||
}
|
||||
|
||||
|
||||
void SessionManager::SetSystem(System * psystem)
|
||||
{
|
||||
system = psystem;
|
||||
}
|
||||
|
||||
void SessionManager::SetLastContainer(LastContainer * plast_container)
|
||||
{
|
||||
session_table.SetLastContainer(plast_container);
|
||||
}
|
||||
|
||||
|
||||
bool SessionManager::IsSession(long id)
|
||||
{
|
||||
@@ -79,11 +100,11 @@ void SessionManager::CreateTemporarySession()
|
||||
s.id = 0;
|
||||
|
||||
session_table.PushBack(s);
|
||||
request.session = &session_table.Back();
|
||||
request->session = &session_table.Back();
|
||||
}
|
||||
else
|
||||
{
|
||||
request.session = &(*i);
|
||||
request->session = &(*i);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,10 +123,10 @@ int attempts = 100;
|
||||
|
||||
if( added )
|
||||
{
|
||||
request.session = &session_table.Back();
|
||||
request.session->new_session = true;
|
||||
request->session = &session_table.Back();
|
||||
request->session->new_session = true;
|
||||
|
||||
log << log2 << "SM: created a new session: " << request.session->id << logend;
|
||||
log << log2 << "SM: created a new session: " << request->session->id << logend;
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -129,17 +150,17 @@ bool SessionManager::SetSessionFromCookie(const std::string & cookie)
|
||||
return false;
|
||||
|
||||
// that session is in the table
|
||||
request.session = &(*s);
|
||||
request.session->new_session = false;
|
||||
request->session = &(*s);
|
||||
request->session->new_session = false;
|
||||
session_table.UpdateLastTime(s, std::time(0));
|
||||
|
||||
if( request.method == Request::get )
|
||||
request.session->last_time_get = request.session->last_time;
|
||||
if( request->method == Request::get )
|
||||
request->session->last_time_get = request->session->last_time;
|
||||
|
||||
log << log2 << "SM: session: " << s->id;
|
||||
|
||||
if( request.session->puser )
|
||||
log << log2 << ", user: " << request.session->puser->name << ", id: " << request.session->puser->id;
|
||||
if( request->session->puser )
|
||||
log << log2 << ", user: " << request->session->puser->name << ", id: " << request->session->puser->id;
|
||||
|
||||
log << log2 << logend;
|
||||
|
||||
@@ -150,9 +171,9 @@ return true;
|
||||
|
||||
void SessionManager::SetSession()
|
||||
{
|
||||
CookieTable::iterator i = request.cookie_table.find(data.http_session_id_name);
|
||||
CookieTable::iterator i = request->cookie_table.find(config->http_session_id_name);
|
||||
|
||||
if( i == request.cookie_table.end() )
|
||||
if( i == request->cookie_table.end() )
|
||||
{
|
||||
CreateSession();
|
||||
}
|
||||
@@ -162,18 +183,18 @@ void SessionManager::SetSession()
|
||||
{
|
||||
// there is no such a session
|
||||
// deleting the old cookie
|
||||
request.cookie_table.erase(i);
|
||||
request->cookie_table.erase(i);
|
||||
|
||||
// and creating a new one
|
||||
CreateSession();
|
||||
}
|
||||
}
|
||||
|
||||
// request.session is set now
|
||||
// request->session is set now
|
||||
|
||||
if( request.session->new_session )
|
||||
if( request->session->new_session )
|
||||
{
|
||||
request.session->plugin_data.Resize(plugin.Size());
|
||||
request->session->plugin_data.Resize(plugin.Size());
|
||||
plugin.Call(WINIX_SESSION_CREATED);
|
||||
}
|
||||
|
||||
@@ -199,7 +220,7 @@ SessionContainer::Iterator SessionManager::SessionEnd()
|
||||
|
||||
void SessionManager::DeleteOldSessions()
|
||||
{
|
||||
session_table.DelFirstByTimeInterval(data.session_max_idle);
|
||||
session_table.DelFirstByTimeInterval(config->session_max_idle);
|
||||
|
||||
if( ++session_checker > 1000 )
|
||||
{
|
||||
@@ -207,7 +228,7 @@ void SessionManager::DeleteOldSessions()
|
||||
log << log3 << "SM: checking sessions which have 'remember me' flag set" << logend;
|
||||
|
||||
session_checker = 0;
|
||||
session_table.DelFirstByTimeInterval(data.session_remember_max_idle, false);
|
||||
session_table.DelFirstByTimeInterval(config->session_remember_max_idle, false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,15 +238,15 @@ void SessionManager::DeleteAllPluginsData()
|
||||
{
|
||||
SessionContainer::Iterator i = session_table.Begin();
|
||||
|
||||
Session * old_session = request.session;
|
||||
Session * old_session = request->session;
|
||||
|
||||
for( ; i!=session_table.End() ; ++i )
|
||||
{
|
||||
request.session = &(*i);
|
||||
request->session = &(*i);
|
||||
i->plugin_data.DeleteAll();
|
||||
}
|
||||
|
||||
request.session = old_session;
|
||||
request->session = old_session;
|
||||
}
|
||||
|
||||
|
||||
@@ -237,19 +258,20 @@ void SessionManager::LoadSessions()
|
||||
SessionParser sp;
|
||||
SessionContainer::Iterator i;
|
||||
|
||||
Session * old_session = request.session;
|
||||
sp.SetUsers(&system->users);
|
||||
Session * old_session = request->session;
|
||||
|
||||
sp.Parse(data.session_file, session_table);
|
||||
sp.Parse(config->session_file, session_table);
|
||||
i = session_table.Begin();
|
||||
|
||||
for( ; i!=session_table.End() ; ++i )
|
||||
{
|
||||
i->plugin_data.Resize(plugin.Size());
|
||||
request.session = &(*i);
|
||||
request->session = &(*i);
|
||||
plugin.Call(WINIX_SESSION_CREATED);
|
||||
}
|
||||
|
||||
request.session = old_session;
|
||||
request->session = old_session;
|
||||
}
|
||||
|
||||
|
||||
@@ -258,10 +280,10 @@ SessionContainer::Iterator i;
|
||||
|
||||
void SessionManager::SaveSessions()
|
||||
{
|
||||
if( data.session_file.empty() )
|
||||
if( config->session_file.empty() )
|
||||
return;
|
||||
|
||||
std::ofstream file(data.session_file.c_str());
|
||||
std::ofstream file(config->session_file.c_str());
|
||||
|
||||
if( !file )
|
||||
{
|
||||
@@ -286,7 +308,7 @@ void SessionManager::SaveSessions()
|
||||
}
|
||||
|
||||
file.close();
|
||||
chmod(data.session_file.c_str(), 0600);
|
||||
chmod(config->session_file.c_str(), 0600);
|
||||
|
||||
log << log2 << "SM: saved " << len << " session(s)" << logend;
|
||||
}
|
||||
|
Reference in New Issue
Block a user