]> git.mxchange.org Git - friendica.git/blobdiff - src/Network/Probe.php
Merge pull request #3609 from rabuzarus/20170802_-_probe_camelcase
[friendica.git] / src / Network / Probe.php
index 30d7ef898c9c433759b6c4d1fcbc6dc847e49b5e..f54db70a6249d2ca64d6dc8272d86d40b6d7d494 100644 (file)
@@ -10,7 +10,13 @@ namespace Friendica\Network;
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
+
+use dbm;
+use Cache;
+use xml;
+
+use DomXPath;
+use DOMDocument;
 
 require_once 'include/feed.php';
 require_once 'include/email.php';
@@ -31,7 +37,7 @@ class Probe {
         *
         * @return array Ordered data
         */
-       private function rearrangeData($data) {
+       private static function rearrangeData($data) {
                $fields = array("name", "nick", "guid", "url", "addr", "alias",
                                "photo", "community", "keywords", "location", "about",
                                "batch", "notify", "poll", "request", "confirm", "poco",
@@ -52,6 +58,28 @@ class Probe {
                return $newdata;
        }
 
+       /**
+        * @brief Check if the hostname belongs to the own server
+        *
+        * @param string $host The hostname that is to be checked
+        *
+        * @return bool Does the testes hostname belongs to the own server?
+        */
+       private static function ownHost($host) {
+               $own_host = get_app()->get_hostname();
+
+               $parts = parse_url($host);
+
+               if (!isset($parts['scheme'])) {
+                       $parts = parse_url('http://'.$host);
+               }
+
+               if (!isset($parts['host'])) {
+                       return false;
+               }
+               return $parts['host'] == $own_host;
+       }
+
        /**
         * @brief Probes for XRD data
         *
@@ -62,7 +90,7 @@ class Probe {
         *      'lrdd-xml' => Link to LRDD endpoint in XML format
         *      'lrdd-json' => Link to LRDD endpoint in JSON format
         */
-       private function xrd($host) {
+       private static function xrd($host) {
 
                // Reset the static variable
                self::$baseurl = '';
@@ -73,8 +101,11 @@ class Probe {
                $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
                $redirects = 0;
 
+               logger("Probing for ".$host, LOGGER_DEBUG);
+
                $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) && !self::ownHost($ssl_url)) {
+                       logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG);
                        return false;
                }
                $xml = $ret['body'];
@@ -84,18 +115,21 @@ class Probe {
                if (!is_object($xrd)) {
                        $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
                        if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                               logger("Probing timeout for ".$url, LOGGER_DEBUG);
                                return false;
                        }
                        $xml = $ret['body'];
                        $xrd = parse_xml_string($xml, false);
                }
                if (!is_object($xrd)) {
-                       return false;
+                       logger("No xrd object found for ".$host, LOGGER_DEBUG);
+                       return array();
                }
 
-               $links = \xml::element_to_array($xrd);
+               $links = xml::element_to_array($xrd);
                if (!isset($links["xrd"]["link"])) {
-                       return false;
+                       logger("No xrd data found for ".$host, LOGGER_DEBUG);
+                       return array();
                }
 
                $xrd_data = array();
@@ -109,11 +143,13 @@ class Probe {
                                continue;
                        }
 
-                       if (($attributes["rel"] == "lrdd") AND
-                               ($attributes["type"] == "application/xrd+xml")) {
+                       if (($attributes["rel"] == "lrdd")
+                               && ($attributes["type"] == "application/xrd+xml")
+                       ) {
                                $xrd_data["lrdd-xml"] = $attributes["template"];
-                       } elseif (($attributes["rel"] == "lrdd") AND
-                               ($attributes["type"] == "application/json")) {
+                       } elseif (($attributes["rel"] == "lrdd")
+                               && ($attributes["type"] == "application/json")
+                       ) {
                                $xrd_data["lrdd-json"] = $attributes["template"];
                        } elseif ($attributes["rel"] == "lrdd") {
                                $xrd_data["lrdd"] = $attributes["template"];
@@ -122,6 +158,8 @@ class Probe {
 
                self::$baseurl = "http://".$host;
 
+               logger("Probing successful for ".$host, LOGGER_DEBUG);
+
                return $xrd_data;
        }
 
@@ -141,12 +179,11 @@ class Probe {
         * a lengthy content page to scrape dfrn attributes
         *
         * @param string $webbie Address that should be probed
-        * @param string $hcard Link to the hcard - is returned by reference
+        * @param string $hcard_url Link to the hcard - is returned by reference
         *
         * @return string profile link
         */
-
-       public static function webfingerDfrn($webbie, &$hcard) {
+       public static function webfingerDfrn($webbie, &$hcard_url) {
 
                $profile_link = '';
 
@@ -157,11 +194,11 @@ class Probe {
                                if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
                                        $profile_link = $link['@attributes']['href'];
                                }
-                               if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) {
+                               if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) && ($profile_link == "")) {
                                        $profile_link = 'stat:'.$link['@attributes']['template'];
                                }
                                if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') {
-                                       $hcard = $link['@attributes']['href'];
+                                       $hcard_url = $link['@attributes']['href'];
                                }
                        }
                }
@@ -182,6 +219,11 @@ class Probe {
        public static function lrdd($uri) {
 
                $lrdd = self::xrd($uri);
+               $webfinger = null;
+
+               if (is_bool($lrdd)) {
+                       return array();
+               }
 
                if (!$lrdd) {
                        $parts = @parse_url($uri);
@@ -201,10 +243,11 @@ class Probe {
                        do {
                                $lrdd = self::xrd($host);
                                $host .= "/".array_shift($path_parts);
-                       } while (!$lrdd AND (sizeof($path_parts) > 0));
+                       } while (!$lrdd && (sizeof($path_parts) > 0));
                }
 
                if (!$lrdd) {
+                       logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
                        return array();
                }
 
@@ -220,7 +263,7 @@ class Probe {
                        $path = str_replace('{uri}', urlencode($uri), $link);
                        $webfinger = self::webfinger($path);
 
-                       if (!$webfinger AND (strstr($uri, "@"))) {
+                       if (!$webfinger && (strstr($uri, "@"))) {
                                $path = str_replace('{uri}', urlencode("acct:".$uri), $link);
                                $webfinger = self::webfinger($path);
                        }
@@ -228,7 +271,7 @@ class Probe {
                        // Special treatment for Mastodon
                        // Problem is that Mastodon uses an URL format like http://domain.tld/@nick
                        // But the webfinger for this format fails.
-                       if (!$webfinger AND isset($nick)) {
+                       if (!$webfinger && isset($nick)) {
                                // Mastodon uses a "@" as prefix for usernames in their url format
                                $nick = ltrim($nick, '@');
 
@@ -240,6 +283,7 @@ class Probe {
                }
 
                if (!is_array($webfinger["links"])) {
+                       logger("No webfinger links found for ".$uri, LOGGER_DEBUG);
                        return false;
                }
 
@@ -273,7 +317,7 @@ class Probe {
        public static function uri($uri, $network = "", $uid = 0, $cache = true) {
 
                if ($cache) {
-                       $result = \Cache::get("probe_url:".$network.":".$uri);
+                       $result = Cache::get("probe_url:".$network.":".$uri);
                        if (!is_null($result)) {
                                return $result;
                        }
@@ -295,7 +339,7 @@ class Probe {
                        $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
                }
 
-               if (!isset($data["name"]) OR ($data["name"] == "")) {
+               if (!isset($data["name"]) || ($data["name"] == "")) {
                        if (isset($data["nick"])) {
                                $data["name"] = $data["nick"];
                        }
@@ -305,7 +349,7 @@ class Probe {
                        }
                }
 
-               if (!isset($data["nick"]) OR ($data["nick"] == "")) {
+               if (!isset($data["nick"]) || ($data["nick"] == "")) {
                        $data["nick"] = strtolower($data["name"]);
 
                        if (strpos($data['nick'], ' ')) {
@@ -325,13 +369,20 @@ class Probe {
 
                // Only store into the cache if the value seems to be valid
                if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
-                       \Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
+                       Cache::set("probe_url:".$network.":".$uri, $data, CACHE_DAY);
 
                        /// @todo temporary fix - we need a real contact update function that updates only changing fields
                        /// The biggest problem is the avatar picture that could have a reduced image size.
                        /// It should only be updated if the existing picture isn't existing anymore.
-                       if (($data['network'] != NETWORK_FEED) AND ($mode == PROBE_NORMAL) AND
-                               $data["name"] AND $data["nick"] AND $data["url"] AND $data["addr"] AND $data["poll"]) {
+                       /// We only update the contact when it is no probing for a specific network.
+                       if (($data['network'] != NETWORK_FEED)
+                               && ($network == "")
+                               && $data["name"]
+                               && $data["nick"]
+                               && $data["url"]
+                               && $data["addr"]
+                               && $data["poll"]
+                       ) {
                                q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s',
                                                `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s'
                                        WHERE `nurl` = '%s' AND NOT `self` AND `uid` = 0",
@@ -351,6 +402,70 @@ class Probe {
                return $data;
        }
 
+       /**
+        * @brief Switch the scheme of an url between http and https
+        *
+        * @param string $url URL
+        *
+        * @return string switched URL
+        */
+       private static function switchScheme($url) {
+               $parts = parse_url($url);
+
+               if (!isset($parts['scheme'])) {
+                       return $url;
+               }
+
+               if ($parts['scheme'] == 'http') {
+                       $url = str_replace('http://', 'https://', $url);
+               } elseif ($parts['scheme'] == 'https') {
+                       $url = str_replace('https://', 'http://', $url);
+               }
+
+               return $url;
+       }
+
+       /**
+        * @brief Checks if a profile url should be OStatus but only provides partial information
+        *
+        * @param array $webfinger Webfinger data
+        * @param string $lrdd Path template for webfinger request
+        *
+        * @return array fixed webfinger data
+        */
+       private static function fixOstatus($webfinger, $lrdd) {
+               if (empty($webfinger['links']) || empty($webfinger['subject'])) {
+                       return $webfinger;
+               }
+
+               $is_ostatus = false;
+               $has_key = false;
+
+               foreach ($webfinger['links'] as $link) {
+                       if ($link['rel'] == NAMESPACE_OSTATUSSUB) {
+                               $is_ostatus = true;
+                       }
+                       if ($link['rel'] == 'magic-public-key') {
+                               $has_key = true;
+                       }
+               }
+
+               if (!$is_ostatus || $has_key) {
+                       return $webfinger;
+               }
+
+               $url = self::switchScheme($webfinger['subject']);
+               $path = str_replace('{uri}', urlencode($url), $lrdd);
+               $webfinger2 = self::webfinger($path);
+
+               // Is the new webfinger detectable as OStatus?
+               if (self::ostatus($webfinger2, true)) {
+                       $webfinger = $webfinger2;
+               }
+
+               return $webfinger;
+       }
+
        /**
         * @brief Fetch information (protocol endpoints and user information) about a given uri
         *
@@ -362,10 +477,10 @@ class Probe {
         *
         * @return array uri data
         */
-       private function detect($uri, $network, $uid) {
+       private static function detect($uri, $network, $uid) {
                $parts = parse_url($uri);
 
-               if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) {
+               if (isset($parts["scheme"]) && isset($parts["host"]) && isset($parts["path"])) {
                        $host = $parts["host"];
                        if (isset($parts["port"])) {
                                $host .= ':'.$parts["port"];
@@ -376,13 +491,18 @@ class Probe {
                        }
                        $lrdd = self::xrd($host);
 
+                       if (is_bool($lrdd)) {
+                               return array();
+                       }
+
                        $path_parts = explode("/", trim($parts["path"], "/"));
 
-                       while (!$lrdd AND (sizeof($path_parts) > 1)) {
+                       while (!$lrdd && (sizeof($path_parts) > 1)) {
                                $host .= "/".array_shift($path_parts);
                                $lrdd = self::xrd($host);
                        }
                        if (!$lrdd) {
+                               logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
                                return self::feed($uri);
                        }
                        $nick = array_pop($path_parts);
@@ -394,8 +514,8 @@ class Probe {
 
                } elseif (strstr($uri, '@')) {
                        // If the URI starts with "mailto:" then jump directly to the mail detection
-                       if (strpos($url, 'mailto:') !== false) {
-                               $uri = str_replace('mailto:', '', $url);
+                       if (strpos($uri, 'mailto:') !== false) {
+                               $uri = str_replace('mailto:', '', $uri);
                                return self::mail($uri, $uid);
                        }
 
@@ -413,12 +533,18 @@ class Probe {
                        }
                        $lrdd = self::xrd($host);
 
+                       if (is_bool($lrdd)) {
+                               return array();
+                       }
+
                        if (!$lrdd) {
+                               logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
                                return self::mail($uri, $uid);
                        }
                        $addr = $uri;
 
                } else {
+                       logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
                        return false;
                }
 
@@ -437,8 +563,11 @@ class Probe {
                        $path = str_replace('{uri}', urlencode($uri), $link);
                        $webfinger = self::webfinger($path);
 
+                       // Fix possible problems with GNU Social probing to wrong scheme
+                       $webfinger = self::fixOstatus($webfinger, $link);
+
                        // We cannot be sure that the detected address was correct, so we don't use the values
-                       if ($webfinger AND ($uri != $addr)) {
+                       if ($webfinger && ($uri != $addr)) {
                                $nick = "";
                                $addr = "";
                        }
@@ -466,32 +595,32 @@ class Probe {
                if (in_array($network, array("", NETWORK_DFRN))) {
                        $result = self::dfrn($webfinger);
                }
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) {
+               if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
                        $result = self::diaspora($webfinger);
                }
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) {
+               if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) {
                        $result = self::ostatus($webfinger);
                }
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) {
+               if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
                        $result = self::pumpio($webfinger);
                }
-               if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) {
+               if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
                        $result = self::feed($uri);
                } else {
                        // We overwrite the detected nick with our try if the previois routines hadn't detected it.
                        // Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
-                       if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) {
+                       if ((!isset($result["nick"]) || ($result["nick"] == "") || (strstr($result["nick"], " "))) && ($nick != "")) {
                                $result["nick"] = $nick;
                        }
 
-                       if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) {
+                       if ((!isset($result["addr"]) || ($result["addr"] == "")) && ($addr != "")) {
                                $result["addr"] = $addr;
                        }
                }
 
                logger($uri." is ".$result["network"], LOGGER_DEBUG);
 
-               if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) {
+               if (!isset($result["baseurl"]) || ($result["baseurl"] == "")) {
                        $pos = strpos($result["url"], $host);
                        if ($pos) {
                                $result["baseurl"] = substr($result["url"], 0, $pos).$host;
@@ -510,7 +639,7 @@ class Probe {
         *
         * @return array webfinger data
         */
-       private function webfinger($url) {
+       private static function webfinger($url) {
 
                $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
                $redirects = 0;
@@ -528,14 +657,16 @@ class Probe {
                        $webfinger = json_decode($data, true);
 
                        if (!isset($webfinger["links"])) {
+                               logger("No json webfinger links for ".$url, LOGGER_DEBUG);
                                return false;
                        }
 
                        return $webfinger;
                }
 
-               $xrd_arr = \xml::element_to_array($xrd);
+               $xrd_arr = xml::element_to_array($xrd);
                if (!isset($xrd_arr["xrd"]["link"])) {
+                       logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
                        return false;
                }
 
@@ -571,23 +702,25 @@ class Probe {
         * "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 string $noscrape_url Link to the noscrape page
         * @param array $data The already fetched data
         *
         * @return array noscrape data
         */
-       private function pollNoscrape($noscrape, $data) {
-               $ret = z_fetch_url($noscrape);
+       private static function pollNoscrape($noscrape_url, $data) {
+               $ret = z_fetch_url($noscrape_url);
                if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                        return false;
                }
                $content = $ret['body'];
                if (!$content) {
+                       logger("Empty body for ".$noscrape_url, LOGGER_DEBUG);
                        return false;
                }
 
                $json = json_decode($content, true);
                if (!is_array($json)) {
+                       logger("No json data for ".$noscrape_url, LOGGER_DEBUG);
                        return false;
                }
 
@@ -680,40 +813,44 @@ class Probe {
        /**
         * @brief Fetch data from a DFRN profile page and via "noscrape"
         *
-        * @param string $profile Link to the profile page
+        * @param string $profile_link Link to the profile page
         *
         * @return array profile data
         */
-       public static function profile($profile) {
+       public static function profile($profile_link) {
 
                $data = array();
 
-               logger("Check profile ".$profile, LOGGER_DEBUG);
+               logger("Check profile ".$profile_link, LOGGER_DEBUG);
 
                // Fetch data via noscrape - this is faster
-               $noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile);
-               $data = self::pollNoscrape($noscrape, $data);
+               $noscrape_url = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile_link);
+               $data = self::pollNoscrape($noscrape_url, $data);
 
-               if (!isset($data["notify"]) OR !isset($data["confirm"]) OR
-                       !isset($data["request"]) OR !isset($data["poll"]) OR
-                       !isset($data["poco"]) OR !isset($data["name"]) OR
-                       !isset($data["photo"])) {
-                       $data = self::pollHcard($profile, $data, true);
+               if (!isset($data["notify"])
+                       || !isset($data["confirm"])
+                       || !isset($data["request"])
+                       || !isset($data["poll"])
+                       || !isset($data["poco"])
+                       || !isset($data["name"])
+                       || !isset($data["photo"])
+               ) {
+                       $data = self::pollHcard($profile_link, $data, true);
                }
 
                $prof_data = array();
-               $prof_data["addr"] = $data["addr"];
-               $prof_data["nick"] = $data["nick"];
+               $prof_data["addr"]         = $data["addr"];
+               $prof_data["nick"]         = $data["nick"];
                $prof_data["dfrn-request"] = $data["request"];
                $prof_data["dfrn-confirm"] = $data["confirm"];
-               $prof_data["dfrn-notify"] = $data["notify"];
-               $prof_data["dfrn-poll"] = $data["poll"];
-               $prof_data["dfrn-poco"] = $data["poco"];
-               $prof_data["photo"] = $data["photo"];
-               $prof_data["fn"] = $data["name"];
-               $prof_data["key"] = $data["pubkey"];
+               $prof_data["dfrn-notify"]  = $data["notify"];
+               $prof_data["dfrn-poll"]    = $data["poll"];
+               $prof_data["dfrn-poco"]    = $data["poco"];
+               $prof_data["photo"]        = $data["photo"];
+               $prof_data["fn"]           = $data["name"];
+               $prof_data["key"]          = $data["pubkey"];
 
-               logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG);
+               logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
 
                return $prof_data;
        }
@@ -725,51 +862,64 @@ class Probe {
         *
         * @return array DFRN data
         */
-       private function dfrn($webfinger) {
+       private static function dfrn($webfinger) {
 
-               $hcard = "";
+               $hcard_url = "";
                $data = array();
                foreach ($webfinger["links"] as $link) {
-                       if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) {
+                       if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
                                $data["network"] = NETWORK_DFRN;
-                       } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
                                $data["url"] = $link["href"];
-                       } elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
-                               $hcard = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+                               $hcard_url = $link["href"];
+                       } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
                                $data["poco"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) {
                                $data["photo"] = $link["href"];
-                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
                                $data["baseurl"] = trim($link["href"], '/');
-                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
                                $data["guid"] = $link["href"];
-                       } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
                                $data["pubkey"] = base64_decode($link["href"]);
 
-                               //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+                               //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
                                if (strstr($data["pubkey"], 'RSA ')) {
                                        $data["pubkey"] = rsatopem($data["pubkey"]);
                                }
                        }
                }
 
-               if (!isset($data["network"]) OR ($hcard == "")) {
+               if (is_array($webfinger["aliases"])) {
+                       foreach ($webfinger["aliases"] as $alias) {
+                               if (substr($alias, 0, 5) == 'acct:') {
+                                       $data["addr"] = substr($alias, 5);
+                               }
+                       }
+               }
+
+               if (!isset($data["network"]) || ($hcard_url == "")) {
                        return false;
                }
 
                // Fetch data via noscrape - this is faster
-               $noscrape = str_replace("/hcard/", "/noscrape/", $hcard);
-               $data = self::pollNoscrape($noscrape, $data);
-
-               if (isset($data["notify"]) AND isset($data["confirm"]) AND isset($data["request"]) AND
-                       isset($data["poll"]) AND isset($data["name"]) AND isset($data["photo"])) {
+               $noscrape_url = str_replace("/hcard/", "/noscrape/", $hcard_url);
+               $data = self::pollNoscrape($noscrape_url, $data);
+
+               if (isset($data["notify"])
+                       && isset($data["confirm"])
+                       && isset($data["request"])
+                       && isset($data["poll"])
+                       && isset($data["name"])
+                       && isset($data["photo"])
+               ) {
                        return $data;
                }
 
-               $data = self::pollHcard($hcard, $data, true);
+               $data = self::pollHcard($hcard_url, $data, true);
 
                return $data;
        }
@@ -777,14 +927,14 @@ class Probe {
        /**
         * @brief Poll the hcard page (Diaspora and Friendica specific)
         *
-        * @param string $hcard Link to the hcard page
+        * @param string $hcard_url Link to the hcard page
         * @param array $data The already fetched data
         * @param boolean $dfrn Poll DFRN specific data
         *
         * @return array hcard data
         */
-       private function pollHcard($hcard, $data, $dfrn = false) {
-               $ret = z_fetch_url($hcard);
+       private static function pollHcard($hcard_url, $data, $dfrn = false) {
+               $ret = z_fetch_url($hcard_url);
                if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                        return false;
                }
@@ -793,12 +943,12 @@ class Probe {
                        return false;
                }
 
-               $doc = new \DOMDocument();
+               $doc = new DOMDocument();
                if (!@$doc->loadHTML($content)) {
                        return false;
                }
 
-               $xpath = new \DomXPath($doc);
+               $xpath = new DomXPath($doc);
 
                $vcards = $xpath->query("//div[contains(concat(' ', @class, ' '), ' vcard ')]");
                if (!is_object($vcards)) {
@@ -811,7 +961,7 @@ class Probe {
                        // We have to discard the guid from the hcard in favour of the guid from lrdd
                        // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
                        $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
-                       if (($search->length > 0) AND ($data["guid"] == "")) {
+                       if (($search->length > 0) && ($data["guid"] == "")) {
                                $data["guid"] = $search->item(0)->nodeValue;
                        }
 
@@ -852,13 +1002,13 @@ class Probe {
                                $attr[$attribute->name] = trim($attribute->value);
                        }
 
-                       if (isset($attr["src"]) AND isset($attr["width"])) {
+                       if (isset($attr["src"]) && isset($attr["width"])) {
                                $avatar[$attr["width"]] = $attr["src"];
                        }
 
                        // We don't have a width. So we just take everything that we got.
                        // This is a Hubzilla workaround which doesn't send a width.
-                       if ((sizeof($avatar) == 0) AND isset($attr["src"])) {
+                       if ((sizeof($avatar) == 0) && isset($attr["src"])) {
                                $avatar[] = $attr["src"];
                        }
                }
@@ -900,56 +1050,60 @@ class Probe {
         *
         * @return array Diaspora data
         */
-       private function diaspora($webfinger) {
+       private static function diaspora($webfinger) {
 
-               $hcard = "";
+               $hcard_url = "";
                $data = array();
                foreach ($webfinger["links"] as $link) {
-                       if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) {
-                               $hcard = $link["href"];
-                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) {
+                       if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+                               $hcard_url = $link["href"];
+                       } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
                                $data["baseurl"] = trim($link["href"], '/');
-                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
                                $data["guid"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
                                $data["url"] = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
                                $data["poco"] = $link["href"];
-                       } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
                                $data["notify"] = $link["href"];
-                       } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
                                $data["pubkey"] = base64_decode($link["href"]);
 
-                               //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA"))
+                               //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
                                if (strstr($data["pubkey"], 'RSA ')) {
                                        $data["pubkey"] = rsatopem($data["pubkey"]);
                                }
                        }
                }
 
-               if (!isset($data["url"]) OR ($hcard == "")) {
+               if (!isset($data["url"]) || ($hcard_url == "")) {
                        return false;
                }
 
                if (is_array($webfinger["aliases"])) {
                        foreach ($webfinger["aliases"] as $alias) {
-                               if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) {
+                               if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
                                        $data["alias"] = $alias;
                                }
                        }
                }
 
                // Fetch further information from the hcard
-               $data = self::pollHcard($hcard, $data);
+               $data = self::pollHcard($hcard_url, $data);
 
                if (!$data) {
                        return false;
                }
 
-               if (isset($data["url"]) AND isset($data["guid"]) AND isset($data["baseurl"]) AND
-                       isset($data["pubkey"]) AND ($hcard != "")) {
+               if (isset($data["url"])
+                       && isset($data["guid"])
+                       && isset($data["baseurl"])
+                       && isset($data["pubkey"])
+                       && ($hcard_url != "")
+               ) {
                        $data["network"] = NETWORK_DIASPORA;
 
                        // The Diaspora handle must always be lowercase
@@ -957,7 +1111,7 @@ class Probe {
 
                        // 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";
+                       $data["batch"]  = $data["baseurl"] . "/receive/public";
                } else {
                        return false;
                }
@@ -969,10 +1123,11 @@ class Probe {
         * @brief Check for OStatus contact
         *
         * @param array $webfinger Webfinger data
+        * @param bool $short Short detection mode
         *
-        * @return array OStatus data
+        * @return array|bool OStatus data or "false" on error or "true" on short mode
         */
-       private function ostatus($webfinger) {
+       private static function ostatus($webfinger, $short = false) {
                $data = array();
                if (is_array($webfinger["aliases"])) {
                        foreach ($webfinger["aliases"] as $alias) {
@@ -982,19 +1137,21 @@ class Probe {
                        }
                }
 
-               if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) {
+               if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")) {
                        $data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
                }
                $pubkey = "";
                foreach ($webfinger["links"] as $link) {
-                       if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
-                               ($link["type"] == "text/html") AND ($link["href"] != "")) {
+                       if (($link["rel"] == "http://webfinger.net/rel/profile-page")
+                               && ($link["type"] == "text/html")
+                               && ($link["href"] != "")
+                       ) {
                                $data["url"] = $link["href"];
-                       } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
                                $data["notify"] = $link["href"];
-                       } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) {
                                $pubkey = $link["href"];
 
                                if (substr($pubkey, 0, 5) === 'data:') {
@@ -1021,12 +1178,19 @@ class Probe {
                        }
                }
 
-               if (isset($data["notify"]) AND isset($data["pubkey"]) AND
-                       isset($data["poll"]) AND isset($data["url"])) {
+               if (isset($data["notify"]) && isset($data["pubkey"])
+                       && isset($data["poll"])
+                       && isset($data["url"])
+               ) {
                        $data["network"] = NETWORK_OSTATUS;
                } else {
                        return false;
                }
+
+               if ($short) {
+                       return true;
+               }
+
                // Fetch all additional data from the feed
                $ret = z_fetch_url($data["poll"]);
                if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
@@ -1067,18 +1231,18 @@ class Probe {
        /**
         * @brief Fetch data from a pump.io profile page
         *
-        * @param string $profile Link to the profile page
+        * @param string $profile_link Link to the profile page
         *
         * @return array profile data
         */
-       private function pumpioProfileData($profile) {
+       private static function pumpioProfileData($profile_link) {
 
-               $doc = new \DOMDocument();
-               if (!@$doc->loadHTMLFile($profile)) {
+               $doc = new DOMDocument();
+               if (!@$doc->loadHTMLFile($profile_link)) {
                        return false;
                }
 
-               $xpath = new \DomXPath($doc);
+               $xpath = new DomXPath($doc);
 
                $data = array();
 
@@ -1111,23 +1275,27 @@ class Probe {
         *
         * @return array pump.io data
         */
-       private function pumpio($webfinger) {
+       private static function pumpio($webfinger) {
 
                $data = array();
                foreach ($webfinger["links"] as $link) {
-                       if (($link["rel"] == "http://webfinger.net/rel/profile-page") AND
-                               ($link["type"] == "text/html") AND ($link["href"] != "")) {
+                       if (($link["rel"] == "http://webfinger.net/rel/profile-page")
+                               && ($link["type"] == "text/html")
+                               && ($link["href"] != "")
+                       ) {
                                $data["url"] = $link["href"];
-                       } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "activity-inbox") && ($link["href"] != "")) {
                                $data["notify"] = $link["href"];
-                       } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "activity-outbox") && ($link["href"] != "")) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) {
+                       } elseif (($link["rel"] == "dialback") && ($link["href"] != "")) {
                                $data["dialback"] = $link["href"];
                        }
                }
-               if (isset($data["poll"]) AND isset($data["notify"]) AND
-                       isset($data["dialback"]) AND isset($data["url"])) {
+               if (isset($data["poll"]) && isset($data["notify"])
+                       && isset($data["dialback"])
+                       && isset($data["url"])
+               ) {
                        // by now we use these fields only for the network type detection
                        // So we unset all data that isn't used at the moment
                        unset($data["dialback"]);
@@ -1155,14 +1323,14 @@ class Probe {
         *
         * @return string feed link
         */
-       private function getFeedLink($url) {
-               $doc = new \DOMDocument();
+       private static function getFeedLink($url) {
+               $doc = new DOMDocument();
 
                if (!@$doc->loadHTMLFile($url)) {
                        return false;
                }
 
-               $xpath = new \DomXPath($doc);
+               $xpath = new DomXPath($doc);
 
                //$feeds = $xpath->query("/html/head/link[@type='application/rss+xml']");
                $feeds = $xpath->query("/html/head/link[@type='application/rss+xml' and @rel='alternate']");
@@ -1198,7 +1366,7 @@ class Probe {
         *
         * @return array feed data
         */
-       private function feed($url, $probe = true) {
+       private static function feed($url, $probe = true) {
                $ret = z_fetch_url($url);
                if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
                        return false;
@@ -1258,7 +1426,7 @@ class Probe {
         *
         * @return array mail data
         */
-       private function mail($uri, $uid) {
+       private static function mail($uri, $uid) {
 
                if (!validate_email($uri)) {
                        return false;
@@ -1268,7 +1436,7 @@ class Probe {
 
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-               if (\dbm::is_result($x) && \dbm::is_result($r)) {
+               if (dbm::is_result($x) && dbm::is_result($r)) {
                        $mailbox = construct_mailbox_name($r[0]);
                        $password = '';
                        openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
@@ -1285,18 +1453,17 @@ class Probe {
                        return false;
                }
 
-               $data = array();
+               $phost = substr($uri, strpos($uri, '@') + 1);
 
-               $data["addr"] = $uri;
+               $data = array();
+               $data["addr"]    = $uri;
                $data["network"] = NETWORK_MAIL;
-               $data["name"] = substr($uri, 0, strpos($uri, '@'));
-               $data["nick"] = $data["name"];
-               $data["photo"] = avatar_img($uri);
-
-               $phost = substr($uri, strpos($uri, '@') + 1);
-               $data["url"] = 'http://'.$phost."/".$data["nick"];
-               $data["notify"] = 'smtp '.random_string();
-               $data["poll"] = 'email '.random_string();
+               $data["name"]    = substr($uri, 0, strpos($uri, '@'));
+               $data["nick"]    = $data["name"];
+               $data["photo"]   = avatar_img($uri);
+               $data["url"]     = 'http://'.$phost."/".$data["nick"];
+               $data["notify"]  = 'smtp '.random_string();
+               $data["poll"]    = 'email '.random_string();
 
                $x = email_msg_meta($mbox, $msgs[0]);
                if (stristr($x[0]->from, $uri)) {
@@ -1308,8 +1475,8 @@ class Probe {
                        foreach ($adr as $feadr) {
                                if ((strcasecmp($feadr->mailbox, $data["name"]) == 0)
                                        &&(strcasecmp($feadr->host, $phost) == 0)
-                                       && (strlen($feadr->personal))) {
-
+                                       && (strlen($feadr->personal))
+                               ) {
                                        $personal = imap_mime_header_decode($feadr->personal);
                                        $data["name"] = "";
                                        foreach ($personal as $perspart) {
@@ -1351,11 +1518,11 @@ class Probe {
                $parts = array_merge($base_parts, $avatar_parts);
 
                // And put them together again
-               $scheme   = isset($parts['scheme']) ? $parts['scheme'] . '://' : '';
-               $host     = isset($parts['host']) ? $parts['host'] : '';
-               $port     = isset($parts['port']) ? ':' . $parts['port'] : '';
-               $path     = isset($parts['path']) ? $parts['path'] : '';
-               $query    = isset($parts['query']) ? '?' . $parts['query'] : '';
+               $scheme   = isset($parts['scheme'])   ? $parts['scheme'] . '://' : '';
+               $host     = isset($parts['host'])     ? $parts['host']           : '';
+               $port     = isset($parts['port'])     ? ':' . $parts['port']     : '';
+               $path     = isset($parts['path'])     ? $parts['path']           : '';
+               $query    = isset($parts['query'])    ? '?' . $parts['query']    : '';
                $fragment = isset($parts['fragment']) ? '#' . $parts['fragment'] : '';
 
                $fixed = $scheme.$host.$port.$path.$query.$fragment;