removed some thread and ticket information from request

they are in FunThread and FunTicket classes now
added funtion FunUptime (I forgot about it)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@631 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2010-08-10 20:43:38 +00:00
parent 76897b8a83
commit 9901c63ede
79 changed files with 1219 additions and 993 deletions

View File

@@ -16,26 +16,55 @@ namespace Fun
FunTicket::FunTicket()
{
fun.url = "ticket";
Clear();
}
bool FunTicket::HasAccess()
{
if( request->is_item || system->mounts.pmount->type != Mount::ticket )
return false;
return true;
}
void FunTicket::Clear()
{
item.Clear();
is_ticket = false;
ticket.Clear();
ticket_tab.clear();
}
void FunTicket::ReadTicket()
{
if( db->GetTicketByDirId(request->dir_tab.back()->id, ticket) == WINIX_ERR_OK )
{
is_ticket = true;
db->GetItemById(ticket.item_id, item);
}
}
void FunTicket::TicketDeleteFirst()
{
if( !request->is_ticket )
if( !is_ticket )
return;
for(size_t i=0 ; i<request->item_table.size() ; ++i)
for(size_t i=0 ; i<request->item_tab.size() ; ++i)
{
if( request->item_table[i].id == request->ticket.item_id )
if( request->item_tab[i].id == ticket.item_id )
{
// this is the first item with the content for the ticket
if( !system->HasReadAccess(request->item_table[i]) )
if( !system->HasReadAccess(request->item_tab[i]) )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
}
request->item_table.erase(request->item_table.begin() + i);
request->item_tab.erase(request->item_tab.begin() + i);
break;
}
}
@@ -45,23 +74,19 @@ void FunTicket::TicketDeleteFirst()
void FunTicket::MakeGet()
{
if( request->is_item || system->mounts.pmount->type != Mount::ticket )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
ReadTicket();
Db::ItemQuery iq;
iq.WhereParentId(request->dir_table.back()->id);
iq.WhereParentId(request->dir_tab.back()->id);
iq.WhereType(Item::file);
iq.WhereAuth(Item::auth_none);
db->GetItems(request->item_table, iq);
db->GetTickets(request->dir_table.back()->id, request->ticket_tab);
db->GetItems(request->item_tab, iq);
db->GetTickets(request->dir_tab.back()->id, ticket_tab);
TicketDeleteFirst();
system->CheckAccessToItems(request->item_table);
system->CheckAccessToItems(request->item_tab);
}