Enano CMS (1.1.x): comparison includes/json2.php

equal deleted inserted replaced

-:de56132c008d
+:bdac73ed481e
 * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Json_Encoder
 {
-/**
+		/**
-* Whether or not to check for possible cycling
+		* Whether or not to check for possible cycling
-*
+		*
-* @var boolean
+		* @var boolean
-*/
+		*/
-protected $_cycleCheck;
+		protected $_cycleCheck;
-/**
+		/**
-* Array of visited objects; used to prevent cycling.
+		* Array of visited objects; used to prevent cycling.
-*
+		*
-* @var array
+		* @var array
-*/
+		*/
-protected $_visited = array();
+		protected $_visited = array();
-/**
+		/**
-* Constructor
+		* Constructor
-*
+		*
-* @param boolean $cycleCheck Whether or not to check for recursion when encoding
+		* @param boolean $cycleCheck Whether or not to check for recursion when encoding
-* @return void
+		* @return void
-*/
+		*/
-protected function __construct($cycleCheck = false)
+		protected function __construct($cycleCheck = false)
-{
+		{
-$this->_cycleCheck = $cycleCheck;
+				$this->_cycleCheck = $cycleCheck;
-}
+		}
-/**
+		/**
-* Use the JSON encoding scheme for the value specified
+		* Use the JSON encoding scheme for the value specified
-*
+		*
-* @param mixed $value The value to be encoded
+		* @param mixed $value The value to be encoded
-* @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
+		* @param boolean $cycleCheck Whether or not to check for possible object recursion when encoding
-* @return string  The encoded value
+		* @return string  The encoded value
-*/
+		*/
-public static function encode($value, $cycleCheck = false)
+		public static function encode($value, $cycleCheck = false)
-{
+		{
-$encoder = new Zend_Json_Encoder(($cycleCheck) ? true : false);
+				$encoder = new Zend_Json_Encoder(($cycleCheck) ? true : false);
-return $encoder->_encodeValue($value);
+				return $encoder->_encodeValue($value);
-}
+		}
-/**
+		/**
-* Recursive driver which determines the type of value to be encoded
+		* Recursive driver which determines the type of value to be encoded
-* and then dispatches to the appropriate method. $values are either
+		* and then dispatches to the appropriate method. $values are either
-*    - objects (returns from {@link _encodeObject()})
+		*    - objects (returns from {@link _encodeObject()})
-*    - arrays (returns from {@link _encodeArray()})
+		*    - arrays (returns from {@link _encodeArray()})
-*    - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
+		*    - basic datums (e.g. numbers or strings) (returns from {@link _encodeDatum()})
-*
+		*
-* @param $value mixed The value to be encoded
+		* @param $value mixed The value to be encoded
-* @return string Encoded value
+		* @return string Encoded value
-*/
+		*/
-protected function _encodeValue(&$value)
+		protected function _encodeValue(&$value)
-{
+		{
-if (is_object($value)) {
+				if (is_object($value)) {
-return $this->_encodeObject($value);
+						return $this->_encodeObject($value);
-} else if (is_array($value)) {
+				} else if (is_array($value)) {
-return $this->_encodeArray($value);
+						return $this->_encodeArray($value);
-}
+				}
-return $this->_encodeDatum($value);
+				return $this->_encodeDatum($value);
-}
+		}
-/**
+		/**
-* Encode an object to JSON by encoding each of the public properties
+		* Encode an object to JSON by encoding each of the public properties
-*
+		*
-* A special property is added to the JSON object called '__className'
+		* A special property is added to the JSON object called '__className'
-* that contains the name of the class of $value. This is used to decode
+		* that contains the name of the class of $value. This is used to decode
-* the object on the client into a specific class.
+		* the object on the client into a specific class.
-*
+		*
-* @param $value object
+		* @param $value object
-* @return string
+		* @return string
-* @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
+		* @throws Zend_Json_Exception If recursive checks are enabled and the object has been serialized previously
-*/
+		*/
-protected function _encodeObject(&$value)
+		protected function _encodeObject(&$value)
-{
+		{
-if ($this->_cycleCheck) {
+				if ($this->_cycleCheck) {
-if ($this->_wasVisited($value)) {
+						if ($this->_wasVisited($value)) {
-throw new Zend_Json_Exception(
+								throw new Zend_Json_Exception(
-'Cycles not supported in JSON encoding, cycle introduced by '
+										'Cycles not supported in JSON encoding, cycle introduced by '
-. 'class "' . get_class($value) . '"'
+										. 'class "' . get_class($value) . '"'
-);
+								);
-}
+						}
-$this->_visited[] = $value;
+						$this->_visited[] = $value;
-}
+				}
-$props = '';
+				$props = '';
-foreach (get_object_vars($value) as $name => $propValue) {
+				foreach (get_object_vars($value) as $name => $propValue) {
-if (isset($propValue)) {
+						if (isset($propValue)) {
-$props .= ','
+								$props .= ','
-. $this->_encodeValue($name)
+												. $this->_encodeValue($name)
-. ':'
+												. ':'
-. $this->_encodeValue($propValue);
+												. $this->_encodeValue($propValue);
-}
+						}
-}
+				}
-return '{"__className":"' . get_class($value) . '"'
+				return '{"__className":"' . get_class($value) . '"'
-. $props . '}';
+								. $props . '}';
-}
+		}
-/**
+		/**
-* Determine if an object has been serialized already
+		* Determine if an object has been serialized already
-*
+		*
-* @param mixed $value
+		* @param mixed $value
-* @return boolean
+		* @return boolean
-*/
+		*/
-protected function _wasVisited(&$value)
+		protected function _wasVisited(&$value)
-{
+		{
-if (in_array($value, $this->_visited, true)) {
+				if (in_array($value, $this->_visited, true)) {
-return true;
+						return true;
-}
+				}
-return false;
+				return false;
-}
+		}
-/**
+		/**
-* JSON encode an array value
+		* JSON encode an array value
-*
+		*
-* Recursively encodes each value of an array and returns a JSON encoded
+		* Recursively encodes each value of an array and returns a JSON encoded
-* array string.
+		* array string.
-*
+		*
-* Arrays are defined as integer-indexed arrays starting at index 0, where
+		* Arrays are defined as integer-indexed arrays starting at index 0, where
-* the last index is (count($array) -1); any deviation from that is
+		* the last index is (count($array) -1); any deviation from that is
-* considered an associative array, and will be encoded as such.
+		* considered an associative array, and will be encoded as such.
-*
+		*
-* @param $array array
+		* @param $array array
-* @return string
+		* @return string
-*/
+		*/
-protected function _encodeArray(&$array)
+		protected function _encodeArray(&$array)
-{
+		{
-$tmpArray = array();
+				$tmpArray = array();
-// Check for associative array
+				// Check for associative array
-if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
+				if (!empty($array) && (array_keys($array) !== range(0, count($array) - 1))) {
-// Associative array
+						// Associative array
-$result = '{';
+						$result = '{';
-foreach ($array as $key => $value) {
+						foreach ($array as $key => $value) {
-$key = (string) $key;
+								$key = (string) $key;
-$tmpArray[] = $this->_encodeString($key)
+								$tmpArray[] = $this->_encodeString($key)
-. ':'
+														. ':'
-. $this->_encodeValue($value);
+														. $this->_encodeValue($value);
-}
+						}
-$result .= implode(',', $tmpArray);
+						$result .= implode(',', $tmpArray);
-$result .= '}';
+						$result .= '}';
-} else {
+				} else {
-// Indexed array
+						// Indexed array
-$result = '[';
+						$result = '[';
-$length = count($array);
+						$length = count($array);
-for ($i = 0; $i < $length; $i++) {
+						for ($i = 0; $i < $length; $i++) {
-$tmpArray[] = $this->_encodeValue($array[$i]);
+								$tmpArray[] = $this->_encodeValue($array[$i]);
-}
+						}
-$result .= implode(',', $tmpArray);
+						$result .= implode(',', $tmpArray);
-$result .= ']';
+						$result .= ']';
-}
+				}
-return $result;
+				return $result;
-}
+		}
-/**
+		/**
-* JSON encode a basic data type (string, number, boolean, null)
+		* JSON encode a basic data type (string, number, boolean, null)
-*
+		*
-* If value type is not a string, number, boolean, or null, the string
+		* If value type is not a string, number, boolean, or null, the string
-* 'null' is returned.
+		* 'null' is returned.
-*
+		*
-* @param $value mixed
+		* @param $value mixed
-* @return string
+		* @return string
-*/
+		*/
-protected function _encodeDatum(&$value)
+		protected function _encodeDatum(&$value)
-{
+		{
-$result = 'null';
+				$result = 'null';
-if (is_int($value) || is_float($value)) {
+				if (is_int($value) || is_float($value)) {
-$result = (string)$value;
+						$result = (string)$value;
-} elseif (is_string($value)) {
+				} elseif (is_string($value)) {
-$result = $this->_encodeString($value);
+						$result = $this->_encodeString($value);
-} elseif (is_bool($value)) {
+				} elseif (is_bool($value)) {
-$result = $value ? 'true' : 'false';
+						$result = $value ? 'true' : 'false';
-}
+				}
-return $result;
+				return $result;
-}
+		}
-/**
+		/**
-* JSON encode a string value by escaping characters as necessary
+		* JSON encode a string value by escaping characters as necessary
-*
+		*
-* @param $value string
+		* @param $value string
-* @return string
+		* @return string
-*/
+		*/
-protected function _encodeString(&$string)
+		protected function _encodeString(&$string)
-{
+		{
-// Escape these characters with a backslash:
+				// Escape these characters with a backslash:
-// " \ / \n \r \t \b \f
+				// " \ / \n \r \t \b \f
-$search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"');
+				$search  = array('\\', "\n", "\t", "\r", "\b", "\f", '"');
-$replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
+				$replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
-$string  = str_replace($search, $replace, $string);
+				$string  = str_replace($search, $replace, $string);
-// Escape certain ASCII characters:
+				// Escape certain ASCII characters:
-// 0x08 => \b
+				// 0x08 => \b
-// 0x0c => \f
+				// 0x0c => \f
-$string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
+				$string = str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
-return '"' . $string . '"';
+				return '"' . $string . '"';
-}
+		}
-/**
+		/**
-* Encode the constants associated with the ReflectionClass
+		* Encode the constants associated with the ReflectionClass
-* parameter. The encoding format is based on the class2 format
+		* parameter. The encoding format is based on the class2 format
-*
+		*
-* @param $cls ReflectionClass
+		* @param $cls ReflectionClass
-* @return string Encoded constant block in class2 format
+		* @return string Encoded constant block in class2 format
-*/
+		*/
-private static function _encodeConstants(ReflectionClass $cls)
+		private static function _encodeConstants(ReflectionClass $cls)
-{
+		{
-$result    = "constants : {";
+				$result    = "constants : {";
-$constants = $cls->getConstants();
+				$constants = $cls->getConstants();
-$tmpArray = array();
+				$tmpArray = array();
-if (!empty($constants)) {
+				if (!empty($constants)) {
-foreach ($constants as $key => $value) {
+						foreach ($constants as $key => $value) {
-$tmpArray[] = "$key: " . self::encode($value);
+								$tmpArray[] = "$key: " . self::encode($value);
-}
+						}
-$result .= implode(', ', $tmpArray);
+						$result .= implode(', ', $tmpArray);
-}
+				}
-return $result . "}";
+				return $result . "}";
-}
+		}
-/**
+		/**
-* Encode the public methods of the ReflectionClass in the
+		* Encode the public methods of the ReflectionClass in the
-* class2 format
+		* class2 format
-*
+		*
-* @param $cls ReflectionClass
+		* @param $cls ReflectionClass
-* @return string Encoded method fragment
+		* @return string Encoded method fragment
-*
+		*
-*/
+		*/
-private static function _encodeMethods(ReflectionClass $cls)
+		private static function _encodeMethods(ReflectionClass $cls)
-{
+		{
-$methods = $cls->getMethods();
+				$methods = $cls->getMethods();
-$result = 'methods:{';
+				$result = 'methods:{';
-$started = false;
+				$started = false;
-foreach ($methods as $method) {
+				foreach ($methods as $method) {
-if (! $method->isPublic() || !$method->isUserDefined()) {
+						if (! $method->isPublic() || !$method->isUserDefined()) {
-continue;
+								continue;
-}
+						}
-if ($started) {
+						if ($started) {
-$result .= ',';
+								$result .= ',';
-}
+						}
-$started = true;
+						$started = true;
-$result .= '' . $method->getName(). ':function(';
+						$result .= '' . $method->getName(). ':function(';
-if ('__construct' != $method->getName()) {
+						if ('__construct' != $method->getName()) {
-$parameters  = $method->getParameters();
+								$parameters  = $method->getParameters();
-$paramCount  = count($parameters);
+								$paramCount  = count($parameters);
-$argsStarted = false;
+								$argsStarted = false;
-$argNames = "var argNames=[";
+								$argNames = "var argNames=[";
-foreach ($parameters as $param) {
+								foreach ($parameters as $param) {
-if ($argsStarted) {
+										if ($argsStarted) {
-$result .= ',';
+												$result .= ',';
-}
+										}
-$result .= $param->getName();
+										$result .= $param->getName();
-if ($argsStarted) {
+										if ($argsStarted) {
-$argNames .= ',';
+												$argNames .= ',';
-}
+										}
-$argNames .= '"' . $param->getName() . '"';
+										$argNames .= '"' . $param->getName() . '"';
-$argsStarted = true;
+										$argsStarted = true;
-}
+								}
-$argNames .= "];";
+								$argNames .= "];";
-$result .= "){"
+								$result .= "){"
-. $argNames
+												. $argNames
-. 'var result = ZAjaxEngine.invokeRemoteMethod('
+												. 'var result = ZAjaxEngine.invokeRemoteMethod('
-. "this, '" . $method->getName()
+												. "this, '" . $method->getName()
-. "',argNames,arguments);"
+												. "',argNames,arguments);"
-. 'return(result);}';
+												. 'return(result);}';
-} else {
+						} else {
-$result .= "){}";
+								$result .= "){}";
-}
+						}
-}
+				}
-return $result . "}";
+				return $result . "}";
-}
+		}
-/**
+		/**
-* Encode the public properties of the ReflectionClass in the class2
+		* Encode the public properties of the ReflectionClass in the class2
-* format.
+		* format.
-*
+		*
-* @param $cls ReflectionClass
+		* @param $cls ReflectionClass
-* @return string Encode properties list
+		* @return string Encode properties list
-*
+		*
-*/
+		*/
-private static function _encodeVariables(ReflectionClass $cls)
+		private static function _encodeVariables(ReflectionClass $cls)
-{
+		{
-$properties = $cls->getProperties();
+				$properties = $cls->getProperties();
-$propValues = get_class_vars($cls->getName());
+				$propValues = get_class_vars($cls->getName());
-$result = "variables:{";
+				$result = "variables:{";
-$cnt = 0;
+				$cnt = 0;
-$tmpArray = array();
+				$tmpArray = array();
-foreach ($properties as $prop) {
+				foreach ($properties as $prop) {
-if (! $prop->isPublic()) {
+						if (! $prop->isPublic()) {
-continue;
+								continue;
-}
+						}
-$tmpArray[] = $prop->getName()
+						$tmpArray[] = $prop->getName()
-. ':'
+												. ':'
-. self::encode($propValues[$prop->getName()]);
+												. self::encode($propValues[$prop->getName()]);
-}
+				}
-$result .= implode(',', $tmpArray);
+				$result .= implode(',', $tmpArray);
-return $result . "}";
+				return $result . "}";
-}
+		}
-/**
+		/**
-* Encodes the given $className into the class2 model of encoding PHP
+		* Encodes the given $className into the class2 model of encoding PHP
-* classes into JavaScript class2 classes.
+		* classes into JavaScript class2 classes.
-* NOTE: Currently only public methods and variables are proxied onto
+		* NOTE: Currently only public methods and variables are proxied onto
-* the client machine
+		* the client machine
-*
+		*
-* @param $className string The name of the class, the class must be
+		* @param $className string The name of the class, the class must be
-* instantiable using a null constructor
+		* instantiable using a null constructor
-* @param $package string Optional package name appended to JavaScript
+		* @param $package string Optional package name appended to JavaScript
-* proxy class name
+		* proxy class name
-* @return string The class2 (JavaScript) encoding of the class
+		* @return string The class2 (JavaScript) encoding of the class
-* @throws Zend_Json_Exception
+		* @throws Zend_Json_Exception
-*/
+		*/
-public static function encodeClass($className, $package = '')
+		public static function encodeClass($className, $package = '')
-{
+		{
-$cls = new ReflectionClass($className);
+				$cls = new ReflectionClass($className);
-if (! $cls->isInstantiable()) {
+				if (! $cls->isInstantiable()) {
-throw new Zend_Json_Exception("$className must be instantiable");
+						throw new Zend_Json_Exception("$className must be instantiable");
-}
+				}
-return "Class.create('$package$className',{"
+				return "Class.create('$package$className',{"
-. self::_encodeConstants($cls)    .","
+								. self::_encodeConstants($cls)    .","
-. self::_encodeMethods($cls)      .","
+								. self::_encodeMethods($cls)      .","
-. self::_encodeVariables($cls)    .'});';
+								. self::_encodeVariables($cls)    .'});';
-}
+		}
-/**
+		/**
-* Encode several classes at once
+		* Encode several classes at once
-*
+		*
-* Returns JSON encoded classes, using {@link encodeClass()}.
+		* Returns JSON encoded classes, using {@link encodeClass()}.
-*
+		*
-* @param array $classNames
+		* @param array $classNames
-* @param string $package
+		* @param string $package
-* @return string
+		* @return string
-*/
+		*/
-public static function encodeClasses(array $classNames, $package = '')
+		public static function encodeClasses(array $classNames, $package = '')
-{
+		{
-$result = '';
+				$result = '';
-foreach ($classNames as $className) {
+				foreach ($classNames as $className) {
-$result .= self::encodeClass($className, $package);
+						$result .= self::encodeClass($className, $package);
-}
+				}
-return $result;
+				return $result;
-}
+		}
 }
 /**
 * Decode JSON encoded string to PHP variable constructs
 * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Json_Decoder
 {
-/**
+		/**
-* Parse tokens used to decode the JSON object. These are not
+		* Parse tokens used to decode the JSON object. These are not
-* for public consumption, they are just used internally to the
+		* for public consumption, they are just used internally to the
-* class.
+		* class.
-*/
+		*/
-const EOF          = 0;
+		const EOF          = 0;
-const DATUM        = 1;
+		const DATUM        = 1;
-const LBRACE       = 2;
+		const LBRACE       = 2;
-const LBRACKET     = 3;
+		const LBRACKET     = 3;
-const RBRACE       = 4;
+		const RBRACE       = 4;
-const RBRACKET     = 5;
+		const RBRACKET     = 5;
-const COMMA        = 6;
+		const COMMA        = 6;
-const COLON        = 7;
+		const COLON        = 7;
-/**
+		/**
-* Use to maintain a "pointer" to the source being decoded
+		* Use to maintain a "pointer" to the source being decoded
-*
+		*
-* @var string
+		* @var string
-*/
+		*/
-protected $_source;
+		protected $_source;
-/**
+		/**
-* Caches the source length
+		* Caches the source length
-*
+		*
-* @var int
+		* @var int
-*/
+		*/
-protected $_sourceLength;
+		protected $_sourceLength;
-/**
+		/**
-* The offset within the souce being decoded
+		* The offset within the souce being decoded
-*
+		*
-* @var int
+		* @var int
-*
+		*
-*/
+		*/
-protected $_offset;
+		protected $_offset;
-/**
+		/**
-* The current token being considered in the parser cycle
+		* The current token being considered in the parser cycle
-*
+		*
-* @var int
+		* @var int
-*/
+		*/
-protected $_token;
+		protected $_token;
-/**
+		/**
-* Flag indicating how objects should be decoded
+		* Flag indicating how objects should be decoded
-*
+		*
-* @var int
+		* @var int
-* @access protected
+		* @access protected
-*/
+		*/
-protected $_decodeType;
+		protected $_decodeType;
-/**
+		/**
-* Constructor
+		* Constructor
-*
+		*
-* @param string $source String source to decode
+		* @param string $source String source to decode
-* @param int $decodeType How objects should be decoded -- see
+		* @param int $decodeType How objects should be decoded -- see
-* {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
+		* {@link Zend_Json::TYPE_ARRAY} and {@link Zend_Json::TYPE_OBJECT} for
-* valid values
+		* valid values
-* @return void
+		* @return void
-*/
+		*/
-protected function __construct($source, $decodeType)
+		protected function __construct($source, $decodeType)
-{
+		{
-// eliminate comments
+				// eliminate comments
-$source = preg_replace(array(
+				$source = preg_replace(array(
-// eliminate single line comments in '// ...' form
+									// eliminate single line comments in '// ...' form
-'#^\s*//(.+)$#m',
+									'#^\s*//(.+)$#m',
-// eliminate multi-line comments in '/* ... */' form, at start of string
+									// eliminate multi-line comments in '/* ... */' form, at start of string
-'#^\s*/\*(.+)\*/#Us',
+									'#^\s*/\*(.+)\*/#Us',
-// eliminate multi-line comments in '/* ... */' form, at end of string
+									// eliminate multi-line comments in '/* ... */' form, at end of string
-'#/\*(.+)\*/\s*$#Us'
+									'#/\*(.+)\*/\s*$#Us'
-), '', $source);
+							), '', $source);
-// Set defaults
+				// Set defaults
-$this->_source       = $source;
+				$this->_source       = $source;
-$this->_sourceLength = strlen($source);
+				$this->_sourceLength = strlen($source);
-$this->_token        = self::EOF;
+				$this->_token        = self::EOF;
-$this->_offset       = 0;
+				$this->_offset       = 0;
-// Normalize and set $decodeType
+				// Normalize and set $decodeType
-if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
+				if (!in_array($decodeType, array(Zend_Json::TYPE_ARRAY, Zend_Json::TYPE_OBJECT)))
-{
+				{
-$decodeType = Zend_Json::TYPE_ARRAY;
+						$decodeType = Zend_Json::TYPE_ARRAY;
-}
+				}
-$this->_decodeType   = $decodeType;
+				$this->_decodeType   = $decodeType;
-// Set pointer at first token
+				// Set pointer at first token
-$this->_getNextToken();
+				$this->_getNextToken();
-}
+		}
-/**
+		/**
-* Decode a JSON source string
+		* Decode a JSON source string
-*
+		*
-* Decodes a JSON encoded string. The value returned will be one of the
+		* Decodes a JSON encoded string. The value returned will be one of the
-* following:
+		* following:
-*        - integer
+		*        - integer
-*        - float
+		*        - float
-*        - boolean
+		*        - boolean
-*        - null
+		*        - null
-*      - StdClass
+		*      - StdClass
-*      - array
+		*      - array
-*         - array of one or more of the above types
+		*         - array of one or more of the above types
-*
+		*
-* By default, decoded objects will be returned as associative arrays; to
+		* By default, decoded objects will be returned as associative arrays; to
-* return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
+		* return a StdClass object instead, pass {@link Zend_Json::TYPE_OBJECT} to
-* the $objectDecodeType parameter.
+		* the $objectDecodeType parameter.
-*
+		*
-* Throws a Zend_Json_Exception if the source string is null.
+		* Throws a Zend_Json_Exception if the source string is null.
-*
+		*
-* @static
+		* @static
-* @access public
+		* @access public
-* @param string $source String to be decoded
+		* @param string $source String to be decoded
-* @param int $objectDecodeType How objects should be decoded; should be
+		* @param int $objectDecodeType How objects should be decoded; should be
-* either or {@link Zend_Json::TYPE_ARRAY} or
+		* either or {@link Zend_Json::TYPE_ARRAY} or
-* {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
+		* {@link Zend_Json::TYPE_OBJECT}; defaults to TYPE_ARRAY
-* @return mixed
+		* @return mixed
-* @throws Zend_Json_Exception
+		* @throws Zend_Json_Exception
-*/
+		*/
-public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+		public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY)
-{
+		{
-if (null === $source) {
+				if (null === $source) {
-throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
+						throw new Zend_Json_Exception('Must specify JSON encoded source for decoding');
-} elseif (!is_string($source)) {
+				} elseif (!is_string($source)) {
-throw new Zend_Json_Exception('Can only decode JSON encoded strings');
+						throw new Zend_Json_Exception('Can only decode JSON encoded strings');
-}
+				}
-$decoder = new self($source, $objectDecodeType);
+				$decoder = new self($source, $objectDecodeType);
-return $decoder->_decodeValue();
+				return $decoder->_decodeValue();
-}
+		}
-/**
+		/**
-* Recursive driving rountine for supported toplevel tops
+		* Recursive driving rountine for supported toplevel tops
-*
+		*
-* @return mixed
+		* @return mixed
-*/
+		*/
-protected function _decodeValue()
+		protected function _decodeValue()
-{
+		{
-switch ($this->_token) {
+				switch ($this->_token) {
-case self::DATUM:
+						case self::DATUM:
-$result  = $this->_tokenValue;
+								$result  = $this->_tokenValue;
-$this->_getNextToken();
+								$this->_getNextToken();
-return($result);
+								return($result);
-break;
+								break;
-case self::LBRACE:
+						case self::LBRACE:
-return($this->_decodeObject());
+								return($this->_decodeObject());
-break;
+								break;
-case self::LBRACKET:
+						case self::LBRACKET:
-return($this->_decodeArray());
+								return($this->_decodeArray());
-break;
+								break;
-default:
+						default:
-return null;
+								return null;
-break;
+								break;
-}
+				}
-}
+		}
-/**
+		/**
-* Decodes an object of the form:
+		* Decodes an object of the form:
-*  { "attribute: value, "attribute2" : value,...}
+		*  { "attribute: value, "attribute2" : value,...}
-*
+		*
-* If ZJsonEnoder or ZJAjax was used to encode the original object
+		* If ZJsonEnoder or ZJAjax was used to encode the original object
-* then a special attribute called __className which specifies a class
+		* then a special attribute called __className which specifies a class
-* name that should wrap the data contained within the encoded source.
+		* name that should wrap the data contained within the encoded source.
-*
+		*
-* Decodes to either an array or StdClass object, based on the value of
+		* Decodes to either an array or StdClass object, based on the value of
-* {@link $_decodeType}. If invalid $_decodeType present, returns as an
+		* {@link $_decodeType}. If invalid $_decodeType present, returns as an
-* array.
+		* array.
-*
+		*
-* @return array|StdClass
+		* @return array|StdClass
-*/
+		*/
-protected function _decodeObject()
+		protected function _decodeObject()
-{
+		{
-$members = array();
+				$members = array();
-$tok = $this->_getNextToken();
+				$tok = $this->_getNextToken();
-while ($tok && $tok != self::RBRACE) {
+				while ($tok && $tok != self::RBRACE) {
-if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
+						if ($tok != self::DATUM || ! is_string($this->_tokenValue)) {
-throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
+								throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source);
-}
+						}
-$key = $this->_tokenValue;
+						$key = $this->_tokenValue;
-$tok = $this->_getNextToken();
+						$tok = $this->_getNextToken();
-if ($tok != self::COLON) {
+						if ($tok != self::COLON) {
-throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
+								throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source);
-}
+						}
-$tok = $this->_getNextToken();
+						$tok = $this->_getNextToken();
-$members[$key] = $this->_decodeValue();
+						$members[$key] = $this->_decodeValue();
-$tok = $this->_token;
+						$tok = $this->_token;
-if ($tok == self::RBRACE) {
+						if ($tok == self::RBRACE) {
-break;
+								break;
-}
+						}
-if ($tok != self::COMMA) {
+						if ($tok != self::COMMA) {
-throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
+								throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source);
-}
+						}
-$tok = $this->_getNextToken();
+						$tok = $this->_getNextToken();
-}
+				}
-switch ($this->_decodeType) {
+				switch ($this->_decodeType) {
-case Zend_Json::TYPE_OBJECT:
+						case Zend_Json::TYPE_OBJECT:
-// Create new StdClass and populate with $members
+								// Create new StdClass and populate with $members
-$result = new StdClass();
+								$result = new StdClass();
-foreach ($members as $key => $value) {
+								foreach ($members as $key => $value) {
-$result->$key = $value;
+										$result->$key = $value;
-}
+								}
-break;
+								break;
-case Zend_Json::TYPE_ARRAY:
+						case Zend_Json::TYPE_ARRAY:
-default:
+						default:
-$result = $members;
+								$result = $members;
-break;
+								break;
-}
+				}
-$this->_getNextToken();
+				$this->_getNextToken();
-return $result;
+				return $result;
-}
+		}
-/**
+		/**
-* Decodes a JSON array format:
+		* Decodes a JSON array format:
-*    [element, element2,...,elementN]
+		*    [element, element2,...,elementN]
-*
+		*
-* @return array
+		* @return array
-*/
+		*/
-protected function _decodeArray()
+		protected function _decodeArray()
-{
+		{
-$result = array();
+				$result = array();
-$starttok = $tok = $this->_getNextToken(); // Move past the '['
+				$starttok = $tok = $this->_getNextToken(); // Move past the '['
-$index  = 0;
+				$index  = 0;
-while ($tok && $tok != self::RBRACKET) {
+				while ($tok && $tok != self::RBRACKET) {
-$result[$index++] = $this->_decodeValue();
+						$result[$index++] = $this->_decodeValue();
-$tok = $this->_token;
+						$tok = $this->_token;
-if ($tok == self::RBRACKET || !$tok) {
+						if ($tok == self::RBRACKET || !$tok) {
-break;
+								break;
-}
+						}
-if ($tok != self::COMMA) {
+						if ($tok != self::COMMA) {
-throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
+								throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source);
-}
+						}
-$tok = $this->_getNextToken();
+						$tok = $this->_getNextToken();
-}
+				}
-$this->_getNextToken();
+				$this->_getNextToken();
-return($result);
+				return($result);
-}
+		}
-/**
+		/**
-* Removes whitepsace characters from the source input
+		* Removes whitepsace characters from the source input
-*/
+		*/
-protected function _eatWhitespace()
+		protected function _eatWhitespace()
-{
+		{
-if (preg_match(
+				if (preg_match(
-'/([\t\b\f\n\r ])*/s',
+								'/([\t\b\f\n\r ])*/s',
-$this->_source,
+								$this->_source,
-$matches,
+								$matches,
-PREG_OFFSET_CAPTURE,
+								PREG_OFFSET_CAPTURE,
-$this->_offset)
+								$this->_offset)
-&& $matches[0][1] == $this->_offset)
+						&& $matches[0][1] == $this->_offset)
-{
+				{
-$this->_offset += strlen($matches[0][0]);
+						$this->_offset += strlen($matches[0][0]);
-}
+				}
-}
+		}
-/**
+		/**
-* Retrieves the next token from the source stream
+		* Retrieves the next token from the source stream
-*
+		*
-* @return int Token constant value specified in class definition
+		* @return int Token constant value specified in class definition
-*/
+		*/
-protected function _getNextToken()
+		protected function _getNextToken()
-{
+		{
-$this->_token      = self::EOF;
+				$this->_token      = self::EOF;
-$this->_tokenValue = null;
+				$this->_tokenValue = null;
-$this->_eatWhitespace();
+				$this->_eatWhitespace();
-if ($this->_offset >= $this->_sourceLength) {
+				if ($this->_offset >= $this->_sourceLength) {
-return(self::EOF);
+						return(self::EOF);
-}
+				}
-$str        = $this->_source;
+				$str        = $this->_source;
-$str_length = $this->_sourceLength;
+				$str_length = $this->_sourceLength;
-$i          = $this->_offset;
+				$i          = $this->_offset;
-$start      = $i;
+				$start      = $i;
-switch ($str{$i}) {
+				switch ($str{$i}) {
-case '{':
+						case '{':
-$this->_token = self::LBRACE;
+							$this->_token = self::LBRACE;
-break;
+							break;
-case '}':
+						case '}':
-$this->_token = self::RBRACE;
+								$this->_token = self::RBRACE;
-break;
+								break;
-case '[':
+						case '[':
-$this->_token = self::LBRACKET;
+								$this->_token = self::LBRACKET;
-break;
+								break;
-case ']':
+						case ']':
-$this->_token = self::RBRACKET;
+								$this->_token = self::RBRACKET;
-break;
+								break;
-case ',':
+						case ',':
-$this->_token = self::COMMA;
+								$this->_token = self::COMMA;
-break;
+								break;
-case ':':
+						case ':':
-$this->_token = self::COLON;
+								$this->_token = self::COLON;
-break;
+								break;
-case  '"':
+						case  '"':
-$result = '';
+								$result = '';
-do {
+								do {
-$i++;
+										$i++;
-if ($i >= $str_length) {
+										if ($i >= $str_length) {
-break;
+												break;
-}
+										}
-$chr = $str{$i};
+										$chr = $str{$i};
-if ($chr == '\\') {
+										if ($chr == '\\') {
-$i++;
+												$i++;
-if ($i >= $str_length) {
+												if ($i >= $str_length) {
-break;
+														break;
-}
+												}
-$chr = $str{$i};
+												$chr = $str{$i};
-switch ($chr) {
+												switch ($chr) {
-case '"' :
+														case '"' :
-$result .= '"';
+																$result .= '"';
-break;
+																break;
-case '\\':
+														case '\\':
-$result .= '\\';
+																$result .= '\\';
-break;
+																break;
-case '/' :
+														case '/' :
-$result .= '/';
+																$result .= '/';
-break;
+																break;
-case 'b' :
+														case 'b' :
-$result .= chr(8);
+																$result .= chr(8);
-break;
+																break;
-case 'f' :
+														case 'f' :
-$result .= chr(12);
+																$result .= chr(12);
-break;
+																break;
-case 'n' :
+														case 'n' :
-$result .= chr(10);
+																$result .= chr(10);
-break;
+																break;
-case 'r' :
+														case 'r' :
-$result .= chr(13);
+																$result .= chr(13);
-break;
+																break;
-case 't' :
+														case 't' :
-$result .= chr(9);
+																$result .= chr(9);
-break;
+																break;
-case '\'' :
+														case '\'' :
-$result .= '\'';
+																$result .= '\'';
-break;
+																break;
-case 'u':
+														case 'u':
-$result .= self::decode_unicode_byte(substr($str, $i + 1, 4));
+															$result .= self::decode_unicode_byte(substr($str, $i + 1, 4));
-$i += 4;
+															$i += 4;
-break;
+															break;
-default:
+														default:
-throw new Zend_Json_Exception("Illegal escape "
+																throw new Zend_Json_Exception("Illegal escape "
-.  "sequence '" . $chr . "'");
+																		.  "sequence '" . $chr . "'");
-}
+														}
-} elseif ($chr == '"') {
+										} elseif ($chr == '"') {
-break;
+												break;
-} else {
+										} else {
-$result .= $chr;
+												$result .= $chr;
-}
+										}
-} while ($i < $str_length);
+								} while ($i < $str_length);
-$this->_token = self::DATUM;
+								$this->_token = self::DATUM;
-//$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
+								//$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
-$this->_tokenValue = $result;
+								$this->_tokenValue = $result;
-break;
+								break;
-case  "'":
+						case  "'":
-$result = '';
+								$result = '';
-do {
+								do {
-$i++;
+										$i++;
-if ($i >= $str_length) {
+										if ($i >= $str_length) {
-break;
+												break;
-}
+										}
-$chr = $str{$i};
+										$chr = $str{$i};
-if ($chr == '\\') {
+										if ($chr == '\\') {
-$i++;
+												$i++;
-if ($i >= $str_length) {
+												if ($i >= $str_length) {
-break;
+														break;
-}
+												}
-$chr = $str{$i};
+												$chr = $str{$i};
-switch ($chr) {
+												switch ($chr) {
-case "'" :
+														case "'" :
-$result .= "'";
+																$result .= "'";
-break;
+																break;
-case '\\':
+														case '\\':
-$result .= '\\';
+																$result .= '\\';
-break;
+																break;
-case '/' :
+														case '/' :
-$result .= '/';
+																$result .= '/';
-break;
+																break;
-case 'b' :
+														case 'b' :
-$result .= chr(8);
+																$result .= chr(8);
-break;
+																break;
-case 'f' :
+														case 'f' :
-$result .= chr(12);
+																$result .= chr(12);
-break;
+																break;
-case 'n' :
+														case 'n' :
-$result .= chr(10);
+																$result .= chr(10);
-break;
+																break;
-case 'r' :
+														case 'r' :
-$result .= chr(13);
+																$result .= chr(13);
-break;
+																break;
-case 't' :
+														case 't' :
-$result .= chr(9);
+																$result .= chr(9);
-break;
+																break;
-case '"' :
+														case '"' :
-$result .= '"';
+																$result .= '"';
-break;
+																break;
-default:
+														default:
-throw new Zend_Json_Exception("Illegal escape "
+																throw new Zend_Json_Exception("Illegal escape "
-.  "sequence '" . $chr . "'");
+																		.  "sequence '" . $chr . "'");
-}
+														}
-} elseif ($chr == "'") {
+										} elseif ($chr == "'") {
-break;
+												break;
-} else {
+										} else {
-$result .= $chr;
+												$result .= $chr;
-}
+										}
-} while ($i < $str_length);
+								} while ($i < $str_length);
-$this->_token = self::DATUM;
+								$this->_token = self::DATUM;
-//$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
+								//$this->_tokenValue = substr($str, $start + 1, $i - $start - 1);
-$this->_tokenValue = $result;
+								$this->_tokenValue = $result;
-break;
+								break;
-case 't':
+						case 't':
-if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
+								if (($i+ 3) < $str_length && substr($str, $start, 4) == "true") {
-$this->_token = self::DATUM;
+										$this->_token = self::DATUM;
-}
+								}
-$this->_tokenValue = true;
+								$this->_tokenValue = true;
-$i += 3;
+								$i += 3;
-break;
+								break;
-case 'f':
+						case 'f':
-if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
+								if (($i+ 4) < $str_length && substr($str, $start, 5) == "false") {
-$this->_token = self::DATUM;
+										$this->_token = self::DATUM;
-}
+								}
-$this->_tokenValue = false;
+								$this->_tokenValue = false;
-$i += 4;
+								$i += 4;
-break;
+								break;
-case 'n':
+						case 'n':
-if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
+								if (($i+ 3) < $str_length && substr($str, $start, 4) == "null") {
-$this->_token = self::DATUM;
+										$this->_token = self::DATUM;
-}
+								}
-$this->_tokenValue = NULL;
+								$this->_tokenValue = NULL;
-$i += 3;
+								$i += 3;
-break;
+								break;
-case ' ':
+							case ' ':
-break;
+								break;
-}
+				}
-if ($this->_token != self::EOF) {
+				if ($this->_token != self::EOF) {
-$this->_offset = $i + 1; // Consume the last token character
+						$this->_offset = $i + 1; // Consume the last token character
-return($this->_token);
+						return($this->_token);
-}
+				}
-$chr = $str{$i};
+				$chr = $str{$i};
-if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
+				if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
-if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
+						if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
-$str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
+								$str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
-$datum = $matches[0][0];
+								$datum = $matches[0][0];
-if (is_numeric($datum)) {
+								if (is_numeric($datum)) {
-if (preg_match('/^0\d+$/', $datum)) {
+										if (preg_match('/^0\d+$/', $datum)) {
-throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
+												throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)");
-} else {
+										} else {
-$val  = intval($datum);
+												$val  = intval($datum);
-$fVal = floatval($datum);
+												$fVal = floatval($datum);
-$this->_tokenValue = ($val == $fVal ? $val : $fVal);
+												$this->_tokenValue = ($val == $fVal ? $val : $fVal);
-}
+										}
-} else {
+								} else {
-throw new Zend_Json_Exception("Illegal number format: $datum");
+										throw new Zend_Json_Exception("Illegal number format: $datum");
-}
+								}
-$this->_token = self::DATUM;
+								$this->_token = self::DATUM;
-$this->_offset = $start + strlen($datum);
+								$this->_offset = $start + strlen($datum);
-}
+						}
-} else {
+				} else {
-throw new Zend_Json_Exception("Illegal Token at pos $i: $chr\nContext:\n--------------------------------------------------" . substr($str, $i) . "\n--------------------------------------------------");
+						throw new Zend_Json_Exception("Illegal Token at pos $i: $chr\nContext:\n--------------------------------------------------" . substr($str, $i) . "\n--------------------------------------------------");
-}
+				}
-return($this->_token);
+				return($this->_token);
-}
+		}
-/**
+		/**
-* Handle a Unicode byte; local to Enano.
+		* Handle a Unicode byte; local to Enano.
-* @param string 4 character byte sequence
+		* @param string 4 character byte sequence
-* @return string
+		* @return string
-*/
+		*/
-protected function decode_unicode_byte($byte)
+		protected function decode_unicode_byte($byte)
-{
+		{
-if ( strlen($byte) != 4 )
+			if ( strlen($byte) != 4 )
-throw new Zend_Json_Exception("Invalid Unicode sequence \\u$byte");
+				throw new Zend_Json_Exception("Invalid Unicode sequence \\u$byte");
-$value = hexdec($byte);
+			$value = hexdec($byte);
-if ($value < 0x0080)
+			if ($value < 0x0080)
-{
+			{
-// 1 byte: 0xxxxxxx
+				// 1 byte: 0xxxxxxx
-$character = chr($value);
+				$character = chr($value);
-}
+			}
-else if ($value < 0x0800)
+			else if ($value < 0x0800)
-{
+			{
-// 2 bytes: 110xxxxx 10xxxxxx
+				// 2 bytes: 110xxxxx 10xxxxxx
-$character =
+				$character =
-chr((($value & 0x07c0) >> 6) | 0xc0)
+						chr((($value & 0x07c0) >> 6) | 0xc0)
-. chr(($value & 0x3f) | 0x80);
+					. chr(($value & 0x3f) | 0x80);
-}
+			}
-else
+			else
-{
+			{
-// 3 bytes: 1110xxxx 10xxxxxx 10xxxxxx
+				// 3 bytes: 1110xxxx 10xxxxxx 10xxxxxx
-$character =
+				$character =
-chr((($value & 0xf000) >> 12) | 0xe0)
+						chr((($value & 0xf000) >> 12) | 0xe0)
-. chr((($value & 0x0fc0) >> 6) | 0x80)
+					. chr((($value & 0x0fc0) >> 6) | 0x80)
-. chr(($value & 0x3f) | 0x80);
+					. chr(($value & 0x3f) | 0x80);
-}
+			}
-return $character;
+			return $character;
-}
+		}
 }
 /**
 * Zend Framework
 *
 * @copyright  Copyright (c) 2005-2007 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Json
 {
-/**
+		/**
-* How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
+		* How objects should be encoded -- arrays or as StdClass. TYPE_ARRAY is 1
-* so that it is a boolean true value, allowing it to be used with
+		* so that it is a boolean true value, allowing it to be used with
-* ext/json's functions.
+		* ext/json's functions.
-*/
+		*/
-const TYPE_ARRAY  = 1;
+		const TYPE_ARRAY  = 1;
-const TYPE_OBJECT = 0;
+		const TYPE_OBJECT = 0;
-/**
+		/**
-* @var bool
+		* @var bool
-*/
+		*/
-public static $useBuiltinEncoderDecoder = true;
+		public static $useBuiltinEncoderDecoder = true;
-/**
+		/**
-* Decodes the given $encodedValue string which is
+		* Decodes the given $encodedValue string which is
-* encoded in the JSON format
+		* encoded in the JSON format
-*
+		*
-* Uses ext/json's json_decode if available.
+		* Uses ext/json's json_decode if available.
-*
+		*
-* @param string $encodedValue Encoded in JSON format
+		* @param string $encodedValue Encoded in JSON format
-* @param int $objectDecodeType Optional; flag indicating how to decode
+		* @param int $objectDecodeType Optional; flag indicating how to decode
-* objects. See {@link ZJsonDecoder::decode()} for details.
+		* objects. See {@link ZJsonDecoder::decode()} for details.
-* @return mixed
+		* @return mixed
-*/
+		*/
-public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
+		public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
-{
+		{
-if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
+				if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) {
-return json_decode($encodedValue, $objectDecodeType);
+						return json_decode($encodedValue, $objectDecodeType);
-}
+				}
-return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
+				return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType);
-}
+		}
-/**
+		/**
-* Encode the mixed $valueToEncode into the JSON format
+		* Encode the mixed $valueToEncode into the JSON format
-*
+		*
-* Encodes using ext/json's json_encode() if available.
+		* Encodes using ext/json's json_encode() if available.
-*
+		*
-* NOTE: Object should not contain cycles; the JSON format
+		* NOTE: Object should not contain cycles; the JSON format
-* does not allow object reference.
+		* does not allow object reference.
-*
+		*
-* NOTE: Only public variables will be encoded
+		* NOTE: Only public variables will be encoded
-*
+		*
-* @param mixed $valueToEncode
+		* @param mixed $valueToEncode
-* @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
+		* @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-* @return string JSON encoded object
+		* @return string JSON encoded object
-*/
+		*/
-public static function encode($valueToEncode, $cycleCheck = false)
+		public static function encode($valueToEncode, $cycleCheck = false)
-{
+		{
-if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
+				if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) {
-return json_encode($valueToEncode);
+						return json_encode($valueToEncode);
-}
+				}
-return Zend_Json_Encoder::encode($valueToEncode, $cycleCheck);
+				return Zend_Json_Encoder::encode($valueToEncode, $cycleCheck);
-}
+		}
 }
 ?>

changeset 1227	bdac73ed481e
parent 1111	8fae8fb3cbb1