From d3237c29612bcb22be85b1fa8fdb29f7f054738a Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller>
Date: Thu, 8 Apr 2010 16:36:49 +0000
Subject: [PATCH] bug fix, support utf8 encoding of javascript url parameters

---
 interface/language/language.php     | 2 +-
 interface/new/new_comprehensive.php | 6 +++---
 interface/practice/ins_search.php   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/language/language.php b/interface/language/language.php
index e0edb8a06..0a4f8e6ed 100644
--- a/interface/language/language.php
+++ b/interface/language/language.php
@@ -18,7 +18,7 @@ require_once("language.inc.php");
 <script language='JavaScript'>
 function editLang(lang_id) {
  var filter = document.forms[0].form_filter.value;
- window.location = '?m=definition&edit=' + lang_id + '&filter=' + escape(filter);
+ window.location = '?m=definition&edit=' + lang_id + '&filter=' + encodeURIComponent(filter);
  return false;
 }
 </script>
diff --git a/interface/new/new_comprehensive.php b/interface/new/new_comprehensive.php
index 5014c1c2b..cac5d6ed1 100644
--- a/interface/new/new_comprehensive.php
+++ b/interface/new/new_comprehensive.php
@@ -225,13 +225,13 @@ while ($lrow = sqlFetchArray($lres)) {
     case  1:
       echo
       " if (f.$fldname.style.backgroundColor != '' && trimlen(f.$fldname.value) > 0) {\n" .
-      "  url += '&$field_id=' + escape(f.$fldname.value);\n" .
+      "  url += '&$field_id=' + encodeURIComponent(f.$fldname.value);\n" .
       " }\n";
       break;
     case 2:
       echo
       " if (f.$fldname.style.backgroundColor != '' && f.$fldname.selectedIndex > 0) {\n" .
-      "  url += '&$field_id=' + escape(f.$fldname.options[f.$fldname.selectedIndex].value);\n" .
+      "  url += '&$field_id=' + encodeURIComponent(f.$fldname.options[f.$fldname.selectedIndex].value);\n" .
       " }\n";
       break;
   }
@@ -452,7 +452,7 @@ while ($mfrow = sqlFetchArray($mfres)) {
           var fval = $('#form_' + flds[i]).val();
           if (fval && fval != '') {
             url += (i == 0) ? '?' : '&';
-            url += 'mf_' + flds[i] + '=' + escape(fval);
+            url += 'mf_' + flds[i] + '=' + encodeURIComponent(fval);
           }
         }
         dlgopen(url, '_blank', 700, 500);
diff --git a/interface/practice/ins_search.php b/interface/practice/ins_search.php
index 545c4620d..6accb04a3 100644
--- a/interface/practice/ins_search.php
+++ b/interface/practice/ins_search.php
@@ -75,7 +75,7 @@ td { font-size:10pt; }
 <?php require($GLOBALS['srcdir'] . "/restoreSession.php"); ?>
 
  function doescape(value) {
-  return escape(value);
+  return encodeURIComponent(value);
  }
 
  // This is invoked when our Search button is clicked.
-- 
2.11.4.GIT