changed: added Cur structure

we have there two pointers: 
 Request * request;
 Session * session;
these are the current request and the current session


the session GC was moved to SessionManager (was in SessionContainer)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@708 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-01-23 14:15:30 +00:00
parent 61ac29b2de
commit 915cabdf97
171 changed files with 2822 additions and 2650 deletions

View File

@@ -46,22 +46,22 @@ void winix_users_logged(Info & i)
void winix_function(Info & i)
{
i.out << request->function->fun.url;
i.out << cur->request->function->fun.url;
}
void winix_function_is(Info & i)
{
if( !request->function )
if( !cur->request->function )
return;
i.res = (request->function->fun.url == i.par);
i.res = (cur->request->function->fun.url == i.par);
}
void winix_function_param_is(Info & i)
{
i.res = request->IsParam(i.par);
i.res = cur->request->IsParam(i.par);
}
@@ -158,13 +158,13 @@ char buf[20];
void winix_err_is(Info & i)
{
int value = Toi(i.par);
i.res = (request->status == value);
i.res = (cur->request->status == value);
}
void winix_err_code(Info & i)
{
i.out << request->status;
i.out << cur->request->status;
}
@@ -177,7 +177,7 @@ void winix_is_err_in_locales(Info & i)
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", cur->request->status);
winix_error_key = buff;
i.res = locale.IsKey(winix_error_key);
@@ -189,7 +189,7 @@ void winix_err_msg_from_locales(Info & i)
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", cur->request->status);
winix_error_key = buff;
i.out << locale.Get(winix_error_key);
@@ -198,8 +198,8 @@ size_t buff_len = sizeof(buff) / sizeof(wchar_t);
void winix_show_content_in_full_window(Info & i)
{
if( request->function )
i.res = (request->function == &functions->fun_ckeditor || request->function == &functions->fun_tinymce);
if( cur->request->function )
i.res = (cur->request->function == &functions->fun_ckeditor || cur->request->function == &functions->fun_tinymce);
}