X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fglobal.asa;h=782e06223321565d05fba4591a82df57e7b7c651;hp=5b0ac49916da0c8d81a95007038b34128bca4bfa;hb=eb4cf5563939a08eba1a10d8c2a8f52205f6535b;hpb=ef7bb336cc67f127fb1d77532ad3da1369c0ae36
diff --git a/htetc/global.asa b/htetc/global.asa
index 5b0ac4991..782e06223 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -4,7 +4,8 @@ BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed...
use strict;
use vars qw( $cgi $p );
-use CGI;
+use Apache::ASP 2.55;
+use CGI 2.47;
#use CGI::Carp qw(fatalsToBrowser);
use Date::Format;
use Date::Parse;
@@ -13,15 +14,23 @@ 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;
@@ -56,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;
@@ -63,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;
@@ -192,7 +201,41 @@ 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) ) {
+
+ #false laziness w/above
+ *redirect = sub {
+ my($location) = @_;
+
+ ${$Response->{BinaryRef}} =
+ $cgi->header.
+ qq!Redirect to $location!.
+ '
'.
+ ( UNIVERSAL::can(dbh, 'sprintProfile')
+ ? encode_entities(dbh->sprintProfile())
+ : 'DBIx::Profile missing sprintProfile method;'.
+ 'unpatched or too old?' ).
+ "\n\n". &sprintAutoProfile(). '
'.
+ '';
+
+ dbh->{'private_profile'} = {};
+
+ $Response->End;
+
+ };
+
+} else {
+
+ *redirect = sub {
+ $Response->Redirect(@_);
+ }
+
}
1;