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

@@ -34,7 +34,26 @@ return percent;
void ticket_is(Info & i)
{
i.res = request->is_ticket;
i.res = functions->fun_ticket.is_ticket;
}
void ticket_item_content(Info & i)
{
HtmlEscape(i.out, functions->fun_ticket.item.content);
}
void ticket_item_content_type_is(Info & i)
{
item_content_type_is(functions->fun_ticket.item, i);
}
void ticket_item_print_content(Info & i)
{
item_print_content(i.out, functions->fun_ticket.item.content, functions->fun_ticket.item.content_type);
}
@@ -56,49 +75,49 @@ void ticket_can_edit(Info & i)
void ticket_type(Info & i)
{
if( request->ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[request->ticket.type]);
if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[functions->fun_ticket.ticket.type]);
}
void ticket_status(Info & i)
{
if( request->ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[request->ticket.status]);
if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[functions->fun_ticket.ticket.status]);
}
void ticket_priority(Info & i)
{
if( request->ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[request->ticket.priority]);
if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[functions->fun_ticket.ticket.priority]);
}
void ticket_category(Info & i)
{
if( request->ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[request->ticket.category]);
if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[functions->fun_ticket.ticket.category]);
}
void ticket_expected(Info & i)
{
if( request->ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[request->ticket.expected]);
if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[functions->fun_ticket.ticket.expected]);
}
void ticket_progress(Info & i)
{
i.out << request->ticket.progress;
i.out << functions->fun_ticket.ticket.progress;
}
void ticket_progress_image_number(Info & i)
{
int percent = request->ticket.progress;
int percent = functions->fun_ticket.ticket.progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -116,15 +135,15 @@ void ticket_tab(Info & i)
{
ticket_tab_index = i.iter;
i.res = ticket_tab_index < request->ticket_tab.size();
i.res = ticket_tab_index < functions->fun_ticket.ticket_tab.size();
}
void ticket_tab_url(Info & i)
{
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -140,9 +159,9 @@ void ticket_tab_url(Info & i)
void ticket_tab_subject(Info & i)
{
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -163,9 +182,9 @@ void ticket_tab_subject_empty(Info & i)
{
i.res = true;
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
i.res = dir->subject.empty();
@@ -178,9 +197,9 @@ void ticket_tab_author(Info & i)
bool unknown = true;
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -212,10 +231,10 @@ bool unknown = true;
void ticket_tab_type(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
if( t.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[t.type]);
@@ -224,10 +243,10 @@ void ticket_tab_type(Info & i)
void ticket_tab_status(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
if( t.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[t.status]);
@@ -236,10 +255,10 @@ void ticket_tab_status(Info & i)
void ticket_tab_priority(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
if( t.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[t.priority]);
@@ -248,10 +267,10 @@ void ticket_tab_priority(Info & i)
void ticket_tab_category(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
if( t.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[t.category]);
@@ -260,10 +279,10 @@ void ticket_tab_category(Info & i)
void ticket_tab_expected(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
if( t.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[t.expected]);
@@ -272,19 +291,19 @@ void ticket_tab_expected(Info & i)
void ticket_tab_progress(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
i.out << request->ticket_tab[ticket_tab_index].progress;
i.out << functions->fun_ticket.ticket_tab[ticket_tab_index].progress;
}
void ticket_tab_progress_image_number(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
int percent = request->ticket_tab[ticket_tab_index].progress;
int percent = functions->fun_ticket.ticket_tab[ticket_tab_index].progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -311,9 +330,9 @@ void ticket_type_tab_defined(Info & i)
void ticket_type_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_type_tab_ind == request->ticket.type);
i.res = (ticket_type_tab_ind == functions->fun_ticket.ticket.type);
}
else
{
@@ -363,9 +382,9 @@ void ticket_status_tab_defined(Info & i)
void ticket_status_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_status_tab_ind == request->ticket.status);
i.res = (ticket_status_tab_ind == functions->fun_ticket.ticket.status);
}
else
{
@@ -414,9 +433,9 @@ void ticket_priority_tab_defined(Info & i)
void ticket_priority_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_priority_tab_ind == request->ticket.priority);
i.res = (ticket_priority_tab_ind == functions->fun_ticket.ticket.priority);
}
else
{
@@ -465,9 +484,9 @@ void ticket_category_tab_defined(Info & i)
void ticket_category_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_category_tab_ind == request->ticket.category);
i.res = (ticket_category_tab_ind == functions->fun_ticket.ticket.category);
}
else
{
@@ -517,9 +536,9 @@ void ticket_expected_tab_defined(Info & i)
void ticket_expected_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_expected_tab_ind == request->ticket.expected);
i.res = (ticket_expected_tab_ind == functions->fun_ticket.ticket.expected);
}
else
{