include jotnets in populate_acl

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index b2c4b31c8132e60161c63a747ac840586d566326..e0055f1c68945712a27ee512f992762a0a8cb2a7 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -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);
 
+       $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.
        // 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']),
                '$denycid' => json_encode($perms['deny_cid']),
                '$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(
                        "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
                ),