aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2023-02-15 13:33:23 +0000
committerMario <mario@mariovavti.com>2023-02-15 13:33:23 +0000
commit09a60774d746de57d6f9e479a1f6cf70c691f031 (patch)
tree1c93fee3a5a88b4cbcd9d9b9237451cf2fee99a1 /include
parent1ca988b177834467671137c94f17a5948b465f6f (diff)
downloadvolse-hubzilla-09a60774d746de57d6f9e479a1f6cf70c691f031.tar.gz
volse-hubzilla-09a60774d746de57d6f9e479a1f6cf70c691f031.tar.bz2
volse-hubzilla-09a60774d746de57d6f9e479a1f6cf70c691f031.zip
we can sign messages which are not from the primary location
Diffstat (limited to 'include')
-rw-r--r--include/channel.php2
-rw-r--r--include/hubloc.php8
-rw-r--r--include/text.php4
3 files changed, 11 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php
index 296615524..c36e50f19 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -3086,6 +3086,6 @@ function channel_url($channel) {
}
function get_channel_hashes() {
- $r = q("SELECT channel_hash FROM channel WHERE channel_removed = 0");
+ $r = dbq("SELECT channel_hash FROM channel WHERE channel_removed = 0");
return flatten_array_recursive($r);
}
diff --git a/include/hubloc.php b/include/hubloc.php
index 0236e4ae7..4d2980a6b 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -392,3 +392,11 @@ function z6_discover() {
}
}
+
+function get_hubloc_id_urls_by_x($xchan) {
+ $r = q("SELECT hubloc_id_url FROM hubloc WHERE hubloc_deleted = 0 AND hubloc_hash = '%s' order by hubloc_primary desc",
+ dbesc($xchan)
+ );
+ return flatten_array_recursive($r);
+}
+
diff --git a/include/text.php b/include/text.php
index 35ce465d6..a09d1bd7b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2621,13 +2621,13 @@ function xchan_query(&$items, $abook = true, $effective_uid = 0) {
if(count($arr)) {
if($abook) {
$chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash and abook_channel = %d
- where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1",
+ where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_deleted = 0 order by hubloc_primary desc",
intval($item['uid'])
);
}
else {
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
- where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_primary = 1");
+ where xchan_hash in (" . protect_sprintf(implode(',', $arr)) . ") and hubloc_deleted = 0 order by hubloc_primary desc");
}
$xchans = q("select * from xchan where xchan_hash in (" . protect_sprintf(implode(',',$arr)) . ") and xchan_network in ('rss','unknown', 'anon', 'token')");
if(! $chans)