--- a/www/loc.php	Sun May 02 00:00:04 2010 +0000
+++ b/www/loc.php	Sun May 02 00:00:45 2010 +0000
@@ -41,7 +41,7 @@
   if (isset($_GET["f"]) && $_GET["f"] != "") {
     $filter = $_GET["f"];
     if (!preg_match("/^[\^A-Za-z]+\$/", $filter)) {
-      echo "<h1>Invalid filter rule '".htmlentities($filter)."'</h1>\n";
+      echo "<h1>Invalid filter rule '".chentities($filter)."'</h1>\n";
       $filter = "C";
       $applyFilter = FALSE;
     } else {
@@ -104,7 +104,7 @@
  <form action="<? echo $_SERVER["PHP_SELF"]; ?>" method="get">
 <?
 if (isset($setName))
-  echo "<input type=\"hidden\" name=\"n\" value=\"".htmlentities($setName)."\" />\n";
+  echo "<input type=\"hidden\" name=\"n\" value=\"".chentities($setName)."\" />\n";
 ?>
  <table>
   <tr>
@@ -223,25 +223,25 @@
         (100 / $maxRow), $iv["continent"]);
         
       if (isset($specialList[$iv["continent"]]) && !$specialList[$iv["continent"]][1]) {
-        echo "<b>".htmlentities($iv["name"])."</b>";
+        echo "<b>".chentities($iv["name"])."</b>";
       } else {
         printURL($iv["continent"].".html#loc".$iv["x"]."_".$iv["y"]);
-        echo htmlentities($iv["name"])."</a>";
+        echo chentities($iv["name"])."</a>";
       }
       
       // If either freeform desc or URL field are set, we add those
       if (isset($iv["url"]) || isset($iv["freeform"])) {
         // Free form description
-        $desc = isset($iv["freeform"]) ? htmlentities($iv["freeform"]) : "";
+        $desc = isset($iv["freeform"]) ? chentities($iv["freeform"]) : "";
 
         // Add URL information, chopped, if any
         if (isset($iv["url"])) {
           $urlEnt = $iv["url"];
-          $urlBegin = "<a href=\"".htmlentities($urlEnt)."\" target=\"_blank\">";
+          $urlBegin = "<a href=\"".chentities($urlEnt)."\" target=\"_blank\">";
           $urlEnd = "</a>";
           if (strlen($iv["url"]) > 40)
             $urlEnt = substr($urlEnt, 0, 40)."...";
-          $desc .= "<br /><br /><b>".htmlentities($urlEnt)."</b>";
+          $desc .= "<br /><br /><b>".chentities($urlEnt)."</b>";
         } else {
           $urlBegin = $urlEnd = "";
         }
@@ -257,7 +257,7 @@
         
       // Alternative names
       if (count($iv["names"]) > 0) {
-        echo "<br />".htmlentities(implode(" | ", $iv["names"]));
+        echo "<br />".chentities(implode(" | ", $iv["names"]));
       }
         
       // Coder / society names
@@ -298,7 +298,7 @@
    */
   foreach ($locationTips as $tipID => $tip) {
     echo "<div class=\"tooltip\" id=\"tt".$tipID.
-    "\"><div class=\"holder\"><b>".htmlentities($tip["title"]).
+    "\"><div class=\"holder\"><b>".chentities($tip["title"]).
     "</b><br />".$tip["desc"]."</div></div>\n";
   }
 } else {