some anomolies found when viewing connections in various cases.

This commit is contained in:
friendica
2014-03-02 19:40:59 -08:00
parent b98ddc69de
commit 7baeb45183
5 changed files with 78 additions and 8 deletions

View File

@@ -176,10 +176,22 @@ function zfinger_init(&$a) {
$ret['follow_url'] = z_root() . '/follow?f=&url=%s';
$permissions = get_all_perms($e['channel_id'],(($ztarget && $zsig)
$ztarget_hash = (($ztarget && $zsig)
? base64url_encode(hash('whirlpool',$ztarget . $zsig,true))
: '' ),false);
: '' );
$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false);
$permissions['connected'] = false;
if($ztarget_hash) {
$b = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($ztarget_hash),
intval($e['channel_id'])
);
if($b)
$permissions['connected'] = true;
}
$ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions);