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

don't decrypt the message body more than once.

Browse Source
This commit is contained in:
friendica 2014-10-24 04:17:48 -07:00
parent 1d8aa7d817
commit 1845ddc4c3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/bb2diaspora.php
View File

@ -340,8 +340,13 @@ function bb2diaspora_itembody($item,$force_update = false) {
if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
$key = get_config('system','prvkey'); $key = get_config('system','prvkey');
$newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : ''); $b = json_decode($item['title'],true);
$newitem['body'] = (($item['body']) ? crypto_unencapsulate(json_decode($item['body'],true),$key) : ''); // if called from diaspora_process_outbound, this decoding has already been done.
// Everything else that calls us will not yet be decoded.
if($b && is_array($b) && array_key_exists('iv',$b)) {
$newitem['title'] = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : '');
$newitem['body'] = (($item['body']) ? crypto_unencapsulate(json_decode($item['body'],true),$key) : '');
}
} }
bb2diaspora_itemwallwall($newitem); bb2diaspora_itemwallwall($newitem);