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

changed: added Cur structure

Browse Source 
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:
Tomasz Sowa
2011-01-23 14:15:30 +00:00
parent 61ac29b2de
commit 915cabdf97
171 changed files with 2822 additions and 2650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
templates/priv.cpp
View File

@@ -26,16 +26,16 @@ static size_t priv_user_reqid = 0;
void priv_user_tab_init(Item & item)
{
priv_user_reqid = request->id;
priv_user_reqid = cur->request->id;
priv_user_table.clear();
if( !request->session->puser )
if( !cur->session->puser )
{
// not logged
priv_user_table.push_back(item.user_id);
}
else
if( request->session->puser->super_user )
if( cur->session->puser->super_user )
{
// super user is allowed to change to any user
for(size_t i=0 ; i<system->users.Size() ; ++i)
@@ -54,16 +54,16 @@ void priv_user_tab_init(Item & item)
void priv_user_tab_init()
{
if( request->is_item )
priv_user_tab_init(request->item);
if( cur->request->is_item )
priv_user_tab_init(cur->request->item);
else
priv_user_tab_init(*request->dir_tab.back());
priv_user_tab_init(*cur->request->dir_tab.back());
}
void priv_user_tab(Info & i)
{
if( priv_user_reqid != request->id )
if( priv_user_reqid != cur->request->id )
priv_user_tab_init();
priv_user_index = i.iter;
@@ -103,14 +103,14 @@ void priv_user_tab_isdefault(Info & i)
{
long uid = priv_user_table[priv_user_index];
if( request->is_item )
if( cur->request->is_item )
{
if( uid == request->item.user_id )
if( uid == cur->request->item.user_id )
i.res = true;
}
else
{
if( uid == request->dir_tab.back()->user_id )
if( uid == cur->request->dir_tab.back()->user_id )
i.res = true;
}
}
@@ -131,16 +131,16 @@ static size_t priv_group_reqid = 0;
void priv_group_tab_init(Item & item)
{
priv_group_reqid = request->id;
priv_group_reqid = cur->request->id;
priv_group_table.clear();
if( !request->session->puser )
if( !cur->session->puser )
{
// not logged
priv_group_table.push_back(item.group_id);
}
else
if( request->session->puser->super_user )
if( cur->session->puser->super_user )
{
// super user is allowed to change to any group
for(size_t i=0 ; i<system->groups.Size() ; ++i)
@@ -150,15 +150,15 @@ void priv_group_tab_init(Item & item)
priv_group_table.push_back(-1);
}
else
if( request->session->puser->id == item.user_id )
if( cur->session->puser->id == item.user_id )
{
bool was_current_group = false;
// owner of the item -- is allowed to change only to a group in which he belongs to
for(size_t i=0 ; i<request->session->puser->groups.size() ; ++i)
for(size_t i=0 ; i<cur->session->puser->groups.size() ; ++i)
{
priv_group_table.push_back( request->session->puser->groups[i] );
priv_group_table.push_back( cur->session->puser->groups[i] );
if( item.group_id == request->session->puser->groups[i] )
if( item.group_id == cur->session->puser->groups[i] )
was_current_group = true;
}
@@ -179,16 +179,16 @@ void priv_group_tab_init(Item & item)
void priv_group_tab_init()
{
if( request->is_item )
priv_group_tab_init(request->item);
if( cur->request->is_item )
priv_group_tab_init(cur->request->item);
else
priv_group_tab_init(*request->dir_tab.back());
priv_group_tab_init(*cur->request->dir_tab.back());
}
void priv_group_tab(Info & i)
{
if( priv_group_reqid != request->id )
if( priv_group_reqid != cur->request->id )
priv_group_tab_init();
priv_group_index = i.iter;
@@ -228,14 +228,14 @@ void priv_group_tab_isdefault(Info & i)
{
long gid = priv_group_table[priv_group_index];
if( request->is_item )
if( cur->request->is_item )
{
if( gid == request->item.group_id )
if( gid == cur->request->item.group_id )
i.res = true;
}
else
{
if( gid == request->dir_tab.back()->group_id )
if( gid == cur->request->dir_tab.back()->group_id )
i.res = true;
}
}
@@ -244,10 +244,10 @@ void priv_group_tab_isdefault(Info & i)
void priv_privileges(Info & i)
{
if( request->is_item )
i.out << Toa(request->item.privileges, 8);
if( cur->request->is_item )
i.out << Toa(cur->request->item.privileges, 8);
else
i.out << Toa(request->dir_tab.back()->privileges, 8);
i.out << Toa(cur->request->dir_tab.back()->privileges, 8);
}
@@ -267,13 +267,13 @@ void priv_privileges_for_dirs(Info & i)
void priv_show_form_chown(Info & i)
{
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chown);
i.res = (cur->request->function == &functions->fun_priv || cur->request->function == &functions->fun_chown);
}
void priv_show_form_chmod(Info & i)
{
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chmod);
i.res = (cur->request->function == &functions->fun_priv || cur->request->function == &functions->fun_chmod);
}