X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=43e9b065367660fe1fc4f9c54344da07f2a8a0b2;hp=6bc2338441319621a48bd5318e5f93d04c3c4f5d;hb=9d35792778885932c09102bd011b518eb47c5131;hpb=76c8b9576ce93895433de2d9a2f5a0524a733103

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 6bc233844..43e9b0653 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -3,6 +3,7 @@ package FS::Mason;
 use strict;
 use vars qw( @ISA @EXPORT_OK $addl_handler_use );
 use Exporter;
+use Carp;
 use File::Slurp qw( slurp );
 use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect
 use HTML::Mason::Interp;
@@ -54,7 +55,9 @@ if ( -e $addl_handler_use_file ) {
 
   #use CGI::Carp qw(fatalsToBrowser);
   use CGI::Cookie;
-  use List::Util qw( max min );
+  use List::Util qw( max min sum );
+  use List::MoreUtils qw( first_index uniq );
+  use Scalar::Util qw( blessed );
   use Data::Dumper;
   use Date::Format;
   use Time::Local;
@@ -63,13 +66,15 @@ if ( -e $addl_handler_use_file ) {
   use DateTime;
   use DateTime::Format::Strptime;
   use FS::Misc::DateTime qw( parse_datetime );
+  use FS::Misc::Geo qw( get_district );
   use Lingua::EN::Inflect qw(PL);
   Lingua::EN::Inflect::classical names=>0; #Categorys
   use Tie::IxHash;
   use URI;
-  use URI::Escape;
+  use URI::Escape 3.31;
   use HTML::Entities;
   use HTML::TreeBuilder;
+  use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
   use JSON;
@@ -79,6 +84,7 @@ if ( -e $addl_handler_use_file ) {
   use IO::Handle;
   use IO::File;
   use IO::Scalar;
+  use IO::String;
   #not actually using this yet anyway...# use IPC::Run3 0.036;
   use Net::Whois::Raw qw(whois);
   if ( $] < 5.006 ) {
@@ -87,6 +93,11 @@ if ( -e $addl_handler_use_file ) {
   }
   use Text::CSV_XS;
   use Spreadsheet::WriteExcel;
+  use Spreadsheet::WriteExcel::Utility;
+  use OLE::Storage_Lite;
+  use Excel::Writer::XLSX;
+  #use Excel::Writer::XLSX::Utility; #redundant with above
+
   use Business::CreditCard 0.30; #for mask-aware cardtype()
   use NetAddr::IP;
   use Net::Ping;
@@ -111,10 +122,14 @@ 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;
-  use FS::UID qw( getotaker dbh datasrc driver_name );
+  use FS::UID qw( dbh datasrc driver_name );
   use FS::Record qw( qsearch qsearchs fields dbdef
                     str2time_sql str2time_sql_closing
+                    midnight_sql
                    );
   use FS::Conf;
   use FS::CGI qw(header menubar table itable ntable idiot
@@ -123,14 +138,19 @@ if ( -e $addl_handler_use_file ) {
   use FS::UI::Web::small_custview qw(small_custview);
   use FS::UI::bytecount;
   use FS::Msgcat qw(gettext geterror);
-  use FS::Misc qw( send_email send_fax
+  use FS::Misc qw( send_email send_fax ocr_image
                    states_hash counties cities state_label
                  );
   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;
@@ -139,12 +159,14 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_bill_pay;
   use FS::cust_credit;
   use FS::cust_credit_bill;
-  use FS::cust_main qw(smart_search);
+  use FS::cust_main;
+  use FS::cust_main::Search qw(smart_search);
   use FS::cust_main::Import;
   use FS::cust_main_county;
   use FS::cust_location;
   use FS::cust_pay;
   use FS::cust_pkg;
+  use FS::cust_pkg::Import;
   use FS::part_pkg_taxclass;
   use FS::cust_pkg_reason;
   use FS::cust_refund;
@@ -234,6 +256,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;
@@ -244,6 +267,76 @@ if ( -e $addl_handler_use_file ) {
   use FS::cgp_rule_action;
   use FS::bill_batch;
   use FS::cust_bill_batch;
+  use FS::rate_time;
+  use FS::rate_time_interval;
+  use FS::msg_template;
+  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;
+  use FS::sales;
+  use FS::access_groupsales;
+  use FS::contact_class;
+  use FS::part_svc_class;
+  use FS::upload_target;
+  use FS::quotation;
+  use FS::quotation_pkg;
+  use FS::quotation_pkg_discount;
+  use FS::cust_bill_void;
+  use FS::cust_bill_pkg_void;
+  use FS::cust_bill_pkg_detail_void;
+  use FS::cust_bill_pkg_display_void;
+  use FS::cust_bill_pkg_tax_location_void;
+  use FS::cust_bill_pkg_tax_rate_location_void;
+  use FS::cust_tax_exempt_pkg_void;
+  use FS::cust_bill_pkg_discount_void;
+  use FS::agent_pkg_class;
+  use FS::svc_export_machine;
+  use FS::GeocodeCache;
+  use FS::log;
+  use FS::log_context;
+  use FS::part_pkg_usage_class;
+  use FS::cust_pkg_usage;
+  use FS::part_pkg_usage_class;
+  use FS::part_pkg_usage;
+  use FS::cdr_cust_pkg_usage;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -287,7 +380,7 @@ if ( -e $addl_handler_use_file ) {
 
       use RT::Interface::Web::Request;
 
-      #nother undeclared web UI dep (for ticket links graph)
+      #another undeclared web UI dep (for ticket links graph)
       use IPC::Run::SafeHandles;
 
       #slow, unreliable, segfaults and is optional
@@ -355,6 +448,7 @@ if ( -e $addl_handler_use_file ) {
   
   sub include {
     use vars qw($m);
+    #carp #should just switch to <& &> syntax
     $m->scomp(@_);
   }
 
@@ -437,27 +531,15 @@ 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' ) {
     RT::LoadConfig();
   }
 
-  # A hook supporting strange legacy ways people have added stuff on
-
-  my @addl_comp_root = ();
-  my $addl_comp_root_file = '%%%FREESIDE_CONF%%%/addl_comp_root.pl';
-  if ( -e $addl_comp_root_file ) {
-    warn "reading $addl_comp_root_file\n";
-    my $text = slurp( $addl_comp_root_file );
-    my @addl = eval $text;
-    if ( @addl && ! $@ ) {
-      @addl_comp_root = @addl;
-    } elsif ($@) {
-      warn "error parsing $addl_comp_root_file: $@\n";
-    }
-  }
+  my $fs_comp_root = '%%%FREESIDE_DOCUMENT_ROOT%%%';
 
   my %interp = (
     request_class        => $request_class,
@@ -465,28 +547,32 @@ sub mason_interps {
     error_mode           => 'output',
     error_format         => 'html',
     ignore_warnings_expr => '.',
-    comp_root            => [
-                              [ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
-                              [ 'rt'      =>'%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
-                              @addl_comp_root,
-                            ],
   );
 
   $interp{out_method} = $opt{outbuf} if $mode eq 'standalone' && $opt{outbuf};
 
   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;
+    ${$_[0]} =~ s/\r/\\r/g;
+    ${$_[0]} =~ s/\n/\\n/g;
+    # prevent premature termination of the script
+    ${$_[0]} =~ s[</script>][<\\/script>]ig;
+    ${$_[0]} = "'". ${$_[0]}. "'";
+  };
+
+  my $defang_sub = sub {
+    ${$_[0]} = $html_defang->defang(${$_[0]});
+  };
+
   my $fs_interp = new HTML::Mason::Interp (
     %interp,
-    escape_flags => { 'js_string' => sub {
-                        #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
-                        ${$_[0]} =~ s/(['\\])/\\$1/g;
-                        ${$_[0]} =~ s/\n/\\n/g;
-                        ${$_[0]} = "'". ${$_[0]}. "'";
-                      },
-                      'defang'    => sub {
-                        ${$_[0]} = $html_defang->defang(${$_[0]});
-                      },
+    comp_root    => $fs_comp_root,
+    escape_flags => { 'js_string'   => $js_string_sub,
+                      'defang'      => $defang_sub,
                     },
     compiler     => HTML::Mason::Compiler::ToObject->new(
                       allow_globals        => [qw(%session)],
@@ -495,10 +581,18 @@ sub mason_interps {
 
   my $rt_interp = new HTML::Mason::Interp (
     %interp,
-    escape_flags => { 'h' => \&RT::Interface::Web::EscapeUTF8 },
+    comp_root    => [
+                      [ 'rt'       => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
+                      [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%'    ],
+                    ],
+    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeUTF8,
+                      'u'         => \&RT::Interface::Web::EscapeURI,
+                      'j'         => \&RT::Interface::Web::EscapeJS,
+                      'js_string' => $js_string_sub,
+                    },
     compiler     => HTML::Mason::Compiler::ToObject->new(
                       default_escape_flags => 'h',
-                      allow_globals        => [qw(%session)],
+                      allow_globals        => [qw(%session $DECODED_ARGS)],
                     ),
   );