harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deprecate/remove json_decode_plus

Browse Source
This commit is contained in:
redmatrix 2016-07-13 22:11:06 -07:00
parent 503b420292
commit b3a785711c
6 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Editpost.php
View File

@ -47,9 +47,9 @@ class Editpost extends \Zotlabs\Web\Controller {
if(intval($itm[0]['item_obscured'])) { if(intval($itm[0]['item_obscured'])) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
if($itm[0]['title']) if($itm[0]['title'])
$itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); $itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
if($itm[0]['body']) if($itm[0]['body'])
$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); $itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
} }
$category = ''; $category = '';

4
Zotlabs/Module/Editwebpage.php
View File

@ -108,9 +108,9 @@ class Editwebpage extends \Zotlabs\Web\Controller {
if(intval($itm[0]['item_obscured'])) { if(intval($itm[0]['item_obscured'])) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
if($itm[0]['title']) if($itm[0]['title'])
$itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); $itm[0]['title'] = crypto_unencapsulate(json_decode($itm[0]['title'],true),$key);
if($itm[0]['body']) if($itm[0]['body'])
$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); $itm[0]['body'] = crypto_unencapsulate(json_decode($itm[0]['body'],true),$key);
} }
$item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1", $item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",

6
include/conversation.php
View File

@ -99,7 +99,7 @@ function localize_item(&$item){
if(intval($item['item_thread_top'])) if(intval($item['item_thread_top']))
return; return;
$obj = json_decode_plus($item['obj']); $obj = json_decode($item['obj'],true);
if((! $obj) && ($item['obj'])) { if((! $obj) && ($item['obj'])) {
logger('localize_item: failed to decode object: ' . print_r($item['obj'],true)); logger('localize_item: failed to decode object: ' . print_r($item['obj'],true));
} }
@ -186,7 +186,7 @@ function localize_item(&$item){
$Alink = $item['author']['xchan_url']; $Alink = $item['author']['xchan_url'];
$obj= json_decode_plus($item['obj']); $obj= json_decode($item['obj'],true);
$Blink = $Bphoto = ''; $Blink = $Bphoto = '';
@ -219,7 +219,7 @@ function localize_item(&$item){
$Aname = $item['author']['xchan_name']; $Aname = $item['author']['xchan_name'];
$Alink = $item['author']['xchan_url']; $Alink = $item['author']['xchan_url'];
$obj= json_decode_plus($item['obj']); $obj= json_decode($item['obj'],true);
$Blink = $Bphoto = ''; $Blink = $Bphoto = '';

20
include/items.php
View File

@ -990,9 +990,9 @@ function encode_item($item,$mirror = false) {
if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) { if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
if($item['title']) if($item['title'])
$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); $item['title'] = crypto_unencapsulate(json_decode($item['title'],true),$key);
if($item['body']) if($item['body'])
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); $item['body'] = crypto_unencapsulate(json_decode($item['body'],true),$key);
} }
// If we're trying to backup an item so that it's recoverable or for export/imprt, // If we're trying to backup an item so that it's recoverable or for export/imprt,
@ -1062,11 +1062,11 @@ function encode_item($item,$mirror = false) {
$x['owner'] = encode_item_xchan($item['owner']); $x['owner'] = encode_item_xchan($item['owner']);
$x['author'] = encode_item_xchan($item['author']); $x['author'] = encode_item_xchan($item['author']);
if($item['obj']) if($item['obj'])
$x['object'] = json_decode_plus($item['obj']); $x['object'] = json_decode($item['obj'],true);
if($item['target']) if($item['target'])
$x['target'] = json_decode_plus($item['target']); $x['target'] = json_decode($item['target'],true);
if($item['attach']) if($item['attach'])
$x['attach'] = json_decode_plus($item['attach']); $x['attach'] = json_decode($item['attach'],true);
if($y = encode_item_flags($item)) if($y = encode_item_flags($item))
$x['flags'] = $y; $x['flags'] = $y;
@ -1382,7 +1382,7 @@ function encode_mail($item,$extended = false) {
$x['to'] = encode_item_xchan($item['to']); $x['to'] = encode_item_xchan($item['to']);
if($item['attach']) if($item['attach'])
$x['attach'] = json_decode_plus($item['attach']); $x['attach'] = json_decode($item['attach'],true);
$x['flags'] = array(); $x['flags'] = array();
@ -2390,7 +2390,7 @@ function tag_deliver($uid, $item_id) {
if(($item['obj_type'] == "") || ($item['obj_type'] !== ACTIVITY_OBJ_PERSON) || (! $item['obj'])) if(($item['obj_type'] == "") || ($item['obj_type'] !== ACTIVITY_OBJ_PERSON) || (! $item['obj']))
$poke_notify = false; $poke_notify = false;
$obj = json_decode_plus($item['obj']); $obj = json_decode($item['obj'],true);
if($obj) { if($obj) {
if($obj['id'] !== $u[0]['channel_hash']) if($obj['id'] !== $u[0]['channel_hash'])
$poke_notify = false; $poke_notify = false;
@ -2427,14 +2427,14 @@ function tag_deliver($uid, $item_id) {
if(($item['owner_xchan'] === $u[0]['channel_hash']) && (! get_pconfig($u[0]['channel_id'],'system','blocktags'))) { if(($item['owner_xchan'] === $u[0]['channel_hash']) && (! get_pconfig($u[0]['channel_id'],'system','blocktags'))) {
logger('tag_deliver: community tag recipient: ' . $u[0]['channel_name']); logger('tag_deliver: community tag recipient: ' . $u[0]['channel_name']);
$j_tgt = json_decode_plus($item['target']); $j_tgt = json_decode($item['target'],true);
if($j_tgt && $j_tgt['id']) { if($j_tgt && $j_tgt['id']) {
$p = q("select * from item where mid = '%s' and uid = %d limit 1", $p = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc($j_tgt['id']), dbesc($j_tgt['id']),
intval($u[0]['channel_id']) intval($u[0]['channel_id'])
); );
if($p) { if($p) {
$j_obj = json_decode_plus($item['obj']); $j_obj = json_decode($item['obj'],true);
logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA); logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
if($j_obj && $j_obj['id'] && $j_obj['title']) { if($j_obj && $j_obj['id'] && $j_obj['title']) {
if(is_array($j_obj['link'])) if(is_array($j_obj['link']))
@ -2519,7 +2519,7 @@ function tag_deliver($uid, $item_id) {
if(intval($item['item_obscured'])) { if(intval($item['item_obscured'])) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
if($item['body']) if($item['body'])
$body = crypto_unencapsulate(json_decode_plus($item['body']),$key); $body = crypto_unencapsulate(json_decode($item['body'],true),$key);
} }
else else
$body = $item['body']; $body = $item['body'];

16
include/text.php
View File

@ -1280,9 +1280,9 @@ function unobscure(&$item) {
if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) { if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
if($item['title']) if($item['title'])
$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); $item['title'] = crypto_unencapsulate(json_decode($item['title'],true),$key);
if($item['body']) if($item['body'])
$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); $item['body'] = crypto_unencapsulate(json_decode($item['body'],true),$key);
if(get_config('system','item_cache')) { if(get_config('system','item_cache')) {
q("update item set title = '%s', body = '%s', item_obscured = 0 where id = %d", q("update item set title = '%s', body = '%s', item_obscured = 0 where id = %d",
dbesc($item['title']), dbesc($item['title']),
@ -1305,7 +1305,7 @@ function unobscure_mail(&$item) {
function theme_attachments(&$item) { function theme_attachments(&$item) {
$arr = json_decode_plus($item['attach']); $arr = json_decode($item['attach'],true);
if(is_array($arr) && count($arr)) { if(is_array($arr) && count($arr)) {
$attaches = array(); $attaches = array();
foreach($arr as $r) { foreach($arr as $r) {
@ -2208,20 +2208,12 @@ function jindent($json) {
return $result; return $result;
} }
function json_decode_plus($s) {
$x = json_decode($s,true);
if(! $x)
$x = json_decode(str_replace(array('\\"','\\\\'),array('"','\\'),$s),true);
return $x;
}
/** /**
* @brief Creates navigation menu for webpage, layout, blocks, menu sites. * @brief Creates navigation menu for webpage, layout, blocks, menu sites.
* *
* @return string * @return string
*/ */
function design_tools() { function design_tools() {
$channel = App::get_channel(); $channel = App::get_channel();

6
include/zot.php
View File

@ -506,7 +506,7 @@ function zot_refresh($them, $channel = null, $force = false) {
)); ));
if(intval($permissions['view_stream'])) { if(intval($permissions['view_stream'])) {
if(intval(get_pconfig($channel['channel_id'],'perms_limit','send_stream') & PERMS_PENDING) if(intval(get_pconfig($channel['channel_id'],'perm_limits','send_stream') & PERMS_PENDING)
|| (! intval($new_connection[0]['abook_pending']))) || (! intval($new_connection[0]['abook_pending'])))
Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id'])); Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
} }
@ -1881,9 +1881,9 @@ function remove_community_tag($sender, $arr, $uid) {
$i = $r[0]; $i = $r[0];
if($i['target']) if($i['target'])
$i['target'] = json_decode_plus($i['target']); $i['target'] = json_decode($i['target'],true);
if($i['object']) if($i['object'])
$i['object'] = json_decode_plus($i['object']); $i['object'] = json_decode($i['object'],true);
if(! ($i['target'] && $i['object'])) { if(! ($i['target'] && $i['object'])) {
logger('remove_community_tag: no target/object'); logger('remove_community_tag: no target/object');