diff options
Diffstat (limited to 'htetc/handler.pl')
| -rw-r--r-- | htetc/handler.pl | 87 |
1 files changed, 16 insertions, 71 deletions
diff --git a/htetc/handler.pl b/htetc/handler.pl index b81606a0a..1ea87e744 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; # Bring in ApacheHandler, necessary for mod_perl integration. # Uncomment the second line (and comment the first) to use @@ -71,10 +71,7 @@ sub handler use HTML::Entities; use IO::Handle; use IO::File; - use Net::Whois::Raw qw(whois); - use Business::CreditCard; use String::Approx qw(amatch); - use Chart::LinesPoints; use HTML::Widgets::SelectLayers 0.03; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); @@ -83,7 +80,6 @@ sub handler small_custview myexit http_header); use FS::Msgcat qw(gettext geterror); use FS::Misc qw( send_email ); - use FS::Report::Table::Monthly; use FS::agent; use FS::agent_type; @@ -103,8 +99,6 @@ sub handler use FS::part_pkg; use FS::part_referral; use FS::part_svc; - use FS::part_svc_router; - use FS::part_virtual_field; use FS::pkg_svc; use FS::port; use FS::queue qw(joblisting); @@ -112,13 +106,10 @@ sub handler 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::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; @@ -128,72 +119,26 @@ sub handler *CGI::redirect = sub { my( $self, $location ) = @_; use vars qw($m); - - if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect - - my $page = - qq!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!. - '<BR><BR><PRE>'. - ( UNIVERSAL::can(dbh, 'sprintProfile') - ? encode_entities(dbh->sprintProfile()) - : 'DBIx::Profile missing sprintProfile method;'. - 'unpatched or too old?' ). - #"\n\n". &sprintAutoProfile(). '</PRE>'. - "\n\n". '</PRE>'. - '</BODY></HTML>'; - dbh->{'private_profile'} = {}; - return $page; - - } else { #normal redirect - - $m->redirect($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); - - sub include { - use vars qw($m); - $m->scomp(@_); - } - - 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!<HTML><BODY>Redirect to <A HREF="$location">$location</A>!. - '<BR><BR><PRE>'. - ( UNIVERSAL::can(dbh, 'sprintProfile') - ? encode_entities(dbh->sprintProfile()) - : 'DBIx::Profile missing sprintProfile method;'. - 'unpatched or too old?' ). - #"\n\n". &sprintAutoProfile(). '</PRE>'. - "\n\n". '</PRE>'. - '</BODY></HTML>' - ); - dbh->{'private_profile'} = {}; - - $m->abort(200); - - } else { #normal redirect - - $m->redirect($location); - - } - - } - - } # end package HTML::Mason::Commands; + } $r->content_type('text/html'); #eorar |