X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=76c3000c9db1404b4b40f30918eca0f35c5c90e6;hb=75905ceede173133e27e1ce5b7046ee62848d541;hp=4d01d7c9e5dd32c9df9a93d946e3b2f40960f350;hpb=733afa09f60a32088277bf743ac29d9caa1c7c78;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 4d01d7c9e..76c3000c9 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -77,7 +77,8 @@ if ( -e $addl_handler_use_file ) {
   use HTML::TableExtract qw(tree);
   use HTML::FormatText;
   use HTML::Defang;
-  use JSON::XS;
+#  use JSON::XS;        ! Maintainers deployed app-breaking defaults,
+  use Cpanel::JSON::XS; # this is considered safe compatible drop-in replacement
 #  use XMLRPC::Transport::HTTP;
 #  use XMLRPC::Lite; # for XMLRPC::Serializer
   use MIME::Base64;
@@ -99,7 +100,7 @@ if ( -e $addl_handler_use_file ) {
   use Excel::Writer::XLSX;
   #use Excel::Writer::XLSX::Utility; #redundant with above
 
-  use Business::CreditCard 0.30; #for mask-aware cardtype()
+  use Business::CreditCard 0.35; #for new mastercard ranges and visa lengths
   use NetAddr::IP;
   use Net::MAC::Vendor;
   use Net::Ping;
@@ -123,6 +124,7 @@ if ( -e $addl_handler_use_file ) {
   use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
                                         #selectlayers.html
   use Locale::Country;
+  use Number::Phone::Country qw( noexport );
   use Business::US::USPS::WebTools::AddressStandardization;
   use Geo::GoogleEarth::Pluggable;
   use LWP::UserAgent;
@@ -136,7 +138,8 @@ if ( -e $addl_handler_use_file ) {
   use FS::Conf;
   use FS::CGI qw(header menubar table itable ntable idiot
                  eidiot myexit http_header);
-  use FS::UI::Web qw(svc_url random_id);
+  use FS::UI::Web qw(svc_url random_id
+                  get_page_pref  set_page_pref);
   use FS::UI::Web::small_custview qw(small_custview);
   use FS::UI::bytecount;
   use FS::Msgcat qw(gettext geterror);
@@ -149,7 +152,8 @@ if ( -e $addl_handler_use_file ) {
   use FS::Report::Table;
   use FS::Report::Table::Monthly;
   use FS::Report::Table::Daily;
-  use FS::Report::Tax;
+  use FS::Report::Tax::ByName;
+  use FS::Report::Tax::All;
   use FS::TicketSystem;
   use FS::NetworkMonitoringSystem;
   use FS::Tron qw( tron_lint );
@@ -389,6 +393,9 @@ if ( -e $addl_handler_use_file ) {
   use FS::svc_fiber;
   use FS::fiber_olt;
   use FS::olt_site;
+  use FS::access_user_page_pref;
+  use FS::part_svc_msgcat;
+  use FS::saved_search;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -460,7 +467,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
 
     # false laziness w/below
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
@@ -520,7 +527,7 @@ if ( -e $addl_handler_use_file ) {
     use vars qw($m);
     $m->clear_buffer;
     #false laziness w/above
-    if ( defined(@DBIx::Profile::ISA) ) {
+    if ( @DBIx::Profile::ISA ) {
 
       if ( $FS::CurrentUser::CurrentUser->option('show_db_profile') ) {
 
@@ -558,7 +565,7 @@ if ( -e $addl_handler_use_file ) {
 
 } # end package HTML::Mason::Commands;
 
-=head1 SUBROUTINE
+=head1 SUBROUTINES
 
 =over 4
 
@@ -653,6 +660,35 @@ sub mason_interps {
 
 }
 
+=item child_init
+
+Per-process Apache child initialization code.
+
+Calls srand() to re-seed Perl's PRNG so that multiple children do not generate
+the same "random" numbers.
+
+Works around a Net::SSLeay connection error by creating and deleting an SSL
+context, so subsequent connections do not error out with a CTX_new (900 NET OR
+SSL ERROR).  See http://bugs.debian.org/830152
+
+=cut
+
+sub child_init {
+  #my ($pool, $server) = @_; #the child process pool (APR::Pool) and the server object (Apache2::ServerRec).
+
+  srand();
+
+  #{
+    use Net::SSLeay;
+    package Net::SSLeay;
+    initialize();
+    my $bad_ctx = new_x_ctx();
+    while ( ERR_get_error() ) {}; #print_errs('CTX_new');
+    CTX_free($bad_ctx);
+  #}
+
+}
+
 =back
 
 =head1 BUGS