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

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 877864eee..6bc233844 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -1,8 +1,9 @@
 package FS::Mason;
 
 use strict;
-use vars qw( @ISA @EXPORT_OK );
+use vars qw( @ISA @EXPORT_OK $addl_handler_use );
 use Exporter;
+use File::Slurp qw( slurp );
 use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect
 use HTML::Mason::Interp;
 use HTML::Mason::Compiler::ToObject;
@@ -30,6 +31,12 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
 
 =cut
 
+$addl_handler_use = '';
+my $addl_handler_use_file = '%%%FREESIDE_CONF%%%/addl_handler_use.pl';
+if ( -e $addl_handler_use_file ) {
+  $addl_handler_use = slurp( $addl_handler_use_file );
+}
+
 # List of modules that you want to use from components (see Admin
 # manual for details)
 {
@@ -50,20 +57,24 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use List::Util qw( max min );
   use Data::Dumper;
   use Date::Format;
-  use Date::Parse;
   use Time::Local;
   use Time::HiRes;
   use Time::Duration;
   use DateTime;
   use DateTime::Format::Strptime;
+  use FS::Misc::DateTime qw( parse_datetime );
   use Lingua::EN::Inflect qw(PL);
+  Lingua::EN::Inflect::classical names=>0; #Categorys
   use Tie::IxHash;
   use URI;
   use URI::Escape;
   use HTML::Entities;
   use HTML::TreeBuilder;
   use HTML::FormatText;
+  use HTML::Defang;
   use JSON;
+#  use XMLRPC::Transport::HTTP;
+#  use XMLRPC::Lite; # for XMLRPC::Serializer
   use MIME::Base64;
   use IO::Handle;
   use IO::File;
@@ -94,6 +105,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use String::Approx qw(amatch);
   use Chart::LinesPoints;
   use Chart::Mountain;
+  use Chart::Bars;
   use Color::Scheme;
   use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
                                         #selectlayers.html
@@ -111,8 +123,11 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   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 states_hash counties state_label );
+  use FS::Misc qw( send_email send_fax
+                   states_hash counties cities state_label
+                 );
   use FS::Misc::eps2png qw( eps2png );
+  use FS::Report::FCC_477;
   use FS::Report::Table::Monthly;
   use FS::TicketSystem;
   use FS::Tron qw( tron_lint );
@@ -165,6 +180,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::part_export;
   use FS::part_export_option;
   use FS::export_svc;
+  use FS::export_device;
   use FS::msgcat;
   use FS::rate;
   use FS::rate_region;
@@ -176,6 +192,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::XMLRPC;
   use FS::payby;
   use FS::cdr;
+  use FS::cdr_batch;
   use FS::inventory_class;
   use FS::inventory_item;
   use FS::pkg_category;
@@ -202,6 +219,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   use FS::part_pkg_report_option;
   use FS::cust_attachment;
   use FS::h_cust_pkg;
+  use FS::h_inventory_item;
   use FS::h_svc_acct;
   use FS::h_svc_broadband;
   use FS::h_svc_domain;
@@ -212,13 +230,33 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
   #use FS::h_phone_device;
   use FS::h_svc_www;
   use FS::cust_statement;
+  use FS::cust_class;
+  use FS::cust_category;
+  use FS::prospect_main;
+  use FS::contact;
+  use FS::svc_pbx;
+  use FS::discount;
+  use FS::cust_pkg_discount;
+  use FS::cust_bill_pkg_discount;
+  use FS::svc_mailinglist;
+  use FS::cgp_rule;
+  use FS::cgp_rule_condition;
+  use FS::cgp_rule_action;
+  use FS::bill_batch;
+  use FS::cust_bill_batch;
   # Sammath Naur
 
+  if ( $FS::Mason::addl_handler_use ) {
+    eval $FS::Mason::addl_handler_use;
+    die $@ if $@;
+  }
+
   if ( %%%RT_ENABLED%%% ) {
     eval '
       use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" );
       use vars qw($Nobody $SystemUser);
       use RT;
+      use RT::Util;
       use RT::Tickets;
       use RT::Transactions;
       use RT::Users;
@@ -247,9 +285,14 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
       #to throw a real error instead of just a mysterious unstyled RT
       use CSS::Squish 0.06;
 
+      use RT::Interface::Web::Request;
+
+      #nother undeclared web UI dep (for ticket links graph)
+      use IPC::Run::SafeHandles;
+
       #slow, unreliable, segfaults and is optional
       #see rt/html/Ticket/Elements/ShowTransactionAttachments
-      use Text::Quoted;
+      #use Text::Quoted;
 
       #?#use File::Path qw( rmtree );
       #?#use File::Glob qw( bsd_glob );
@@ -320,6 +363,11 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
     $m->comp('/elements/errorpage.html', @_);
   }
 
+  sub errorpage_popup {
+    use vars qw($m);
+    $m->comp('/elements/errorpage-popup.html', @_);
+  }
+
   sub redirect {
     my( $location ) = @_;
     use vars qw($m);
@@ -367,15 +415,22 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
 
 =over 4
 
-=item mason_interps [ MODE ]
+=item mason_interps [ MODE [ OPTION => VALUE ... ] ]
 
 Returns a list consisting of two HTML::Mason::Interp objects, the first for
 Freeside pages, and the second for RT pages.
 
-#MODE can be 'apache' or 'standalone'.  If not specified, defaults to 'apache'.
+MODE can be 'apache' or 'standalone'.  If not specified, defaults to 'apache'.
+
+Options and values can be passed following mode.  Currently available options
+are:
+
+I<outbuf> should be set to a scalar reference in standalone mode.
 
 =cut
 
+my %defang_opts = ( attribs_to_callback => ['src'], attribs_callback => sub { 1 });
+
 sub mason_interps {
   my $mode = shift || 'apache';
   my %opt = @_;
@@ -385,10 +440,25 @@ sub mason_interps {
   my $request_class = 'FS::Mason::Request';
 
   #not entirely sure it belongs here, but what the hey
-  if ( %%%RT_ENABLED%%% ) {
+  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 %interp = (
     request_class        => $request_class,
     data_dir             => '%%%MASONDATA%%%',
@@ -398,11 +468,14 @@ sub mason_interps {
     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);
+
   my $fs_interp = new HTML::Mason::Interp (
     %interp,
     escape_flags => { 'js_string' => sub {
@@ -410,7 +483,10 @@ sub mason_interps {
                         ${$_[0]} =~ s/(['\\])/\\$1/g;
                         ${$_[0]} =~ s/\n/\\n/g;
                         ${$_[0]} = "'". ${$_[0]}. "'";
-                      }
+                      },
+                      'defang'    => sub {
+                        ${$_[0]} = $html_defang->defang(${$_[0]});
+                      },
                     },
     compiler     => HTML::Mason::Compiler::ToObject->new(
                       allow_globals        => [qw(%session)],