X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=da2f5828a070ddf33ffe0afdfdbafa2a6f2e8a1e;hb=c6297fc9d80c00a2a32d0e9d1fad5debfe53823d;hp=24ddf79203d5752f81eafd7685cf015ba0dfc8f8;hpb=4314d9e0da1486cead65bc75ee0ab4351d49555e;p=freeside.git

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 24ddf7920..da2f5828a 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -91,7 +91,7 @@ if ( -e $addl_handler_use_file ) {
   use Excel::Writer::XLSX;
   #use Excel::Writer::XLSX::Utility; #redundant with above
 
-  use Business::CreditCard 0.30; #for mask-aware cardtype()
+  use Business::CreditCard 0.36; #for best-effort cardtype() (60xx as Discover)
   use NetAddr::IP;
   use Net::MAC::Vendor;
   use Net::Ping;
@@ -118,6 +118,7 @@ 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 LWP::UserAgent;
@@ -129,6 +130,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
@@ -412,6 +414,11 @@ if ( -e $addl_handler_use_file ) {
   use FS::fiber_olt;
   use FS::olt_site;
   use FS::access_user_page_pref;
+  use FS::part_svc_msgcat;
+  use FS::commission_schedule;
+  use FS::commission_rate;
+  use FS::saved_search;
+  use FS::sector_coverage;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -465,15 +472,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 ) {
 
@@ -678,7 +689,7 @@ the same "random" numbers.
 
 Works around a Net::SSLeay connection error by creating and deleting an SSL
 context, so subsequent connections do not error out with a CTX_new (900 NET OR
-SSL ERROR).
+SSL ERROR).  See http://bugs.debian.org/830152
 
 =cut