projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix country code browser on subsequent selections and add country name
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
041b76c
..
da2f582
100644
(file)
--- a/
FS/FS/Mason.pm
+++ b/
FS/FS/Mason.pm
@@
-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
@@
-470,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 ) {