X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=768ebffec0e70df1747dc5ade869ba9b010d23f6;hb=4063ea45f3ab0a9cb2582834e55ac3afc71425f9;hp=5544ebbe85296b35c2baef9e2266e97ea6b09e25;hpb=22a35047ecdffff80110e06cc08fc84f9ddba9b0;p=freeside.git

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 5544ebbe8..768ebffec 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -34,7 +34,9 @@ my $interp = new HTML::Mason::Interp (parser=>$parser,
                                       data_dir=>'/home/ivan/freeside_current/masondata',
                                       out_mode=>'stream',
                                      );
-my $ah = new HTML::Mason::ApacheHandler (interp=>$interp);
+my $ah = new HTML::Mason::ApacheHandler ( interp => $interp,
+                                          #auto_send_headers => 0,
+                                        );
 
 # Activate the following if running httpd as root (the normal case).
 # Resets ownership of all files created by Mason at startup.
@@ -59,16 +61,20 @@ sub handler
       #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 String::Approx qw(amatch);
-      use FS::UID qw(cgisuidsetup dbh getotaker datasrc);
+      use Chart::LinesPoints;
+      use HTML::Widgets::SelectLayers 0.02;
+      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 myexit);
+                     small_custview myexit http_header);
+      use FS::Msgcat qw(gettext geterror);
 
       use FS::agent;
       use FS::agent_type;
@@ -88,9 +94,10 @@ sub handler
       use FS::part_pkg;
       use FS::part_referral;
       use FS::part_svc;
+      use FS::part_svc_router;
       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;
@@ -99,7 +106,18 @@ sub handler
       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;
+      use FS::router;
+      use FS::part_router_field;
+      use FS::router_field;
+      use FS::addr_block;
+      use FS::part_sb_field;
+      use FS::sb_field;
+      use FS::svc_broadband;
       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 ) = @_;
@@ -111,12 +129,12 @@ sub handler
         $r->method('GET');
         $r->headers_in->unset('Content-length');
         $r->content_type('text/html');
-        $r->err_header_out('Location' => $location);
+        #$r->err_header_out('Location' => $location);
+        $r->header_out('Location' => $location);
          $r->header_out('Content-Type' => 'text/html');
          $m->abort(302);
 
         '';
-    
       };
 
       $cgi = new CGI;
@@ -124,6 +142,7 @@ sub handler
       #&cgisuidsetup($r);
       $p = popurl(2);
     }
+
     $r->content_type('text/html');
     #eorar
 
@@ -131,9 +150,12 @@ sub handler
     $headers->{'Pragma'} = $headers->{'Cache-control'} = 'no-cache';
     #$r->no_cache(1);
     $headers->{'Expires'} = '0';
-    
-    $ah->handle_request($r);
 
+#    $r->send_http_header;
+
+    my $status = $ah->handle_request($r);
+
+    $status;
 }
 
 1;