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

28
plugins/ticket/createticket.cpp
View File

@@ -40,7 +40,7 @@ void CreateTicket::SetTicketInfo(TicketInfo * pinfo)
bool CreateTicket::HasAccess()
{
if( request->is_item || !system->HasWriteAccess(*request->dir_tab.back()) )
if( cur->request->is_item || !system->HasWriteAccess(*cur->request->dir_tab.back()) )
return false;
if( !system->mounts.pmount || system->mounts.pmount->type != ticket_info->mount_type_ticket )
@@ -54,9 +54,9 @@ return true;
void CreateTicket::AddTicket(Ticket & ticket, Item & item)
{
ticket.file_id = item.id;
request->status = tdb->AddTicket(ticket);
cur->request->status = tdb->AddTicket(ticket);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
{
// sending notification
notify_msg.code = WINIX_NOTIFY_CODE_USER1;
@@ -80,15 +80,15 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
functions->SetUser(item);
item.privileges = 0644; // !! tymczasowo
item.parent_id = request->dir_tab.back()->id;
item.parent_id = cur->request->dir_tab.back()->id;
// adding without notificating
request->status = system->AddFile(item, false);
cur->request->status = system->AddFile(item, false);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
AddTicket(ticket, item);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
{
log << log2 << "CreateTicket: added a new ticket" << logend;
RemoveTicket();
@@ -97,7 +97,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
else
{
log << log1 << "CreateTicket: problem with adding a new ticket, error code: "
<< request->status << logend;
<< cur->request->status << logend;
}
}
@@ -106,9 +106,9 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
void CreateTicket::RemoveTicket()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
request->session->plugin_data.Get(ticket_info->plugin_id) );
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long dir_id = request->dir_tab.back()->id;
long dir_id = cur->request->dir_tab.back()->id;
session_data->create_ticket_map.erase(dir_id);
}
@@ -117,9 +117,9 @@ void CreateTicket::RemoveTicket()
Ticket & CreateTicket::PrepareTicket()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
request->session->plugin_data.Get(ticket_info->plugin_id) );
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long dir_id = request->dir_tab.back()->id;
long dir_id = cur->request->dir_tab.back()->id;
Ticket & ticket = session_data->GetTicket(dir_id, session_data->create_ticket_map);
return ticket;
@@ -133,13 +133,13 @@ void CreateTicket::MakePost()
ticket_info->FindCurrentConf();
Ticket & ticket = PrepareTicket();
Item & item = request->item;
Item & item = cur->request->item;
ticket_info->ticket = &ticket;
ticket_info->ReadTicketParams(ticket, false);
functions->ReadItem(item, Item::file);
if( !request->IsPostVar(L"fileuploadsubmit") )
if( !cur->request->IsPostVar(L"fileuploadsubmit") )
Submit(ticket, item);
}