projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 76992 - removed some development code
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
0257b04
..
956ea62
100644
(file)
--- 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 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;
#use CGI::Carp qw(fatalsToBrowser);
use CGI::Cookie;
@@
-91,7
+91,7
@@
if ( -e $addl_handler_use_file ) {
use Excel::Writer::XLSX;
#use Excel::Writer::XLSX::Utility; #redundant with above
use Excel::Writer::XLSX;
#use Excel::Writer::XLSX::Utility; #redundant with above
- use Business::CreditCard 0.3
5; #for new mastercard ranges and visa lengths
+ use Business::CreditCard 0.3
6; #for best-effort cardtype() (60xx as Discover)
use NetAddr::IP;
use Net::MAC::Vendor;
use Net::Ping;
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 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;
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;
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
use FS::CGI qw(header menubar table itable ntable idiot
eidiot myexit http_header);
use FS::UI::Web qw(svc_url random_id
@@
-413,6
+415,10
@@
if ( -e $addl_handler_use_file ) {
use FS::olt_site;
use FS::access_user_page_pref;
use FS::part_svc_msgcat;
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 ) {
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
@@
-466,15
+472,19
@@
if ( -e $addl_handler_use_file ) {
no warnings 'redefine';
*CGI::redirect = sub {
my $self = shift;
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);
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 ) {
# false laziness w/below
if ( @DBIx::Profile::ISA ) {