aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-02 21:58:28 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-02 21:58:28 -0700
commit1a5898bf80246fca87ecd7a56f9b7e4780e4089c (patch)
tree7f80261ecac578fe8cedd1b32c591d37eda86dd8 /include
parent8b2b92fe3267af0b7f3fea33940a440c847c84f2 (diff)
parent54301a9ff518224309664cd8c2f23cba0d30cb2d (diff)
downloadvolse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.gz
volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.bz2
volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.zip
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
Diffstat (limited to 'include')
-rw-r--r--include/zot.php21
1 files changed, 21 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php
index dfaff268e..9497e4668 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -2887,6 +2887,27 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
foreach($arr['abook'] as $abook) {
+ if(! array_key_exists('abook_blocked',$abook)) {
+ // convert from redmatrix
+ if($abook['abook_flags'] & 0x0001)
+ $abook['abook_blocked'] = 1;
+ if($abook['abook_flags'] & 0x0002)
+ $abook['abook_ignored'] = 1;
+ if($abook['abook_flags'] & 0x0004)
+ $abook['abook_hidden'] = 1;
+ if($abook['abook_flags'] & 0x0008)
+ $abook['abook_archived'] = 1;
+ if($abook['abook_flags'] & 0x0010)
+ $abook['abook_pending'] = 1;
+ if($abook['abook_flags'] & 0x0020)
+ $abook['abook_unconnected'] = 1;
+ if($abook['abook_flags'] & 0x0080)
+ $abook['abook_self'] = 1;
+ if($abook['abook_flags'] & 0x0100)
+ $abook['abook_feed'] = 1;
+ }
+
+
$clean = array();
if($abook['abook_xchan'] && $abook['entry_deleted']) {
logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);