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 /Zotlabs/Module | |
| parent | 7524948a970271072030b3f67183152b2c23081b (diff) | |
| download | volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.tar.gz volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.tar.bz2 volse-hubzilla-b5b57523f14597f13b88a93f8787bb5a4f966c58.zip | |
more perms work
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Import.php | 9 |
1 files changed, 9 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 |