X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fglobal.asa;h=f00ae57f53751a08a4f20ae9551afdcd755900f8;hb=4196bc59e8cceb04c6f76fab46ce249ff0178c43;hp=a2d8dee123bda4de9dd2bee9497b4c271ad4fdb2;hpb=13988e77a2e52f427783f13f3a5b0131fcb7b01b;p=freeside.git
diff --git a/htetc/global.asa b/htetc/global.asa
index a2d8dee12..f00ae57f5 100644
--- a/htetc/global.asa
+++ b/htetc/global.asa
@@ -9,6 +9,7 @@ use CGI;
use Date::Format;
use Date::Parse;
use Time::Local;
+use File::Basename;
use Tie::IxHash;
use HTML::Entities;
use IO::Handle;
@@ -41,6 +42,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);
@@ -48,15 +51,11 @@ use FS::raddb;
use FS::session;
use FS::svc_acct;
use FS::svc_acct_pop qw(popselector);
-use FS::svc_acct_sm;
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::type_pkgs;
use FS::part_export;
@@ -74,7 +73,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
@@ -109,8 +109,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";
@@ -125,15 +129,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'} = {};
@@ -182,5 +192,40 @@ sub sprintAutoProfile {
}
+sub include {
+ $Response->Include(@_);
+}
+
+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;