From a03423794a1a9dc15588d40684fee3bf9a57b629 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Fri, 14 May 2021 08:56:06 +0000
Subject: Random PHP 8 fixes

---
 Zotlabs/Module/Magic.php  | 3 ++-
 Zotlabs/Module/Photos.php | 8 ++++----
 Zotlabs/Module/Sse.php    | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php
index b4372e26d..bfd38d2fa 100644
--- a/Zotlabs/Module/Magic.php
+++ b/Zotlabs/Module/Magic.php
@@ -40,7 +40,7 @@ class Magic extends Controller {
 			goaway($dest);
 		}
 
-		$basepath = $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : ''); 
+		$basepath = $parsed['scheme'] . '://' . $parsed['host'] . (isset($parsed['port']) ? ':' . $parsed['port'] : '');
 		$owapath = SConfig::get($basepath,'system','openwebauth', $basepath . '/owa');
 
 		// This is ready-made for a plugin that provides a blacklist or "ask me" before blindly authenticating. 
@@ -110,6 +110,7 @@ class Magic extends Controller {
 				$headers['(request-target)'] = 'post ' . '/owa';
 
 				$headers = HTTPSig::create_sig($headers,$channel['channel_prvkey'], channel_url($channel),true,'sha512');
+				$redirects = 0;
 				$x = z_post_url($owapath,$data,$redirects,[ 'headers' => $headers ]);
 				logger('owa fetch returned: ' . print_r($x,true),LOGGER_DATA);
 				if ($x['success']) {
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 099289c03..e62accb06 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -876,7 +876,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			$prevlink = '';
 			$nextlink = '';
 
-			if($_GET['order'] === 'posted')
+			if(isset($_GET['order']) && $_GET['order'] === 'posted')
 				$order = 'ASC';
 			else
 				$order = 'DESC';
@@ -901,8 +901,8 @@ class Photos extends \Zotlabs\Web\Controller {
 					}
 				}
 
-				$prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
-				$nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($_GET['order'] === 'posted') ? '?f=&order=posted' : '');
+				$prevlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$prv]['hash'] . (($order == 'ASC') ? '?f=&order=posted' : '');
+				$nextlink = z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $prvnxt[$nxt]['hash'] . (($order == 'ASC') ? '?f=&order=posted' : '');
 	 		}
 
 
@@ -987,7 +987,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				}
 
 				$tags = array();
-				if($link_item['term']) {
+				if(x($link_item, 'term')) {
 					$cnt = 0;
 					foreach($link_item['term'] as $t) {
 						$tags[$cnt] = array(0 => format_term_for_display($t));
diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php
index 8bea65207..6f3df299f 100644
--- a/Zotlabs/Module/Sse.php
+++ b/Zotlabs/Module/Sse.php
@@ -108,7 +108,8 @@ class Sse extends Controller {
 				echo 'data: {}';
 				echo "\n\n";
 
-				ob_end_flush();
+				if(ob_get_length() > 0)
+					ob_end_flush();
 				flush();
 
 				if(connection_status() != CONNECTION_NORMAL || connection_aborted()) {
-- 
cgit v1.2.3