Changeset c02bb9c in github

Timestamp:

Oct 7, 2008 3:27:29 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

27a12ed

Parents:

2727053

Message:

#1485472: added js keywords escaping in json_serialize()

File:

• program/include/rcube_shared.inc (modified) (3 diffs)

program/include/rcube_shared.inc

@@ -110 +110 @@
 
 /**
+ * Returns whether an $str is a reserved word for any of the version of Javascript or ECMAScript
+ * @param str String to check
+ * @return boolean True if $str is a reserver word, False if not
+ */
+function is_js_reserved_word($str)
+{
+  return in_array($str, array(
+    // ECMASript ver 4 reserved words
+    'as','break','case','catch','class','const','continue',
+    'default','delete','do','else','export','extends','false','finally','for','function',
+    'if','import','in','instanceof','is','namespace','new','null','package','private',
+    'public','return','super','switch','this','throw','true','try','typeof','use','var',
+    'void','while','with',
+    // ECMAScript ver 4 future reserved words
+    'abstract','debugger','enum','goto','implements','interface','native','protected',
+    'synchronized','throws','transient','volatile',
+    // special meaning in some contexts
+    'get','set',
+    // were reserved in ECMAScript ver 3
+    'boolean','byte','char','double','final','float','int','long','short','static'
+  ));
+}
+
+
+/**
  * Convert a variable into a javascript object notation
  *
@@ -146 +171 @@
       {
         // enclose key with quotes if it is not variable-name conform
-        if (!ereg("^[_a-zA-Z]{1}[_a-zA-Z0-9]*$", $key) /* || is_js_reserved_word($key) */)
+        if (!ereg("^[_a-zA-Z]{1}[_a-zA-Z0-9]*$", $key) || is_js_reserved_word($key))
           $key = "'$key'";
 
@@ -163 +188 @@
 
 }
+
 
 /**