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:
@@ -27,10 +27,10 @@ bool Mv::MoveCheckAccessFromToDir()
|
||||
Item * last;
|
||||
Item * last_but_one = 0;
|
||||
|
||||
last = request->dir_table[request->dir_table.size()-1];
|
||||
last = request->dir_tab[request->dir_tab.size()-1];
|
||||
|
||||
if( request->dir_table.size() >= 2 )
|
||||
last_but_one = request->dir_table[request->dir_table.size()-2];
|
||||
if( request->dir_tab.size() >= 2 )
|
||||
last_but_one = request->dir_tab[request->dir_tab.size()-2];
|
||||
|
||||
if( request->method != Request::post )
|
||||
{
|
||||
@@ -64,7 +64,7 @@ bool Mv::MoveCheckAccessFrom()
|
||||
{
|
||||
// moving a file
|
||||
|
||||
if( !system->HasWriteAccess(*request->dir_table.back()) )
|
||||
if( !system->HasWriteAccess(*request->dir_tab.back()) )
|
||||
{
|
||||
request->status = WINIX_ERR_PERMISSION_DENIED;
|
||||
return false;
|
||||
@@ -237,16 +237,16 @@ Db::ItemQuery iq;
|
||||
iq.sel_type = true;
|
||||
iq.sel_url = true;
|
||||
iq.sel_auth = true;
|
||||
iq.WhereParentId(request->dir_table.back()->id);
|
||||
iq.WhereParentId(request->dir_tab.back()->id);
|
||||
|
||||
db->GetItems(request->item_table, iq);
|
||||
db->GetItems(request->item_tab, iq);
|
||||
|
||||
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].type == Item::dir )
|
||||
MoveDir(request->item_table[i], false);
|
||||
if( request->item_tab[i].type == Item::dir )
|
||||
MoveDir(request->item_tab[i], false);
|
||||
else
|
||||
MoveFile(request->item_table[i], false);
|
||||
MoveFile(request->item_tab[i], false);
|
||||
}
|
||||
|
||||
system->RedirectToLastDir();
|
||||
@@ -355,7 +355,7 @@ void Mv::MakePost()
|
||||
}
|
||||
else
|
||||
{
|
||||
MoveDir(*request->dir_table.back());
|
||||
MoveDir(*request->dir_tab.back());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user