Changeset 324

Timestamp:

Nov 5, 2006, 12:32:22 PM (14 years ago)

Author:

Nick Burch

Message:

Do escaping and de-escaping of ' properly

Location:

trunk/npemap.org.uk

Files:

• cgi/get-reports.fcgi (modified) (1 diff)
• static/reportedAsProblem.html (modified) (1 diff)

trunk/npemap.org.uk/cgi/get-reports.fcgi

@@ -118 +118 @@
                         my ($postcode,$outward,$inward,$easting,$northing,$id,$source,$reason,$reporter,$reported_time) = @$row;
                         # Escape the reason and email
-                        $reason =~ s/'/"/;
-                        $reporter =~ s/'/"/;
+                        $reason =~ s/'/"/g;
+                        $reporter =~ s/'/"/g;
 
             print "addReport($id, '$postcode', $easting, $northing, [$source], ['$reason','$reporter','$reported_time']);\n";

trunk/npemap.org.uk/static/reportedAsProblem.html

@@ -55 +55 @@
         idc.appendChild(document.createTextNode(id));
 
+        // De-escape
+        reporting[0] = reporting[0].replace(/"/g,"'");
+        reporting[2] = reporting[2].replace(/"/g,"'");
+        // Display
         textc.appendChild(document.createTextNode(reporting[0]));
         datec.appendChild(document.createTextNode(reporting[2]));