From 844727dc19e584b807cd1831a8268544f7230965 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 5 Jul 2021 04:16:02 +0000
Subject: [PATCH] Simplyfying code

---
 src/Module/Proxy.php |  8 ++------
 src/Util/Proxy.php   | 20 +++-----------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 6ccc38f60d..b1683e8f5b 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -40,10 +40,7 @@ class Proxy extends BaseModule
 {
 
 	/**
-	 * Initializer method for this class.
-	 *
-	 * Sets application instance and checks if /proxy/ path is writable.
-	 *
+	 * Fetch remote image content
 	 */
 	public static function rawContent(array $parameters = [])
 	{
@@ -81,8 +78,7 @@ class Proxy extends BaseModule
 		$fetchResult = HTTPSignature::fetchRaw($request['url'], local_user(), ['timeout' => 10]);
 		$img_str = $fetchResult->getBody();
 
-		// If there is an error then return an error
-		if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || empty($img_str)) {
+		if (!$fetchResult->isSuccess() || empty($img_str)) {
 			Logger::info('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
 			self::responseError();
 			// stop.
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 839442797e..16e3e221ff 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -87,21 +87,11 @@ class Proxy
 	 */
 	public static function proxifyUrl($url, $size = '')
 	{
-		// Get application instance
-		$a = DI::app();
-
 		// Trim URL first
 		$url = trim($url);
 
-		// Is no http in front of it?
-		/// @TODO To weak test for being a valid URL
-		if (substr($url, 0, 4) !== 'http') {
-			return $url;
-		}
-
-		// Only continue if it isn't a local image and the isn't deactivated
-		if (self::isLocalImage($url)) {
-			$url = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $url);
+		// Quit if not an HTTP/HTTPS link or if local
+		if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https']) || self::isLocalImage($url)) {
 			return $url;
 		}
 
@@ -175,11 +165,7 @@ class Proxy
 			return true;
 		}
 
-		// links normalised - bug #431
-		$baseurl = Strings::normaliseLink(DI::baseUrl());
-		$url = Strings::normaliseLink($url);
-
-		return (substr($url, 0, strlen($baseurl)) == $baseurl);
+		return Network::isLocalLink($url);
 	}
 
 	/**