diff options
| -rwxr-xr-x | web/alert.cgi | 16 | ||||
| -rwxr-xr-x | web/rss.cgi | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/web/alert.cgi b/web/alert.cgi index 17e92fc16..dd4676644 100755 --- a/web/alert.cgi +++ b/web/alert.cgi @@ -296,9 +296,9 @@ feed, or enter your email address to subscribe to an email alert.')); EOF my $rss_feed; if ($pretty_pc_text) { - $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text/", $q); + $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text", $q); } else { - $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon/", $q); + $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon", $q); } my $default_link = Cobrand::url($cobrand, "/alert?type=local;feed=local:$lat:$lon", $q); @@ -307,10 +307,10 @@ EOF $out .= " <a href='$rss_feed'><img src='/i/feed.png' width='16' height='16' title='" . _('RSS feed of nearby problems') . "' alt='" . _('RSS feed') . "' border='0'></a>"; $out .= '</p> <p id="rss_local_alt">' . _('(alternatively the RSS feed can be customised, within'); - my $rss_feed_2k = Cobrand::url($cobrand, $rss_feed.'2', $q); - my $rss_feed_5k = Cobrand::url($cobrand, $rss_feed.'5', $q); - my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'10', $q); - my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'20', $q); + my $rss_feed_2k = Cobrand::url($cobrand, $rss_feed.'/2', $q); + my $rss_feed_5k = Cobrand::url($cobrand, $rss_feed.'/5', $q); + my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'/10', $q); + my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'/20', $q); $out .= <<EOF; <a href="$rss_feed_2k">2km</a> / <a href="$rss_feed_5k">5km</a> / <a href="$rss_feed_10k">10km</a> / <a href="$rss_feed_20k">20km</a>) @@ -437,8 +437,8 @@ sub alert_rss { $url .= "?" . $extra_params if ($extra_params); print $q->redirect($url); return; - } elsif ($feed =~ /^local:(\d+):(\d+)$/) { - $url = $base_url . '/rss/n/' . $1 . ',' . $2; + } elsif ($feed =~ /^local:([\d\.-]+):([\d\.-]+)$/) { + $url = $base_url . '/rss/l/' . $1 . ',' . $2; $url .= "?" . $extra_params if ($extra_params); print $q->redirect($url); return; diff --git a/web/rss.cgi b/web/rss.cgi index 1ca2a1fe2..1273a2a5e 100755 --- a/web/rss.cgi +++ b/web/rss.cgi @@ -108,6 +108,7 @@ sub rss_local_problems { $error = shift; }; if ($error) { + print $q->redirect(-location => "$base/alert"); return ''; } else { ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon ); |