X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fglobal.asa;h=ee5cfcb3c1e7f7c9c8c8a61fdafa4e317f652581;hb=972ef71fa13cf9a76cb6453a98ece950e1776f1a;hp=21e112e6b34f3683d76f68706fb8fe3409ae78c4;hpb=abf5c5442afce5198f6289840791c96f58254e85;p=freeside.git diff --git a/htetc/global.asa b/htetc/global.asa index 21e112e6b..ee5cfcb3c 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -4,11 +4,12 @@ BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed... use strict; use vars qw( $cgi $p ); -use CGI; +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; @@ -73,7 +74,7 @@ sub Script_OnStart { $p = popurl(2); #print $cgi->header( '-expires' => 'now' ); #dbh->{'private_profile'} = {} if dbh->can('sprintProfile'); - dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, '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 @@ -137,8 +138,8 @@ if ( defined(@DBIx::Profile::ISA) ) { my( $self, $location) = @_; my $page = $cgi->header. - qq!Redirect to $location

!. - '
'.
+      qq!Redirect to $location!.
+      '

'.
         ( UNIVERSAL::can(dbh, 'sprintProfile')
             ? encode_entities(dbh->sprintProfile())
             : 'DBIx::Profile missing sprintProfile method;'.
@@ -191,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;