X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=3d6092e44faef6c5313412f4d6ed6150a6a00eae;hp=219f6b738db1a6377ffd971d360d1be1a41dc98d;hb=9f351b4a4df08d607aa0d647709b06cbea1c5ffe;hpb=9a90f2af0663c9b4e9611e044fd25349425d1aec
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 219f6b738..3d6092e44 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)
{
@@ -38,19 +45,27 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use strict;
use vars qw( %session );
use CGI 3.29 qw(-private_tempfiles); #3.29 to fix RT attachment problems
+
+ #breaks quick payment entry
+ #http://rt.cpan.org/Public/Bug/Display.html?id=37365
+ die "CGI.pm v3.38 is broken, use any other version >= 3.29".
+ " (Debian 5.0? aptitude remove libcgi-pm-perl)"
+ if $CGI::VERSION == 3.38;
+
#use CGI::Carp qw(fatalsToBrowser);
use CGI::Cookie;
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);
use Tie::IxHash;
- use URI::URL;
+ use URI;
use URI::Escape;
use HTML::Entities;
use HTML::TreeBuilder;
@@ -70,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;
@@ -91,8 +119,10 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
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::eps2png qw( eps2png );
use FS::Report::Table::Monthly;
use FS::TicketSystem;
+ use FS::Tron qw( tron_lint );
use FS::agent;
use FS::agent_type;
@@ -102,7 +132,9 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use FS::cust_credit;
use FS::cust_credit_bill;
use FS::cust_main 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::part_pkg_taxclass;
@@ -140,15 +172,19 @@ 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;
use FS::rate_prefix;
+ use FS::rate_detail;
+ use FS::usage_class;
use FS::payment_gateway;
use FS::agent_payment_gateway;
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;
@@ -161,6 +197,8 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use FS::access_right;
use FS::AccessRight;
use FS::svc_phone;
+ use FS::phone_device;
+ use FS::part_device;
use FS::reason_type;
use FS::reason;
use FS::cust_main_note;
@@ -170,6 +208,27 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use FS::part_pkg_taxoverride;
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;
+ use FS::h_svc_domain;
+ #use FS::h_domain_record;
+ use FS::h_svc_external;
+ use FS::h_svc_forward;
+ use FS::h_svc_phone;
+ #use FS::h_phone_device;
+ use FS::h_svc_www;
+ use FS::cust_statement;
+ use FS::svc_pbx;
+ use FS::svc_mailinglist;
+ # Sammath Naur
+
+ if ( $FS::Mason::addl_handler_use ) {
+ eval $FS::Mason::addl_handler_use;
+ die $@ if $@;
+ }
if ( %%%RT_ENABLED%%% ) {
eval '
@@ -206,7 +265,7 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
#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 );
@@ -228,20 +287,35 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use vars qw($m);
# false laziness w/below
- if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
-
- my $page =
- qq!Redirect to $location!.
- '
'.
- ( UNIVERSAL::can(dbh, 'sprintProfile')
- ? encode_entities(dbh->sprintProfile())
- : 'DBIx::Profile missing sprintProfile method;'.
- 'unpatched or too old?' ).
- #"\n\n". &sprintAutoProfile(). '
'.
- "\n\n". ''.
- '';
- dbh->{'private_profile'} = {};
- return $page;
+ if ( defined(@DBIx::Profile::ISA) ) {
+
+ if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
+
+ #profiling redirect
+
+ my $page =
+ qq!Redirect to $location!.
+ '
'.
+ ( UNIVERSAL::can(dbh, 'sprintProfile')
+ ? encode_entities(dbh->sprintProfile())
+ : 'DBIx::Profile missing sprintProfile method;'.
+ 'unpatched or too old?' ).
+ #"\n\n". &sprintAutoProfile(). '
'.
+ "\n\n". ''.
+ '';
+
+
+ dbh->{'private_profile'} = {};
+ return $page;
+
+ } else {
+
+ #clear db profile, but normal redirect
+ dbh->{'private_profile'} = {};
+ $m->redirect($location);
+ '';
+
+ }
} else { #normal redirect
@@ -267,20 +341,33 @@ Initializes the Mason environment, loads all Freeside and RT libraries, etc.
use vars qw($m);
$m->clear_buffer;
#false laziness w/above
- if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
-
- $m->print(
- qq!Redirect to $location!.
- '
'.
- ( UNIVERSAL::can(dbh, 'sprintProfile')
- ? encode_entities(dbh->sprintProfile())
- : 'DBIx::Profile missing sprintProfile method;'.
- 'unpatched or too old?' ).
- #"\n\n". &sprintAutoProfile(). '
'.
- "\n\n". ''.
- ''
- );
- dbh->{'private_profile'} = {};
+ if ( defined(@DBIx::Profile::ISA) ) {
+
+ if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
+
+ #profiling redirect
+
+ $m->print(
+ qq!Redirect to $location!.
+ '
'.
+ ( UNIVERSAL::can(dbh, 'sprintProfile')
+ ? encode_entities(dbh->sprintProfile())
+ : 'DBIx::Profile missing sprintProfile method;'.
+ 'unpatched or too old?' ).
+ #"\n\n". &sprintAutoProfile(). '
'.
+ "\n\n". ''.
+ ''
+ );
+
+ dbh->{'private_profile'} = {};
+
+ } else {
+
+ #clear db profile, but normal redirect
+ dbh->{'private_profile'} = {};
+ $m->redirect($location);
+
+ }
} else { #normal redirect
@@ -318,6 +405,21 @@ sub mason_interps {
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%%%',
@@ -327,6 +429,7 @@ sub mason_interps {
comp_root => [
[ 'freeside'=>'%%%FREESIDE_DOCUMENT_ROOT%%%' ],
[ 'rt' =>'%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ],
+ @addl_comp_root,
],
);
@@ -341,6 +444,9 @@ sub mason_interps {
${$_[0]} = "'". ${$_[0]}. "'";
}
},
+ compiler => HTML::Mason::Compiler::ToObject->new(
+ allow_globals => [qw(%session)],
+ ),
);
my $rt_interp = new HTML::Mason::Interp (