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

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 15f9203f8..cce39be1f 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -60,7 +60,7 @@ my $ah = new HTML::Mason::ApacheHandler (
                 [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
                 [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
               ],
-  data_dir=>'/usr/local/etc/freeside/masondata',
+  data_dir=>'%%%MASONDATA%%%',
   #out_mode=>'stream',
 
   #RT
@@ -92,10 +92,13 @@ sub handler
       use vars qw( %session );
       use CGI 2.47 qw(-private_tempfiles);
       #use CGI::Carp qw(fatalsToBrowser);
+      use List::Util qw( max min );
       use Date::Format;
       use Date::Parse;
       use Time::Local;
       use Time::Duration;
+      use DateTime::Format::Strptime;
+      use Lingua::EN::Inflect qw(PL);
       use Tie::IxHash;
       use URI::Escape;
       use HTML::Entities;
@@ -113,7 +116,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 +128,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;
 
@@ -137,6 +143,7 @@ sub handler
       use FS::cust_main_county;
       use FS::cust_pay;
       use FS::cust_pkg;
+      use FS::cust_pkg_reason;
       use FS::cust_refund;
       use FS::cust_svc;
       use FS::nas;
@@ -146,6 +153,7 @@ sub handler
       use FS::part_svc;
       use FS::part_svc_router;
       use FS::part_virtual_field;
+      use FS::pay_batch;
       use FS::pkg_svc;
       use FS::port;
       use FS::queue qw(joblisting);
@@ -175,6 +183,17 @@ 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;
+      use FS::access_usergroup;
+      use FS::access_groupagent;
+      use FS::access_right;
+      use FS::AccessRight;
+      use FS::svc_phone;
+      use FS::reason_type;
+      use FS::reason;
+      use FS::cust_main_note;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -208,6 +227,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 +267,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 +285,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);
 
         }