Don't create notifications for own posts

[friendica.git] / src / Util / Network.php

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 92265e30e6116a8721d8f2b1f4d9db3524e1439f..0f6389ce870363d5438ad857a366e41215d63f38 100644 (file)
--- 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);
@@ -104,7 +105,7 @@ class Network
 
                $parts2 = [];
                $parts = parse_url($url);
-               $path_parts = explode('/', defaults($parts, 'path', ''));
+               $path_parts = explode('/', $parts['path'] ?? '');
                foreach ($path_parts as $part) {
                        if (strlen($part) <> mb_strlen($part)) {
                                $parts2[] = rawurlencode($part);
@@ -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)) {
@@ -285,16 +286,6 @@ class Network
                        curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
                }
 
-               if (defined('LIGHTTPD')) {
-                       if (empty($headers)) {
-                               $headers = ['Expect:'];
-                       } else {
-                               if (!in_array('Expect:', $headers)) {
-                                       array_push($headers, 'Expect:');
-                               }
-                       }
-               }
-
                if (!empty($headers)) {
                        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
                }
@@ -335,13 +326,38 @@ 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) {
+                       $redirects++;
+
+                       if (empty($headers)) {
+                               $headers = ['Expect:'];
+                       } else {
+                               if (!in_array('Expect:', $headers)) {
+                                       array_push($headers, 'Expect:');
+                               }
+                       }
+                       Logger::info('Server responds with 417, applying workaround', ['url' => $url]);
+                       return self::post($url, $params, $headers, $redirects, $timeout);
+               }
 
                Logger::log('post_url: end ' . $url, Logger::DATA);
 
                return $curlResponse;
        }
 
+       /**
+        * Return raw post data from a post request
+        *
+        * @return string post data
+        */
+       public static function postdata()
+       {
+               return file_get_contents('php://input');
+       }
+
        /**
         * @brief Check URL to see if it's real
         *
@@ -370,7 +386,7 @@ class Network
                /// @TODO Really suppress function outcomes? Why not find them + debug them?
                $h = @parse_url($url);
 
-               if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+               if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP))) {
                        return $url;
                }
 
@@ -396,7 +412,7 @@ class Network
                $h = substr($addr, strpos($addr, '@') + 1);
 
                // Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
-               if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+               if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP))) {
                        return true;
                }
                if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
@@ -472,7 +488,7 @@ class Network
                }
 
                foreach ($domain_blocklist as $domain_block) {
-                       if (strcasecmp($domain_block['domain'], $host) === 0) {
+                       if (fnmatch(strtolower($domain_block['domain']), strtolower($host))) {
                                return true;
                        }
                }
@@ -540,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);
@@ -614,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);
 
@@ -639,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;
@@ -681,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;
@@ -791,8 +807,8 @@ class Network
                $i = 0;
                $path = "";
                do {
-                       $path1 = defaults($pathparts1, $i, '');
-                       $path2 = defaults($pathparts2, $i, '');
+                       $path1 = $pathparts1[$i] ?? '';
+                       $path2 = $pathparts2[$i] ?? '';
 
                        if ($path1 == $path2) {
                                $path .= $path1."/";