This commit was generated by cvs2svn to compensate for changes in r5562,

[freeside.git] / httemplate / search / sqlradius.cgi

diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 95f4147..324729b 100644 (file)
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -65,13 +65,14 @@
 
       <TR>
 %     foreach my $field ( keys %efields ) { 
+%       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>
@@ -83,8 +84,11 @@
 
 % } 
 
-
 <%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('List rating data');
+
 ###
 # parse cgi params
 ###
@@ -93,12 +97,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;