fix total links and line up custom field columns

[freeside.git] / htetc / global.asa

diff --git a/htetc/global.asa b/htetc/global.asa
index 65f3355..612f6f4 100644 (file)
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -14,10 +14,16 @@ 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.03;
+use FS;
 use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
 use FS::Record qw(qsearch qsearchs fields dbdef);
 use FS::Conf;
@@ -26,6 +32,7 @@ use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
 use FS::Msgcat qw(gettext geterror);
 use FS::Misc qw( send_email );
 use FS::Report::Table::Monthly;
+use FS::TicketSystem;
 
 use FS::agent;
 use FS::agent_type;
@@ -66,9 +73,11 @@ use FS::part_export;
 use FS::part_export_option;
 use FS::export_svc;
 use FS::msgcat;
+use FS::rate;
+use FS::rate_region;
+use FS::rate_prefix;
 
 sub Script_OnStart {
-  $Response->AddHeader('Pragma' => 'no-cache');
   $Response->AddHeader('Cache-control' => 'no-cache');
 #  $Response->AddHeader('Expires' => 0);
   $Response->{Expires} = -36288000;
@@ -197,9 +206,10 @@ sub sprintAutoProfile {
 }
 
 sub include {
-  ( my $file = shift ) =~ s(^/)();
-  $Response->Include($file, @_);
-  '';
+  ( 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) ) {