X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=fc7d369ad528d1b4d89f9e9c76aeb6d5c034dfb6;hb=fe442683efb8b75394d7df041716c47c81b05fbc;hp=443725a3d88f334c5ebe440ac60de0efb5db7d12;hpb=6354d7c81da4ef440131374f67620633ca4feef1;p=friendica.git

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 443725a3d8..fc7d369ad5 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -75,13 +75,16 @@ class Proxy
 	 * provided URL isn't local
 	 *
 	 * @param string $url       The URL to proxyfy
-	 * @param string $size      One of the ProxyUtils::SIZE_* constants
-	 *
+	 * @param string $size      One of the Proxy::SIZE_* constants
 	 * @return string The proxyfied URL or relative path
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function proxifyUrl($url, $size = '')
+	public static function proxifyUrl(string $url, string $size = ''): string
 	{
+		if (!DI::config()->get('system', 'proxify_content')) {
+			return $url;
+		}
+
 		// Trim URL first
 		$url = trim($url);
 
@@ -133,7 +136,7 @@ class Proxy
 	 * @return string Proxified HTML code
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function proxifyHtml($html)
+	public static function proxifyHtml(string $html): string
 	{
 		$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
 
@@ -144,10 +147,11 @@ class Proxy
 	 * Checks if the URL is a local URL.
 	 *
 	 * @param string $url
+	 *
 	 * @return boolean
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function isLocalImage($url)
+	public static function isLocalImage(string $url): bool
 	{
 		if (substr($url, 0, 1) == '/') {
 			return true;
@@ -164,9 +168,10 @@ class Proxy
 	 * Return the array of query string parameters from a URL
 	 *
 	 * @param string $url URL to parse
+	 *
 	 * @return array Associative array of query string parameters
 	 */
-	private static function parseQuery($url)
+	private static function parseQuery(string $url): array
 	{
 		$query = parse_url($url, PHP_URL_QUERY);
 		$query = html_entity_decode($query);
@@ -180,10 +185,11 @@ class Proxy
 	 * Call-back method to replace the UR
 	 *
 	 * @param array $matches Matches from preg_replace_callback()
+	 *
 	 * @return string Proxified HTML image tag
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private static function replaceUrl(array $matches)
+	private static function replaceUrl(array $matches): string
 	{
 		// if the picture seems to be from another picture cache then take the original source
 		$queryvar = self::parseQuery($matches[2]);