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

32
plugins/ticket/editticket.cpp
View File

@@ -41,10 +41,10 @@ bool EditTicket::HasAccess()
{
// not logged users cannot edit tickets
// !! we are waiting for the sticky bit
if( !request->session->puser )
if( !cur->session->puser )
return false;
if( !request->is_item || !system->HasWriteAccess(request->item) )
if( !cur->request->is_item || !system->HasWriteAccess(cur->request->item) )
return false;
if( !system->mounts.pmount || system->mounts.pmount->type != ticket_info->mount_type_ticket )
@@ -58,9 +58,9 @@ return true;
void EditTicket::ChangeTicket(Ticket & ticket, Item & item)
{
request->status = tdb->RemoveAddTicket(ticket);
cur->request->status = tdb->RemoveAddTicket(ticket);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
{
// sending notification
/*
@@ -83,12 +83,12 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
return;
// adding without notificating
request->status = system->EditFile(item, old_url != item.url);
cur->request->status = system->EditFile(item, old_url != item.url);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
ChangeTicket(ticket, item);
if( request->status == WINIX_ERR_OK )
if( cur->request->status == WINIX_ERR_OK )
{
log << log2 << "EditTicket: ticket modified" << logend;
RemoveTicket();
@@ -97,7 +97,7 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
else
{
log << log1 << "EditTicket: problem with editing a ticket, error code: "
<< request->status << logend;
<< cur->request->status << logend;
}
}
@@ -107,9 +107,9 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
void EditTicket::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 file_id = request->item.id;
long file_id = cur->request->item.id;
session_data->create_ticket_map.erase(file_id);
session_data->new_file_map.erase(file_id);
}
@@ -119,10 +119,10 @@ void EditTicket::RemoveTicket()
Ticket & EditTicket::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) );
bool is_new;
long file_id = request->item.id;
long file_id = cur->request->item.id;
Ticket & ticket = session_data->GetTicket(file_id, session_data->edit_ticket_map, &is_new);
if( is_new )
@@ -138,9 +138,9 @@ return ticket;
std::vector<long> & EditTicket::PrepareFileMap()
{
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 file_id = request->item.id;
long file_id = cur->request->item.id;
std::vector<long> & file_map = session_data->GetFileTab(file_id, session_data->new_file_map);
return file_map;
@@ -152,7 +152,7 @@ void EditTicket::MakePost()
ticket_info->FindCurrentConf();
Ticket & ticket = PrepareTicket();
Item & item = request->item;
Item & item = cur->request->item;
old_url = item.url;
std::vector<long> & file_map = PrepareFileMap();
ticket_info->ticket = &ticket;
@@ -160,7 +160,7 @@ void EditTicket::MakePost()
ticket_info->ReadTicketParams(ticket, false, &file_map);
functions->ReadItem(item, Item::file);
if( !request->IsPostVar(L"fileuploadsubmit") )
if( !cur->request->IsPostVar(L"fileuploadsubmit") )
Submit(ticket, item);
}