From dbf2541aacb0f69ecea17048ed2086f24585ebf5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 Oct 2019 16:48:46 -0700 Subject: [PATCH] rename hyperdrive setting, add acl patches from upstream --- Zotlabs/Module/Settings/Channel.php | 2 +- view/js/acl.js | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 12b1cb3d9..89685d235 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -512,7 +512,7 @@ class Channel { $autoperms = ''; } - $hyperdrive = [ 'hyperdrive', t('Enable hyperdrive'), ((get_pconfig(local_channel(),'system','hyperdrive',true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no ]; + $hyperdrive = [ 'hyperdrive', t('Friend-of-friend conversations'), ((get_pconfig(local_channel(),'system','hyperdrive',true)) ? 1 : 0), t('Import public third-party conversations in which your connections participate.'), $yes_no ]; if (get_config('system','activitypub')) { $apconfig = true; diff --git a/view/js/acl.js b/view/js/acl.js index 730b515a0..9415113dd 100644 --- a/view/js/acl.js +++ b/view/js/acl.js @@ -207,7 +207,7 @@ ACL.prototype.on_button_hide = function(event) { ACL.prototype.set_allow = function(itemid) { type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); switch(type) { case "g": if (that.allow_gid.indexOf(id)<0) { @@ -231,7 +231,7 @@ ACL.prototype.set_allow = function(itemid) { ACL.prototype.set_deny = function(itemid) { type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); switch(type) { case "g": if (that.deny_gid.indexOf(id)<0) { @@ -310,8 +310,12 @@ ACL.prototype.update_view = function(value) { else { that.list.show(); //show acl-list + datasrc2src('#acl-list-content .list-group-item img[data-src]'); that.info.hide(); //hide acl-info that.update_select('custom'); + if(typeof value === 'undefined') { + value = 'custom'; + } /* jot acl */ if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') { @@ -334,7 +338,7 @@ ACL.prototype.update_view = function(value) { $("#acl-list-content .acl-list-item").each(function() { itemid = $(this).attr('id'); type = itemid[0]; - id = itemid.substr(1); + id = decodeURIComponent(itemid.substr(1)); btshow = $(this).children(".acl-button-show").removeClass("btn-success").addClass("btn-outline-success"); bthide = $(this).children(".acl-button-hide").removeClass("btn-danger").addClass("btn-outline-danger");