From 5435fbed686b4123889941d786e52a33a1b5705a Mon Sep 17 00:00:00 2001
From: joshuaruesweg <ruesweg@woltlab.com>
Date: Wed, 21 Oct 2020 17:34:16 +0200
Subject: [PATCH] Use Guzzle to test the Gravatar URL

---
 .../lib/data/user/avatar/Gravatar.class.php   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
index a8e0a1935e..2004402dcd 100644
--- a/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/Gravatar.class.php
@@ -1,9 +1,10 @@
 <?php
 namespace wcf\data\user\avatar;
-use wcf\system\exception\SystemException;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Request;
+use wcf\system\io\HttpFactory;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
-use wcf\util\FileUtil;
 
 /**
  * Represents a gravatar.
@@ -98,13 +99,20 @@ class Gravatar extends DefaultAvatar {
 	 */
 	public static function test($email) {
 		$gravatarURL = sprintf(self::GRAVATAR_BASE, md5(mb_strtolower($email)), 80, GRAVATAR_DEFAULT_TYPE);
+		$client = HttpFactory::getDefaultClient();
+		$request = new Request('GET', $gravatarURL);
+		
 		try {
-			$tmpFile = FileUtil::downloadFileFromHttp($gravatarURL, 'gravatar');
-			@unlink($tmpFile);
-			return true;
+			$response = $client->send($request);
+			
+			if ($response->getStatusCode() === 200) {
+				return true;
+			}
 		}
-		catch (SystemException $e) {
-			return false;
+		catch (GuzzleException $e) {
+			// Ignore exception, because we return false anyways.
 		}
+		
+		return false;
 	}
 }
-- 
2.20.1