aboutsummaryrefslogtreecommitdiffstats
path: root/include/acl_selectors.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2017-02-13 20:38:11 -0500
committerAndrew Manning <tamanning@zoho.com>2017-02-13 20:38:11 -0500
commit69b08a20625ab49fb562f47a651cff7d554d000e (patch)
tree0b68c79a135cdc6da5c0f4df5fa32e133c97b615 /include/acl_selectors.php
parent05fd5eb8be51ca1fee7b9ec108e87d3599833797 (diff)
parent8ed0913df61abdc9963a3f3e1b181ce695e273b5 (diff)
downloadvolse-hubzilla-69b08a20625ab49fb562f47a651cff7d554d000e.tar.gz
volse-hubzilla-69b08a20625ab49fb562f47a651cff7d554d000e.tar.bz2
volse-hubzilla-69b08a20625ab49fb562f47a651cff7d554d000e.zip
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include/acl_selectors.php')
-rw-r--r--include/acl_selectors.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index dcf0fe9a2..09c24f82c 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -174,6 +174,16 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
$custom = false;
}
+ $r = q("SELECT id, profile_guid, profile_name from profile where is_default = 0 and uid = %d order by profile_name",
+ intval(local_channel())
+ );
+ if($r) {
+ foreach($r as $rv) {
+ $selected = (($single_group && 'vp.' . $rr['hash'] === $allow_gid[0]) ? ' selected = "selected" ' : '');
+ $groups .= '<option id="' . 'vp' . $rv['id'] . '" value="' . 'vp.' . $rv['profile_guid'] . '"' . $selected . '>' . t('Profile','acl') . ' ' . $rv['profile_name'] . '</option>' . "\r\n";
+ }
+ }
+
$r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
intval(local_channel())
);