From 118a5edebc745fe2760f781c8bb9e9006bf6215f Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 15 Sep 2022 09:19:55 +0000 Subject: fix warnings and regressions --- Zotlabs/Web/HTTPHeaders.php | 4 ++-- Zotlabs/Web/HTTPSig.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/HTTPHeaders.php b/Zotlabs/Web/HTTPHeaders.php index 4be51a8f3..902d637f7 100644 --- a/Zotlabs/Web/HTTPHeaders.php +++ b/Zotlabs/Web/HTTPHeaders.php @@ -20,7 +20,7 @@ class HTTPHeaders { } } else { - if($this->in_progress['k']) { + if(isset($this->in_progress['k'])) { $this->parsed[] = [ $this->in_progress['k'] => $this->in_progress['v'] ]; $this->in_progress = []; } @@ -30,7 +30,7 @@ class HTTPHeaders { } } - if($this->in_progress['k']) { + if(isset($this->in_progress['k'])) { $this->parsed[] = [ $this->in_progress['k'] => $this->in_progress['v'] ]; $this->in_progress = []; } diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index cb41c2b7d..35b8054e6 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -299,6 +299,7 @@ class HTTPSig { // Check the local cache first, but remove any fragments like #main-key since these won't be present in our cached data $url = ((strpos($id, '#')) ? substr($id, 0, strpos($id, '#')) : $id); + $best = []; // $force is used to ignore the local cache and only use the remote data; for instance the cached key might be stale if (!$force) { @@ -374,6 +375,8 @@ class HTTPSig { static function get_webfinger_key($id, $force = false) { + $best = []; + if (!$force) { $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", dbesc($id) @@ -420,6 +423,9 @@ class HTTPSig { */ static function get_zotfinger_key($id, $force = false) { + + $best = []; + if (!$force) { $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc", dbesc($id) -- cgit v1.2.3 From 937d6cb1efef3250f68f2b943e3964473495acae Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 22 Sep 2022 06:31:35 +0000 Subject: php8: fix warnings --- Zotlabs/Web/WebServer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 70c6eb9b8..c1f43863a 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -58,7 +58,7 @@ class WebServer { if((x($_GET,'zid')) && (! \App::$install)) { \App::$query_string = strip_zids(\App::$query_string); if(! local_channel()) { - if ($_SESSION['my_address']!=$_GET['zid']) { + if (isset($_SESSION['my_address']) && $_SESSION['my_address'] != $_GET['zid']) { $_SESSION['my_address'] = $_GET['zid']; $_SESSION['authenticated'] = 0; } -- cgit v1.2.3 From 03475bfb15637d61698e1b3350f7b98654637fc6 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 26 Sep 2022 08:31:57 +0000 Subject: =?UTF-8?q?=C3=83fix=20regression?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zotlabs/Web/WebServer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index c1f43863a..9fa5a7797 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -58,12 +58,13 @@ class WebServer { if((x($_GET,'zid')) && (! \App::$install)) { \App::$query_string = strip_zids(\App::$query_string); if(! local_channel()) { - if (isset($_SESSION['my_address']) && $_SESSION['my_address'] != $_GET['zid']) { + if (!isset($_SESSION['my_address']) || $_SESSION['my_address'] != $_GET['zid']) { $_SESSION['my_address'] = $_GET['zid']; $_SESSION['authenticated'] = 0; } - if(! $_SESSION['authenticated']) + if(!$_SESSION['authenticated']) { zid_init(); + } } } -- cgit v1.2.3