Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

convert all stored json calls to json_decode_plus()

Browse source
This commit is contained in:
friendica 2013-08-06 03:54:49 -07:00
parent 71347bb9e0
commit 24b9799dca
6 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -174,7 +174,7 @@ function localize_item(&$item){
$Alink = $item['author']['xchan_url'];
$obj= json_decode($item['object'],true);
$obj= json_decode_plus($item['object']);
$Blink = $Bphoto = '';
@ -203,7 +203,7 @@ function localize_item(&$item){
$Alink = $item['author']['xchan_url'];
$obj= json_decode($item['object'],true);
$obj= json_decode_plus($item['object']);
$Blink = $Bphoto = '';

18
include/items.php
View file

@ -621,9 +621,9 @@ function encode_item($item) {
if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
$key = get_config('system','prvkey');
if($item['title'])
$item['title'] = aes_unencapsulate(json_decode($item['title'],true),$key);
$item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
$item['body'] = aes_unencapsulate(json_decode($item['body'],true),$key);
$item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key);
}
if($item['item_restrict'] & ITEM_DELETED) {
@ -655,11 +655,11 @@ function encode_item($item) {
$x['owner'] = encode_item_xchan($item['owner']);
$x['author'] = encode_item_xchan($item['author']);
if($item['object'])
$x['object'] = json_decode($item['object'],true);
$x['object'] = json_decode_plus($item['object']);
if($item['target'])
$x['target'] = json_decode($item['target'],true);
$x['target'] = json_decode_plus($item['target']);
if($item['attach'])
$x['attach'] = json_decode($item['attach'],true);
$x['attach'] = json_decode_plus($item['attach']);
if($y = encode_item_flags($item))
$x['flags'] = $y;
@ -821,9 +821,9 @@ function encode_mail($item) {
if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) {
$key = get_config('system','prvkey');
if($item['title'])
$item['title'] = aes_unencapsulate(json_decode($item['title'],true),$key);
$item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
$item['body'] = aes_unencapsulate(json_decode($item['body'],true),$key);
$item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key);
}
$x['message_id'] = $item['mid'];
@ -1939,14 +1939,14 @@ function tag_deliver($uid,$item_id) {
logger('tag_deliver: community tag activity received');
if(($item['owner_xchan'] === $u[0]['channel_hash']) && (! get_pconfig($u[0]['channel_id'],'system','blocktags'))) {
$j_tgt = json_decode($item['target'],true);
$j_tgt = json_decode_plus($item['target']);
if($j_tgt && $j_tgt['id']) {
$p = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc($j_tgt['id']),
intval($u[0]['channel_id'])
);
if($p) {
$j_obj = json_decode($item['object'],true);
$j_obj = json_decode_plus($item['object']);
logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
if($j_obj && $j_obj['id'] && $j_obj['title']) {
if(is_array($j_obj['link']))

12
include/message.php
View file

@ -181,9 +181,9 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) {
$key = get_config('system','prvkey');
if($r[$k]['title'])
$r[$k]['title'] = aes_unencapsulate(json_decode($r[$k]['title'],true),$key);
$r[$k]['title'] = aes_unencapsulate(json_decode_plus($r[$k]['title']),$key);
if($r[$k]['body'])
$r[$k]['body'] = aes_unencapsulate(json_decode($r[$k]['body'],true),$key);
$r[$k]['body'] = aes_unencapsulate(json_decode_plus($r[$k]['body']),$key);
}
}
@ -220,9 +220,9 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee
if($messages[$k]['mail_flags'] & MAIL_OBSCURED) {
$key = get_config('system','prvkey');
if($messages[$k]['title'])
$messages[$k]['title'] = aes_unencapsulate(json_decode($messages[$k]['title'],true),$key);
$messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key);
if($messages[$k]['body'])
$messages[$k]['body'] = aes_unencapsulate(json_decode($messages[$k]['body'],true),$key);
$messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key);
}
}
@ -308,9 +308,9 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda
if($messages[$k]['mail_flags'] & MAIL_OBSCURED) {
$key = get_config('system','prvkey');
if($messages[$k]['title'])
$messages[$k]['title'] = aes_unencapsulate(json_decode($messages[$k]['title'],true),$key);
$messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key);
if($messages[$k]['body'])
$messages[$k]['body'] = aes_unencapsulate(json_decode($messages[$k]['body'],true),$key);
$messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key);
}
}

6
include/text.php
View file

@ -988,9 +988,9 @@ function prepare_body(&$item,$attach = false) {
if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
$key = get_config('system','prvkey');
if($item['title'])
$item['title'] = aes_unencapsulate(json_decode($item['title'],true),$key);
$item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key);
if($item['body'])
$item['body'] = aes_unencapsulate(json_decode($item['body'],true),$key);
$item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key);
}
$s = prepare_text($item['body'],$item['mimetype']);
@ -1004,7 +1004,7 @@ function prepare_body(&$item,$attach = false) {
}
$arr = json_decode($item['attach'],true);
$arr = json_decode_plus($item['attach']);
if(count($arr)) {
$s .= '<div class="body-attach">';
foreach($arr as $r) {

4
include/zot.php
View file

@ -1153,9 +1153,9 @@ function remove_community_tag($sender,$arr,$uid) {
$i = $r[0];
if($i['target'])
$i['target'] = json_decode($i['target'],true);
$i['target'] = json_decode_plus($i['target']);
if($i['object'])
$i['object'] = json_decode($i['object'],true);
$i['object'] = json_decode_plus($i['object']);
if(! ($i['target'] && $i['object'])) {
logger('remove_community_tag: no target/object');

4
mod/editpost.php
View file

@ -52,9 +52,9 @@ function editpost_content(&$a) {
if($itm[0]['item_flags'] & ITEM_OBSCURED) {
$key = get_config('system','prvkey');
if($itm[0]['title'])
$itm[0]['title'] = aes_unencapsulate(json_decode($itm[0]['title'],true),$key);
$itm[0]['title'] = aes_unencapsulate(json_decode_plus($itm[0]['title']),$key);
if($itm[0]['body'])
$itm[0]['body'] = aes_unencapsulate(json_decode($itm[0]['body'],true),$key);
$itm[0]['body'] = aes_unencapsulate(json_decode_plus($itm[0]['body']),$key);
}
$tpl = get_markup_template("jot.tpl");