diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2014-03-09 04:15:11 +0100 |
| commit | 76ab9403af3b562531a7eb0831e5a7ecc9aedb38 (patch) | |
| tree | c4d74f0cc8aac0fcd5a52520170a64c8d4b01395 /mod/zfinger.php | |
| parent | e8e980c8175be6dae7d642d9707493c465b7137b (diff) | |
| parent | 80e381176e1e301782bc56cbb7c6037825eddf2d (diff) | |
| download | volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.gz volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.bz2 volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.zip | |
merge
Diffstat (limited to 'mod/zfinger.php')
| -rw-r--r-- | mod/zfinger.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php index 94671271b..4f59c1973 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -176,10 +176,21 @@ 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); + + if($ztarget_hash) { + $permissions['connected'] = false; + $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); |