aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-16 00:03:22 -0700
committerfriendica <info@friendica.com>2013-06-16 00:03:22 -0700
commita37ac8f2f36353bba26ccd2631bf1c85ae6e02da (patch)
treede4ab82ff9a4886cd9683e7819fef7a17e6855da /mod
parentf338da04e13990de57dabc3a284945486f96c741 (diff)
downloadvolse-hubzilla-a37ac8f2f36353bba26ccd2631bf1c85ae6e02da.tar.gz
volse-hubzilla-a37ac8f2f36353bba26ccd2631bf1c85ae6e02da.tar.bz2
volse-hubzilla-a37ac8f2f36353bba26ccd2631bf1c85ae6e02da.zip
flag taggable connections in acl selector
Diffstat (limited to 'mod')
-rw-r--r--mod/acl.php20
1 files changed, 11 insertions, 9 deletions
diff --git a/mod/acl.php b/mod/acl.php
index dea0047f2..df6de13b2 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -123,7 +123,7 @@ function acl_init(&$a){
}
if ($type=='' || $type=='c') {
- $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
+ $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, abook_their_perms
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()),
@@ -142,7 +142,7 @@ function acl_init(&$a){
);
}
elseif($type == 'a') {
- $r = q("SELECT abook_id as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag FROM abook left join xchan on abook_xchan = xchan_hash
+ $r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d
$sql_extra3
ORDER BY xchan_name ASC ",
@@ -196,13 +196,15 @@ function acl_init(&$a){
if(count($r)) {
foreach($r as $g){
$contacts[] = array(
- "type" => "c",
- "photo" => $g['micro'],
- "name" => $g['name'],
- "id" => $g['id'],
- "xid" => $g['hash'],
- "link" => $g['nick'],
- "nick" => substr($g['nick'],0,strpos($g['nick'],'@'))
+ "type" => "c",
+ "photo" => $g['micro'],
+ "name" => $g['name'],
+ "id" => $g['id'],
+ "xid" => $g['hash'],
+ "link" => $g['nick'],
+ "nick" => substr($g['nick'],0,strpos($g['nick'],'@')),
+ "network" => '',
+ "taggable" => (($g['abook_their_perms'] & PERMS_W_TAGWALL) ? 'taggable' : '')
);
}
}