plugin ticket: rewritten templates ezc functions
(now images/files are working fine) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@795 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -111,7 +111,7 @@ void CreateTicket::RemoveTmpTicket()
|
||||
|
||||
long dir_id = cur->request->dir_tab.back()->id;
|
||||
session_data->create_ticket_map.erase(dir_id);
|
||||
session_data->create_file_map.erase(dir_id);
|
||||
session_data->create_space_map.erase(dir_id);
|
||||
}
|
||||
|
||||
|
||||
@@ -121,22 +121,24 @@ Ticket & CreateTicket::PrepareTicket()
|
||||
SessionData * session_data = reinterpret_cast<SessionData*>(
|
||||
cur->session->plugin_data.Get(ticket_info->plugin_id) );
|
||||
|
||||
bool is_new;
|
||||
long dir_id = cur->request->dir_tab.back()->id;
|
||||
Ticket & ticket = session_data->GetTicket(dir_id, session_data->create_ticket_map);
|
||||
Ticket & ticket = session_data->GetTicket(dir_id, session_data->create_ticket_map, &is_new);
|
||||
ticket_info->create_new_ticket = is_new;
|
||||
|
||||
return ticket;
|
||||
}
|
||||
|
||||
|
||||
std::vector<long> & CreateTicket::PrepareFileMap()
|
||||
PT::Space & CreateTicket::PrepareSpace()
|
||||
{
|
||||
SessionData * session_data = reinterpret_cast<SessionData*>(
|
||||
cur->session->plugin_data.Get(ticket_info->plugin_id) );
|
||||
|
||||
long dir_id = cur->request->dir_tab.back()->id;
|
||||
std::vector<long> & file_map = session_data->GetFileTab(dir_id, session_data->create_file_map);
|
||||
PT::Space & space = session_data->GetSpace(dir_id, session_data->create_space_map);
|
||||
|
||||
return file_map;
|
||||
return space;
|
||||
}
|
||||
|
||||
|
||||
@@ -145,15 +147,17 @@ void CreateTicket::MakePost()
|
||||
ticket_info->Clear();
|
||||
ticket_info->FindCurrentConf();
|
||||
|
||||
Ticket & ticket = PrepareTicket();
|
||||
Item & item = cur->request->item;
|
||||
Ticket & ticket = PrepareTicket();
|
||||
PT::Space & meta = PrepareSpace();
|
||||
Item & item = cur->request->item;
|
||||
ticket_info->ticket = &ticket;
|
||||
ticket_info->item = &item;
|
||||
std::vector<long> & file_map = PrepareFileMap();
|
||||
|
||||
ticket_info->ReadTicketParams(ticket, false, file_map, item.meta);
|
||||
ticket_info->ReadTicketParams(ticket, false, meta);
|
||||
functions->ReadItem(item, Item::file);
|
||||
|
||||
ticket_info->CopyTicketSpace(meta, item);
|
||||
|
||||
if( !cur->request->IsPostVar(L"fileuploadsubmit") )
|
||||
Submit(ticket, item);
|
||||
}
|
||||
@@ -165,9 +169,12 @@ void CreateTicket::MakeGet()
|
||||
ticket_info->Clear();
|
||||
ticket_info->FindCurrentConf();
|
||||
|
||||
Ticket & ticket = PrepareTicket();
|
||||
Ticket & ticket = PrepareTicket();
|
||||
PT::Space & meta = PrepareSpace();
|
||||
ticket_info->ticket = &ticket;
|
||||
ticket_info->item = &cur->request->item;
|
||||
|
||||
ticket_info->CopyTicketSpace(meta, *ticket_info->item);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user