From ff43d62e445422a40271855dcd9933499da501fa Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Oct 2012 03:13:57 -0700 Subject: add hash to channel structure for consistency/redundancy --- mod/zperms.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mod/zperms.php') 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)) { -- cgit v1.2.3