MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

include jotnets in populate_acl

Browse source
This commit is contained in:
rabuzarus 2015-06-25 12:33:05 +02:00
parent 8e800af306
commit 12528f033a
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/acl_selectors.php
View file

@ -283,10 +283,15 @@ function get_acl_permissions($user = null) {
} }
function populate_acl($user = null,$celeb = false) { function populate_acl($user = null,$celeb = false,$show_jotnets = true,$show_mail = false) {
$perms = get_acl_permissions($user); $perms = get_acl_permissions($user);
$jotnets = '';
if($show_jotnets) {
call_hooks('jot_networks', $jotnets);
}
// We shouldn't need to prune deadguys from the block list. Either way they can't get the message. // We shouldn't need to prune deadguys from the block list. Either way they can't get the message.
// Also no point enumerating groups and checking them, that will take place on delivery. // Also no point enumerating groups and checking them, that will take place on delivery.
@ -337,6 +342,11 @@ function populate_acl($user = null,$celeb = false) {
'$allowgid' => json_encode($perms['allow_gid']), '$allowgid' => json_encode($perms['allow_gid']),
'$denycid' => json_encode($perms['deny_cid']), '$denycid' => json_encode($perms['deny_cid']),
'$denygid' => json_encode($perms['deny_gid']), '$denygid' => json_encode($perms['deny_gid']),
'$emailcc' => t('CC: email addresses'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$jotnets' => $jotnets,
'$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close'),
'$features' => array( '$features' => array(
"aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false") "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
), ),