From b996d82c5f9632e93fb3262e2a3f0da66150557b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 24 Aug 2020 09:45:26 +0200 Subject: prefer zot6 and also check for hubloc_deleted --- include/auth.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/auth.php') 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']); -- cgit v1.2.3