From 065a50c920ebfe2274ab134bca7849051f3582e7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 2 Jul 2015 21:55:36 -0700 Subject: a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix --- include/zot.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'include/zot.php') diff --git a/include/zot.php b/include/zot.php index 66156b4e0..34e7f3e42 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2922,6 +2922,28 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { foreach($arr['abook'] as $abook) { + if(array_key_exists('abook_blocked',$abook)) { + // convert from hubzilla + $abook['abook_flags'] = 0; + if(intval($abook['abook_blocked'])) + $abook['abook_flags'] |= ABOOK_FLAG_BLOCKED; + if(intval($abook['abook_ignored'])) + $abook['abook_flags'] |= ABOOK_FLAG_IGNORED; + if(intval($abook['abook_hidden'])) + $abook['abook_flags'] |= ABOOK_FLAG_HIDDEN; + if(intval($abook['abook_archived'])) + $abook['abook_flags'] |= ABOOK_FLAG_ARCHIVED; + if(intval($abook['abook_pending'])) + $abook['abook_flags'] |= ABOOK_FLAG_PENDING; + if(intval($abook['abook_unconnected'])) + $abook['abook_flags'] |= ABOOK_FLAG_UNCONNECTED; + if(intval($abook['abook_self'])) + $abook['abook_flags'] |= ABOOK_FLAG_SELF; + if(intval($abook['abook_feed'])) + $abook['abook_flags'] |= ABOOK_FLAG_FEED; + + } + $clean = array(); if($abook['abook_xchan'] && $abook['entry_deleted']) { logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']); -- cgit v1.2.3