consolidate hubloc storage

11 files changed, 97 insertions, 62 deletions

diff --git a/include/Import/refimport.php b/include/Import/refimport.php
index 3ef8870ac..04540a9bd 100644
--- a/include/Import/refimport.php
+++ b/include/Import/refimport.php
@@ -1,7 +1,6 @@
 <?php
 
 require_once('include/html2bbcode.php');
-require_once('include/hubloc.php');
 
 // Sample module for importing conversation data from Reflection CMS. Some preparation was used to 
 // dump relevant posts, categories and comments into individual JSON files, and also JSON dump of 
diff --git a/include/api_zot.php b/include/api_zot.php
index 0881211d0..0b10555a6 100644
--- a/include/api_zot.php
+++ b/include/api_zot.php
@@ -350,7 +350,6 @@
 		if(api_user() === false)
 			return false;
 		logger('api_xchan');
-		require_once('include/hubloc.php');
 
 		if($_SERVER['REQUEST_METHOD'] === 'POST') {			
 			$r = xchan_store($_REQUEST);
diff --git a/include/bbcode.php b/include/bbcode.php
index b8d732443..c0033f280 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -7,7 +7,7 @@
 require_once('include/oembed.php');
 require_once('include/event.php');
 require_once('include/zot.php');
-require_once('include/hubloc.php');
+
 
 function tryoembed($match) {
 	$url = ((count($match) == 2) ? $match[1] : $match[2]);
diff --git a/include/bookmarks.php b/include/bookmarks.php
index c6e8e86f2..0db103054 100644
--- a/include/bookmarks.php
+++ b/include/bookmarks.php
@@ -23,7 +23,6 @@ function bookmark_add($channel,$sender,$taxonomy,$private,$opts = null) {
 	$iarr['mitem_desc'] = $taxonomy['term'];
 	$iarr['mitem_flags'] = (($ischat) ? MENU_ITEM_CHATROOM : 0);
 
-	require_once('include/hubloc.php');
 	$zrl = is_matrix_url($taxonomy['url']);
 
 	if($zrl)
diff --git a/include/channel.php b/include/channel.php
index d2ef89cc8..10c38a5ac 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -291,20 +291,21 @@ 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_addr, hubloc_primary,
-		hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
-		values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
-		dbesc($guid),
-		dbesc($sig),
-		dbesc($hash),
-		dbesc(channel_reddress($ret['channel'])),
-		intval($primary),
-		dbesc(z_root()),
-		dbesc(base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey']))),
-		dbesc(App::get_hostname()),
-		dbesc(z_root() . '/post'),
-		dbesc(get_config('system','pubkey')),
-		dbesc('zot')
+	$r = hubloc_store_lowlevel(
+		[
+			'hubloc_guid'     => $guid,
+			'hubloc_guid_sig' => $sig,
+			'hubloc_hash'     => $hash,
+			'hubloc_addr'     => channel_reddress($ret['channel']),
+			'hubloc_primary'  => $primary,
+			'hubloc_url'      => z_root(),
+			'hubloc_url_sig'  => base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey'])),
+			'hubloc_host'     => App::get_hostname(),
+			'hubloc_callback' => z_root() . '/post',
+			'hubloc_sitekey'  => get_config('system','pubkey'),
+			'hubloc_network'  => 'zot',
+			'hubloc_updated'  => datetime_convert()
+		]
 	);
 	if(! $r)
 		logger('create_identity: Unable to store hub location');
diff --git a/include/hubloc.php b/include/hubloc.php
index 4da92ae72..e17be028c 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -1,5 +1,36 @@
 <?php /** @file */
 
+
+function hubloc_store_lowlevel($arr) {
+
+	$store = [
+		'hubloc_guid'        => ((array_key_exists('hubloc_guid',$arr))        ? $arr['hubloc_guid']        : ''),
+		'hubloc_guid_sig'    => ((array_key_exists('hubloc_guid_sig',$arr))    ? $arr['hubloc_guid_sig']    : ''),
+		'hubloc_hash'        => ((array_key_exists('hubloc_hash',$arr))        ? $arr['hubloc_hash']        : ''),
+		'hubloc_addr'        => ((array_key_exists('hubloc_addr',$arr))        ? $arr['hubloc_addr']        : ''),
+		'hubloc_network'     => ((array_key_exists('hubloc_network',$arr))     ? $arr['hubloc_network']     : ''),
+		'hubloc_flags'       => ((array_key_exists('hubloc_flags',$arr))       ? $arr['hubloc_flags']       : 0),
+		'hubloc_status'      => ((array_key_exists('hubloc_status',$arr))      ? $arr['hubloc_status']      : 0),
+		'hubloc_url'         => ((array_key_exists('hubloc_url',$arr))         ? $arr['hubloc_url']         : ''),
+		'hubloc_url_sig'     => ((array_key_exists('hubloc_url_sig',$arr))     ? $arr['hubloc_url_sig']     : ''),
+		'hubloc_host'        => ((array_key_exists('hubloc_host',$arr))        ? $arr['hubloc_host']        : ''),
+		'hubloc_callback'    => ((array_key_exists('hubloc_callback',$arr))    ? $arr['hubloc_callback']    : ''),
+		'hubloc_connect'     => ((array_key_exists('hubloc_connect',$arr))     ? $arr['hubloc_connect']     : ''),
+		'hubloc_sitekey'     => ((array_key_exists('hubloc_sitekey',$arr))     ? $arr['hubloc_sitekey']     : ''),
+		'hubloc_updated'     => ((array_key_exists('hubloc_updated',$arr))     ? $arr['hubloc_updated']     : NULL_DATE),
+		'hubloc_connected'   => ((array_key_exists('hubloc_connected',$arr))   ? $arr['hubloc_connected']   : NULL_DATE),
+		'hubloc_primary'     => ((array_key_exists('hubloc_primary',$arr))     ? $arr['hubloc_primary']     : 0),
+		'hubloc_orphancheck' => ((array_key_exists('hubloc_orphancheck',$arr)) ? $arr['hubloc_orphancheck'] : 0),
+		'hubloc_error'       => ((array_key_exists('hubloc_error',$arr))       ? $arr['hubloc_error']       : 0),
+		'hubloc_deleted'     => ((array_key_exists('hubloc_deleted',$arr))     ? $arr['hubloc_deleted']     : 0)
+	];
+
+	return create_table_from_array('hubloc',$store);
+
+}
+
+
+
 function prune_hub_reinstalls() {
 
 	$r = q("select site_url from site where site_type = %d",
diff --git a/include/network.php b/include/network.php
index 9049d016b..66716ef9e 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1469,15 +1469,18 @@ function discover_by_webbie($webbie) {
 		);
 
 		if(! $r) {
-			$r = q("insert into hubloc ( hubloc_guid, hubloc_hash, hubloc_addr, hubloc_network, hubloc_url, hubloc_host, hubloc_callback, hubloc_updated, hubloc_primary ) values ('%s','%s','%s','%s','%s','%s','%s','%s', 1)",
-				dbesc(($diaspora_guid) ? $diaspora_guid : $location),
-				dbesc($address),
-				dbesc($address),
-				dbesc($network),
-				dbesc($base),
-				dbesc($host),
-				dbesc($notify),
-				dbescdate(datetime_convert())
+			$r = hubloc_store_lowlevel(
+				[
+					'hubloc_guid'     => (($diaspora_guid) ? $diaspora_guid : $location),
+					'hubloc_hash'     => $address,
+					'hubloc_addr'     => $address,
+					'hubloc_network'  => $network,
+					'hubloc_url'      => $base,
+					'hubloc_host'     => $host,
+					'hubloc_callback' => $notify,
+					'hubloc_updated'  => datetime_convert(),
+					'hubloc_primary'  => 1
+				]
 			);
 		}
 		$photos = import_xchan_photo($avatar,$address);
diff --git a/include/oembed.php b/include/oembed.php
index 58ad29291..aac7d15b4 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -2,8 +2,6 @@
 
 use Zotlabs\Lib as Zlib;
 
-require_once('include/hubloc.php');
-
 
 function oembed_replacecb($matches){
 
diff --git a/include/text.php b/include/text.php
index 1beefc6eb..4f0dc869b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -4,7 +4,7 @@
  */
 
 require_once("include/bbcode.php");
-require_once('include/hubloc.php');
+
 
 // random string, there are 86 characters max in text mode, 128 for hex
 // output is urlsafe
diff --git a/include/zid.php b/include/zid.php
index ac6433e4c..f5df1c611 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -170,7 +170,7 @@ function zidify_text($s) {
  * @return string
  */
 function red_zrl_callback($matches) {
-	require_once('include/hubloc.php');
+
 	$zrl = is_matrix_url($matches[2]);
 
 	$t = strip_zids($matches[2]);
@@ -215,7 +215,7 @@ function red_unescape_codeblock($m) {
 
 
 function red_zrlify_img_callback($matches) {
-	require_once('include/hubloc.php');
+
 	$zrl = is_matrix_url($matches[2]);
 
 	$t = strip_zids($matches[2]);
diff --git a/include/zot.php b/include/zot.php
index 1538e956e..094b50b72 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -10,7 +10,6 @@
 
 require_once('include/crypto.php');
 require_once('include/items.php');
-require_once('include/hubloc.php');
 require_once('include/queue_fn.php');
 require_once('include/perm_upgrade.php');
 
@@ -2469,22 +2468,25 @@ function sync_locations($sender, $arr, $absolute = false) {
 				);
 			}
 			logger('sync_locations: new hub: ' . $location['url']);
-			$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected)
-					values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')",
-				dbesc($sender['guid']),
-				dbesc($sender['guid_sig']),
-				dbesc($sender['hash']),
-				dbesc($location['address']),
-				dbesc('zot'),
-				intval($location['primary']),
-				dbesc($location['url']),
-				dbesc($location['url_sig']),
-				dbesc($location['host']),
-				dbesc($location['callback']),
-				dbesc($location['sitekey']),
-				dbesc(datetime_convert()),
-				dbesc(datetime_convert())
+
+			$r = hubloc_store_lowlevel(
+				[
+					'hubloc_guid'      => $sender['guid'],
+					'hubloc_guid_sig'  => $sender['guid_sig'],
+					'hubloc_hash'      => $sender['hash'],
+					'hubloc_addr'      => $location['address'],
+					'hubloc_network'   => 'zot',
+					'hubloc_primary'   => $location['primary'],
+					'hubloc_url'       => $location['url'],
+					'hubloc_url_sig'   => $location['url_sig'],
+					'hubloc_host'      => $location['host'],
+					'hubloc_callback'  => $location['callback'],
+					'hubloc_sitekey'   => $location['sitekey'],
+					'hubloc_updated'   => datetime_convert(),
+					'hubloc_connected' => datetime_convert()
+				]
 			);
+
 			$what .= 'newhub ';
 			$changed = true;
 
@@ -4057,21 +4059,24 @@ function check_zotinfo($channel,$locations,&$ret) {
 			q("delete from hubloc where hubloc_hash = '%s'",
 				dbesc($channel['channel_hash'])
 			);
-			$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_primary,
-				hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
-				values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
-				dbesc($channel['channel_guid']),
-				dbesc($channel['channel_guid_sig']),
-				dbesc($channel['channel_hash']),
-				dbesc(channel_reddress($channel)),
-				intval(1),
-				dbesc(z_root()),
-				dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))),
-				dbesc(App::get_hostname()),
-				dbesc(z_root() . '/post'),
-				dbesc(get_config('system','pubkey')),
-				dbesc('zot')
+
+			$r = hubloc_store_lowelevel(
+				[
+					'hubloc_guid'     => $channel['channel_guid'],
+					'hubloc_guid_sig' => $channel['channel_guid_sig'],
+					'hubloc_hash'     => $channel['channel_hash'],
+					'hubloc_addr'     => channel_reddress($channel),
+					'hubloc_network'  => 'zot',
+					'hubloc_primary'  => 1,
+					'hubloc_url'      => z_root(),
+					'hubloc_url_sig'  => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey'])),
+					'hubloc_host'     => App::get_hostname(),
+					'hubloc_callback' => z_root() . '/post',
+					'hubloc_sitekey'  => get_config('system','pubkey'),
+					'hubloc_updated'  => datetime_convert(),
+				]
 			);
+
 			if($r) {
 				$x = zot_encode_locations($channel);
 				if($x) {