X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=be16bbb276ce13f36fb75200ff7ceb3c46a74fcd;hb=8fd4e70cbf7022a9e2308568d7cff2f1ea9eaf04;hp=6e6072ef72d8a8b1756d67703caf37710086a198;hpb=4e1e828e7ef0437b002544cc30f9934ca1c9751b;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 6e6072ef7..be16bbb27 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -118,7 +118,9 @@ if ( -e $addl_handler_use_file ) {
   use FS::UI::Web::small_custview qw(small_custview);
   use FS::UI::bytecount;
   use FS::Msgcat qw(gettext geterror);
-  use FS::Misc qw( send_email send_fax states_hash counties state_label );
+  use FS::Misc qw( send_email send_fax
+                   states_hash counties cities state_label
+                 );
   use FS::Misc::eps2png qw( eps2png );
   use FS::Report::Table::Monthly;
   use FS::TicketSystem;
@@ -172,6 +174,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::part_export;
   use FS::part_export_option;
   use FS::export_svc;
+  use FS::export_device;
   use FS::msgcat;
   use FS::rate;
   use FS::rate_region;
@@ -183,6 +186,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::XMLRPC;
   use FS::payby;
   use FS::cdr;
+  use FS::cdr_batch;
   use FS::inventory_class;
   use FS::inventory_item;
   use FS::pkg_category;
@@ -219,6 +223,15 @@ if ( -e $addl_handler_use_file ) {
   #use FS::h_phone_device;
   use FS::h_svc_www;
   use FS::cust_statement;
+  use FS::cust_class;
+  use FS::cust_category;
+  use FS::prospect_main;
+  use FS::contact;
+  use FS::svc_pbx;
+  use FS::discount;
+  use FS::cust_pkg_discount;
+  use FS::cust_bill_pkg_discount;
+  use FS::svc_mailinglist;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -259,9 +272,11 @@ if ( -e $addl_handler_use_file ) {
       #to throw a real error instead of just a mysterious unstyled RT
       use CSS::Squish 0.06;
 
+      use RT::Interface::Web::Request;
+
       #slow, unreliable, segfaults and is optional
       #see rt/html/Ticket/Elements/ShowTransactionAttachments
-      use Text::Quoted;
+      #use Text::Quoted;
 
       #?#use File::Path qw( rmtree );
       #?#use File::Glob qw( bsd_glob );
@@ -379,12 +394,17 @@ if ( -e $addl_handler_use_file ) {
 
 =over 4
 
-=item mason_interps [ MODE ]
+=item mason_interps [ MODE [ OPTION => VALUE ... ] ]
 
 Returns a list consisting of two HTML::Mason::Interp objects, the first for
 Freeside pages, and the second for RT pages.
 
-#MODE can be 'apache' or 'standalone'.  If not specified, defaults to 'apache'.
+MODE can be 'apache' or 'standalone'.  If not specified, defaults to 'apache'.
+
+Options and values can be passed following mode.  Currently available options
+are:
+
+I<outbuf> should be set to a scalar reference in standalone mode.
 
 =cut
 
@@ -397,7 +417,7 @@ sub mason_interps {
   my $request_class = 'FS::Mason::Request';
 
   #not entirely sure it belongs here, but what the hey
-  if ( %%%RT_ENABLED%%% ) {
+  if ( %%%RT_ENABLED%%% && $mode ne 'standalone' ) {
     RT::LoadConfig();
   }