github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-14 18:48:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ZF JSON

Browse source 
Убираем местные костыли по работе с JSON.
This commit is contained in:
Exile 2014-12-01 20:05:43 +03:00
commit 067528b2d7
7 changed files with 9 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

84
library/includes/functions.php
View file

@ -2287,7 +2287,7 @@ function get_poll_data_items_js ($topic_id)
}
foreach ($items as $k => $v)
{
$items[$k] = php2js($v);
$items[$k] = Zend\Json\Json::encode($v);
}
return is_array($topic_id) ? $items : $items[$topic_id];
@ -2296,7 +2296,7 @@ function get_poll_data_items_js ($topic_id)
function poll_is_active ($t_data)
{
global $bb_cfg;
return ($t_data['topic_vote'] == 1 && $t_data['topic_time'] > TIMENOW - $bb_cfg['poll_max_days']*86400);
return ($t_data['topic_vote'] == 1 && $t_data['topic_time'] > TIMENOW - $bb_cfg['poll_max_days'] * 86400);
}
function print_confirmation ($tpl_vars)
@ -2373,86 +2373,6 @@ function caching_output ($enabled, $mode, $cache_var_name, $ttl = 300)
}
}
//
// Ajax
//
/**
* Encode PHP var to JSON (PHP -> JS)
*/
function bb_json_encode ($data)
{
return json_encode($data);
}
/**
* Decode JSON to PHP (JS -> PHP)
*/
function bb_json_decode ($data)
{
if (!is_string($data)) trigger_error('invalid argument for '. __FUNCTION__, E_USER_ERROR);
return json_decode($data, true);
}
/**
* -- from JsHttpRequest --
* Convert a PHP scalar, array or hash to JS scalar/array/hash. This function is
* an analog of json_encode(), but it can work with a non-UTF8 input and does not
* analyze the passed data. Output format must be fully JSON compatible.
*
* @param mixed $a Any structure to convert to JS.
* @return string JavaScript equivalent structure.
*/
function php2js ($a = false)
{
if (is_null($a)) return 'null';
if ($a === false) return 'false';
if ($a === true) return 'true';
if (is_scalar($a))
{
if (is_float($a))
{
// Always use "." for floats.
$a = str_replace(",", ".", strval($a));
}
// All scalars are converted to strings to avoid indeterminism.
// PHP's "1" and 1 are equal for all PHP operators, but
// JS's "1" and 1 are not. So if we pass "1" or 1 from the PHP backend,
// we should get the same result in the JS frontend (string).
// Character replacements for JSON.
static $jsonReplaces = array(
array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'),
array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'),
);
return '"'. str_replace($jsonReplaces[0], $jsonReplaces[1], $a) .'"';
}
$isList = true;
for ($i = 0, reset($a); $i < count($a); $i++, next($a))
{
if (key($a) !== $i)
{
$isList = false;
break;
}
}
$result = array();
if ($isList)
{
foreach ($a as $v)
{
$result[] = php2js($v);
}
return '[ '. join(', ', $result) .' ]';
}
else
{
foreach ($a as $k => $v)
{
$result[] = php2js($k) .': '. php2js($v);
}
return '{ '. join(', ', $result) .' }';
}
}
function clean_title ($str, $replace_underscore = false)
{
$str = ($replace_underscore) ? str_replace('_', ' ', $str) : $str;