diff options
| author | friendica <info@friendica.com> | 2012-10-04 03:13:57 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-10-04 03:13:57 -0700 |
| commit | ff43d62e445422a40271855dcd9933499da501fa (patch) | |
| tree | 2a44942f74e86f1a0f1ad240dc040689a3a776d6 /mod | |
| parent | e124c9fa5ca046d48eb927fe80706cf6d42f6bff (diff) | |
| download | volse-hubzilla-ff43d62e445422a40271855dcd9933499da501fa.tar.gz volse-hubzilla-ff43d62e445422a40271855dcd9933499da501fa.tar.bz2 volse-hubzilla-ff43d62e445422a40271855dcd9933499da501fa.zip | |
add hash to channel structure for consistency/redundancy
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/zfinger.php | 8 | ||||
| -rw-r--r-- | mod/zperms.php | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mod/zfinger.php b/mod/zfinger.php index 95c17ecd8..e76255032 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -13,7 +13,7 @@ function zfinger_init(&$a) { $r = null; if(strlen($zguid)) { - $r = q("select * from channel where channel_global_id = '%s' limit 1", + $r = q("select * from channel where channel_guid = '%s' limit 1", dbesc($zguid) ); } @@ -49,8 +49,8 @@ function zfinger_init(&$a) { // Communication details - $ret['guid'] = $e['channel_global_id']; - $ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_global_id'],$e['channel_prvkey'])); + $ret['guid'] = $e['channel_guid']; + $ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_guid'],$e['channel_prvkey'])); $ret['key'] = $e['channel_pubkey']; $ret['name'] = $e['channel_name']; $ret['address'] = $e['channel_address']; @@ -60,7 +60,7 @@ function zfinger_init(&$a) { // array of (verified) hubs this channel uses $ret['hubs'] = array(); - $x = zot_get_hubloc(array($e['channel_global_id'])); + $x = zot_get_hubloc(array($e['channel_guid'])); if($x && count($x)) { foreach($x as $hub) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { diff --git a/mod/zperms.php b/mod/zperms.php index de1d4dd6d..6a7097cd6 100644 --- a/mod/zperms.php +++ b/mod/zperms.php @@ -16,7 +16,7 @@ function zperms_init(&$a) { $r = null; if(strlen($zguid)) { - $r = q("select * from channel where channel_global_id = '%s' limit 1", + $r = q("select * from channel where channel_guid = '%s' limit 1", dbesc($zguid) ); } @@ -49,8 +49,8 @@ function zperms_init(&$a) { $ret['success'] = true; - $ret['guid'] = $e['channel_global_id']; - $ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_global_id'],$e['channel_prvkey'])); + $ret['guid'] = $e['channel_guid']; + $ret['guid_sig'] = base64url_encode(rsa_sign($e['channel_guid'],$e['channel_prvkey'])); $ret['key'] = $e['channel_pubkey']; $ret['name'] = $e['channel_name']; $ret['address'] = $e['channel_address']; @@ -63,7 +63,7 @@ function zperms_init(&$a) { // array of (verified) hubs this channel uses $ret['hubs'] = array(); - $x = zot_get_hubloc(array($e['channel_global_id'])); + $x = zot_get_hubloc(array($e['channel_guid'])); if($x && count($x)) { foreach($x as $hub) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { |