fix dep on HTML::GoogleMaps, RT#15539

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

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 550ea1a..fc45b99 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -71,6 +71,7 @@ if ( -e $addl_handler_use_file ) {
   use URI::Escape;
   use HTML::Entities;
   use HTML::TreeBuilder;
+  use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
   use JSON;
@@ -88,6 +89,7 @@ if ( -e $addl_handler_use_file ) {
   }
   use Text::CSV_XS;
   use Spreadsheet::WriteExcel;
+  use Spreadsheet::WriteExcel::Utility;
   use Business::CreditCard 0.30; #for mask-aware cardtype()
   use NetAddr::IP;
   use Net::Ping;
@@ -112,6 +114,7 @@ if ( -e $addl_handler_use_file ) {
                                         #selectlayers.html
   use Locale::Country;
   use Business::US::USPS::WebTools::AddressStandardization;
+  use Geo::GoogleEarth::Pluggable;
   use LWP::UserAgent;
   use Storable qw( nfreeze thaw );
   use FS;
@@ -131,9 +134,14 @@ if ( -e $addl_handler_use_file ) {
                  );
   use FS::Misc::eps2png qw( eps2png );
   use FS::Report::FCC_477;
+  use FS::Report::Table;
   use FS::Report::Table::Monthly;
+  use FS::Report::Table::Daily;
   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::agent;
   use FS::agent_type;
@@ -239,6 +247,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_category;
   use FS::prospect_main;
   use FS::contact;
+  use FS::phone_type;
   use FS::svc_pbx;
   use FS::discount;
   use FS::cust_pkg_discount;
@@ -255,6 +264,44 @@ if ( -e $addl_handler_use_file ) {
   use FS::part_tag;
   use FS::acct_snarf;
   use FS::part_pkg_discount;
+  use FS::svc_cert;
+  use FS::svc_dsl;
+  use FS::qual;
+  use FS::qual_option;
+  use FS::dsl_note;
+  use FS::part_pkg_vendor;
+  use FS::cust_note_class;
+  use FS::svc_port;
+  use FS::lata;
+  use FS::did_vendor;
+  use FS::did_order;
+  use FS::torrus_srvderive;
+  use FS::torrus_srvderive_component;
+  use FS::areacode;
+  use FS::svc_dish;
+  use FS::h_svc_dish;
+  use FS::svc_hardware;
+  use FS::h_svc_hardware;
+  use FS::hardware_class;
+  use FS::hardware_type;
+  use FS::hardware_status;
+  use FS::did_order_item;
+  use FS::msa;
+  use FS::rate_center;
+  use FS::cust_msg;
+  use FS::radius_group;
+  use FS::template_content;
+  use FS::dsl_device;
+  use FS::nas;
+  use FS::nas;
+  use FS::export_nas;
+  use FS::legacy_cust_bill;
+  use FS::rate_tier;
+  use FS::rate_tier_detail;
+  use FS::radius_attr;
+  use FS::discount_plan;
+  use FS::tower;
+  use FS::tower_sector;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -449,7 +496,8 @@ sub mason_interps {
 
   #my $request_class = 'HTML::Mason::Request'.
                       #( $mode eq 'apache' ? '::ApacheHandler' : '' );
-  my $request_class = 'FS::Mason::Request';
+  my $request_class = $mode eq 'standalone' ? 'FS::Mason::StandaloneRequest'
+                                            : 'FS::Mason::Request';
 
   #not entirely sure it belongs here, but what the hey
   if ( %%%RT_ENABLED%%% && $mode ne 'standalone' ) {
@@ -491,6 +539,7 @@ sub mason_interps {
 
   my $html_defang = new HTML::Defang (%defang_opts);
 
+  #false laziness w/ FS::Maketext js_mt
   my $js_string_sub = sub {
     #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
     ${$_[0]} =~ s/(['\\])/\\$1/g;
@@ -499,13 +548,15 @@ sub mason_interps {
     ${$_[0]} = "'". ${$_[0]}. "'";
   };
 
+  my $defang_sub = sub {
+    ${$_[0]} = $html_defang->defang(${$_[0]});
+  };
+
   my $fs_interp = new HTML::Mason::Interp (
     %interp,
     comp_root    => $fs_comp_root,
-    escape_flags => { 'js_string' => $js_string_sub,
-                      'defang'    => sub {
-                        ${$_[0]} = $html_defang->defang(${$_[0]});
-                      },
+    escape_flags => { 'js_string'   => $js_string_sub,
+                      'defang'      => $defang_sub,
                     },
     compiler     => HTML::Mason::Compiler::ToObject->new(
                       allow_globals        => [qw(%session)],