X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=297d591eaef2d833ca1392231ef6a7ef41ad7e45;hb=0ed195595b5c7ea404c8848d9d1881ada4214489;hp=caa2e6046674c93432dd438fb9c52628d5e04748;hpb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index caa2e6046..297d591ea 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;
@@ -83,6 +83,7 @@ if ( -e $addl_handler_use_file ) {
   use IO::File;
   use IO::Scalar;
   use IO::String;
+  use File::Slurp qw( slurp );
   #not actually using this yet anyway...# use IPC::Run3 0.036;
   use Net::Whois::Raw qw(whois);
   if ( $] < 5.006 ) {
@@ -98,6 +99,7 @@ if ( -e $addl_handler_use_file ) {
 
   use Business::CreditCard 0.30; #for mask-aware cardtype()
   use NetAddr::IP;
+  use Net::MAC::Vendor;
   use Net::Ping;
   use Net::Ping::External;
   #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 )
@@ -129,7 +131,7 @@ 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
@@ -137,6 +139,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::UI::Web qw(svc_url);
   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 );
   use FS::Msgcat qw(gettext geterror);
   use FS::Misc qw( send_email send_fax ocr_image
                    states_hash counties cities state_label
@@ -146,12 +149,15 @@ if ( -e $addl_handler_use_file ) {
   use FS::Report::Table;
   use FS::Report::Table::Monthly;
   use FS::Report::Table::Daily;
+  use FS::Report::Tax;
   use FS::TicketSystem;
   use FS::NetworkMonitoringSystem;
   use FS::Tron qw( tron_lint );
   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;
@@ -176,7 +182,6 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_pay_refund;
   use FS::cust_svc;
   use FS::nas;
-  use FS::part_bill_event;
   use FS::part_event;
   use FS::part_event_condition;
   use FS::part_pkg;
@@ -375,6 +380,31 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_bill_pkg_fee;
   use FS::part_fee_msgcat;
   use FS::part_fee_usage;
+  use FS::sched_item;
+  use FS::sched_avail;
+  use FS::export_batch;
+  use FS::export_batch_item;
+  use FS::part_pkg_fcc_option;
+  use FS::state;
+  use FS::state;
+  use FS::queue_stat;
+  use FS::deploy_zone;
+  use FS::deploy_zone_block;
+  use FS::deploy_zone_vertex;
+  use FS::TaxEngine;
+  use FS::tax_status;
+  use FS::circuit_type;
+  use FS::circuit_provider;
+  use FS::circuit_termination;
+  use FS::svc_circuit;
+  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;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -403,21 +433,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;
 
@@ -433,6 +455,7 @@ if ( -e $addl_handler_use_file ) {
     die $@ if $@;
   }
 
+  no warnings 'redefine';
   *CGI::redirect = sub {
     my $self = shift;
     my $cookie = '';