diff options
| author | friendica <info@friendica.com> | 2012-12-07 13:35:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-12-07 13:35:45 -0800 |
| commit | 1079c10fa49326e2396685577a4d31faeb174625 (patch) | |
| tree | e607b7a0dfdb5c3fff55ed3f20a433d9d35621f2 /mod/acl.php | |
| parent | c2c048dc59b4d43a7fdaf15d954df712cfc7c3ee (diff) | |
| download | volse-hubzilla-1079c10fa49326e2396685577a4d31faeb174625.tar.gz volse-hubzilla-1079c10fa49326e2396685577a4d31faeb174625.tar.bz2 volse-hubzilla-1079c10fa49326e2396685577a4d31faeb174625.zip | |
progress on the acl selector - it should mostly work, but the returned data isn't yet parsed correctly in mod_item
Diffstat (limited to 'mod/acl.php')
| -rw-r--r-- | mod/acl.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/acl.php b/mod/acl.php index 338996829..76be01ee6 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -114,7 +114,8 @@ function acl_init(&$a){ "type" => "g", "photo" => "images/twopeople.png", "name" => $g['name'], - "id" => $g['hash'], + "id" => $g['id'], + "xid" => $g['hash'], "uids" => explode(",",$g['uids']), "link" => '' ); @@ -122,7 +123,7 @@ function acl_init(&$a){ } if ($type=='' || $type=='c') { - $r = q("SELECT xchan_hash as id, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick + $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), @@ -186,6 +187,7 @@ function acl_init(&$a){ "photo" => $g['micro'], "name" => $g['name'], "id" => $g['id'], + "xid" => $g['hash'], "link" => $g['url'], "nick" => $g['nick'], ); |