X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=b00ab6d512dcceae054bdfa74798f6f7b02cfc0a;hp=a4517e66ab96c703277dcb229cde238051d71145;hb=dc058e6549b8353ae16e8a1b3f6d88b667d5c8d9;hpb=484e9cb891ba36b2ca4ec63575602d4434b13545
diff --git a/htetc/handler.pl b/htetc/handler.pl
index a4517e66a..b00ab6d51 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -3,10 +3,10 @@
package HTML::Mason;
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;
+use warnings;
+use FS::Mason qw( mason_interps );
+
+#use vars qw($r);
# Bring in ApacheHandler, necessary for mod_perl integration.
# Uncomment the second line (and comment the first) to use
@@ -16,59 +16,14 @@ use HTML::Mason::ApacheHandler;
###use Module::Refresh;###
-# List of modules that you want to use from components (see Admin
-# manual for details)
-#{ package HTML::Mason::Commands;
-# use CGI;
-#}
-
-if ( %%%RT_ENABLED%%% ) {
- eval '
- use lib ( "/opt/rt3/local/lib", "/opt/rt3/lib" );
- use RT;
- use vars qw($Nobody $SystemUser);
- 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( $fs_interp, $rt_interp ) = mason_interps('apache');
my $ah = new HTML::Mason::ApacheHandler (
- interp => $fs_interp,
- args_method => 'CGI', #(and FS too)
+ interp => $fs_interp,
+ request_class => 'FS::Mason::Request',
+ args_method => 'CGI', #(and FS too)
);
# Activate the following if running httpd as root (the normal case).
@@ -76,9 +31,29 @@ my $ah = new HTML::Mason::ApacheHandler (
#
#chown (Apache->server->uid, Apache->server->gid, $interp->files_written);
+my $protect_fds;
+
sub handler
{
- ($r) = @_;
+ #($r) = @_;
+ my $r = shift;
+
+ #from rt/bin/webmux.pl(.in)
+ if ( !$protect_fds && $ENV{'MOD_PERL'} && exists $ENV{'MOD_PERL_API_VERSION'}
+ && $ENV{'MOD_PERL_API_VERSION'} >= 2
+ ) {
+ # under mod_perl2, STDIN and STDOUT get closed and re-opened,
+ # however they are not on FD 0 and 1. In this case, the next
+ # socket that gets opened will occupy one of these FDs, and make
+ # all system() and open "|-" calls dangerous; for example, the
+ # DBI handle can get this FD, which later system() calls will
+ # close by putting garbage into the socket.
+ $protect_fds = [];
+ push @{$protect_fds}, IO::Handle->new_from_fd(0, "r")
+ if fileno(STDIN) != 0;
+ push @{$protect_fds}, IO::Handle->new_from_fd(1, "w")
+ if fileno(STDOUT) != 1;
+ }
# If you plan to intermix images in the same directory as
# components, activate the following to prevent Mason from
@@ -86,273 +61,10 @@ sub handler
#
#return -1 if $r->content_type && $r->content_type !~ m|^text/|i;
- #rar
- { package HTML::Mason::Commands;
- use strict;
- 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)";
- die $@ if $@;
- }
- 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; #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 str2time_sql);
- use FS::Conf;
- 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 states_hash counties state_label );
- use FS::Report::Table::Monthly;
- use FS::TicketSystem;
-
- use FS::agent;
- use FS::agent_type;
- use FS::domain_record;
- use FS::cust_bill;
- use FS::cust_bill_pay;
- use FS::cust_credit;
- use FS::cust_credit_bill;
- use FS::cust_main qw(smart_search);
- 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_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);
- use FS::raddb;
- 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;
- use FS::router;
- use FS::addr_block;
- use FS::svc_broadband;
- use FS::svc_external;
- use FS::type_pkgs;
- use FS::part_export;
- use FS::part_export_option;
- use FS::export_svc;
- use FS::msgcat;
- use FS::rate;
- use FS::rate_region;
- use FS::rate_prefix;
- 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;
- 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 '
- use RT::Tickets;
- use RT::Transactions;
- use RT::Users;
- use RT::CurrentUser;
- use RT::Templates;
- use RT::Queues;
- use RT::ScripActions;
- use RT::ScripConditions;
- use RT::Scrips;
- use RT::Groups;
- use RT::GroupMembers;
- use RT::CustomFields;
- 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;
-
- #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 $@;
- }
-
- *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);
-
- # false laziness w/below
- if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
-
- my $page =
- qq!Redirect to $location!.
- '
'.
- ( UNIVERSAL::can(dbh, 'sprintProfile')
- ? encode_entities(dbh->sprintProfile())
- : 'DBIx::Profile missing sprintProfile method;'.
- 'unpatched or too old?' ).
- #"\n\n". &sprintAutoProfile(). '
'.
- "\n\n". ''.
- '';
- dbh->{'private_profile'} = {};
- return $page;
-
- } else { #normal redirect
-
- $m->redirect($location);
- '';
-
- }
-
- };
-
- 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
- #&adminsuidsetup('fs_selfservice'); #old installs w/'fs_selfserv'??
- &adminsuidsetup('fs_queue');
-
- }
-
- sub include {
- use vars qw($m);
- $m->scomp(@_);
- }
-
- sub errorpage {
- use vars qw($m);
- $m->comp('/elements/errorpage.html', @_);
- }
-
- sub redirect {
- my( $location ) = @_;
- use vars qw($m);
- $m->clear_buffer;
- #false laziness w/above
- if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
-
- $m->print(
- qq!Redirect to $location!.
- '
'.
- ( UNIVERSAL::can(dbh, 'sprintProfile')
- ? encode_entities(dbh->sprintProfile())
- : 'DBIx::Profile missing sprintProfile method;'.
- 'unpatched or too old?' ).
- #"\n\n". &sprintAutoProfile(). '
'.
- "\n\n". ''.
- ''
- );
- dbh->{'private_profile'} = {};
-
- #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
-
- $m->redirect($location);
-
- }
-
- }
-
- } # end package HTML::Mason::Commands;
-
###Module::Refresh->refresh;###
- $r->content_type('text/html');
+ $r->content_type('text/html; charset=utf-8');
+ #$r->content_type('text/html; charset=iso-8859-1');
#eorar
my $headers = $r->headers_out;
@@ -364,19 +76,32 @@ sub handler
if ( $r->filename =~ /\/rt\// ) { #RT
- $ah->interp($rt_interp);
+ # 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;
+
local $SIG{__WARN__};
local $SIG{__DIE__};
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;
+ $ah->interp($rt_interp);
} else {
+ local $SIG{__WARN__};
+ local $SIG{__DIE__};
+
+ RT::Init() if $RT::VERSION; #for lack of something else
+
+ #we don't want the RT error handlers under FS
+ {
+ no warnings 'uninitialized';
+ undef($SIG{__WARN__}) if defined($SIG{__WARN__});
+ undef($SIG{__DIE__}) if defined($SIG{__DIE__} );
+ }
+
$ah->interp($fs_interp);
}