aboutsummaryrefslogtreecommitdiffstats
path: root/include/channel.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-12 17:32:28 -0700
committerzotlabs <mike@macgirvin.com>2017-04-12 18:46:15 -0700
commit1c32564536cbfa12bd21a1c8161921b13d7dcc66 (patch)
treedd861e977bdf5883f952699e84e2b74b9d79f7cb /include/channel.php
parent63dd6ad01a173d640e5c49dede1246dba840aa74 (diff)
downloadvolse-hubzilla-1c32564536cbfa12bd21a1c8161921b13d7dcc66.tar.gz
volse-hubzilla-1c32564536cbfa12bd21a1c8161921b13d7dcc66.tar.bz2
volse-hubzilla-1c32564536cbfa12bd21a1c8161921b13d7dcc66.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/channel.php')
-rw-r--r--include/channel.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/channel.php b/include/channel.php
index 7394b1308..890bb8bd6 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -538,6 +538,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']);
}
}
@@ -1999,7 +2001,10 @@ 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'] : '')
];