X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=eb26dde5d3d82072bb1352a3f7543c613ede8304;hp=ed99bf694204b0c68e2cb769201f0f9da5fac00b;hb=d0221fabd4656b3a04251ca6168cc45f54d23574;hpb=e1b1693a656964c6db0b8a3fb85494014434dcb1 diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index ed99bf694..eb26dde5d 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) { @@ -52,6 +59,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc. use Date::Format; use Date::Parse; use Time::Local; + use Time::HiRes; use Time::Duration; use DateTime; use DateTime::Format::Strptime; @@ -77,6 +85,19 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc. use Spreadsheet::WriteExcel; use Business::CreditCard 0.30; #for mask-aware cardtype() use NetAddr::IP; + use Net::Ping; + use Net::Ping::External; + #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 ) + { + no warnings 'redefine'; + eval 'sub Net::Ping::External::_ping_linux { + my %args = @_; + my $command = "ping -s $args{size} -c $args{count} -w $args{timeout} $args{host}"; + return Net::Ping::External::_ping_system($command, 0); + } + '; + die $@ if $@; + } use String::Approx qw(amatch); use Chart::LinesPoints; use Chart::Mountain; @@ -97,7 +118,9 @@ 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::Table::Monthly; use FS::TicketSystem; @@ -151,6 +174,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; @@ -162,6 +186,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; @@ -186,6 +211,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc. use FS::part_pkg_taxrate; use FS::tax_rate; use FS::part_pkg_report_option; + use FS::cust_attachment; use FS::h_cust_pkg; use FS::h_svc_acct; use FS::h_svc_broadband; @@ -196,8 +222,22 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc. use FS::h_svc_phone; #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; # 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" ); @@ -231,9 +271,11 @@ 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; + #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 ); @@ -351,12 +393,17 @@ 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 should be set to a scalar reference in standalone mode. =cut @@ -369,10 +416,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%%%', @@ -382,6 +444,7 @@ sub mason_interps { comp_root => [ [ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%' ], [ 'rt' =>'%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ], + @addl_comp_root, ], );