Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / Mason.pm

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 81671ff..58b3da7 100644 (file)
--- 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;
@@ -131,12 +131,12 @@ if ( -e $addl_handler_use_file ) {
   use FS::UID qw( dbh datasrc driver_name );
   use FS::Record qw( qsearch qsearchs fields dbdef
                     str2time_sql str2time_sql_closing
-                    midnight_sql
+                    midnight_sql regexp_sql
                    );
   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 +156,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;
@@ -398,6 +400,16 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_credit_source_bill_pkg;
   use FS::prospect_contact;
   use FS::cust_contact;
+  use FS::legacy_cust_history;
+  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 ) {
@@ -426,21 +438,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;
 
@@ -456,6 +460,7 @@ if ( -e $addl_handler_use_file ) {
     die $@ if $@;
   }
 
+  no warnings 'redefine';
   *CGI::redirect = sub {
     my $self = shift;
     my $cookie = '';
@@ -509,7 +514,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(@_);
   }
 
@@ -646,7 +651,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,