basic hub registration

2 files changed, 18 insertions, 15 deletions

diff --git a/mod/post.php b/mod/post.php
index c44e6114d..a33c44e57 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -15,16 +15,16 @@ function post_post(&$a) {
 
 	if($msgtype === 'notify') {
 
-		$hub = zot_gethub($_REQUEST['guid']);
+		$hub = zot_gethub($_REQUEST);
 		if(! $hub) {
 			$result = zot_register_hub($_REQUEST);
-			if(! $result) {
+			if((! $result) || (! zot_gethub($_REQUEST))) {
 				$ret['message'] = 'Hub not available.';
-				json_return_and_dir($ret);
+				json_return_and_die($ret);
 			}
 		}
-		// check which hub is primary and take action if mismatched
 
+		// check which hub is primary and take action if mismatched
 
 		// add to receive queue
 		// qreceive_add($_REQUEST);
diff --git a/mod/zfinger.php b/mod/zfinger.php
index 1da5c613b..77d9555d3 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -25,27 +25,30 @@ function zfinger_init(&$a) {
 
 		$ret['success'] = true;
 
+		// Communication details
+
 		$ret['guid'] = $e['entity_global_id'];
-		$ret['url'] = z_root();
-		$ret['primary'] = (bool) $e['entity_primary'];
-		$ret['callback'] = z_root() . '/' . 'post';
-		$ret['sitekey'] = get_config('system','pubkey');
-		$ret['key'] = $e['pubkey'];
+		$ret['key']  = $e['pubkey'];
+
+		// array of (verified) hubs this entity uses
 
 		$ret['hubs'] = array();
 		$x = zot_get_hubloc(array($e['entity_global_id']));
 		if($x && count($x)) {
 			foreach($x as $hub) {
-				$ret['hubs'][] = array(
-						'primary' => (bool) $hub['hubloc_primary'],
-						'url' => $hub['hubloc_url'],
+				if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) {
+					$ret['hubs'][] = array(
+						'primary'  => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false),
+						'url'      => $hub['hubloc_url'],
 						'callback' => $hub['hubloc_callback'],
-						'sitekey' => $hub['hubloc_sitekey']
-				);
+						'sitekey'  => $hub['hubloc_sitekey']
+					);
+				}
 			}
 		}
 
-			// more stuff
+
+		// more stuff, e.g. the basic public profile
 
 		json_return_and_die($ret);