X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fhandler.pl;h=481d5a2d98f4b1abed29f3623857cddd94d7fe7b;hb=24426a8b0d8e42dd5d00115cd84bd5d786fc58c3;hp=d55ba3310ed01c0d25768fe866730fd66b9e243f;hpb=536d684c3e17375d45a5d62bc5d748fec0224860;p=freeside.git

diff --git a/htetc/handler.pl b/htetc/handler.pl
index d55ba3310..481d5a2d9 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -28,20 +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,
-                                          #auto_send_headers => 0,
-                                        );
+
+#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=>'/var/www/freeside',
+  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
 {
@@ -94,6 +99,7 @@ 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 qw(joblisting);
@@ -105,6 +111,13 @@ 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;
@@ -113,7 +126,7 @@ sub handler
 
       *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