Merge branch 'master' into z6

1 files changed, 18 insertions, 0 deletions

diff --git a/include/hubloc.php b/include/hubloc.php
index 0daa5908c..0d1a2e560 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -257,6 +257,24 @@ function hubloc_mark_as_down($posturl) {
 }
 
 
+/**
+ * @brief return comma separated string of non-dead clone locations (net addresses) for a given netid
+ *
+ * @param string $netid network identity (typically xchan_hash or hubloc_hash)
+ * @return string
+ */ 
+
+function locations_by_netid($netid) {
+
+	$locs = q("select hubloc_addr as location from hubloc left join site on hubloc_url = site_url where hubloc_hash = '%s' and hubloc_deleted = 0 and site_dead = 0",
+		dbesc($netid)
+	);
+
+	return array_elm_to_str($locs,'location',', ');
+
+}
+
+
 
 function ping_site($url) {