X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=aeae3800f2b57e417186df44a216738d3861eef4;hb=99e7fe7d18b91fb886f684a01df2f4efe02b34eb;hp=584d930b11d2c2a46f2ecd5f9da5f1aa2d587f9f;hpb=c7e637f35948396ca2bf760160f2a1a3081e0484;p=freeside.git
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 584d930b1..aeae3800f 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
@@ -38,7 +38,7 @@ use strict;
my $ah = new HTML::Mason::ApacheHandler (
#interp => $interp,
#auto_send_headers => 0,
- comp_root=>'/var/www/freeside',
+ comp_root=>'%%%FREESIDE_DOCUMENT_ROOT%%%',
data_dir=>'/usr/local/etc/freeside/masondata',
#out_mode=>'stream',
);
@@ -71,8 +71,13 @@ sub handler
use HTML::Entities;
use IO::Handle;
use IO::File;
+ use Net::Whois::Raw qw(whois);
+ if ( $] < 5.006 ) {
+ eval "use Net::Whois::Raw 0.32 qw(whois)";
+ die $@ if $@;
+ }
+ 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);
@@ -80,6 +85,7 @@ sub handler
use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot
small_custview myexit http_header);
use FS::Msgcat qw(gettext geterror);
+ use FS::Misc qw( send_email );
use FS::agent;
use FS::agent_type;
@@ -99,8 +105,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);
@@ -108,13 +112,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;
@@ -124,78 +125,32 @@ sub handler
*CGI::redirect = sub {
my( $self, $location ) = @_;
use vars qw($m);
-
- 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);
- '';
-
- }
-
+ #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!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'} = {};
-
- $m->abort(200);
-
- } else { #normal redirect
-
- $m->redirect($location);
-
- }
-
- }
-
- } # end package HTML::Mason::Commands;
+ }
$r->content_type('text/html');
#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';