harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add zat to acl

Browse Source
This commit is contained in:
redmatrix 2016-07-14 20:26:22 -07:00
parent f3eb9af046
commit f70f4a4e85
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Zotlabs/Module/Acl.php
View File

@ -131,11 +131,36 @@ class Acl extends \Zotlabs\Web\Controller {
if($extra_channels_sql != '') if($extra_channels_sql != '')
$extra_channels_sql = " OR (abook_channel IN ($extra_channels_sql)) and abook_hidden = 0 "; $extra_channels_sql = " OR (abook_channel IN ($extra_channels_sql)) and abook_hidden = 0 ";
$r2 = null;
$r1 = q("select * from atoken where atoken_uid = %d",
intval(local_channel())
);
if($r1) {
$r2 = array();
foreach($r1 as $rr) {
$r2[] = [
'id' => 'a' . $rr['atoken_id'] ,
'hash' => $rr['atoken_uid'] . '.' . $rr['atoken_name'],
'name' => $rr['atoken_name'],
'micro' => get_default_profile_photo(48),
'url' => z_root(),
'nick' => t('guest:') . $rr['atoken_name'],
'abook_their_perms' => 0,
'abook_flags' => 0,
'abook_self' => 0
];
}
}
$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, abook_flags, abook_self $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, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash FROM abook left join xchan on abook_xchan = xchan_hash
WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
intval(local_channel()) intval(local_channel())
); );
if($r2)
$r = array_merge($r2,$r);
} }
else { // Visitors else { // Visitors