X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=9b808e68c00b82f6ae37bce440281d9920cd9353;hb=9f69daa6b11920b84840c17bf95955dee959367e;hp=737e5af0bdb9441d86ab862cdc5e6aad334e142b;hpb=10225293c7ccecb9273e0f17cbc65889496cf090;p=freeside.git

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 737e5af0b..9b808e68c 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -88,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);
@@ -99,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;
@@ -117,8 +118,8 @@ sub handler
       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 );
@@ -170,6 +171,10 @@ 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;
 
       if ( %%%RT_ENABLED%%% ) {
         eval '
@@ -186,7 +191,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;
@@ -232,9 +237,9 @@ sub handler
         &cgisuidsetup($cgi);
         #&cgisuidsetup($r);
         $p = popurl(2);
+        $fsurl = rooturl();
       }
 
-
       sub include {
         use vars qw($m);
         $m->scomp(@_);
@@ -260,7 +265,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