diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-18 16:45:43 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-18 16:45:43 -0700 |
| commit | b5b57523f14597f13b88a93f8787bb5a4f966c58 (patch) | |
| tree | 0463cf24db71539ba4bf355f60b7e9f461677109 | |
| parent | 7524948a970271072030b3f67183152b2c23081b (diff) | |
| download | volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.tar.gz volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.tar.bz2 volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.zip | |
more perms work
| -rw-r--r-- | Zotlabs/Module/Import.php | 9 | ||||
| -rw-r--r-- | include/channel.php | 1 | ||||
| -rw-r--r-- | include/import.php | 1 | ||||
| -rw-r--r-- | include/zot.php | 14 |
4 files changed, 25 insertions, 0 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index e34f5e49e..d27f013b9 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -8,6 +8,7 @@ namespace Zotlabs\Module; require_once('include/zot.php'); require_once('include/channel.php'); require_once('include/import.php'); +require_once('include/perm_upgrade.php'); @@ -339,6 +340,8 @@ class Import extends \Zotlabs\Web\Controller { $abooks = $data['abook']; if($abooks) { foreach($abooks as $abook) { + + $abook_copy = $abook; $abconfig = null; if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) @@ -347,6 +350,10 @@ class Import extends \Zotlabs\Web\Controller { unset($abook['abook_id']); unset($abook['abook_rating']); unset($abook['abook_rating_text']); + unset($abook['abconfig']); + unset($abook['abook_their_perms']); + unset($abook['abook_my_perms']); + $abook['abook_account'] = $account_id; $abook['abook_channel'] = $channel['channel_id']; if(! array_key_exists('abook_blocked',$abook)) { @@ -385,6 +392,8 @@ class Import extends \Zotlabs\Web\Controller { $friends ++; if(intval($abook['abook_feed'])) $feeds ++; + + translate_abook_perms_inbound($channel,$abook_copy); if($abconfig) { // @fixme does not handle sync of del_abconfig diff --git a/include/channel.php b/include/channel.php index 12b4152ca..bec7d11d6 100644 --- a/include/channel.php +++ b/include/channel.php @@ -521,6 +521,7 @@ function identity_basic_export($channel_id, $items = false) { $abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']); if($abconfig) $ret['abook'][$x]['abconfig'] = $abconfig; + translate_abook_perms_outbound($ret['abook'][$x]); } stringify_array_elms($xchans); } diff --git a/include/import.php b/include/import.php index 7a19ab68f..e4f5ba5a7 100644 --- a/include/import.php +++ b/include/import.php @@ -1,6 +1,7 @@ <?php require_once('include/menu.php'); +require_once('include/perm_upgrade.php'); function import_channel($channel, $account_id, $seize) { diff --git a/include/zot.php b/include/zot.php index 2ebcc4bf0..0a835a909 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2938,6 +2938,12 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { $channel = $r[0]; translate_channel_perms_outbound($channel); + if($packet && array_key_exists('abook',$packet) && $packet['abook']) { + for($x = 0; $x < count($packet['abook']); $x ++) { + translate_abook_perms_outbound($packet['abook'][$x]); + } + } + if(intval($channel['channel_removed'])) return; @@ -3195,6 +3201,8 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { foreach($arr['abook'] as $abook) { + + $abconfig = null; if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) @@ -3289,6 +3297,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { } } + // This will set abconfig vars if the sender is using old-style fixed permissions + // using the raw abook record as passed to us. New-style permissions will fall through + // and be set using abconfig + + translate_abook_perms_inbound($channel,$abook); + if($abconfig) { // @fixme does not handle sync of del_abconfig foreach($abconfig as $abc) { |