From 5d2dc4e8fdb62785cf306496c7cdcefb31d4a0ed Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Aug 2014 02:45:21 -0700 Subject: switch everything over to crypto_encapsulate() --- include/items.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index 1f2b33579..bdf4007af 100755 --- a/include/items.php +++ b/include/items.php @@ -318,9 +318,9 @@ function post_activity_item($arr) { $key = get_config('system','pubkey'); $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); @@ -2713,9 +2713,9 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { $key = get_config('system','pubkey'); $flag_bits = $flag_bits|ITEM_OBSCURED; if($title) - $title = json_encode(aes_encapsulate($title,$key)); + $title = json_encode(crypto_encapsulate($title,$key)); if($body) - $body = json_encode(aes_encapsulate($body,$key)); + $body = json_encode(crypto_encapsulate($body,$key)); } } else { -- cgit v1.2.3 From 56e8b2b9714336059d3b19a28ab0593c22068b0b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Aug 2014 15:22:26 -0700 Subject: add "any connections" to can_comment_on_post() - was missing --- include/items.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index bdf4007af..f10a5c570 100755 --- a/include/items.php +++ b/include/items.php @@ -132,6 +132,7 @@ function can_comment_on_post($observer_xchan,$item) { // false. return false; break; + case 'any connections': case 'contacts': case '': if(array_key_exists('owner',$item)) { -- cgit v1.2.3