small formatting updates to RADIUS report

[freeside.git] / htetc / global.asa

diff --git a/htetc/global.asa b/htetc/global.asa
index ee5cfcb..782e062 100644 (file)
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -4,25 +4,33 @@ BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
 
 use strict;
 use vars qw( $cgi $p );
+use Apache::ASP 2.55;
 use CGI 2.47;
 #use CGI::Carp qw(fatalsToBrowser);
 use Date::Format;
 use Date::Parse;
 use Time::Local;
-use File::Basename;
 use Tie::IxHash;
 use HTML::Entities;
 use IO::Handle;
 use IO::File;
+use Net::Whois::Raw qw(whois);
+if ( $] < 5.006 ) {
+  eval "use Net::Whois::Raw 0.32 qw(whois)";
+  die $@ if $@;
+}
+use Business::CreditCard;
 use String::Approx qw(amatch);
 use Chart::LinesPoints;
-use HTML::Widgets::SelectLayers 0.02;
+use HTML::Widgets::SelectLayers 0.03;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
 use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
                small_custview myexit http_header);
 use FS::Msgcat qw(gettext geterror);
+use FS::Misc qw( send_email );
+use FS::Report::Table::Monthly;
 
 use FS::agent;
 use FS::agent_type;
@@ -57,6 +65,7 @@ use FS::svc_www;
 use FS::router;
 use FS::addr_block;
 use FS::svc_broadband;
+use FS::svc_external;
 use FS::type_pkgs;
 use FS::part_export;
 use FS::part_export_option;
@@ -64,7 +73,6 @@ use FS::export_svc;
 use FS::msgcat;
 
 sub Script_OnStart {
-  $Response->AddHeader('Pragma' => 'no-cache');
   $Response->AddHeader('Cache-control' => 'no-cache');
 #  $Response->AddHeader('Expires' => 0);
   $Response->{Expires} = -36288000;
@@ -193,7 +201,10 @@ sub sprintAutoProfile {
 }
 
 sub include {
-  $Response->Include(@_);
+  ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/);
+  #broken in 5.005# ${$Response->TrapInclude($file, @_)};
+  my $ref = $Response->TrapInclude($file, @_);
+  $$ref;
 }
 
 if ( defined(@DBIx::Profile::ISA) ) {