From 8cf82a844993a6c12f20a462c5ba7d8a79fe803b Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 29 Feb 2024 04:40:04 +0000
Subject: [PATCH] Exceptions and warnings fixed

---
 src/Protocol/Email.php | 2 +-
 src/Util/ParseUrl.php  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 68d56da8bc..836235105c 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -259,7 +259,7 @@ class Email
 
 		if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
 			// filename may be given as 'Filename' or 'Name' or both
-			$filename = ($params['filename'])? $params['filename'] : $params['name'];
+			$filename = $params['filename'] ?? $params['name'];
 			// filename may be encoded, so see imap_mime_header_decode()
 			$attachments[$filename] = $data;  // this is a problem if two files have same name
 		}
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 7c9a058b43..d12d84278b 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -235,7 +235,12 @@ class ParseUrl
 			return $siteinfo;
 		}
 
-		$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
+		try {
+			$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::CONTENT_LENGTH => 1000000]);
+		} catch (\Throwable $th) {
+			Logger::info('Exception when fetching', ['url' => $url, 'code' => $th->getCode(), 'message' => $th->getMessage()]);
+			return $siteinfo;
+		}
 		if (!$curlResult->isSuccess() || empty($curlResult->getBodyString())) {
 			Logger::info('Empty body or error when fetching', ['url' => $url, 'success' => $curlResult->isSuccess(), 'code' => $curlResult->getReturnCode()]);
 			return $siteinfo;