aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-10-12 20:28:48 +0000
committerMario <mario@mariovavti.com>2020-10-12 20:28:48 +0000
commit5f93157d5a5cc824d98c39d1983d882df0a13067 (patch)
tree756c32aae616b7d7ce53e5b80fdf269dc1d54d2b
parent8d3c201830020d63a5204df04fdcb2ae04bf2b0f (diff)
downloadvolse-hubzilla-5f93157d5a5cc824d98c39d1983d882df0a13067.tar.gz
volse-hubzilla-5f93157d5a5cc824d98c39d1983d882df0a13067.tar.bz2
volse-hubzilla-5f93157d5a5cc824d98c39d1983d882df0a13067.zip
improve find_best_identity() and fix wrong variable
-rw-r--r--Zotlabs/Lib/Activity.php17
-rw-r--r--Zotlabs/Lib/Libzot.php4
2 files changed, 13 insertions, 8 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index f3885033b..4886f9239 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -3185,14 +3185,19 @@ class Activity {
}
static function find_best_identity($xchan) {
- $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s'",
- dbesc($xchan)
- );
- if ($r) {
- $r = Libzot::zot_record_preferred($r);
- return $r['hubloc_hash'];
+
+ if(filter_var($xchan, FILTER_VALIDATE_URL)) {
+ $r = q("select hubloc_hash, hubloc_network from hubloc where hubloc_id_url = '%s'",
+ dbesc($xchan)
+ );
+ if ($r) {
+ $r = Libzot::zot_record_preferred($r);
+ return $r['hubloc_hash'];
+ }
}
+
return $xchan;
+
}
}
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index fb64626d6..654b0461b 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1469,8 +1469,8 @@ class Libzot {
// Make sure we use the zot6 identity where applicable
- $msg_arr['author_xchan'] = Activity::find_best_identity($msg_arr['author_xchan']);
- $msg_arr['owner_xchan'] = Activity::find_best_identity($msg_arr['owner_xchan']);
+ $arr['author_xchan'] = Activity::find_best_identity($arr['author_xchan']);
+ $arr['owner_xchan'] = Activity::find_best_identity($arr['owner_xchan']);
// We've validated the sender. Now make sure that the sender is the owner or author