X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=aeae3800f2b57e417186df44a216738d3861eef4;hb=2c409fc7ec987574161817024018e54d5879288e;hp=5be19c443c0bea0bd15ea9612b781ce1b56344d3;hpb=5bb9eff0716710611f50071bec6167b4514edb48;p=freeside.git

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 5be19c443..aeae3800f 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -28,18 +28,25 @@ use strict;
 
 # 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);
+
+#my $parser = new HTML::Mason::Parser;
+#my $interp = new HTML::Mason::Interp (parser=>$parser,
+#                                      comp_root=>'/var/www/masondocs',
+#                                      data_dir=>'/usr/local/etc/freeside/masondata',
+#                                      out_mode=>'stream',
+#                                     );
+my $ah = new HTML::Mason::ApacheHandler (
+  #interp => $interp,
+  #auto_send_headers => 0,
+  comp_root=>'%%%FREESIDE_DOCUMENT_ROOT%%%',
+  data_dir=>'/usr/local/etc/freeside/masondata',
+  #out_mode=>'stream',
+);
 
 # 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
 {
@@ -55,20 +62,30 @@ sub handler
     { package HTML::Mason::Commands;
       use strict;
       use vars qw( $cgi $p );
-      use CGI;
+      use CGI 2.47;
       #use CGI::Carp qw(fatalsToBrowser);
       use Date::Format;
       use Date::Parse;
+      use Time::Local;
       use Tie::IxHash;
       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 FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+      use HTML::Widgets::SelectLayers 0.03;
+      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);
+                     small_custview myexit http_header);
+      use FS::Msgcat qw(gettext geterror);
+      use FS::Misc qw( send_email );
 
       use FS::agent;
       use FS::agent_type;
@@ -90,7 +107,7 @@ sub handler
       use FS::part_svc;
       use FS::pkg_svc;
       use FS::port;
-      use FS::queue;
+      use FS::queue qw(joblisting);
       use FS::raddb;
       use FS::session;
       use FS::svc_acct;
@@ -100,23 +117,48 @@ sub handler
       use FS::svc_forward;
       use FS::svc_www;
       use FS::type_pkgs;
+      use FS::part_export;
+      use FS::part_export_option;
+      use FS::export_svc;
+      use FS::msgcat;
+
+      *CGI::redirect = sub {
+        my( $self, $location ) = @_;
+        use vars qw($m);
+        #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);
     }
+
     $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';
-    
+
+#    $r->send_http_header;
+
     my $status = $ah->handle_request($r);
-    
-    return $status;
+
+    $status;
 }
 
 1;