X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=e74f44eb1012d7e25541eb312259745ba0dd1d47;hb=83053569b3d965924e2e1d4f5b199609ec7c29af;hp=550ea1a451363bf302911217de376efb6bab34d9;hpb=7bbe939d139be7edd77378cfc9a2c3ec6287749d;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 550ea1a45..e74f44eb1 100644
--- 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;
@@ -133,7 +135,10 @@ if ( -e $addl_handler_use_file ) {
   use FS::Report::FCC_477;
   use FS::Report::Table::Monthly;
   use FS::TicketSystem;
+  use FS::NetworkMonitoringSystem;
   use FS::Tron qw( tron_lint );
+  use FS::Locales;
+  use FS::L10N;
 
   use FS::agent;
   use FS::agent_type;
@@ -239,6 +244,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 +261,28 @@ 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::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;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -380,6 +408,11 @@ if ( -e $addl_handler_use_file ) {
     $m->comp('/elements/errorpage-popup.html', @_);
   }
 
+  sub mt {
+    use vars qw($lh);
+    $lh->maketext(@_);
+  }
+
   sub redirect {
     my( $location ) = @_;
     use vars qw($m);
@@ -449,7 +482,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' ) {
@@ -499,13 +533,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)],