From 11d831e4d7bd4163ea518892f541252ce1acea2e Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 10 Mar 2021 11:14:02 +0000
Subject: More PHP 8 fixes

---
 include/html2plain.php | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

(limited to 'include/html2plain.php')

diff --git a/include/html2plain.php b/include/html2plain.php
index 91a1f14cb..bf8581bdb 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -76,28 +76,47 @@ function quotelevel($message, $wraplength = 75)
 	return(implode("\n", $newlines));
 }
 
+
 function collecturls($message) {
+	
 	$pattern = '/<a.*?href="(.*?)".*?>(.*?)<\/a>/is';
 	preg_match_all($pattern, $message, $result, PREG_SET_ORDER);
-
-	$urls = array();
-	foreach ($result as $treffer) {
-		// A list of some links that should be ignored
-		$list = array("/user/", "/tag/", "/group/", "/profile/", "/channel/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
-				"//facebook.com/profile.php?id=", "//plus.google.com/");
-		foreach ($list as $listitem)
-			if (strpos($treffer[1], $listitem) !== false)
-				$ignore = true;
-
-		if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
+	
+	$urls = [];
+	if ($result) {
+		$ignore = false;
+		foreach ($result as $treffer) {
+			// A list of some links that should be ignored
+			$list = [
+				"/user/",
+				"/tag/",
+				"/group/",
+				"/profile/",
+				"/channel/",
+				"/search?search=",
+				"/search?tag=",
+				"mailto:",
+				"/u/",
+				"/node/",
+				"//facebook.com/profile.php?id=",
+				"//plus.google.com/"
+			];
+			foreach ($list as $listitem)
+				if (strpos($treffer[1], $listitem) !== false)
+					$ignore = true;
+						
+			if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
 				$ignore = false;
-
-		if (!$ignore)
-			$urls[$treffer[1]] = $treffer[1];
+					
+			if (! $ignore)
+				$urls[$treffer[1]] = $treffer[1];
+		}
 	}
+	
 	return($urls);
 }
 
+
 function html2plain($html, $wraplength = 75, $compact = false)
 {
 
-- 
cgit v1.2.3