X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=4feb0b680f27ddfcb1a03799d7ba9198a11a0fdd;hb=4b44aca50735dc047e495825bff7dfa717acb615;hp=3473e8d167ddf9b578d8390f02d5b4d3fe7af83a;hpb=eaf81e5e66db1f722192005ff75bb5831c1912eb;p=friendica.git

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 3473e8d167..4feb0b680f 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -2,12 +2,8 @@
 
 namespace Friendica\Util;
 
-use Friendica\BaseModule;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
-use Friendica\Core\System;
-
-require_once 'include/security.php';
+use Friendica\DI;
 
 /**
  * @brief Proxy utilities class
@@ -61,11 +57,12 @@ class Proxy
 	 * @param string $size      One of the ProxyUtils::SIZE_* constants
 	 *
 	 * @return string The proxyfied URL or relative path
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function proxifyUrl($url, $writemode = false, $size = '')
 	{
 		// Get application instance
-		$a = BaseObject::getApp();
+		$a = DI::app();
 
 		// Trim URL first
 		$url = trim($url);
@@ -78,7 +75,7 @@ class Proxy
 
 		// Only continue if it isn't a local image and the isn't deactivated
 		if (self::isLocalImage($url)) {
-			$url = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
+			$url = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $url);
 			return $url;
 		}
 
@@ -91,7 +88,7 @@ class Proxy
 		$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
 
 		// Creating a sub directory to reduce the amount of files in the cache directory
-		$basepath = $a->get_basepath() . '/proxy';
+		$basepath = $a->getBasePath() . '/proxy';
 
 		$shortpath = hash('md5', $url);
 		$longpath = substr($shortpath, 0, 2);
@@ -111,7 +108,7 @@ class Proxy
 			$longpath .= '.' . $extension;
 		}
 
-		$proxypath = System::baseUrl() . '/proxy/' . $longpath;
+		$proxypath = DI::baseUrl() . '/proxy/' . $longpath;
 
 		if ($size != '') {
 			$size = ':' . $size;
@@ -122,7 +119,7 @@ class Proxy
 		if ((strlen($proxypath) > 250) && $writemode) {
 			return $shortpath;
 		} elseif (strlen($proxypath) > 250) {
-			return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+			return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
 		} elseif ($writemode) {
 			return $longpath;
 		} else {
@@ -139,10 +136,11 @@ class Proxy
 	 * @param string $html Un-proxified HTML code
 	 *
 	 * @return string Proxified HTML code
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function proxifyHtml($html)
 	{
-		$html = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
+		$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
 
 		return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
 	}
@@ -152,6 +150,7 @@ class Proxy
 	 *
 	 * @param string $url
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function isLocalImage($url)
 	{
@@ -164,8 +163,8 @@ class Proxy
 		}
 
 		// links normalised - bug #431
-		$baseurl = normalise_link(System::baseUrl());
-		$url = normalise_link($url);
+		$baseurl = Strings::normaliseLink(DI::baseUrl());
+		$url = Strings::normaliseLink($url);
 
 		return (substr($url, 0, strlen($baseurl)) == $baseurl);
 	}
@@ -191,6 +190,7 @@ class Proxy
 	 *
 	 * @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)
 	{