fix escaping in coordinate links

[freeside.git] / httemplate / elements / coord-links.html

diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index 907e5f0..60882de 100644 (file)
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -3,20 +3,36 @@
 <& /elements/popup_link.html,
      'action'      => $p. 'view/map.html?'. $query,
      'label'       => mt('map'),
-     'actionlabel' => $name,
+     'actionlabel' => uri_escape_utf8($name),
      'width'       => 763,
      'height'      => 575,
      #'color'
 &>
 
+% if ( $origin ) {
+  <& /elements/popup_link.html,
+      'action'      => $p. "view/directions.html?origin=$origin;". $query,
+      'label'       => mt('directions'),
+      'actionlabel' => uri_escape_utf8($name),
+      'width'       => 763,
+      'height'      => 575,
+  &>
+% }
+
 <A HREF="<%$p%>view/kml.cgi?<% $query %>"><% mt('earth') |h %></A>
 
 <%init>
 
-my ($latitude, $longitude, $name) = @_;
+my ($latitude, $longitude, $name, $agentnum) = @_;
 
-my $query = 'name='. uri_escape($name).
+my $query = 'name='. uri_escape_utf8($name).
             ';lat='. $latitude.
             ';lon='. $longitude;
 
+my $origin;
+#for directions link
+if ( $agentnum =~ /^\d+$/ ) {
+  $origin = FS::Conf->new->config('company_address', $agentnum);
+  $origin = uri_escape($origin);
+}
 </%init>