Set "last_failure" on connection timeout when checking server

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index c2136eec8b6e64e5718043612dc2657ece3c17f1..f67a821f9dc04b3854570b881189ca98aa527ea8 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -364,9 +364,9 @@ class Probe {
                                return self::mail($uri, $uid);
                        }
 
-                       if ($network == NETWORK_MAIL)
+                       if ($network == NETWORK_MAIL) {
                                return self::mail($uri, $uid);
-
+                       }
                        // Remove "acct:" from the URI
                        $uri = str_replace('acct:', '', $uri);
 
@@ -391,37 +391,37 @@ class Probe {
                /// @todo Do we need the prefix "acct:" or "acct://"?
 
                foreach ($lrdd AS $key => $link) {
-                       if ($webfinger)
+                       if ($webfinger) {
                                continue;
-
-                       if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json")))
+                       }
+                       if (!in_array($key, array("lrdd", "lrdd-xml", "lrdd-json"))) {
                                continue;
-
-                       // Try webfinger with the address (user@domain.tld)
-                       $path = str_replace('{uri}', urlencode($addr), $link);
+                       }
+                       // At first try it with the given uri
+                       $path = str_replace('{uri}', urlencode($uri), $link);
                        $webfinger = self::webfinger($path);
 
-                       // Mastodon needs to have it with "acct:"
+                       // We cannot be sure that the detected address was correct, so we don't use the values
+                       if ($webfinger AND ($uri != $addr)) {
+                               $nick = "";
+                               $addr = "";
+                       }
+
+                       // Try webfinger with the address (user@domain.tld)
                        if (!$webfinger) {
-                               $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
+                               $path = str_replace('{uri}', urlencode($addr), $link);
                                $webfinger = self::webfinger($path);
                        }
 
-                       // If webfinger wasn't successful then try it with the URL - possibly in the format https://...
-                       if (!$webfinger AND ($uri != $addr)) {
-                               $path = str_replace('{uri}', urlencode($uri), $link);
+                       // Mastodon needs to have it with "acct:"
+                       if (!$webfinger) {
+                               $path = str_replace('{uri}', urlencode("acct:".$addr), $link);
                                $webfinger = self::webfinger($path);
-
-                               // Since the detection with the address wasn't successful, we delete it.
-                               if ($webfinger) {
-                                       $nick = "";
-                                       $addr = "";
-                               }
                        }
-
                }
-               if (!$webfinger)
+               if (!$webfinger) {
                        return self::feed($uri);
+               }
 
                $result = false;