aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.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 /Zotlabs/Module/Acl.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 'Zotlabs/Module/Acl.php')
-rw-r--r--Zotlabs/Module/Acl.php19
1 files changed, 18 insertions, 1 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 2b364d9ac..6f5b0ddf9 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -103,7 +103,24 @@ class Acl extends \Zotlabs\Web\Controller {
$contacts = array();
if($type == '' || $type == 'g') {
-
+
+ $r = q("select id, profile_guid, profile_name from profile where is_default = 0 and uid = %d",
+ intval(local_channel())
+ );
+ if($r) {
+ foreach($r as $rv) {
+ $groups[] = array(
+ "type" => "g",
+ "photo" => "images/twopeople.png",
+ "name" => t('Profile','acl') . ' ' . $rv['profile_name'],
+ "id" => 'vp' . $rv['id'],
+ "xid" => 'vp.' . $rv['profile_guid'],
+ "uids" => group_get_profile_members_xchan(local_channel(), $rv['id']),
+ "link" => ''
+ );
+ }
+ }
+
$r = q("SELECT groups.id, groups.hash, groups.gname
FROM groups, group_member
WHERE groups.deleted = 0 AND groups.uid = %d