aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-01-30 10:12:45 +0000
committerMario <mario@mariovavti.com>2020-01-30 10:12:45 +0000
commit19bb9e018152ce528846fb955b58d76f1bb6bdec (patch)
tree80ea5ec40f9dbeb80904a27ed0faa49cfe7afae1 /Zotlabs/Lib
parent9545a81166cf52c930dfafda40d93bf93d66260d (diff)
downloadvolse-hubzilla-19bb9e018152ce528846fb955b58d76f1bb6bdec.tar.gz
volse-hubzilla-19bb9e018152ce528846fb955b58d76f1bb6bdec.tar.bz2
volse-hubzilla-19bb9e018152ce528846fb955b58d76f1bb6bdec.zip
zap is storing perms different from hubzilla - revert Lib/Connect to use the hubzilla way. Eventually we might want to streamline this with zap. This will require a DB update to upgrade permissions in abconfig.
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Connect.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Connect.php b/Zotlabs/Lib/Connect.php
index 978a4ce39..5fc0e3fe1 100644
--- a/Zotlabs/Lib/Connect.php
+++ b/Zotlabs/Lib/Connect.php
@@ -152,7 +152,6 @@ class Connect {
call_hooks('follow_allow',$hookdata);
if(! $hookdata['allowed']) {
- hz_syslog('zesz');
$result['message'] = t('Protocol disabled.');
return $result;
}
@@ -211,7 +210,7 @@ class Connect {
$p['perms']['moderated'] = 0;
}
- $my_perms = Permissions::serialise($p['perms']);
+ $my_perms = $p['perms'];
$profile_assign = get_pconfig($uid,'system','profile_assign','');
@@ -279,8 +278,10 @@ class Connect {
// Set suitable permissions to the connection
- if ($my_perms) {
- set_abconfig($uid,$xchan_hash,'system','my_perms',$my_perms);
+ if($my_perms) {
+ foreach($my_perms as $k => $v) {
+ set_abconfig($uid,$xchan_hash,'my_perms',$k,$v);
+ }
}
// fetch the entire record