Merge remote-tracking branch 'upstream/master'

1 files changed, 25 insertions, 0 deletions

diff --git a/include/Contact.php b/include/Contact.php
index b9ad1e4cb..992ed27e2 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,6 +1,31 @@
 <?php /** @file */
 
 
+
+function rconnect_url($channel_id,$xchan) {
+
+	if(! $xchan)
+		return '';
+
+	$r = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' limit 1",
+		intval($channel_id),
+		dbesc($xchan)
+	);
+
+	if($r)
+		return '';
+
+	$r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d ) limit 1",
+		dbesc($xchan),
+		intval(HUBLOC_FLAGS_PRIMARY)
+	);
+
+	if($r)
+		return $r[0]['hubloc_url'];
+	return '';
+
+}
+
 function abook_connections($channel_id, $sql_conditions = '') {
 	$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d
 		and not ( abook_flags & %d ) $sql_conditions",