Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F803462
in-portal
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Tue, Feb 25, 12:31 PM
Size
4 KB
Mime Type
text/x-diff
Expires
Thu, Feb 27, 12:31 PM (1 d, 2 h)
Engine
blob
Format
Raw Data
Handle
576277
Attached To
rINP In-Portal
in-portal
View Options
Index: branches/RC/core/units/general/helpers/json_helper.php
===================================================================
--- branches/RC/core/units/general/helpers/json_helper.php (revision 11705)
+++ branches/RC/core/units/general/helpers/json_helper.php (revision 11706)
@@ -1,156 +1,153 @@
<?php
class JSONHelper extends kHelper {
// var $match = Array ('\\', "\n", "\t", "\r", "\b", "\f", '"');
// var $replace = Array ('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\"');
// \x{2028} is some strange char found in GTA responses... it breaks javascript
var $match = Array ('/\\\\/u', '/\\"/u', '/\\t/u', '/\\n/u', '/\\r/u', '/\\x{2028}/u');
var $replace = Array ('\\\\\\\\', '\\"', '\\t', '\\n', '\\r', '');
/**
* Object constructor
*
* @return JSONHelper
*/
function JSONHelper() {
}
/**
* Parse structure to JSON
*
* @param mixed $data
* @return string
*/
function parse($data)
{
return '('.$this->encode($data).')';
}
/**
* Converts PHP variable to JSON string
* Can convert any PHP variable with any content to correct JSON structure
*
* @param mixed $data Data to convert
* @return string
*/
function encode($data)
{
$type = $this->getType($data);
switch ($type) {
case 'object':
$data = '{'.$this->processData($data, $type).'}';
break;
case 'array':
$data = '['.$this->processData($data, $type).']';
break;
- case 'number':
- $data = $data;
- break;
- case 'string':
- $data = '"'.$this->escape($data).'"';
- break;
- case 'boolean':
- $data = ($data) ? 'true' : 'false';
- break;
- case 'null':
- $data = 'null';
- break;
+ default:
+ if (is_int($data) || is_float($data)) {
+ $data = (string)$data;
+ } elseif (is_string($data)) {
+ $data = "'".$this->escape($data)."'";
+ } elseif (is_bool($data)) {
+ $data = $data ? 'true' : 'false';
+ } else {
+ $data = 'null';
+ }
}
-
return $data;
}
/**
* Enter description here...
*
* @param unknown_type $input
* @param unknown_type $type
* @return unknown
*/
function processData($data, $type)
{
$output = Array();
// If data is an object - it should be converted as a key => value pair
if ($type == 'object'){
foreach($data as $key => $value) {
$output[] = '"'.$key.'": '.$this->encode($value);
}
} else {
foreach($data as $key => $value) {
$output[] = $this->encode($value);
}
}
return implode(',', $output);;
}
/**
* Function determines type of variable
*
* @param unknown_type $data
* @return unknown
*/
function getType(&$data)
{
if (is_object($data)) {
$type = 'object';
} elseif (is_array($data)) {
// If array is assoc it should be processed as an object
if($this->is_assoc($data)) {
$type = 'object';
} else {
$type = 'array';
}
} elseif (is_numeric($data)) {
$type = 'number';
} elseif(is_string($data)) {
$type = 'string';
} elseif(is_bool($data)) {
$type = 'boolean';
} elseif(is_null($data)) {
$type = 'null';
} else {
$type = 'string';
}
return $type;
}
/**
* Function determines if array is associative
*
* @param array $array
* @return bool
*/
function is_assoc($array)
{
// Arrays are defined as integer-indexed arrays starting at index 0, where
// the last index is (count($array) -1); any deviation from that is
// considered an associative array, and will be encoded as such (from Zend Framework).
return !empty($array) && (array_keys($array) !== range(0, count($array) - 1));
}
/**
* Escapes special characters
* Function escapes ", \, /, \n and \r symbols so that not to cause JavaScript error or
* data loss
*
* @param string $string
* @return string
*/
function escape($string)
{
$string = preg_replace($this->match, $this->replace, $string);
return $string;
// Escape certain ASCII characters:
// 0x08 => \b
// 0x0c => \f
// return str_replace(array(chr(0x08), chr(0x0C)), array('\b', '\f'), $string);
}
}
\ No newline at end of file
Property changes on: branches/RC/core/units/general/helpers/json_helper.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property
Event Timeline
Log In to Comment