X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=3d577f6d2ae987b5b0dcad3679898c2e921fde11;hp=1553a42df95443963e1aaff7592a1b03d952205f;hb=9aee669886202be7035e6c6049fc71bc99dd3013;hpb=ded0ab5cac02f099b387de360fb6dd6bd8cbb6b4 diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 1553a42df..3d577f6d2 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -57,7 +57,7 @@ if ( -e $addl_handler_use_file ) { 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; @@ -78,13 +78,12 @@ if ( -e $addl_handler_use_file ) { use HTML::FormatText; use HTML::Defang; use JSON::XS; -# use XMLRPC::Transport::HTTP; -# use XMLRPC::Lite; # for XMLRPC::Serializer 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 ) { @@ -100,6 +99,7 @@ if ( -e $addl_handler_use_file ) { use Business::CreditCard 0.30; #for mask-aware cardtype() 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,15 +121,17 @@ if ( -e $addl_handler_use_file ) { use HTML::Widgets::SelectLayers 0.07; #should go away in favor of #selectlayers.html use Locale::Country; + use Locale::Currency; + use Locale::Currency::Format; use Business::US::USPS::WebTools::AddressStandardization; use Geo::GoogleEarth::Pluggable; use LWP::UserAgent; use Storable qw( nfreeze thaw ); use FS; - use FS::UID qw( getotaker dbh datasrc driver_name ); + 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::CGI qw(header menubar table itable ntable idiot @@ -137,6 +139,7 @@ if ( -e $addl_handler_use_file ) { use FS::UI::Web qw(svc_url); 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 @@ -146,12 +149,15 @@ 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::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; @@ -163,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; @@ -175,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; @@ -212,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; @@ -313,7 +318,6 @@ if ( -e $addl_handler_use_file ) { use FS::tower; use FS::tower_sector; use FS::sales; - use FS::access_groupsales; use FS::contact_class; use FS::part_svc_class; use FS::upload_target; @@ -339,6 +343,68 @@ if ( -e $addl_handler_use_file ) { use FS::part_pkg_usage; use FS::cdr_cust_pkg_usage; use FS::part_pkg_msgcat; + use FS::svc_cable; + use FS::agent_currency; + use FS::currency_exchange; + use FS::part_pkg_currency; + use FS::cust_payby; + use FS::vend_main; + use FS::vend_class; + use FS::vend_bill; + use FS::vend_pay; + use FS::vend_bill_pay; + use FS::sales_pkg_class; + use FS::svc_alarm; + use FS::cable_model; + use FS::invoice_mode; + 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; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { @@ -367,21 +433,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; @@ -397,6 +455,7 @@ if ( -e $addl_handler_use_file ) { die $@ if $@; } + no warnings 'redefine'; *CGI::redirect = sub { my $self = shift; my $cookie = ''; @@ -409,7 +468,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') ) { @@ -450,7 +509,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(@_); } @@ -469,7 +528,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') ) { @@ -587,7 +646,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,