Merge branch 'php8' into 'dev'

Stricter parameters checks for PHP 8 support

See merge request hubzilla/core!1921

4 files changed, 81 insertions, 72 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 5fefb2979..c800f331d 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -104,7 +104,10 @@ class Activity {
 		if ($x['success']) {
 			$m = parse_url($url);
 			if ($m) {
-				$site_url = unparse_url(['scheme' => $m['scheme'], 'host' => $m['host'], 'port' => $m['port'] ]);
+				$y = [ 'scheme' => $m['scheme'], 'host' => $m['host'] ];
+				if (array_key_exists('port', $m))
+					$y['port'] = $m['port'];
+				$site_url = unparse_url($y);
 				q("UPDATE site SET site_update = '%s', site_dead = 0 WHERE site_url = '%s' AND site_update < %s - INTERVAL %s",
 					dbesc(datetime_convert()),
 					dbesc($site_url),
@@ -570,7 +573,7 @@ class Activity {
 
 		$ret = [];
 
-		if ($item['tag'] && is_array($item['tag'])) {
+		if (array_key_exists('tag', $item) && is_array($item['tag'])) {
 			$ptr = $item['tag'];
 			if (!array_key_exists(0, $ptr)) {
 				$ptr = [$ptr];
@@ -579,23 +582,25 @@ class Activity {
 				if (!array_key_exists('type', $t))
 					$t['type'] = 'Hashtag';
 
-				switch ($t['type']) {
-					case 'Hashtag':
-						$ret[] = ['ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name'])];
-						break;
+				if (array_key_exists('href', $t) && array_key_exists('name', $t)) {
+					switch ($t['type']) {
+						case 'Hashtag':
+							$ret[] = ['ttype' => TERM_HASHTAG, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '#') ? substr($t['name'], 1) : $t['name'])];
+							break;
 
-					case 'Mention':
-						$mention_type = substr($t['name'], 0, 1);
-						if ($mention_type === '!') {
-							$ret[] = ['ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'], 1))];
-						}
-						else {
-							$ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])];
-						}
-						break;
+						case 'Mention':
+							$mention_type = substr($t['name'], 0, 1);
+							if ($mention_type === '!') {
+								$ret[] = ['ttype' => TERM_FORUM, 'url' => $t['href'], 'term' => escape_tags(substr($t['name'], 1))];
+							}
+							else {
+								$ret[] = ['ttype' => TERM_MENTION, 'url' => $t['href'], 'term' => escape_tags((substr($t['name'], 0, 1) === '@') ? substr($t['name'], 1) : $t['name'])];
+							}
+							break;
 
-					default:
-						break;
+						default:
+							break;
+					}
 				}
 			}
 		}
