tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

removed some thread and ticket information from request

Browse Source 
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:
Tomasz Sowa
2010-08-10 20:43:38 +00:00
parent 76897b8a83
commit 9901c63ede
79 changed files with 1219 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
functions/rm.cpp
View File

@@ -62,7 +62,7 @@ return true;
bool Rm::HasAccess()
{
if( !request->is_item )
return HasAccess(*request->dir_table.back());
return HasAccess(*request->dir_tab.back());
else
return HasAccess(request->item);
@@ -100,10 +100,10 @@ void Rm::RemoveAllDirs(long dir_id)
plugin.Call(WINIX_DIR_PREPARE_TO_REMOVE, dir_id);
rm_auth_iq.WhereParentId(dir_id);
db->GetItems(request->item_table, rm_auth_iq);
db->GetItems(request->item_tab, rm_auth_iq);
for(size_t i=0 ; i<request->item_table.size() ; ++i)
RemoveAuth(request->item_table[i]);
for(size_t i=0 ; i<request->item_tab.size() ; ++i)
RemoveAuth(request->item_tab[i]);
if( db->DelDirById(dir_id) == WINIX_ERR_OK )
{
@@ -123,21 +123,21 @@ void Rm::RemoveAllDirs()
RemoveAuthPrepareQuery();
// this method deletes recursively all directories
RemoveAllDirs(request->dir_table.back()->id);
request->dir_table.erase(--request->dir_table.end());
RemoveAllDirs(request->dir_tab.back()->id);
request->dir_tab.erase(--request->dir_tab.end());
if( request->dir_table.empty() )
if( request->dir_tab.empty() )
{
// we have deleted the root directory
system->dirs.CheckRootDir(); // adding a new root dir
Item * proot = system->dirs.GetRootDir();
if( proot )
request->dir_table.push_back(proot);
request->dir_tab.push_back(proot);
else
// there is no a root dir
// CheckRootDir() didn't add the root dir (probably problem with the database)
// make sure that ::Make() will check that the dir_table is empty and returns
// make sure that ::Make() will check that the dir_tab is empty and returns
return;
}
@@ -147,7 +147,7 @@ void Rm::RemoveAllDirs()
void Rm::RemoveDir()
{
if( request->param_table.empty() )
if( request->param_tab.empty() )
request->status = WINIX_ERR_PERMISSION_DENIED; // use parameter "r" for removing a directory
else
if( request->IsParam("r") )
@@ -189,9 +189,9 @@ void Rm::RemoveAuth(Item & item)
void Rm::RemoveFile()
{
// for safety we check if param_table is empty
// for safety we check if param_tab is empty
// a user can use "confirm" but can make a mistake when typing
if( !request->param_table.empty() )
if( !request->param_tab.empty() )
{
request->status = WINIX_ERR_UNKNOWN_PARAM;
return;