Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index df2246f2064b91a88371e436f4cb3e9e03833248..44824103b452042dfd93c1bdc7fc414a4d39ec44 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -200,7 +200,7 @@ class Probe {
        }
 
        /**
-        * @brief Fetch information about a given uri
+        * @brief Fetch information (protocol endpoints and user information) about a given uri
         *
         * @param string $uri Address that should be probed
         * @param string $network Test for this specific network
@@ -279,7 +279,9 @@ class Probe {
        }
 
        /**
-        * @brief Detect information about a given uri
+        * @brief Fetch information (protocol endpoints and user information) about a given uri
+        *
+        * This function is only called by the "uri" function that adds caching and rearranging of data.
         *
         * @param string $uri Address that should be probed
         * @param string $network Test for this specific network
@@ -289,7 +291,7 @@ class Probe {
         */
        private function detect($uri, $network, $uid) {
                if (strstr($uri, '@')) {
-                       // If the URI starts with "mailto:" then jum directly to the mail detection
+                       // If the URI starts with "mailto:" then jump directly to the mail detection
                        if (strpos($url,'mailto:') !== false) {
                                $uri = str_replace('mailto:', '', $url);
                                return self::mail($uri, $uid);
@@ -406,7 +408,9 @@ class Probe {
        }
 
        /**
-        * @brief Do a webfinger request
+        * @brief Perform a webfinger request.
+        *
+        * For details see RFC 7033: <https://tools.ietf.org/html/rfc7033>
         *
         * @param string $url Address that should be probed
         *
@@ -458,7 +462,10 @@ class Probe {
        }
 
        /**
-        * @brief Poll the noscrape page (Friendica specific)
+        * @brief Poll the Friendica specific noscrape page.
+        *
+        * "noscrape" is a faster alternative to fetch the data from the hcard.
+        * This functionality was originally created for the directory.
         *
         * @param string $noscrape Link to the noscrape page
         * @param array $data The already fetched data
@@ -543,7 +550,7 @@ class Probe {
        }
 
        /**
-        * @brief Fetch data from a DFRN profile page
+        * @brief Fetch data from a DFRN profile page and via "noscrape"
         *
         * @param string $profile Link to the profile page
         *
@@ -781,6 +788,9 @@ class Probe {
                        isset($data["pubkey"]) AND ($hcard != "")) {
                        $data["network"] = NETWORK_DIASPORA;
 
+                       // The Diaspora handle must always be lowercase
+                       $data["addr"] = strtolower($data["addr"]);
+
                        // We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
                        $data["notify"] = $data["baseurl"]."/receive/users/".$data["guid"];
                        $data["batch"] = $data["baseurl"]."/receive/public";