X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=cbe2dd35d0e5a2466ffd8ddadb66a7047aff2ace;hp=15f9203f80040789416f0e5f350d7cb0d8b10ca1;hb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;hpb=600a0939e7e7e589dae4f4f5bfef3650728940b7

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 15f9203f8..cbe2dd35d 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -113,7 +113,10 @@ sub handler
       use Business::CreditCard;
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
+      use Chart::Mountain;
+      use Color::Scheme;
       use HTML::Widgets::SelectLayers 0.05;
+      use Locale::Country;
       use FS;
       use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
       use FS::Record qw(qsearch qsearchs fields dbdef);
@@ -122,7 +125,7 @@ sub handler
                      eidiot small_custview myexit http_header);
       use FS::UI::Web;
       use FS::Msgcat qw(gettext geterror);
-      use FS::Misc qw( send_email send_fax );
+      use FS::Misc qw( send_email send_fax states_hash state_label );
       use FS::Report::Table::Monthly;
       use FS::TicketSystem;
 
@@ -175,6 +178,9 @@ sub handler
       use FS::cdr;
       use FS::inventory_class;
       use FS::inventory_item;
+      use FS::pkg_class;
+      use FS::access_user;
+      use FS::access_group;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -208,6 +214,7 @@ sub handler
         my( $self, $location ) = @_;
         use vars qw($m);
 
+        # false laziness w/below
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
           my $page =
@@ -247,10 +254,8 @@ sub handler
 
       sub redirect {
         my( $location ) = @_;
-        warn 'redir1 $m='.$m;
         use vars qw($m);
         $m->clear_buffer;
-        warn 'redir3-prof';
         #false laziness w/above
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
@@ -267,14 +272,13 @@ sub handler
           );
           dbh->{'private_profile'} = {};
 
-          warn 'redir9-prof';
-          my $rv = $m->abort(200);
-          warn "redir10-prof: $rv";
-          $rv;
+          #whew.  removing this is all that's needed to fix the annoying
+          #blank-page-instead-of-profiling-redirect-when-called-from-an-include
+          #bug triggered by mason 1.32
+          #my $rv = $m->abort(200);
 
         } else { #normal redirect
 
-          warn 'redir9-redirect';
           $m->redirect($location);
 
         }