aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2020-08-24 09:45:26 +0200
committerMario Vavti <mario@mariovavti.com>2020-08-24 09:45:26 +0200
commitb996d82c5f9632e93fb3262e2a3f0da66150557b (patch)
tree8e7d2291eab87631318f9eedfa4fff2e41a5cc25
parentc53794a8a2bd4c6100d4c5f8e7785c8436b454fa (diff)
downloadvolse-hubzilla-b996d82c5f9632e93fb3262e2a3f0da66150557b.tar.gz
volse-hubzilla-b996d82c5f9632e93fb3262e2a3f0da66150557b.tar.bz2
volse-hubzilla-b996d82c5f9632e93fb3262e2a3f0da66150557b.zip
prefer zot6 and also check for hubloc_deleted
-rw-r--r--include/auth.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php
index b952754fd..8eeb077b5 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -9,6 +9,8 @@
* Also provides a function for OpenID identiy matching.
*/
+use Zotlabs\Lib\Libzot;
+
require_once('include/api_auth.php');
require_once('include/security.php');
@@ -224,12 +226,13 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
$r = array(atoken_xchan($y[0]));
}
else {
- $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1",
+ $r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' and hubloc_deleted = 0",
dbesc($_SESSION['visitor_id'])
);
}
if($r) {
- App::set_observer($r[0]);
+ $r = Libzot::zot_record_preferred($r);
+ App::set_observer($r);
}
else {
unset($_SESSION['visitor_id']);