fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-15 00:12:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #314 from kijin/pr/json-encode-compat

Browse source 
XML/JSON 반환 포맷의 XE 호환성 개선
This commit is contained in:
Kijin Sung 2016-02-27 14:40:53 +09:00
commit 8149ecec36
2 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

37
classes/display/JSONDisplayHandler.php
View file

@ -15,20 +15,41 @@ class JSONDisplayHandler
$variables['error'] = $oModule->getError();
$variables['message'] = $oModule->getMessage();
$temp = array();
foreach ($variables as $key => $value)
self::_convertCompat($variables, Context::getRequestMethod());
return json_encode($variables);
}
/**
* Convert arrays in a format that is compatible with XE.
*
* @param array $array
* @param string $compat_type
* @return array
*/
protected static function _convertCompat(&$array, $compat_type = 'JSON')
{
foreach ($array as $key => &$value)
{
if (self::_isNumericArray($value))
if (is_object($value))
{
$temp[$key] = array_values($value);
$value = get_object_vars($value);
}
else
if (is_array($value))
{
$temp[$key] = $value;
self::_convertCompat($value, $compat_type);
if (self::_isNumericArray($value))
{
if ($compat_type === 'XMLRPC')
{
$value = array('item' => array_values($value));
}
else
{
$value = array_values($value);
}
}
}
}
return json_encode($temp);
}
/**

6
common/js/xml_handler.js
View file

@ -69,11 +69,7 @@
var result = {};
$.each(data, function(key, val) {
if ($.inArray(key, ["error", "message", "act", "redirect_url"]) >= 0 || $.inArray(key, return_fields) >= 0) {
if ($.isArray(val)) {
result[key] = { item: val };
} else {
result[key] = val;
}
result[key] = val;
}
});