X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FNetwork.php;h=0f6389ce870363d5438ad857a366e41215d63f38;hb=4b44aca50735dc047e495825bff7dfa717acb615;hp=f222dc22df0b735af42158d5f4e0350dcfe95da1;hpb=98c12006d509f2ef4a98b06be04db7286c9da322;p=friendica.git diff --git a/src/Util/Network.php b/src/Util/Network.php index f222dc22df..0f6389ce87 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -10,6 +10,7 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\System; +use Friendica\DI; use Friendica\Network\CurlResult; class Network @@ -95,7 +96,7 @@ class Network { $stamp1 = microtime(true); - $a = \get_app(); + $a = DI::app(); if (strlen($url) > 1000) { Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG); @@ -233,7 +234,7 @@ class Network @curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); + DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack()); return $curlResponse; } @@ -259,7 +260,7 @@ class Network return CurlResult::createErrorCurl($url); } - $a = \get_app(); + $a = DI::app(); $ch = curl_init($url); if (($redirects > 8) || (!$ch)) { @@ -325,7 +326,7 @@ class Network curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); + DI::profiler()->saveTimestamp($stamp1, 'network', System::callstack()); // Very old versions of Lighttpd don't like the "Expect" header, so we remove it when needed if ($curlResponse->getReturnCode() == 417) { @@ -555,7 +556,7 @@ class Network Hook::callAll('avatar_lookup', $avatar); if (! $avatar['success']) { - $avatar['url'] = System::baseUrl() . '/images/person-300.jpg'; + $avatar['url'] = DI::baseUrl() . '/images/person-300.jpg'; } Logger::log('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], Logger::DEBUG); @@ -629,7 +630,7 @@ class Network */ public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false) { - $a = \get_app(); + $a = DI::app(); $url = self::stripTrackingQueryParams($url); @@ -654,7 +655,7 @@ class Network $http_code = $curl_info['http_code']; curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); + DI::profiler()->saveTimestamp($stamp1, "network", System::callstack()); if ($http_code == 0) { return $url; @@ -696,7 +697,7 @@ class Network $body = curl_exec($ch); curl_close($ch); - $a->getProfiler()->saveTimestamp($stamp1, "network", System::callstack()); + DI::profiler()->saveTimestamp($stamp1, "network", System::callstack()); if (trim($body) == "") { return $url;