#28004 Adjustments to directions link on customer view page

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

diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index 6b91a26..4c263c6 100644 (file)
--- a/httemplate/elements/coord-links.html
+++ b/httemplate/elements/coord-links.html
@@ -3,7 +3,7 @@
 <& /elements/popup_link.html,
      'action'      => $p. 'view/map.html?'. $query,
      'label'       => mt('map'),
-     'actionlabel' => $name,
+     'actionlabel' => $js_name,
      'width'       => 763,
      'height'      => 575,
      #'color'
@@ -12,8 +12,8 @@
 % if ( $origin ) {
   <& /elements/popup_link.html,
       'action'      => $p. "view/directions.html?origin=$origin;". $query,
-      'label'       => mt('dir'),
-      'actionlabel' => $name,
+      'label'       => mt('directions'),
+      'actionlabel' => $js_name,
       'width'       => 763,
       'height'      => 575,
   &>
@@ -25,14 +25,22 @@
 
 my ($latitude, $longitude, $name, $agentnum) = @_;
 
-my $query = 'name='. uri_escape($name).
+my $query = 'name='. uri_escape_utf8($name).
             ';lat='. $latitude.
             ';lon='. $longitude;
 
+my $js_name = $name;
+$js_name =~ s/[<>"]/ /g;
+$m->interp->apply_escapes($js_name, 'js_string');
+$js_name =~ s/^'//;
+$js_name =~ s/'$//;
+
+my @origin;
 my $origin;
 #for directions link
 if ( $agentnum =~ /^\d+$/ ) {
-  $origin = FS::Conf->new->config('company_address', $agentnum);
+  @origin = FS::Conf->new->config('company_address', $agentnum);
+  $origin = join (/,/,@origin);
   $origin = uri_escape($origin);
 }
 </%init>