From 0dd06b736a227196154332168d29f6c807819a83 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 31 Oct 2012 18:05:36 -0700
Subject: need to accomodate different webbies on different hubs

---
 include/identity.php | 5 +++--
 install/database.sql | 4 +++-
 mod/zfinger.php      | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index e05aaba30..b0a99a744 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -100,12 +100,13 @@ function create_identity($arr) {
 
 	// Create a verified hub location pointing to this site.
 
-	$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_flags, 
+	$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, 
 		hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey )
-		values ( '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )",
+		values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )",
 		dbesc($guid),
 		dbesc($sig),
 		dbesc($hash),
+		dbesc($ret['channel']['channel_address'] . '@' . get_app()->get_hostname()),
 		intval(($primary) ? HUBLOC_FLAGS_PRIMARY : 0),
 		dbesc(z_root()),
 		dbesc(base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey']))),
diff --git a/install/database.sql b/install/database.sql
index e73a34c29..9feadf86b 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -469,6 +469,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   `hubloc_guid` char(255) NOT NULL DEFAULT '',
   `hubloc_guid_sig` text NOT NULL,
   `hubloc_hash` char(255) NOT NULL,
+  `hubloc_addr` char(255) NOT NULL DEFAULT '',
   `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `hubloc_url` char(255) NOT NULL DEFAULT '',
   `hubloc_url_sig` text NOT NULL,
@@ -481,7 +482,8 @@ CREATE TABLE IF NOT EXISTS `hubloc` (
   KEY `hubloc_guid` (`hubloc_guid`),
   KEY `hubloc_flags` (`hubloc_flags`),
   KEY `hubloc_connect` (`hubloc_connect`),
-  KEY `hubloc_host` (`hubloc_host`)
+  KEY `hubloc_host` (`hubloc_host`),
+  KEY `hubloc_addr` (`hubloc_addr`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `intro` (
diff --git a/mod/zfinger.php b/mod/zfinger.php
index c1abeedc9..4e935b723 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -79,6 +79,7 @@ function zfinger_init(&$a) {
 					'url'      => $hub['hubloc_url'],
 					'url_sig'  => $hub['hubloc_url_sig'],
 					'host'     => $hub['hubloc_host'],
+					'address'  => $hub['hubloc_addr'],
 					'callback' => $hub['hubloc_callback'],
 					'sitekey'  => $hub['hubloc_sitekey']
 				);
-- 
cgit v1.2.3