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

28
core/system.cpp
View File

@@ -114,15 +114,17 @@ Item * pdir;
{
// !! zrobic nowy interfejs
// !! GetItem pozamieniac na GetFile
// !! i nie uzywac request->item_table (zrobic sobie lokalny tutaj)
db->GetItem(request->item_table, item_id);
// !! i nie uzywac request->item_tab (zrobic sobie lokalny tutaj)
db->GetItem(request->item_tab, item_id);
if( !request->item_table.empty() )
if( !request->item_tab.empty() )
{
if( !dirs.MakePath(request->item_table[0].parent_id, path) )
log << log1 << "Content: Can't redirect: no dirs for item id: " << request->item_table[0].id << ", requested directory id: " << request->item_table[0].parent_id << logend;
if( !dirs.MakePath(request->item_tab[0].parent_id, path) )
log << log1 << "Content: Can't redirect: no dirs for item id: "
<< request->item_tab[0].id << ", requested directory id: "
<< request->item_tab[0].parent_id << logend;
request->redirect_to += path + request->item_table[0].url;
request->redirect_to += path + request->item_tab[0].url;
}
else
{
@@ -138,7 +140,7 @@ Item * pdir;
void System::RedirectToLastDir()
{
// !! dac sprawdzenie czy istnieje
RedirectTo( *request->dir_table.back() );
RedirectTo( *request->dir_tab.back() );
}
@@ -147,7 +149,7 @@ void System::RedirectToLastItem()
if( request->is_item )
RedirectTo(request->item);
else
RedirectTo( *request->dir_table.back() );// !! dac sprawdzenie czy istnieje
RedirectTo( *request->dir_tab.back() );// !! dac sprawdzenie czy istnieje
}
@@ -337,7 +339,7 @@ bool System::DirsHaveReadExecPerm()
{
std::vector<Item*>::iterator i;
for(i = request->dir_table.begin() ; i!=request->dir_table.end() ; ++i)
for(i = request->dir_tab.begin() ; i!=request->dir_tab.end() ; ++i)
{
if( !HasReadExecAccess(**i) )
return false;
@@ -348,15 +350,15 @@ return true;
// if we don't have access we only remove the item from the table
void System::CheckAccessToItems(std::vector<Item> & item_table)
void System::CheckAccessToItems(std::vector<Item> & item_tab)
{
size_t i = 0;
while( i < item_table.size() )
while( i < item_tab.size() )
{
if( !HasReadAccess(item_table[i]) )
if( !HasReadAccess(item_tab[i]) )
{
item_table.erase(item_table.begin() + i);
item_tab.erase(item_tab.begin() + i);
}
else
{