X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=be6f2f758d9b379233379475f8657eff6bdd841c;hp=25962412b29eb221f974d82cf79f5a0cbac12e43;hb=7153190ee1bfeb6d3ad9e6da270a41a949333a7e;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1 diff --git a/htetc/handler.pl b/htetc/handler.pl index 25962412b..be6f2f758 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -1,13 +1,12 @@ #!/usr/bin/perl -# -# This is a basic, fairly fuctional Mason handler.pl. -# -# For something a little more involved, check out session_handler.pl package HTML::Mason; -# Bring in main Mason package. +use strict; +use vars qw($r); use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect +use HTML::Mason::Interp; +use HTML::Mason::Compiler::ToObject; # Bring in ApacheHandler, necessary for mod_perl integration. # Uncomment the second line (and comment the first) to use @@ -15,11 +14,6 @@ use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect use HTML::Mason::ApacheHandler; # use HTML::Mason::ApacheHandler (args_method=>'mod_perl'); -# Uncomment the next line if you plan to use the Mason previewer. -#use HTML::Mason::Preview; - -use strict; - ###use Module::Refresh;### # List of modules that you want to use from components (see Admin @@ -28,18 +22,6 @@ use strict; # use CGI; #} -# Create Mason objects -# - -#my $parser = new HTML::Mason::Parser; -#my $interp = new HTML::Mason::Interp (parser=>$parser, -# comp_root=>'/var/www/masondocs', -# data_dir=>'/usr/local/etc/freeside/masondata', -# out_mode=>'stream', -# ); - -use vars qw($r); - if ( %%%RT_ENABLED%%% ) { eval ' use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" ); @@ -48,26 +30,45 @@ if ( %%%RT_ENABLED%%% ) { RT::LoadConfig(); '; die $@ if $@; +} +# Create Mason objects -} +my %interp = ( + request_class => 'HTML::Mason::Request::ApacheHandler', + data_dir => '%%%MASONDATA%%%', + error_mode => 'output', + error_format => 'html', + ignore_warnings_expr => '.', + comp_root => [ + [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ], + [ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ], + ], +); + +my $fs_interp = new HTML::Mason::Interp ( + %interp, + escape_flags => { 'js_string' => sub { + #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge; + ${$_[0]} =~ s/(['\\])/\\$1/g; + ${$_[0]} =~ s/\n/\\n/g; + ${$_[0]} = "'". ${$_[0]}. "'"; + } + }, +); +my $rt_interp = new HTML::Mason::Interp ( + %interp, + escape_flags => { 'h' => \&RT::Interface::Web::EscapeUTF8 }, + compiler => HTML::Mason::Compiler::ToObject->new( + default_escape_flags => 'h', + allow_globals => [qw(%session)], + ), +); my $ah = new HTML::Mason::ApacheHandler ( - #interp => $interp, - #auto_send_headers => 0, - comp_root=> [ - [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ], - [ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ], - ], - data_dir=>'%%%MASONDATA%%%', - #out_mode=>'stream', - - #RT - args_method => 'CGI', - default_escape_flags => 'h', - allow_globals => [qw(%session)], - #autoflush => 1, + interp => $fs_interp, + args_method => 'CGI', #(and FS too) ); # Activate the following if running httpd as root (the normal case). @@ -90,7 +91,7 @@ sub handler use strict; use vars qw( $cgi $p $fsurl); use vars qw( %session ); - use CGI 2.47 qw(-private_tempfiles); + use CGI 3.29 qw(-private_tempfiles); #3.29 to fix RT attachment problems #use CGI::Carp qw(fatalsToBrowser); use CGI::Cookie; use List::Util qw( max min ); @@ -103,8 +104,11 @@ sub handler use DateTime::Format::Strptime; use Lingua::EN::Inflect qw(PL); use Tie::IxHash; + use URI::URL; use URI::Escape; use HTML::Entities; + use HTML::TreeBuilder; + use HTML::FormatText; use JSON; use MIME::Base64; use IO::Handle; @@ -119,19 +123,25 @@ sub handler use Text::CSV_XS; use Spreadsheet::WriteExcel; use Business::CreditCard 0.30; #for mask-aware cardtype() + use NetAddr::IP; use String::Approx qw(amatch); use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.07; + use HTML::Widgets::SelectLayers 0.07; #should go away in favor of + #selectlayers.html use Locale::Country; + use Business::US::USPS::WebTools::AddressStandardization; use FS; - use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); - use FS::Record qw(qsearch qsearchs fields dbdef); + use FS::UID qw( adminsuidsetup cgisuidsetup getotaker + dbh datasrc driver_name + ); + use FS::Record qw(qsearch qsearchs fields dbdef str2time_sql); use FS::Conf; use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot - eidiot small_custview myexit http_header); + eidiot myexit http_header); use FS::UI::Web qw(svc_url); + 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 ); @@ -149,8 +159,11 @@ sub handler use FS::cust_main_county; use FS::cust_pay; use FS::cust_pkg; + use FS::part_pkg_taxclass; use FS::cust_pkg_reason; use FS::cust_refund; + use FS::cust_credit_refund; + use FS::cust_pay_refund; use FS::cust_svc; use FS::nas; use FS::part_bill_event; @@ -169,6 +182,7 @@ sub handler use FS::session; use FS::svc_acct; use FS::svc_acct_pop qw(popselector); + use FS::acct_rt_transaction; use FS::svc_domain; use FS::svc_forward; use FS::svc_www; @@ -203,6 +217,12 @@ sub handler use FS::reason_type; use FS::reason; use FS::cust_main_note; + use FS::tax_class; + use FS::cust_tax_location; + use FS::part_pkg_taxproduct; + use FS::part_pkg_taxoverride; + use FS::part_pkg_taxrate; + use FS::tax_rate; if ( %%%RT_ENABLED%%% ) { eval ' @@ -221,12 +241,27 @@ sub handler 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 Text::Quoted; + + #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; + + #slow, unreliable, segfaults and is optional + #see rt/html/Ticket/Elements/ShowTransactionAttachments + #use Text::Quoted; + + #?#use File::Path qw( rmtree ); + #?#use File::Glob qw( bsd_glob ); + #?#use File::Spec::Unix; + '; die $@ if $@; } @@ -267,12 +302,23 @@ sub handler }; - unless ( $HTML::Mason::r->filename =~ /\/rt\/.*NoAuth/ ) { #RT + if ( $HTML::Mason::r->filename !~ /\/rt\/.*NoAuth/ ) { #not RT images/JS + $cgi = new CGI; &cgisuidsetup($cgi); #&cgisuidsetup($r); $p = popurl(2); $fsurl = rooturl(); + + } elsif ( $HTML::Mason::r->filename =~ /\/rt\/REST\/.*NoAuth/ ) { + + #need to log somebody in for the mail gw + + ##old installs w/fs_selfs or selfserv?? + #&adminsuidsetup('fs_selfservice'); + + &adminsuidsetup('fs_queue'); + } sub include { @@ -280,6 +326,11 @@ sub handler $m->scomp(@_); } + sub errorpage { + use vars qw($m); + $m->comp('/elements/errorpage.html', @_); + } + sub redirect { my( $location ) = @_; use vars qw($m); @@ -327,15 +378,9 @@ sub handler # $r->send_http_header; - #$ah->interp->remove_escape('h'); - if ( $r->filename =~ /\/rt\// ) { #RT - #warn "processing RT file". $r->filename. "; escaping for RT\n"; - # MasonX::Request::ExtendedCompRoot - #$ah->interp->comp_root( '/rt'. $ah->interp->comp_root() ); - - $ah->interp->set_escape( h => \&RT::Interface::Web::EscapeUTF8 ); + $ah->interp($rt_interp); local $SIG{__WARN__}; local $SIG{__DIE__}; @@ -343,21 +388,14 @@ sub handler RT::Init(); # We don't need to handle non-text, non-xml items - return -1 if defined( $r->content_type ) && $r->content_type !~ m!(^text/|\bxml\b)!io; + return -1 if defined( $r->content_type ) + && $r->content_type !~ m!(^text/|\bxml\b)!io; } else { - #$ah->interp->set_escape( 'h' => sub { ${$_[0]}; } ); - $ah->interp->set_escape( 'h' => sub {} ); - - $ah->interp->set_escape( 'js_string' => sub { - #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge; - ${$_[0]} =~ s/(['\\])/\\$1/g; - ${$_[0]} =~ s/\n/\\n/g; - ${$_[0]} = "'". ${$_[0]}. "'"; - } ); - } - $ah->interp->ignore_warnings_expr('.'); + $ah->interp($fs_interp); + + } my %session; my $status; @@ -366,6 +404,7 @@ sub handler # if ( $@ ) { # $RT::Logger->crit($@); # } + warn $@ if $@; undef %session;