X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=ebd40addabb12c9def5f869a4c5ffc6628b9851a;hb=HEAD;hp=245bdea8886cd8a47787b6397f80abb83d0fae16;hpb=4b05b20576ddb14577d59c87c8257c6804449410;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 245bdea88..ebd40adda 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -45,7 +45,7 @@ if ( -e $addl_handler_use_file ) {
 
   use strict;
   use vars qw( %session );
-  use CGI 3.39 qw(-private_tempfiles); #3.39 for cpan#37365
+  use CGI 4.08 qw(-private_tempfiles); #4.08 for multi_param
 
   #use CGI::Carp qw(fatalsToBrowser);
   use CGI::Cookie;
@@ -85,6 +85,7 @@ if ( -e $addl_handler_use_file ) {
     die $@ if $@;
   }
   use Text::CSV_XS;
+  use Archive::Zip;
   use Spreadsheet::WriteExcel;
   use Spreadsheet::WriteExcel::Utility;
   use OLE::Storage_Lite;
@@ -118,8 +119,12 @@ if ( -e $addl_handler_use_file ) {
   #use FS::geocode_Mixin; #for its code2country
   use Locale::Currency;
   use Locale::Currency::Format;
+  use Number::Phone::Country qw( noexport );
   use Business::US::USPS::WebTools::AddressStandardization;
-  use Geo::GoogleEarth::Pluggable;
+  use Geo::GoogleEarth::Pluggable 0.16;
+  use Geo::Shapelib;
+  use Geo::JSON;
+  use Geo::JSON::FeatureCollection;
   use LWP::UserAgent;
   use Storable qw( nfreeze thaw );
   use FS;
@@ -129,6 +134,7 @@ if ( -e $addl_handler_use_file ) {
                     midnight_sql regexp_sql
                    );
   use FS::Conf;
+  use FS::ConfDefaults;
   use FS::CGI qw(header menubar table itable ntable idiot
                  eidiot myexit http_header);
   use FS::UI::Web qw(svc_url random_id
@@ -260,6 +266,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::cust_category;
   use FS::prospect_main;
   use FS::contact;
+  use FS::contact::Import;
   use FS::phone_type;
   use FS::svc_pbx;
   use FS::discount;
@@ -384,7 +391,6 @@ if ( -e $addl_handler_use_file ) {
   use FS::export_batch_item;
   use FS::part_pkg_fcc_option;
   use FS::state;
-  use FS::state;
   use FS::queue_stat;
   use FS::deploy_zone;
   use FS::deploy_zone_block;
@@ -415,6 +421,13 @@ if ( -e $addl_handler_use_file ) {
   use FS::part_svc_msgcat;
   use FS::commission_schedule;
   use FS::commission_rate;
+  use FS::realestate_location;
+  use FS::realestate_unit;
+  use FS::svc_realestate;
+  use FS::saved_search;
+  use FS::sector_coverage;
+  use FS::svc_group;
+  use FS::Misc::DepositSlip qw( deposit_slip_pdf );
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -468,15 +481,19 @@ if ( -e $addl_handler_use_file ) {
   no warnings 'redefine';
   *CGI::redirect = sub {
     my $self = shift;
-    my $cookie = '';
-    if ( $_[0] eq '-cookie' ) { #this isn't actually used at the moment
-      (my $x, $cookie) = (shift, shift);
-      $HTML::Mason::r->err_headers_out->add( 'Set-cookie' => $cookie );
-    }
-    my $location = shift;
 
     use vars qw($m);
 
+    my $location = '';
+    if ( $_[0] =~ /^-/ ) {
+      my %opt = @_;
+      $location = $opt{'-uri'};
+      my $cookie = $opt{'-cookie'};
+      $m->apache_req->err_headers_out->{'Set-cookie'} = $cookie if $cookie;
+    } else {
+      $location = shift;
+    }
+
     # false laziness w/below
     if ( @DBIx::Profile::ISA ) {