X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fglobal.asa;h=782e06223321565d05fba4591a82df57e7b7c651;hp=7d84600ed433d2a9bfa08a5f45a2291976b463c1;hb=eb4cf5563939a08eba1a10d8c2a8f52205f6535b;hpb=66729728e57c13e44eaac51dc8deaf37e47b7530
diff --git a/htetc/global.asa b/htetc/global.asa
index 7d84600ed..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;
@@ -41,6 +50,8 @@ use FS::part_bill_event;
use FS::part_pkg;
use FS::part_referral;
use FS::part_svc;
+use FS::part_svc_router;
+use FS::part_virtual_field;
use FS::pkg_svc;
use FS::port;
use FS::queue qw(joblisting);
@@ -51,12 +62,10 @@ use FS::svc_acct_pop qw(popselector);
use FS::svc_domain;
use FS::svc_forward;
use FS::svc_www;
-use FS::ac_type;
-use FS::ac;
-use FS::part_ac_field;
-use FS::ac_field;
-use FS::ac_block;
+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;
@@ -73,7 +81,8 @@ sub Script_OnStart {
&cgisuidsetup($cgi);
$p = popurl(2);
#print $cgi->header( '-expires' => 'now' );
- dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+ #dbh->{'private_profile'} = {} if dbh->can('sprintProfile');
+ dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
#really should check for FS::Profiler or something
# Devel::AutoProfiler _our_ VERSION? thanks a fucking lot
@@ -108,8 +117,12 @@ sub Script_OnFlush {
my $ref = $Response->{BinaryRef};
#$$ref = $cgi->header( @FS::CGI::header ) . $$ref;
#$$ref = $cgi->header() . $$ref;
- if ( dbh->can('sprintProfile') ) {
- if ( lc($Response->{ContentType}) eq 'text/html' ) {
+ #warn "Script_OnFlush called with dbh ". dbh. "\n";
+ #if ( dbh->can('sprintProfile') ) {
+ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
+ #warn "dbh can sprintProfile\n";
+ if ( lc($Response->{ContentType}) eq 'text/html' ) { #con
+ #warn "contenttype is sprintProfile\n";
$$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i
or warn "can't remove";
@@ -124,15 +137,21 @@ sub Script_OnFlush {
}
}
-if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) {
+#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) {
+if ( defined(@DBIx::Profile::ISA) ) {
#warn "enabling profiling redirects";
*CGI::redirect = sub {
my( $self, $location) = @_;
my $page =
$cgi->header.
- qq!Redirect to $location
!.
- ''. encode_entities(dbh->sprintProfile()).
+ 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'} = {};
@@ -181,5 +200,43 @@ sub sprintAutoProfile {
}
+sub 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;