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:
@@ -23,18 +23,18 @@ Subject::Subject()
|
||||
bool Subject::SubjectCheckAccess()
|
||||
{
|
||||
// super user can always
|
||||
if( request->session->puser && request->session->puser->super_user )
|
||||
if( cur->session->puser && cur->session->puser->super_user )
|
||||
return true;
|
||||
|
||||
bool access;
|
||||
|
||||
if( request->is_item )
|
||||
access = system->HasWriteAccess(request->item);
|
||||
if( cur->request->is_item )
|
||||
access = system->HasWriteAccess(cur->request->item);
|
||||
else
|
||||
access = system->HasWriteAccess(*request->dir_tab.back());
|
||||
access = system->HasWriteAccess(*cur->request->dir_tab.back());
|
||||
|
||||
if( !access )
|
||||
request->status = WINIX_ERR_PERMISSION_DENIED;
|
||||
cur->request->status = WINIX_ERR_PERMISSION_DENIED;
|
||||
|
||||
return access;
|
||||
}
|
||||
@@ -43,9 +43,9 @@ return access;
|
||||
|
||||
void Subject::EditDirSubject()
|
||||
{
|
||||
Item & dir = *request->dir_tab.back();
|
||||
Item & dir = *cur->request->dir_tab.back();
|
||||
|
||||
request->PostVar(L"subject", dir.subject);
|
||||
cur->request->PostVar(L"subject", dir.subject);
|
||||
db->EditSubjectById(dir, dir.id);
|
||||
|
||||
system->RedirectToLastDir();
|
||||
@@ -55,10 +55,10 @@ void Subject::EditDirSubject()
|
||||
|
||||
void Subject::EditFileSubject()
|
||||
{
|
||||
request->PostVar(L"subject", request->item.subject);
|
||||
db->EditSubjectById(request->item, request->item.id);
|
||||
cur->request->PostVar(L"subject", cur->request->item.subject);
|
||||
db->EditSubjectById(cur->request->item, cur->request->item.id);
|
||||
|
||||
system->RedirectTo(request->item);
|
||||
system->RedirectTo(cur->request->item);
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ void Subject::MakePost()
|
||||
if( !SubjectCheckAccess() )
|
||||
return;
|
||||
|
||||
if( request->is_item )
|
||||
if( cur->request->is_item )
|
||||
EditFileSubject();
|
||||
else
|
||||
EditDirSubject();
|
||||
|
Reference in New Issue
Block a user