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

@@ -82,27 +82,32 @@ void item_content_noescape(Info & i)
}
void item_content_type_is(Info & i)
void item_content_type_is(Item & item, Info & i)
{
i.res = false;
if( request->item.content_type == Item::ct_text && i.par == "text" )
if( item.content_type == Item::ct_text && i.par == "text" )
i.res = true;
if( request->item.content_type == Item::ct_formatted_text && i.par == "formatted text" )
else
if( item.content_type == Item::ct_formatted_text && i.par == "formatted text" )
i.res = true;
if( request->item.content_type == Item::ct_html && i.par == "html" )
else
if( item.content_type == Item::ct_html && i.par == "html" )
i.res = true;
if( request->item.content_type == Item::ct_bbcode && i.par == "bbcode" )
else
if( item.content_type == Item::ct_bbcode && i.par == "bbcode" )
i.res = true;
if( request->item.content_type == Item::ct_raw && i.par == "raw" )
else
if( item.content_type == Item::ct_raw && i.par == "raw" )
i.res = true;
}
void item_content_type_is(Info & i)
{
item_content_type_is(request->item, i);
}
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type)
{
@@ -210,7 +215,7 @@ void item_can_remove(Info & i)
{
// !! tutaj trzeba bedzie cos innego zrobic
// zwlaszcza jak dojdzie sticky bit
i.res = system->HasWriteAccess(*request->dir_table.back());
i.res = system->HasWriteAccess(*request->dir_tab.back());
}
@@ -331,51 +336,51 @@ static size_t item_index;
void item_tab(Info & i)
{
item_index = i.iter;
i.res = item_index < request->item_table.size();
i.res = item_index < request->item_tab.size();
}
void item_tab_id(Info & i)
{
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].id;
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].id;
}
void item_tab_subject(Info & i)
{
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].subject);
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].subject);
}
void item_tab_subject_noescape(Info & i)
{
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].subject;
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].subject;
}
void item_tab_content(Info & i)
{
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].content);
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].content);
}
void item_tab_content_noescape(Info & i)
{
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].content;
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].content;
}
void item_tab_print_content(Info & i)
{
if( item_index >= request->item_table.size() )
if( item_index >= request->item_tab.size() )
return;
std::string & content = request->item_table[item_index].content;
Item::ContentType type = request->item_table[item_index].content_type;
std::string & content = request->item_tab[item_index].content;
Item::ContentType type = request->item_tab[item_index].content_type;
item_print_content(i.out, content, type);
}
@@ -383,19 +388,19 @@ void item_tab_print_content(Info & i)
void item_tab_privileges(Info & i)
{
if( item_index < request->item_table.size() )
i.out << "0" << std::setbase(8) << request->item_table[item_index].privileges << std::setbase(10);
if( item_index < request->item_tab.size() )
i.out << "0" << std::setbase(8) << request->item_tab[item_index].privileges << std::setbase(10);
}
void item_tab_dir(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
std::string path;
if( system->dirs.MakePath(request->item_table[item_index].parent_id, path) )
if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) )
HtmlEscape(i.out, path);
else
i.out << "/the path does not exist/";
@@ -405,14 +410,14 @@ void item_tab_dir(Info & i)
void item_tab_url(Info & i)
{
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].url);
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].url);
}
void item_tab_link(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
HtmlEscape(i.out, config->base_url);
item_tab_dir(i);
@@ -423,7 +428,7 @@ void item_tab_link(Info & i)
void item_tab_link_auth(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
HtmlEscape(i.out, config->base_url_auth);
item_tab_dir(i);
@@ -434,9 +439,9 @@ void item_tab_link_auth(Info & i)
void item_tab_can_read(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
if( system->HasReadAccess(request->item_table[item_index]) )
if( system->HasReadAccess(request->item_tab[item_index]) )
i.res = true;
}
}
@@ -444,9 +449,9 @@ void item_tab_can_read(Info & i)
void item_tab_can_write(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
if( system->HasWriteAccess(request->item_table[item_index]) )
if( system->HasWriteAccess(request->item_tab[item_index]) )
i.res = true;
}
}
@@ -464,10 +469,10 @@ void item_tab_info(Info & i)
void item_tab_user(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
User * puser = system->users.GetUser(request->item_table[item_index].user_id);
print_user_name(i, puser, request->item_table[item_index].guest_name);
User * puser = system->users.GetUser(request->item_tab[item_index].user_id);
print_user_name(i, puser, request->item_tab[item_index].guest_name);
}
}
@@ -475,10 +480,10 @@ void item_tab_user(Info & i)
void item_tab_modification_user(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
User * puser = system->users.GetUser(request->item_table[item_index].modification_user_id);
print_user_name(i, puser, request->item_table[item_index].guest_name);
User * puser = system->users.GetUser(request->item_tab[item_index].modification_user_id);
print_user_name(i, puser, request->item_tab[item_index].guest_name);
}
}
@@ -486,9 +491,9 @@ void item_tab_modification_user(Info & i)
void item_tab_users_different(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
i.res = (request->item_table[item_index].user_id != request->item_table[item_index].modification_user_id);
i.res = (request->item_tab[item_index].user_id != request->item_tab[item_index].modification_user_id);
}
}
@@ -496,9 +501,9 @@ void item_tab_users_different(Info & i)
void item_tab_group(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
long group_id = request->item_table[item_index].group_id;
long group_id = request->item_tab[item_index].group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -511,9 +516,9 @@ void item_tab_group(Info & i)
void item_tab_date_creation(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_creation;
tm * ptm = &request->item_tab[item_index].date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -522,9 +527,9 @@ void item_tab_date_creation(Info & i)
void item_tab_date_modification(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_modification;
tm * ptm = &request->item_tab[item_index].date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -533,9 +538,9 @@ void item_tab_date_modification(Info & i)
void item_tab_date_creation_nice(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_creation;
tm * ptm = &request->item_tab[item_index].date_creation;
print_date_nice(i, ptm);
}
}
@@ -544,9 +549,9 @@ void item_tab_date_creation_nice(Info & i)
void item_tab_date_modification_nice(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_modification;
tm * ptm = &request->item_tab[item_index].date_modification;
print_date_nice(i, ptm);
}
}
@@ -554,10 +559,10 @@ void item_tab_date_modification_nice(Info & i)
void item_tab_dates_equal(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
tm * ptm1 = &request->item_table[item_index].date_creation;
tm * ptm2 = &request->item_table[item_index].date_modification;
tm * ptm1 = &request->item_tab[item_index].date_creation;
tm * ptm2 = &request->item_tab[item_index].date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -571,7 +576,7 @@ void item_tab_dates_equal(Info & i)
void item_tab_run(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
if( !system->HasReadExecAccess(request->item) )
{
@@ -579,7 +584,7 @@ void item_tab_run(Info & i)
return;
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_table[item_index]);
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
Ezc::Generator gen(i.out, *p, ezc_functions);
gen.Generate();
}
@@ -588,10 +593,10 @@ void item_tab_run(Info & i)
void item_tab_can_use_emacs(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
// !!
//i.res = request->CanUseEmacs(request->item_table[item_index], true);
//i.res = request->CanUseEmacs(request->item_tab[item_index], true);
}
}