fixup reports for templated webUI

4 files changed, 18 insertions, 57 deletions

diff --git a/httemplate/search/report_cc.cgi b/httemplate/search/report_cc.cgi
index f1c3c962c..128565fce 100755
--- a/httemplate/search/report_cc.cgi
+++ b/httemplate/search/report_cc.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('Credit Card Recipt Report Results');
+print header('Credit Card Recipt Report Results');
 
 open (REPORT, "freeside-cc-receipts-report -v -s $beginning -d $ending $user |");
 
diff --git a/httemplate/search/report_credit.cgi b/httemplate/search/report_credit.cgi
index e4a9bf241..fac6c8d0f 100755
--- a/httemplate/search/report_credit.cgi
+++ b/httemplate/search/report_credit.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('In House Credit Report Results');
+print header('In House Credit Report Results');
 
 open (REPORT, "freeside-credit-report -v -s $beginning -d $ending $user |");
 
diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index ba02eb720..fdd3779a9 100755
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -1,18 +1,9 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
+my $user = getotaker;
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
-
-print $cgi->header( '-expires' => '-2m' ),
-  header('Current Receivables Report Results');
+print header('Current Receivables Report Results');
 
 open (REPORT, "freeside-receivables-report -v $user |");
 
diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index bc683f8b7..79aa65c9a 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -1,25 +1,15 @@
+<!-- mason kludge -->
 <%
 
-use strict;
-use vars qw( $cgi $user $beginning $ending );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup getotaker );
-use FS::CGI qw( header );
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$user = getotaker;
+my $user = getotaker;
 
 $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-$beginning = $1;
+my $beginning = $1;
 
 $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-$ending = $1;
+my $ending = $1;
 
-print $cgi->header( '-expires' => '-2m' ),
-  header('Tax Report Results');
+print header('Tax Report Results');
 
 open (REPORT, "freeside-tax-report -v -s $beginning -d $ending $user |");