X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=a2a761737fe2c6d16b403bee83fb656242c8f2a9;hb=2748aaf4aa3f19e17a37edc07e89ee402108900d;hp=78779d78a6b76ab5a2fc468b43903ccf68ba8a66;hpb=7d34aacffa38c4cac09b54080487a66c264e4668;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 78779d78a..a2a761737 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -57,7 +57,7 @@ if ( -e $addl_handler_use_file ) {
   use CGI::Cookie;
   use List::Util qw( max min sum );
   use List::MoreUtils qw( first_index uniq );
-  use Scalar::Util qw( blessed );
+  use Scalar::Util qw( blessed looks_like_number );
   use Data::Dumper;
   use Date::Format;
   use Time::Local;
@@ -77,7 +77,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
-  use JSON::XS;
+  use Cpanel::JSON::XS;
   use MIME::Base64;
   use IO::Handle;
   use IO::File;
@@ -121,6 +121,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
                                         #selectlayers.html
   use Locale::Country;
+  #use FS::geocode_Mixin; #for its code2country
   use Locale::Currency;
   use Locale::Currency::Format;
   use Business::US::USPS::WebTools::AddressStandardization;
@@ -136,7 +137,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::Conf;
   use FS::CGI qw(header menubar table itable ntable idiot
                  eidiot myexit http_header);
-  use FS::UI::Web qw(svc_url);
+  use FS::UI::Web qw(svc_url random_id);
   use FS::UI::Web::small_custview qw(small_custview);
   use FS::UI::bytecount;
   use FS::UI::REST qw( rest_auth rest_uri_remain encode_rest );
@@ -156,6 +157,8 @@ if ( -e $addl_handler_use_file ) {
   use FS::Locales;
   use FS::Maketext qw( mt emt js_mt );
 
+  use FS::Query;
+
   use FS::agent;
   use FS::agent_type;
   use FS::domain_record;
@@ -402,6 +405,12 @@ if ( -e $addl_handler_use_file ) {
   use FS::quotation_pkg_tax;
   use FS::cust_pkg_reason_fee;
   use FS::part_svc_link;
+  use FS::access_user_log;
+  use FS::report_batch;
+  use FS::report_batch;
+  use FS::report_batch;
+  use FS::report_batch;
+  use FS::password_history;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -430,21 +439,13 @@ if ( -e $addl_handler_use_file ) {
       use RT::CustomFieldValues;
       use RT::ObjectCustomFieldValues;
 
-      #blah.  manually updated from RT::Interface::Web::Handler
-      use RT::Interface::Web;
-      use MIME::Entity;
-      use Text::Wrapper;
-      use Time::ParseDate;
-      use Time::HiRes;
-      use HTML::Scrubber;
+      use RT::Interface::Web::Handler;
 
       #blah.  not even in RT::Interface::Web::Handler, just in 
       #html/NoAuth/css/dhandler and rt-test-dependencies.  ask for it here
       #to throw a real error instead of just a mysterious unstyled RT
       use CSS::Squish 0.06;
 
-      use RT::Interface::Web::Request;
-
       #another undeclared web UI dep (for ticket links graph)
       use IPC::Run::SafeHandles;
 
@@ -460,6 +461,7 @@ if ( -e $addl_handler_use_file ) {
     die $@ if $@;
   }
 
+  no warnings 'redefine';
   *CGI::redirect = sub {
     my $self = shift;
     my $cookie = '';
@@ -513,7 +515,7 @@ if ( -e $addl_handler_use_file ) {
   
   sub include {
     use vars qw($m);
-    #carp #should just switch to <& &> syntax
+    #warn 'include deprecated; use an HTML::Mason <& &> style include (or $m->scomp) at '. $m->callers(0)->path. "\n";
     $m->scomp(@_);
   }
 
@@ -650,7 +652,8 @@ sub mason_interps {
                       [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
                       [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
                     ],
-    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeUTF8,
+    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeHTML,
+                      #u and j aren't used anymore?  :/
                       'u'         => \&RT::Interface::Web::EscapeURI,
                       'j'         => \&RT::Interface::Web::EscapeJS,
                       'js_string' => $js_string_sub,