Apache::ASP 2.55 required

[freeside.git] / htetc / global.asa
diff --git a/htetc/global.asa b/htetc/global.asa

index 21e112e..8027ae3 100644 (file)
--- 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;
@@ -15,13 +16,14 @@ use IO::Handle;
  use IO::File;
  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::agent;
  use FS::agent_type;
@@ -56,6 +58,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;
@@ -73,7 +76,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 +140,8 @@ if ( defined(@DBIx::Profile::ISA) ) {
      my( $self, $location) = @_;
      my $page =
        $cgi->header.
-      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A><BR><BR>!.
-      '<PRE>'.
+      qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+      '<BR><BR><PRE>'.
          ( UNIVERSAL::can(dbh, 'sprintProfile')
              ? encode_entities(dbh->sprintProfile())
              : 'DBIx::Profile missing sprintProfile method;'.
@@ -191,5 +194,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!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!.
+      '<BR><BR><PRE>'.
+        ( UNIVERSAL::can(dbh, 'sprintProfile')
+            ? encode_entities(dbh->sprintProfile())
+            : 'DBIx::Profile missing sprintProfile method;'.
+              'unpatched or too old?'                        ).
+      "\n\n". &sprintAutoProfile().  '</PRE>'.
+      '</BODY></HTML>';
+
+    dbh->{'private_profile'} = {};
+
+    $Response->End;
+
+  };
+
+} else {
+
+  *redirect = sub {
+    $Response->Redirect(@_);
+  }
+
+}
+
  1;