diff options
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/CrossSell.pm | 3 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 5 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Geocode/OSM.pm | 3 | ||||
| -rw-r--r-- | perllib/Open311.pm | 6 |
4 files changed, 13 insertions, 4 deletions
diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm index f9a02a61b..f9cde6936 100644 --- a/perllib/CrossSell.pm +++ b/perllib/CrossSell.pm @@ -19,7 +19,6 @@ package CrossSell; use strict; use LWP::Simple qw($ua get); -$ua->timeout(5); use URI::Escape; use mySociety::AuthToken; use mySociety::Web qw(ent); @@ -169,6 +168,8 @@ sub display_advert ($$;$%) { return '' unless $c->cobrand->moniker eq 'fixmystreet'; + $ua->timeout(5); + #if (defined $data{council} && $data{council} eq '2326') { # my ($out, $ad) = display_hfyc_cheltenham_advert($email, $name); # if ($out) { diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 04265963a..8d0b5ab50 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -4,6 +4,7 @@ use base 'FixMyStreet::Cobrand::Base'; use strict; use warnings; use FixMyStreet; +use Encode; use URI; use Digest::MD5 qw(md5_hex); @@ -647,7 +648,9 @@ sub get_report_stats { return 0; } sub get_council_sender { return 'Email' }; sub example_places { - return FixMyStreet->config('EXAMPLE_PLACES') || [ 'High Street', 'Main Street' ]; + my $e = FixMyStreet->config('EXAMPLE_PLACES') || [ 'High Street', 'Main Street' ]; + $e = [ map { Encode::decode('UTF-8', $_) } @$e ]; + return $e; } sub process_extras {} diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm index ba939b443..197b2b1e7 100644 --- a/perllib/FixMyStreet/Geocode/OSM.pm +++ b/perllib/FixMyStreet/Geocode/OSM.pm @@ -15,7 +15,7 @@ use Digest::MD5 qw(md5_hex); use Encode; use File::Slurp; use File::Path (); -use LWP::Simple; +use LWP::Simple qw($ua); use Memcached; use XML::Simple; @@ -49,6 +49,7 @@ sub string { if (-s $cache_file) { $js = File::Slurp::read_file($cache_file); } else { + $ua->timeout(15); $js = LWP::Simple::get($url); $js = encode_utf8($js) if utf8::is_utf8($js); File::Path::mkpath($cache_dir); diff --git a/perllib/Open311.pm b/perllib/Open311.pm index aa0e64b53..6d218131f 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -65,7 +65,11 @@ sub send_service_request { if ( $obj ) { if ( $obj->{ request }->{ service_request_id } ) { - return $obj->{ request }->{ service_request_id }; + my $request_id = $obj->{request}->{service_request_id}; + + unless ( ref $request_id ) { + return $request_id; + } } else { my $token = $obj->{ request }->{ token }; if ( $token ) { |