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

51
functions/functions.cpp
View File

@@ -124,6 +124,7 @@ void Functions::Create()
Add(fun_tinymce);
Add(fun_uname);
Add(fun_upload);
Add(fun_uptime);
Add(fun_who);
}
@@ -138,14 +139,14 @@ void Functions::Parse()
void Functions::SetDefaultFunctionForFile()
{
if( request->item.auth != Item::auth_none )
request->pfunction = &fun_download;
request->function = &fun_download;
else
if( system->HasReadExecAccess(request->item) )
request->pfunction = &fun_run;
request->function = &fun_run;
else
request->pfunction = &fun_cat;
request->function = &fun_cat;
log << log3 << "Content: default function: " << request->pfunction->fun.url << logend;
log << log3 << "Content: default function: " << request->function->fun.url << logend;
}
@@ -153,7 +154,7 @@ void Functions::SetDefaultFunctionForFile()
void Functions::SetDefaultFunctionForDir()
{
long default_item = request->dir_table.back()->default_item;
long default_item = request->dir_tab.back()->default_item;
if( default_item != -1 )
{
@@ -165,20 +166,20 @@ void Functions::SetDefaultFunctionForDir()
if( system->mounts.pmount->type == Mount::thread )
{
request->pfunction = &fun_thread;
log << log3 << "Content: default function: " << request->pfunction->fun.url << logend;
request->function = &fun_thread;
log << log3 << "Content: default function: " << request->function->fun.url << logend;
}
else
if( system->mounts.pmount->type == Mount::ticket )
{
request->pfunction = &fun_ticket;
log << log3 << "Content: default function: " << request->pfunction->fun.url << logend;
request->function = &fun_ticket;
log << log3 << "Content: default function: " << request->function->fun.url << logend;
}
else
{
// cms
request->pfunction = &fun_ls;
log << log3 << "Content: default function: " << request->pfunction->fun.url << logend;
request->function = &fun_ls;
log << log3 << "Content: default function: " << request->function->fun.url << logend;
}
}
@@ -205,7 +206,7 @@ void Functions::MakeGet()
// in authorizer mode only cat function is available
// (and must be default)
if( request->pfunction )
if( request->function )
{
request->status = WINIX_ERR_NO_ITEM;
log << log1 << "Content: in authorizer mode only 'cat' funtion is available and must "
@@ -213,30 +214,30 @@ void Functions::MakeGet()
return;
}
request->pfunction = &fun_cat;
request->function = &fun_cat;
}
if( !request->pfunction )
if( !request->function )
SetDefaultFunction();
if( !request->redirect_to.empty() )
return;
if( !request->pfunction )
if( !request->function )
{
request->status = WINIX_ERR_NO_FUNCTION;
log << log1 << "Functions: no function (neither cat nor ls)" << logend;
return;
}
if( !request->pfunction->HasAccess() )
if( !request->function->HasAccess() )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
request->pfunction->MakeGet();
request->function->MakeGet();
}
@@ -249,23 +250,23 @@ void Functions::MakePost()
return;
}
if( !request->pfunction )
if( !request->function )
SetDefaultFunction();
if( !request->pfunction )
if( !request->function )
{
request->status = WINIX_ERR_NO_FUNCTION;
log << log1 << "Functions: MakePost: no function" << logend;
return;
}
if( !request->pfunction->HasAccess() )
if( !request->function->HasAccess() )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
request->pfunction->MakePost();
request->function->MakePost();
}
@@ -321,9 +322,9 @@ bool Functions::ReadItemUrlSubject(Item & item, Item::Type item_type)
if( item.subject.empty() )
{
item.subject = request->dir_table.back()->subject;
item.subject = request->dir_tab.back()->subject;
item.subject += "_msg_";
item.subject += ToStr(db->Size(request->dir_table.back()->id, Item::file));
item.subject += ToStr(db->Size(request->dir_tab.back()->id, Item::file));
}
// if item.url is empty then it will be set from item.subject
@@ -387,7 +388,7 @@ bool Functions::ReadItem(Item & item, Item::Type item_type)
return false;
item.type = item_type;
item.parent_id = request->dir_table.back()->id; // !! moze to dac jako parametr?
item.parent_id = request->dir_tab.back()->id; // !! moze to dac jako parametr?
bool edit_with_url = ReadItemUrlSubject(item, item_type);
@@ -411,5 +412,5 @@ void Functions::SetUser(Item & item)
request->PostVar("guestname", item.guest_name);
}
item.group_id = request->dir_table.back()->group_id;
item.group_id = request->dir_tab.back()->group_id;
}