@@ -607,7 +612,7 @@ class Activity {
 
 		$ret = [];
 
-		if ($item['term']) {
+		if (array_key_exists('term', $item) && is_array($item['term'])) {
 			foreach ($item['term'] as $t) {
 				switch ($t['ttype']) {
 					case TERM_HASHTAG:
@@ -638,7 +643,7 @@ class Activity {
 
 		$ret = [];
 
-		if ($item['attach']) {
+		if (array_key_exists('attach', $item)) {
 			$atts = ((is_array($item['attach'])) ? $item['attach'] : json_decode($item['attach'], true));
 			if ($atts) {
 				foreach ($atts as $att) {
@@ -651,7 +656,7 @@ class Activity {
 				}
 			}
 		}
-		if ($item['iconfig']) {
+		if (array_key_exists('iconfig', $item) && is_array($item['iconfig'])) {
 			foreach ($item['iconfig'] as $att) {
 				if ($att['sharing']) {
 					$value = ((is_string($att['v']) && preg_match('|^a:[0-9]+:{.*}$|s', $att['v'])) ? unserialize($att['v']) : $att['v']);
@@ -695,16 +700,16 @@ class Activity {
 
 		$ret = [];
 
-		if ($item['attachment']) {
+		if (array_key_exists('attachment', $item) && is_array($item['attachment'])) {
 			foreach ($item['attachment'] as $att) {
 				$entry = [];
-				if ($att['href'])
+				if (array_key_exists('href', $att))
 					$entry['href'] = $att['href'];
-				elseif ($att['url'])
+				elseif (array_key_exists('url', $att))
 					$entry['href'] = $att['url'];
-				if ($att['mediaType'])
+				if (array_key_exists('mediaType', $att))
 					$entry['type'] = $att['mediaType'];
-				elseif ($att['type'] === 'Image')
+				elseif (array_key_exists('type', $att) && $att['type'] === 'Image')
 					$entry['type'] = 'image/jpeg';
 				if ($entry)
 					$ret[] = $entry;
@@ -977,19 +982,17 @@ class Activity {
 	// Returns an array of URLS for any mention tags found in the item array $i.
 	static function map_mentions($i) {
 
-		if (!$i['term']) {
-			return [];
-		}
-
 		$list = [];
 
-		foreach ($i['term'] as $t) {
-			if (!$t['url']) {
-				continue;
-			}
-			if ($t['ttype'] == TERM_MENTION) {
-				$url    = self::lookup_term_url($t['url']);
-				$list[] = (($url) ? $url : $t['url']);
+		if (array_key_exists('term', $i) && is_array($i['term'])) {
+			foreach ($i['term'] as $t) {
+				if (!$t['url']) {
+					continue;
+				}
+				if ($t['ttype'] == TERM_MENTION) {
+					$url    = self::lookup_term_url($t['url']);
+					$list[] = (($url) ? $url : $t['url']);
+				}
 			}
 		}
 
@@ -1601,13 +1604,13 @@ class Activity {
 
 		if ($inbox) {
 			$collections['inbox'] = $inbox;
-			if ($person_obj['outbox'])
+			if (array_key_exists('outbox', $person_obj))
 				$collections['outbox'] = $person_obj['outbox'];
-			if ($person_obj['followers'])
+			if (array_key_exists('followers', $person_obj))
 				$collections['followers'] = $person_obj['followers'];
-			if ($person_obj['following'])
+			if (array_key_exists('following', $person_obj))
 				$collections['following'] = $person_obj['following'];
-			if ($person_obj['endpoints'] && $person_obj['endpoints']['sharedInbox'])
+			if (array_key_exists('endpoints', $person_obj) && array_key_exists('sharedInbox', $person_obj['endpoints']))
 				$collections['sharedInbox'] = $person_obj['endpoints']['sharedInbox'];
 		}
 
@@ -2111,22 +2114,22 @@ class Activity {
 		$s['uuid']       = $act->obj['diaspora:guid'];
 		$s['parent_mid'] = $act->parent_id;
 
-		if ($act->data['published']) {
+		if (array_key_exists('published', $act->data)) {
 			$s['created'] = datetime_convert('UTC', 'UTC', $act->data['published']);
 		}
-		elseif ($act->obj['published']) {
+		elseif (array_key_exists('published', $act->obj)) {
 			$s['created'] = datetime_convert('UTC', 'UTC', $act->obj['published']);
 		}
-		if ($act->data['updated']) {
+		if (array_key_exists('updated', $act->data)) {
 			$s['edited'] = datetime_convert('UTC', 'UTC', $act->data['updated']);
 		}
-		elseif ($act->obj['updated']) {
+		elseif (array_key_exists('updated', $act->obj)) {
 			$s['edited'] = datetime_convert('UTC', 'UTC', $act->obj['updated']);
 		}
-		if ($act->data['expires']) {
+		if (array_key_exists('expires', $act->data)) {
 			$s['expires'] = datetime_convert('UTC', 'UTC', $act->data['expires']);
 		}
-		elseif ($act->obj['expires']) {
+		elseif (array_key_exists('expires', $act->obj)) {
 			$s['expires'] = datetime_convert('UTC', 'UTC', $act->obj['expires']);
 		}
 
@@ -2186,10 +2189,10 @@ class Activity {
 			}
 		}
 
-		if (!$s['created'])
+		if (! array_key_exists('created', $s))
 			$s['created'] = datetime_convert();
 
-		if (!$s['edited'])
+		if (! array_key_exists('edited', $s))
 			$s['edited'] = $s['created'];
 
 		$s['title']   = (($response_activity) ? EMPTY_STR : self::bb_content($content, 'name'));
@@ -2290,17 +2293,20 @@ class Activity {
 			$s['iconfig'] = $a;
 		}
 
-		if ($act->obj['type'] === 'Note' && $s['attach']) {
-			$s['body'] .= self::bb_attach($s['attach'], $s['body']);
-		}
-
-		if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) {
-			if ($act->obj['endTime']) {
-				$s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['endTime']);
+		if (array_key_exists('type', $act->obj)) {
+			
+			if ($act->obj['type'] === 'Note' && $s['attach']) {
+				$s['body'] .= self::bb_attach($s['attach'], $s['body']);
+			}
+			
+			if ($act->obj['type'] === 'Question' && in_array($act->type, ['Create', 'Update'])) {
+				if (array_key_exists('endTime', $act->obj)) {
+					$s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['endTime']);
+				}
 			}
 		}
 
-		if ($act->obj['closed']) {
+		if (array_key_exists('closed', $act->obj)) {
 			$s['comments_closed'] = datetime_convert('UTC', 'UTC', $act->obj['closed']);
 		}
 
@@ -2716,7 +2722,7 @@ class Activity {
 			}
 		}
 
-		if ($act->obj['conversation']) {
+		if (array_key_exists('conversation', $act->obj)) {
 			set_iconfig($item, 'ostatus', 'conversation', $act->obj['conversation'], 1);
 		}
 
@@ -3369,22 +3375,25 @@ class Activity {
 		require_once('include/event.php');
 		$ret = false;
 
-		if (is_array($content[$field])) {
-			foreach ($content[$field] as $k => $v) {
-				$ret .= html2bbcode($v);
-				// save this for auto-translate or dynamic filtering
-				// $ret .= '[language=' . $k . ']' . html2bbcode($v) . '[/language]';
-			}
-		}
-		else {
-			if ($field === 'bbcode' && array_key_exists('bbcode', $content)) {
-				$ret = $content[$field];
+		if (array_key_exists($field, $content)) {
+			if (is_array($content[$field])) {
+				foreach ($content[$field] as $k => $v) {
+					$ret .= html2bbcode($v);
+					// save this for auto-translate or dynamic filtering
+					// $ret .= '[language=' . $k . ']' . html2bbcode($v) . '[/language]';
+				}
 			}
 			else {
-				$ret = html2bbcode($content[$field]);
+				if ($field === 'bbcode' && array_key_exists('bbcode', $content)) {
+					$ret = $content[$field];
+				}
+				else {
+					$ret = html2bbcode($content[$field]);
+				}
 			}
 		}
-		if ($field === 'content' && $content['event'] && (!strpos($ret, '[event'))) {
+
+		if ($field === 'content' && array_key_exists('event', $content) && (!strpos($ret, '[event'))) {
 			$ret .= format_event_bbcode($content['event']);
 		}
 
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index ac1545644..26c6aaf40 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -116,7 +116,7 @@ class Channel_calendar extends Controller {
 
 		if ($results) {
 			// Set permissions based on tag replacements
-			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, false, $private);
+			set_linkified_perms($results, $str_contact_allow, $str_group_allow, $uid, $private);
 
 			foreach ($results as $result) {
 				$success = $result['success'];
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index bc35ac452..f3e8e4e57 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -832,7 +832,7 @@ class Item extends Controller {
 			if($results) {
 
 				// Set permissions based on tag replacements
-				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item, $private);
+				set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $private, $parent_item);
 
 				foreach($results as $result) {
 					$success = $result['success'];
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index ee360dac5..87697f5a7 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -180,7 +180,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				$channel = channelx_by_n($r[0]['uid']);
 
 				// Now we'll see if we can access the photo
-				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
+				$e = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d LIMIT 1",
 					dbesc($photo),
 					intval($resolution)
 				);