X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=7bdb6059e44239ab0b230bc684554c83491b6748;hp=398d78561eff68cb3f66ad4a0f21bc6ee61db84a;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hpb=ecc15d03711690d2b2aeeda2bd8ff1119956c583 diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 398d78561..7bdb6059e 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -45,19 +45,13 @@ if ( -e $addl_handler_use_file ) { 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 4.08 qw(-private_tempfiles); #4.08 for multi_param #use CGI::Carp qw(fatalsToBrowser); use CGI::Cookie; use List::Util qw( max min sum ); use List::MoreUtils qw( first_index uniq ); - use Scalar::Util qw( blessed ); + use Scalar::Util qw( blessed looks_like_number ); use Data::Dumper; use Date::Format; use Time::Local; @@ -77,14 +71,13 @@ if ( -e $addl_handler_use_file ) { use HTML::TableExtract qw(tree); use HTML::FormatText; use HTML::Defang; - use JSON::XS; -# use XMLRPC::Transport::HTTP; -# use XMLRPC::Lite; # for XMLRPC::Serializer + use Cpanel::JSON::XS; use MIME::Base64; use IO::Handle; use IO::File; use IO::Scalar; use IO::String; + use File::Slurp qw( slurp ); #not actually using this yet anyway...# use IPC::Run3 0.036; use Net::Whois::Raw qw(whois); if ( $] < 5.006 ) { @@ -98,8 +91,9 @@ 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.36; #for best-effort cardtype() (60xx as Discover) use NetAddr::IP; + use Net::MAC::Vendor; use Net::Ping; use Net::Ping::External; #if CPAN #7815 ever gets fixed# if ( $Net::Ping::External::VERSION <= 0.12 ) @@ -121,8 +115,10 @@ if ( -e $addl_handler_use_file ) { use HTML::Widgets::SelectLayers 0.07; #should go away in favor of #selectlayers.html use Locale::Country; + #use FS::geocode_Mixin; #for its code2country use Locale::Currency; use Locale::Currency::Format; + use Number::Phone::Country qw( noexport ); use Business::US::USPS::WebTools::AddressStandardization; use Geo::GoogleEarth::Pluggable; use LWP::UserAgent; @@ -131,29 +127,37 @@ if ( -e $addl_handler_use_file ) { use FS::UID qw( dbh datasrc driver_name ); use FS::Record qw( qsearch qsearchs fields dbdef str2time_sql str2time_sql_closing - midnight_sql + midnight_sql regexp_sql ); use FS::Conf; + use FS::ConfDefaults; use FS::CGI qw(header menubar table itable ntable idiot eidiot myexit http_header); - use FS::UI::Web qw(svc_url); + 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::UI::REST qw( rest_auth rest_uri_remain encode_rest ); use FS::Msgcat qw(gettext geterror); use FS::Misc qw( send_email send_fax ocr_image states_hash counties cities state_label + card_types ); 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::Report::Tax::ByName; + use FS::Report::Tax::All; 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::Query; + use FS::agent; use FS::agent_type; use FS::domain_record; @@ -165,6 +169,7 @@ if ( -e $addl_handler_use_file ) { use FS::h_cust_main; use FS::cust_main::Search qw(smart_search); use FS::cust_main::Import; + use FS::cust_main::Import_Charges; use FS::cust_main_county; use FS::cust_location; use FS::cust_pay; @@ -177,7 +182,6 @@ if ( -e $addl_handler_use_file ) { use FS::cust_pay_refund; use FS::cust_svc; use FS::nas; - use FS::part_bill_event; use FS::part_event; use FS::part_event_condition; use FS::part_pkg; @@ -214,7 +218,6 @@ if ( -e $addl_handler_use_file ) { 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; @@ -259,6 +262,7 @@ if ( -e $addl_handler_use_file ) { use FS::cust_category; use FS::prospect_main; use FS::contact; + use FS::contact::Import; use FS::phone_type; use FS::svc_pbx; use FS::discount; @@ -357,6 +361,65 @@ if ( -e $addl_handler_use_file ) { use FS::invoice_conf; use FS::cable_provider; use FS::cust_credit_void; + use FS::discount_class; + use FS::alarm_system; + use FS::alarm_type; + use FS::alarm_station; + use FS::addr_range; + use FS::svc_conferencing; + use FS::conferencing_type; + use FS::conferencing_quality; + use FS::svc_video; + use FS::part_pkg_usageprice; + use FS::cust_pkg_usageprice; + use FS::pbx_extension; + use FS::pbx_device; + use FS::extension_device; + use FS::cust_main_credit_limit; + use FS::cust_event_fee; + use FS::part_fee; + use FS::cust_bill_pkg_fee; + use FS::part_fee_msgcat; + use FS::part_fee_usage; + use FS::sched_item; + use FS::sched_avail; + use FS::export_batch; + use FS::export_batch_item; + use FS::part_pkg_fcc_option; + use FS::state; + use FS::state; + use FS::queue_stat; + use FS::deploy_zone; + use FS::deploy_zone_block; + use FS::deploy_zone_vertex; + use FS::TaxEngine; + use FS::tax_status; + use FS::circuit_type; + use FS::circuit_provider; + use FS::circuit_termination; + use FS::svc_circuit; + use FS::cust_credit_source_bill_pkg; + use FS::prospect_contact; + use FS::cust_contact; + use FS::legacy_cust_history; + use FS::quotation_pkg_tax; + use FS::cust_pkg_reason_fee; + use FS::part_svc_link; + use FS::access_user_log; + use FS::report_batch; + use FS::report_batch; + use FS::report_batch; + use FS::report_batch; + use FS::password_history; + 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::commission_schedule; + use FS::commission_rate; + use FS::saved_search; + use FS::sector_coverage; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { @@ -385,21 +448,13 @@ if ( -e $addl_handler_use_file ) { use RT::CustomFieldValues; use RT::ObjectCustomFieldValues; - #blah. manually updated from RT::Interface::Web::Handler - use RT::Interface::Web; - use MIME::Entity; - use Text::Wrapper; - use Time::ParseDate; - use Time::HiRes; - use HTML::Scrubber; + use RT::Interface::Web::Handler; #blah. not even in RT::Interface::Web::Handler, just in #html/NoAuth/css/dhandler and rt-test-dependencies. ask for it here #to throw a real error instead of just a mysterious unstyled RT use CSS::Squish 0.06; - use RT::Interface::Web::Request; - #another undeclared web UI dep (for ticket links graph) use IPC::Run::SafeHandles; @@ -415,17 +470,22 @@ if ( -e $addl_handler_use_file ) { die $@ if $@; } + no warnings 'redefine'; *CGI::redirect = sub { my $self = shift; - my $cookie = ''; - if ( $_[0] eq '-cookie' ) { #this isn't actually used at the moment - (my $x, $cookie) = (shift, shift); - $HTML::Mason::r->err_headers_out->add( 'Set-cookie' => $cookie ); - } - my $location = shift; use vars qw($m); + my $location = ''; + if ( $_[0] =~ /^-/ ) { + my %opt = @_; + $location = $opt{'-uri'}; + my $cookie = $opt{'-cookie'}; + $m->apache_req->err_headers_out->{'Set-cookie'} = $cookie if $cookie; + } else { + $location = shift; + } + # false laziness w/below if ( @DBIx::Profile::ISA ) { @@ -468,7 +528,7 @@ if ( -e $addl_handler_use_file ) { sub include { use vars qw($m); - #carp #should just switch to <& &> syntax + #warn 'include deprecated; use an HTML::Mason <& &> style include (or $m->scomp) at '. $m->callers(0)->path. "\n"; $m->scomp(@_); } @@ -525,7 +585,7 @@ if ( -e $addl_handler_use_file ) { } # end package HTML::Mason::Commands; -=head1 SUBROUTINE +=head1 SUBROUTINES =over 4 @@ -605,7 +665,8 @@ sub mason_interps { [ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ], [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ], ], - escape_flags => { 'h' => \&RT::Interface::Web::EscapeUTF8, + escape_flags => { 'h' => \&RT::Interface::Web::EscapeHTML, + #u and j aren't used anymore? :/ 'u' => \&RT::Interface::Web::EscapeURI, 'j' => \&RT::Interface::Web::EscapeJS, 'js_string' => $js_string_sub, @@ -620,6 +681,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