X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsqlradius.cgi;h=486b94d9465ad056f6fee8f7f1017438412c6595;hb=4d68624491e3500a0bdb737a421c3711e5defebf;hp=2b6b6929737b5e46b5bba276a9fc4ca32112307f;hpb=b9dea1e88a8a13a0d206e23ee5c864a0be813030;p=freeside.git
diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 2b6b69297..486b94d94 100644
--- 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, ) }
% ) {
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
% 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 =~ /
- <% &{ $efields{$field}->{fmt} }( $session->{$field},
- $session,
- $part_export,
- )
- %>
+
+ <% $html %>
|
% }
@@ -93,12 +94,12 @@
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')
- && $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;
@@ -222,12 +223,12 @@ my $duration_format = sub {
my $hour = int($seconds/3600);
my $min = int( ($seconds%3600) / 60 );
my $sec = $seconds%60;
- ''.
- ''.
+ ''.
+ ''.
( $hour ? "$hourh" : ' ' ).
- ' | '.
+ ' | '.
( ( $hour || $min ) ? "$minm" : ' ' ).
- ' | '.
+ ' | '.
"$secs".
' | ';
};
|