[freeside-commits] branch master updated. d18cf10c30afa6dce46c31cb87a1733202518cb8

[Ivan]

The branch, master has been updated
       via  d18cf10c30afa6dce46c31cb87a1733202518cb8 (commit)
      from  840d76586528a4f4335d1b8138378d8fa9a42aff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d18cf10c30afa6dce46c31cb87a1733202518cb8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jul 5 16:29:48 2012 -0700

    fix escaping in coordinate links

diff --git a/httemplate/elements/coord-links.html b/httemplate/elements/coord-links.html
index 60882de..02a224a 100644
--- 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' => uri_escape_utf8($name),
+     'actionlabel' => $js_name,
      'width'       => 763,
      'height'      => 575,
      #'color'
@@ -13,7 +13,7 @@
   <& /elements/popup_link.html,
       'action'      => $p. "view/directions.html?origin=$origin;". $query,
       'label'       => mt('directions'),
-      'actionlabel' => uri_escape_utf8($name),
+      'actionlabel' => $js_name,
       'width'       => 763,
       'height'      => 575,
   &>
@@ -29,6 +29,12 @@ 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;
 #for directions link
 if ( $agentnum =~ /^\d+$/ ) {

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/coord-links.html |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)