X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=htetc%2Fhandler.pl;h=dcbe72733e7d145864f443674ea4afc03ca1149d;hb=1a033848671cad2cbe7687b37fc718b3b2a68b83;hp=ba59e89d361b2be810c3614d6fac2326c144e52e;hpb=2b49cbe76b94c6c1561aa2bf37beba7d47591190;p=freeside.git

diff --git a/htetc/handler.pl b/htetc/handler.pl
index ba59e89d3..dcbe72733 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -20,6 +20,8 @@ use HTML::Mason::ApacheHandler;
 
 use strict;
 
+###use Module::Refresh;###
+
 # List of modules that you want to use from components (see Admin
 # manual for details)
 #{  package HTML::Mason::Commands;
@@ -86,7 +88,7 @@ sub handler
     #rar
     { package HTML::Mason::Commands;
       use strict;
-      use vars qw( $cgi $p );
+      use vars qw( $cgi $p $fsurl);
       use vars qw( %session );
       use CGI 2.47 qw(-private_tempfiles);
       #use CGI::Carp qw(fatalsToBrowser);
@@ -97,6 +99,7 @@ sub handler
       use Tie::IxHash;
       use URI::Escape;
       use HTML::Entities;
+      use JSON;
       use IO::Handle;
       use IO::File;
       use IO::Scalar;
@@ -111,15 +114,16 @@ sub handler
       use String::Approx qw(amatch);
       use Chart::LinesPoints;
       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);
       use FS::Conf;
-      use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
-                     small_custview myexit http_header);
+      use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot
+                     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;
 
@@ -168,6 +172,11 @@ sub handler
       use FS::payment_gateway;
       use FS::agent_payment_gateway;
       use FS::XMLRPC;
+      use FS::payby;
+      use FS::cdr;
+      use FS::inventory_class;
+      use FS::inventory_item;
+      use FS::pkg_class;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -184,7 +193,7 @@ sub handler
           use RT::GroupMembers;
           use RT::CustomFields;
           use RT::CustomFieldValues;
-          use RT::TicketCustomFieldValues;
+          use RT::ObjectCustomFieldValues;
 
           use RT::Interface::Web;
           use MIME::Entity;
@@ -201,6 +210,7 @@ sub handler
         my( $self, $location ) = @_;
         use vars qw($m);
 
+        # false laziness w/below
         if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
 
           my $page =
@@ -230,9 +240,9 @@ sub handler
         &cgisuidsetup($cgi);
         #&cgisuidsetup($r);
         $p = popurl(2);
+        $fsurl = rooturl();
       }
 
-
       sub include {
         use vars qw($m);
         $m->scomp(@_);
@@ -258,7 +268,10 @@ sub handler
           );
           dbh->{'private_profile'} = {};
 
-          $m->abort(200);
+          #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
 
@@ -270,6 +283,8 @@ sub handler
 
     } # end package HTML::Mason::Commands;
 
+    ###Module::Refresh->refresh;###
+
     $r->content_type('text/html');
     #eorar