aboutsummaryrefslogtreecommitdiffstats
path: root/include/Contact.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/Contact.php')
-rw-r--r--include/Contact.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php
index 6b0ffe4f7..992ed27e2 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -3,20 +3,27 @@
function rconnect_url($channel_id,$xchan) {
+
if(! $xchan)
return '';
- $r = q("select abook_id from abook where abook_channel_id = %d and abook_xchan = '%s' limit 1",
+
+ $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 & HUBLOC_FLAGS_PRIMARY) limit 1",
- dbesc($xchan)
+
+ $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 = '') {