From: Michael <heluecht@pirati.ca>
Date: Tue, 6 Jul 2021 06:44:18 +0000 (+0000)
Subject: Proxy settings removed
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dac27ead7a1dfe8814b194cb6cd2bcb88a81f782;p=friendica.git

Proxy settings removed
---

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 3dde6c1242..068b013269 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -198,7 +198,6 @@ class Site extends BaseAdmin
 		$max_display_comments   = (!empty($_POST['max_display_comments'])   ? intval($_POST['max_display_comments'])          : 0);
 		$temppath               = (!empty($_POST['temppath'])               ? Strings::escapeTags(trim($_POST['temppath']))   : '');
 		$singleuser             = (!empty($_POST['singleuser'])             ? Strings::escapeTags(trim($_POST['singleuser'])) : '');
-		$proxy_disabled         = !empty($_POST['proxy_disabled']);
 		$only_tag_search        = !empty($_POST['only_tag_search']);
 		$rino                   = (!empty($_POST['rino'])                   ? intval($_POST['rino'])                          : 0);
 		$check_new_version_url  = (!empty($_POST['check_new_version_url'])  ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none');
@@ -402,7 +401,6 @@ class Site extends BaseAdmin
 
 		DI::config()->set('system', 'temppath', $temppath);
 
-		DI::config()->set('system', 'proxy_disabled'   , $proxy_disabled);
 		DI::config()->set('system', 'only_tag_search'  , $only_tag_search);
 
 		DI::config()->set('system', 'worker_queues'    , $worker_queues);
@@ -668,7 +666,6 @@ class Site extends BaseAdmin
 			'$max_comments'           => ['max_comments', DI::l10n()->t('Maximum numbers of comments per post'), DI::config()->get('system', 'max_comments'), DI::l10n()->t('How much comments should be shown for each post? Default value is 100.')],
 			'$max_display_comments'   => ['max_display_comments', DI::l10n()->t('Maximum numbers of comments per post on the display page'), DI::config()->get('system', 'max_display_comments'), DI::l10n()->t('How many comments should be shown on the single view for each post? Default value is 1000.')],
 			'$temppath'               => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')],
-			'$proxy_disabled'         => ['proxy_disabled', DI::l10n()->t('Disable picture proxy'), DI::config()->get('system', 'proxy_disabled'), DI::l10n()->t('The picture proxy increases performance and privacy. It shouldn\'t be used on systems with very low bandwidth.')],
 			'$only_tag_search'        => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')],
 
 			'$relocate_url'           => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')],
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 12be746a68..443725a3d8 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -72,8 +72,7 @@ class Proxy
 	 * Transform a remote URL into a local one.
 	 *
 	 * This function only performs the URL replacement on http URL and if the
-	 * provided URL isn't local, "the isn't deactivated" (sic) and if the config
-	 * system.proxy_disabled is set to false.
+	 * provided URL isn't local
 	 *
 	 * @param string $url       The URL to proxyfy
 	 * @param string $size      One of the ProxyUtils::SIZE_* constants
@@ -91,11 +90,6 @@ class Proxy
 			return $url;
 		}
 
-		// Is the proxy disabled?
-		if (DI::config()->get('system', 'proxy_disabled')) {
-			return $url;
-		}
-
 		// Image URL may have encoded ampersands for display which aren't desirable for proxy
 		$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
 
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 9405992005..64d49d3a31 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -108,7 +108,6 @@
 		{{include file="field_checkbox.tpl" field=$only_tag_search}}
 		{{include file="field_input.tpl" field=$max_comments}}
 		{{include file="field_input.tpl" field=$max_display_comments}}
-		{{include file="field_checkbox.tpl" field=$proxy_disabled}}
 		{{include file="field_checkbox.tpl" field=$dbclean}}
 		{{include file="field_input.tpl" field=$dbclean_expire_days}}
 		{{include file="field_input.tpl" field=$dbclean_unclaimed}}
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index 97d5907a65..ad87151777 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -243,7 +243,6 @@
 						{{include file="field_checkbox.tpl" field=$only_tag_search}}
 						{{include file="field_input.tpl" field=$max_comments}}
 						{{include file="field_input.tpl" field=$max_display_comments}}
-						{{include file="field_checkbox.tpl" field=$proxy_disabled}}
 						{{include file="field_checkbox.tpl" field=$dbclean}}
 						{{include file="field_input.tpl" field=$dbclean_expire_days}}
 						{{include file="field_input.tpl" field=$dbclean_unclaimed}}