X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=e065f092b20e6ac829672cf7caa96bc9ec2dc3f4;hp=cac90044d00d0f80252ddd6c63e0931c42b4b756;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hpb=a4c96748eb6eab29a70f3a944c6520283a635c78 diff --git a/htetc/handler.pl b/htetc/handler.pl index cac90044d..e065f092b 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 HTML::Mason; +use strict; +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 @@ -15,37 +14,27 @@ use HTML::Mason; 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 Module::Refresh;### -use strict; +# Create Mason objects -# List of modules that you want to use from components (see Admin -# manual for details) -#{ package HTML::Mason::Commands; -# use CGI; -#} +my( $fs_interp, $rt_interp ) = mason_interps('apache'); -# Create Mason objects -# -my $parser = new HTML::Mason::Parser; -my $interp = new HTML::Mason::Interp (parser=>$parser, - comp_root=>'/var/www/masondocs', - data_dir=>'/home/ivan/freeside_current/masondata', - out_mode=>'stream', - ); -my $ah = new HTML::Mason::ApacheHandler ( interp => $interp, - #auto_send_headers => 0, - ); +my $ah = new HTML::Mason::ApacheHandler ( + 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). # Resets ownership of all files created by Mason at startup. # -chown (Apache->server->uid, Apache->server->gid, $interp->files_written); +#chown (Apache->server->uid, Apache->server->gid, $interp->files_written); sub handler { - my ($r) = @_; + #($r) = @_; + my $r = shift; # If you plan to intermix images in the same directory as # components, activate the following to prevent Mason from @@ -53,91 +42,69 @@ 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 ); - use CGI; - #use CGI::Carp qw(fatalsToBrowser); - use Date::Format; - use Date::Parse; - use Tie::IxHash; - use HTML::Entities; - use IO::Handle; - use IO::File; - use String::Approx qw(amatch); - use FS::UID qw(cgisuidsetup dbh getotaker datasrc); - 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); - - 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; - use FS::cust_main_county; - use FS::cust_pay; - use FS::cust_pkg; - use FS::cust_refund; - use FS::cust_svc; - use FS::nas; - use FS::part_bill_event; - use FS::part_pkg; - use FS::part_referral; - use FS::part_svc; - use FS::pkg_svc; - use FS::port; - use FS::queue; - use FS::raddb; - use FS::session; - use FS::svc_acct; - use FS::svc_acct_pop qw(popselector); - use FS::svc_acct_sm; - use FS::svc_domain; - use FS::svc_forward; - use FS::svc_www; - use FS::type_pkgs; - - *CGI::redirect = sub { - my( $self, $location ) = @_; - - #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect - $m->clear_buffer; - # The next two lines are necessary to stop Apache from re-reading - # POSTed data. - $r->method('GET'); - $r->headers_in->unset('Content-length'); - $r->content_type('text/html'); - #$r->err_header_out('Location' => $location); - $r->header_out('Location' => $location); - $r->header_out('Content-Type' => 'text/html'); - $m->abort(302); - - ''; - }; - - $cgi = new CGI; - &cgisuidsetup($cgi); - #&cgisuidsetup($r); - $p = popurl(2); - } + ###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; - $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache'; + $headers->{'Cache-control'} = 'no-cache'; #$r->no_cache(1); $headers->{'Expires'} = '0'; # $r->send_http_header; - my $status = $ah->handle_request($r); + if ( $r->filename =~ /\/rt\// ) { #RT + + # 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(); + + $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); + + } + + my %session; + my $status; + eval { $status = $ah->handle_request($r); }; +#!! +# if ( $@ ) { +# $RT::Logger->crit($@); +# } + warn $@ if $@; + + undef %session; + +#!! +# if ($RT::Handle->TransactionDepth) { +# $RT::Handle->ForceRollback; +# $RT::Logger->crit( +#"Transaction not committed. Usually indicates a software fault. Data loss may have occurred" +# ); +# } $status; }