diff options
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Lib/Queue.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Zot_probe.php | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 0c25605e7..7663131bb 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -567,7 +567,7 @@ class Activity { } } } - $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d limit 1", + $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", intval($i['parent']) ); if ($d) { @@ -980,7 +980,7 @@ class Activity { } } - $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d limit 1", + $d = q("select hubloc.* from hubloc left join item on hubloc_hash = owner_xchan where item.id = %d and hubloc_deleted = 0 order by hubloc_id desc limit 1", intval($i['parent']) ); if ($d) { diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php index e03816f05..246b42667 100644 --- a/Zotlabs/Lib/Queue.php +++ b/Zotlabs/Lib/Queue.php @@ -202,7 +202,7 @@ class Queue { if($channel && $base) { $h = q("SELECT hubloc_sitekey, site_crypto FROM hubloc LEFT JOIN site ON hubloc_url = site_url - WHERE site_url = '%s' AND hubloc_network = 'zot6' ORDER BY hubloc_id DESC LIMIT 1", + WHERE site_url = '%s' AND hubloc_network = 'zot6' AND hubloc_deleted = 0 ORDER BY hubloc_primary DESC, hubloc_id DESC LIMIT 1", dbesc($base) ); if($h) { diff --git a/Zotlabs/Module/Zot_probe.php b/Zotlabs/Module/Zot_probe.php index 7585affdf..bdd9506eb 100644 --- a/Zotlabs/Module/Zot_probe.php +++ b/Zotlabs/Module/Zot_probe.php @@ -8,21 +8,21 @@ use Zotlabs\Web\HTTPSig; class Zot_probe extends \Zotlabs\Web\Controller { function get() { - + $o .= '<h3>Zot6 Probe Diagnostic</h3>'; - + $o .= '<form action="zot_probe" method="get">'; $o .= 'Lookup URI: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" /><br>'; - $o .= '<input type="submit" name="submit" value="Submit" /></form>'; - + $o .= '<input type="submit" name="submit" value="Submit" /></form>'; + $o .= '<br /><br />'; - + if(x($_GET,'addr')) { $addr = $_GET['addr']; $x = Zotfinger::exec($addr); - + $o .= '<pre>' . htmlspecialchars(print_array($x)) . '</pre>'; $headers = 'Accept: application/x-zot+json, application/jrd+json, application/json'; @@ -38,10 +38,10 @@ class Zot_probe extends \Zotlabs\Web\Controller { $o .= '<pre>' . htmlspecialchars(json_encode(json_decode($x['body']),JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)) . '</pre>' . EOL; - } + } } return $o; } - + } |