X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=c5873a878d982686f36bd4175e035582a43c292b;hp=737e5af0bdb9441d86ab862cdc5e6aad334e142b;hb=1293d137b061f097190eda53e4e78214e18832e6;hpb=10225293c7ccecb9273e0f17cbc65889496cf090 diff --git a/htetc/handler.pl b/htetc/handler.pl index 737e5af0b..c5873a878 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -7,7 +7,7 @@ package HTML::Mason; # Bring in main Mason package. -use HTML::Mason 1.1; +use HTML::Mason 1.27; #http://www.masonhq.com/?ApacheModPerl2Redirect # Bring in ApacheHandler, necessary for mod_perl integration. # Uncomment the second line (and comment the first) to use @@ -60,7 +60,7 @@ my $ah = new HTML::Mason::ApacheHandler ( [ 'freeside' => '%%%FREESIDE_DOCUMENT_ROOT%%%' ], [ 'rt' => '%%%FREESIDE_DOCUMENT_ROOT%%%/rt' ], ], - data_dir=>'/usr/local/etc/freeside/masondata', + data_dir=>'%%%MASONDATA%%%', #out_mode=>'stream', #RT @@ -88,20 +88,29 @@ sub handler #rar { package HTML::Mason::Commands; use strict; - use vars qw( $cgi $p ); + use vars qw( $cgi $p $fsurl); use vars qw( %session ); use CGI 2.47 qw(-private_tempfiles); #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::Duration; + use DateTime; + use DateTime::Format::Strptime; + use Lingua::EN::Inflect qw(PL); use Tie::IxHash; use URI::Escape; use HTML::Entities; + use JSON; + use MIME::Base64; use IO::Handle; use IO::File; use IO::Scalar; + #not actually using this yet anyway...# use IPC::Run3 0.036; use Net::Whois::Raw qw(whois); if ( $] < 5.006 ) { eval "use Net::Whois::Raw 0.32 qw(whois)"; @@ -109,19 +118,23 @@ sub handler } use Text::CSV_XS; use Spreadsheet::WriteExcel; - use Business::CreditCard; + use Business::CreditCard 0.30; #for mask-aware cardtype() use String::Approx qw(amatch); use Chart::LinesPoints; - use HTML::Widgets::SelectLayers 0.05; + use Chart::Mountain; + use Color::Scheme; + use HTML::Widgets::SelectLayers 0.07; + use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; - use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot - small_custview myexit http_header); - use FS::UI::Web; + use FS::CGI qw(header menubar popurl rooturl table itable ntable idiot + eidiot small_custview myexit http_header); + use FS::UI::Web qw(svc_url); + use FS::UI::bytecount; use FS::Msgcat qw(gettext geterror); - use FS::Misc qw( send_email send_fax ); + use FS::Misc qw( send_email send_fax states_hash counties state_label ); use FS::Report::Table::Monthly; use FS::TicketSystem; @@ -136,15 +149,19 @@ sub handler use FS::cust_main_county; use FS::cust_pay; use FS::cust_pkg; + use FS::cust_pkg_reason; use FS::cust_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; use FS::part_referral; use FS::part_svc; use FS::part_svc_router; use FS::part_virtual_field; + use FS::pay_batch; use FS::pkg_svc; use FS::port; use FS::queue qw(joblisting); @@ -152,6 +169,7 @@ sub handler use FS::session; use FS::svc_acct; use FS::svc_acct_pop qw(popselector); + use FS::svc_acct_rt_transaction; use FS::svc_domain; use FS::svc_forward; use FS::svc_www; @@ -170,6 +188,22 @@ sub handler use FS::payment_gateway; use FS::agent_payment_gateway; use FS::XMLRPC; + use FS::payby; + use FS::cdr; + use FS::inventory_class; + use FS::inventory_item; + use FS::pkg_class; + use FS::access_user; + use FS::access_user_pref; + use FS::access_group; + use FS::access_usergroup; + use FS::access_groupagent; + use FS::access_right; + use FS::AccessRight; + use FS::svc_phone; + use FS::reason_type; + use FS::reason; + use FS::cust_main_note; if ( %%%RT_ENABLED%%% ) { eval ' @@ -186,12 +220,11 @@ sub handler use RT::GroupMembers; use RT::CustomFields; use RT::CustomFieldValues; - use RT::TicketCustomFieldValues; + use RT::ObjectCustomFieldValues; use RT::Interface::Web; use MIME::Entity; use Text::Wrapper; - use CGI::Cookie; use Time::ParseDate; use HTML::Scrubber; use Text::Quoted; @@ -200,9 +233,17 @@ sub handler } *CGI::redirect = sub { - my( $self, $location ) = @_; + 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); + # false laziness w/below if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect my $page = @@ -232,9 +273,9 @@ sub handler &cgisuidsetup($cgi); #&cgisuidsetup($r); $p = popurl(2); + $fsurl = rooturl(); } - sub include { use vars qw($m); $m->scomp(@_); @@ -260,7 +301,10 @@ sub handler ); dbh->{'private_profile'} = {}; - $m->abort(200); + #whew. removing this is all that's needed to fix the annoying + #blank-page-instead-of-profiling-redirect-when-called-from-an-include + #bug triggered by mason 1.32 + #my $rv = $m->abort(200); } else { #normal redirect @@ -303,9 +347,19 @@ sub handler 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 { ${$_[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('.'); + my %session; my $status; eval { $status = $ah->handle_request($r); };