diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-12 17:32:28 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-12 17:32:28 -0700 |
| commit | d7f4526a00dba2c6a97bc4c231f57c7aa179a691 (patch) | |
| tree | 644487c9c0c24e9b25b70c4e622eac165cb0b078 /include | |
| parent | 57f20c0c2231099ce62dbdf2300e840114e8ce96 (diff) | |
| download | volse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.tar.gz volse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.tar.bz2 volse-hubzilla-d7f4526a00dba2c6a97bc4c231f57c7aa179a691.zip | |
backend infrastructure for 'channel protection password'; which will be used to optionally encrypt export files and resolve channel/identity ownership/hijacking disputes
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.php | 6 | ||||
| -rw-r--r-- | include/import.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/channel.php b/include/channel.php index 1bdd5a478..0a4c9009a 100644 --- a/include/channel.php +++ b/include/channel.php @@ -537,6 +537,8 @@ function identity_basic_export($channel_id, $sections = null) { $ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()]; if(in_array('channel',$sections)) { $ret['channel'] = $r[0]; + unset($ret['channel']['channel_password']); + unset($ret['channel']['channel_salt']); } } @@ -2020,7 +2022,9 @@ function channel_store_lowlevel($arr) { 'channel_deny_gid' => ((array_key_exists('channel_deny_gid',$arr)) ? $arr['channel_deny_gid'] : ''), 'channel_removed' => ((array_key_exists('channel_removed',$arr)) ? $arr['channel_removed'] : '0'), 'channel_system' => ((array_key_exists('channel_system',$arr)) ? $arr['channel_system'] : '0'), - 'channel_moved' => ((array_key_exists('channel_moved',$arr)) ? $arr['channel_moved'] : '') + 'channel_moved' => ((array_key_exists('channel_moved',$arr)) ? $arr['channel_moved'] : ''), + 'channel_password' => ((array_key_exists('channel_password',$arr)) ? $arr['channel_password'] : ''), + 'channel_salt' => ((array_key_exists('channel_salt',$arr)) ? $arr['channel_salt'] : '') ]; return create_table_from_array('channel',$store); diff --git a/include/import.php b/include/import.php index 9007dbe74..224bb1803 100644 --- a/include/import.php +++ b/include/import.php @@ -82,7 +82,7 @@ function import_channel($channel, $account_id, $seize) { 'channel_r_storage', 'channel_r_pages', 'channel_w_stream', 'channel_w_wall', 'channel_w_comment', 'channel_w_mail', 'channel_w_like', 'channel_w_tagwall', 'channel_w_chat', 'channel_w_storage', 'channel_w_pages', 'channel_a_republish', - 'channel_a_delegate', 'perm_limits' + 'channel_a_delegate', 'perm_limits', 'channel_password', 'channel_salt' ]; $clean = array(); |