diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 15 | ||||
| -rw-r--r-- | include/zot.php | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/include/items.php b/include/items.php index 49e3dd3de..13d891736 100755 --- a/include/items.php +++ b/include/items.php @@ -532,6 +532,21 @@ function get_item_elements($x) { $arr['item_private'] = ((array_key_exists('flags',$x) && is_array($x['flags']) && in_array('private',$x['flags'])) ? 1 : 0); + $arr['item_flags'] = 0; + + // if it's a private post, encrypt it in the DB. + // We have to do that here because we need to cleanse the input and prevent bad stuff from getting in, + // and we need plaintext to do that. + + if(intval($arr['item_private'])) { + $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; + $key = get_config('system','pubkey'); + if($arr['title']) + $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + if($arr['body']) + $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + } + if(array_key_exists('flags',$x) && in_array('deleted',$x['flags'])) $arr['item_restrict'] = ITEM_DELETED; diff --git a/include/zot.php b/include/zot.php index c53e6c267..b4e005076 100644 --- a/include/zot.php +++ b/include/zot.php @@ -834,20 +834,6 @@ function zot_import($arr) { if($i['message']['type'] === 'activity') { $arr = get_item_elements($i['message']); - // if it's a private post, encrypt it in the DB. - // We have to do that here because we need to cleanse the input and prevent bad stuff from getting in, - // and we need plaintext to do that. - - if(array_key_exists('item_private',$arr) && intval($arr['item_private'])) { - logger('Encrypting local storage'); - $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; - $key = get_config('system','pubkey'); - if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); - if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); - } - if(! array_key_exists('created',$arr)) { logger('Activity rejected: probable failure to lookup author/owner. ' . print_r($i['message'],true)); continue; |