projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix elements/ links here too
[freeside.git]
/
httemplate
/
search
/
sqlradius.cgi
diff --git
a/httemplate/search/sqlradius.cgi
b/httemplate/search/sqlradius.cgi
index
2b6b692
..
486b94d
100644
(file)
--- a/
httemplate/search/sqlradius.cgi
+++ b/
httemplate/search/sqlradius.cgi
@@
-57,21
+57,22
@@
% @{ $part_export->usage_sessions(
% $beginning, $ending, $cgi_svc_acct, $ip, $prefix, ) }
% ) {
% @{ $part_export->usage_sessions(
% $beginning, $ending, $cgi_svc_acct, $ip, $prefix, ) }
% ) {
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
<TR>
% foreach my $field ( keys %efields ) {
<TR>
% foreach my $field ( keys %efields ) {
-%
if ( $bgcolor eq $bgcolor1 ) {
-%
$bgcolor = $bgcolor2;
-%
} else {
-%
$bgcolor = $bgcolor1
;
-%
}
+%
my $html = &{ $efields{$field}->{fmt} }( $session->{$field},
+%
$session,
+%
$part_export,
+%
)
;
+%
my $class = ( $html =~ /<TABLE/ ? 'inv' : 'grid' );
- <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="<% $efields{$field}->{align} %>">
- <% &{ $efields{$field}->{fmt} }( $session->{$field},
- $session,
- $part_export,
- )
- %>
+ <TD CLASS="<%$class%>" BGCOLOR="<% $bgcolor %>" ALIGN="<% $efields{$field}->{align} %>">
+ <% $html %>
</TD>
% }
</TR>
</TD>
% }
</TR>
@@
-93,12
+94,12
@@
my $beginning = '';
my $ending = '';
if ( $cgi->param('beginning')
my $beginning = '';
my $ending = '';
if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/
]{0,10
})$/ ) {
+ && $cgi->param('beginning') =~ /^([ 0-9\-\/
\:\w]{0,54
})$/ ) {
$beginning = str2time($1);
}
if ( $cgi->param('ending')
$beginning = str2time($1);
}
if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/
]{0,10
})$/ ) {
- $ending = str2time($1) + 86399;
+ && $cgi->param('ending') =~ /^([ 0-9\-\/
\:\w]{0,54
})$/ ) {
+ $ending = str2time($1)
; #
+ 86399;
}
if ( $cgi->param('begin') && $cgi->param('begin') =~ /^(\d+)$/ ) {
$beginning = $1;
}
if ( $cgi->param('begin') && $cgi->param('begin') =~ /^(\d+)$/ ) {
$beginning = $1;
@@
-222,12
+223,12
@@
my $duration_format = sub {
my $hour = int($seconds/3600);
my $min = int( ($seconds%3600) / 60 );
my $sec = $seconds%60;
my $hour = int($seconds/3600);
my $min = int( ($seconds%3600) / 60 );
my $sec = $seconds%60;
- '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0>'.
- '<TR><TD ALIGN="right">'.
+ '<TABLE
CLASS="inv"
BORDER=0 CELLSPACING=0 CELLPADDING=0>'.
+ '<TR><TD
CLASS="inv"
ALIGN="right">'.
( $hour ? "<B>$hour</B>h" : ' ' ).
( $hour ? "<B>$hour</B>h" : ' ' ).
- '</TD><TD ALIGN="right">'.
+ '</TD><TD
CLASS="inv"
ALIGN="right">'.
( ( $hour || $min ) ? "<B>$min</B>m" : ' ' ).
( ( $hour || $min ) ? "<B>$min</B>m" : ' ' ).
- '</TD><TD ALIGN="right">'.
+ '</TD><TD
CLASS="inv"
ALIGN="right">'.
"<B>$sec</B>s".
'</TD></TR></TABLE>';
};
"<B>$sec</B>s".
'</TD></TR></TABLE>';
};