populate new fields

2 files changed, 47 insertions, 16 deletions

diff --git a/include/channel.php b/include/channel.php
index 22cdb9fe7..030efffb9 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -10,6 +10,7 @@ use Zotlabs\Access\Permissions;
 use Zotlabs\Daemon\Master;
 use Zotlabs\Lib\System;
 use Zotlabs\Render\Comanche;
+use Zotlabs\Lib\Zotlib;
 
 require_once('include/zot.php');
 require_once('include/crypto.php');
@@ -232,6 +233,7 @@ function create_identity($arr) {
 
 	$sig = base64url_encode(rsa_sign($guid,$key['prvkey']));
 	$hash = make_xchan_hash($guid,$sig);
+	$zhash = Zotlib::make_xchan_hash($guid,$key['pubkey']);
 
 	// Force a few things on the short term until we can provide a theme or app with choice
 
@@ -265,6 +267,7 @@ function create_identity($arr) {
 			'channel_guid'        => $guid,
 			'channel_guid_sig'    => $sig,
 			'channel_hash'        => $hash,
+			'channel_portable_id' => $zhash,
 			'channel_prvkey'      => $key['prvkey'],
 			'channel_pubkey'      => $key['pubkey'],
 			'channel_pageflags'   => intval($pageflags),
@@ -345,27 +348,48 @@ function create_identity($arr) {
 	if(! $r)
 		logger('Unable to store hub location');
 
+	$r = hubloc_store_lowlevel(
+		[
+			'hubloc_guid'     => $guid,
+			'hubloc_guid_sig' => 'sha256.' . $sig,
+			'hubloc_hash'     => $zhash,
+			'hubloc_addr'     => channel_reddress($ret['channel']),
+			'hubloc_primary'  => intval($primary),
+			'hubloc_url'      => z_root(),
+			'hubloc_url_sig'  => 'sha256.' . base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey'])),
+			'hubloc_host'     => App::get_hostname(),
+			'hubloc_callback' => z_root() . '/zot',
+			'hubloc_sitekey'  => get_config('system','pubkey'),
+			'hubloc_network'  => 'zot6',
+			'hubloc_updated'  => datetime_convert()
+		]
+	);
+	if(! $r)
+		logger('Unable to store hub location');
+
+
 	$newuid = $ret['channel']['channel_id'];
 
 	$r = xchan_store_lowlevel(
 		[
-			'xchan_hash'       => $hash,
-			'xchan_guid'       => $guid,
-			'xchan_guid_sig'   => $sig,
-			'xchan_pubkey'     => $key['pubkey'],
+			'xchan_hash'        => $hash,
+			'xchan_portable_id' => $zhash,
+			'xchan_guid'        => $guid,
+			'xchan_guid_sig'    => $sig,
+			'xchan_pubkey'      => $key['pubkey'],
 			'xchan_photo_mimetype' => (($photo_type) ? $photo_type : 'image/png'),
-			'xchan_photo_l'    => z_root() . "/photo/profile/l/{$newuid}",
-			'xchan_photo_m'    => z_root() . "/photo/profile/m/{$newuid}",
-			'xchan_photo_s'    => z_root() . "/photo/profile/s/{$newuid}",
-			'xchan_addr'       => channel_reddress($ret['channel']),
-			'xchan_url'        => z_root() . '/channel/' . $ret['channel']['channel_address'],
-			'xchan_follow'     => z_root() . '/follow?f=&url=%s',
-			'xchan_connurl'    => z_root() . '/poco/' . $ret['channel']['channel_address'],
-			'xchan_name'       => $ret['channel']['channel_name'],
-			'xchan_network'    => 'zot',
-			'xchan_photo_date' => datetime_convert(),
-			'xchan_name_date'  => datetime_convert(),
-			'xchan_system'     => $system
+			'xchan_photo_l'     => z_root() . "/photo/profile/l/{$newuid}",
+			'xchan_photo_m'     => z_root() . "/photo/profile/m/{$newuid}",
+			'xchan_photo_s'     => z_root() . "/photo/profile/s/{$newuid}",
+			'xchan_addr'        => channel_reddress($ret['channel']),
+			'xchan_url'         => z_root() . '/channel/' . $ret['channel']['channel_address'],
+			'xchan_follow'      => z_root() . '/follow?f=&url=%s',
+			'xchan_connurl'     => z_root() . '/poco/' . $ret['channel']['channel_address'],
+			'xchan_name'        => $ret['channel']['channel_name'],
+			'xchan_network'     => 'zot',
+			'xchan_photo_date'  => datetime_convert(),
+			'xchan_name_date'   => datetime_convert(),
+			'xchan_system'      => $system
 		]
 	);
 
@@ -2355,6 +2379,7 @@ function channel_store_lowlevel($arr) {
 		'channel_guid'            => ((array_key_exists('channel_guid',$arr))            ? $arr['channel_guid']            : ''),
 		'channel_guid_sig'        => ((array_key_exists('channel_guid_sig',$arr))        ? $arr['channel_guid_sig']        : ''),
 		'channel_hash'            => ((array_key_exists('channel_hash',$arr))            ? $arr['channel_hash']            : ''),
+		'channel_portable_id'     => ((array_key_exists('channel_portable_id',$arr))     ? $arr['channel_portable_id']     : ''),
 		'channel_timezone'        => ((array_key_exists('channel_timezone',$arr))        ? $arr['channel_timezone']        : 'UTC'),
 		'channel_location'        => ((array_key_exists('channel_location',$arr))        ? $arr['channel_location']        : ''),
 		'channel_theme'           => ((array_key_exists('channel_theme',$arr))           ? $arr['channel_theme']           : ''),
diff --git a/include/xchan.php b/include/xchan.php
index eb5f1b4a3..5516d046f 100644
--- a/include/xchan.php
+++ b/include/xchan.php
@@ -5,8 +5,14 @@ use Zotlabs\Zot6\HTTPSig;
 
 function xchan_store_lowlevel($arr) {
 
+	if(! $arr['xchan_hash']) {
+		logger('No xchan_hash');
+		return false;
+	}
+
 	$store = [
 		'xchan_hash' => ((array_key_exists('xchan_hash',$arr)) ? $arr['xchan_hash'] : ''),
+		'xchan_portable_id' => ((array_key_exists('xchan_portable_id',$arr)) ? $arr['xchan_portable_id'] : ''),
 		'xchan_guid' => ((array_key_exists('xchan_guid',$arr)) ? $arr['xchan_guid'] : ''),
 		'xchan_guid_sig' => ((array_key_exists('xchan_guid_sig',$arr)) ? $arr['xchan_guid_sig'] : ''),
 		'xchan_pubkey' => ((array_key_exists('xchan_pubkey',$arr)) ? $arr['xchan_pubkey'] : ''),