Bugfix for bugfix :-)

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index a245ef250f2e12b001de453a98d6dca410795761..0b3c66412965df6fcd2bd2131863a7875baf0e16 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -217,7 +217,6 @@ class Probe {
                if ($cache) {
                        $result = Cache::get("probe_url:".$network.":".$uri);
                        if (!is_null($result)) {
-                               $result = unserialize($result);
                                return $result;
                        }
                }
@@ -257,7 +256,7 @@ 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,serialize($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.
@@ -325,7 +324,7 @@ class Probe {
                                !isset($parts["path"]))
                                return false;
 
-                       // todo: Ports?
+                       /// @todo: Ports?
                        $host = $parts["host"];
 
                        if ($host == 'twitter.com')
@@ -570,6 +569,8 @@ class Probe {
 
                $data = array();
 
+               logger("Check profile ".$profile, LOGGER_DEBUG);
+
                // Fetch data via noscrape - this is faster
                $noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile);
                $data = self::poll_noscrape($noscrape, $data);
@@ -592,6 +593,8 @@ class Probe {
                $prof_data["fn"] = $data["name"];
                $prof_data["key"] = $data["pubkey"];
 
+               logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG);
+
                return $prof_data;
        }
 
@@ -661,8 +664,12 @@ class Probe {
         */
        private function poll_hcard($hcard, $data, $dfrn = false) {
 
+               $content = fetch_url($hcard);
+               if (!$content)
+                       return false;
+
                $doc = new DOMDocument();
-               if (!@$doc->loadHTMLFile($hcard))
+               if (!@$doc->loadHTML($content))
                        return false;
 
                $xpath = new DomXPath($doc);
@@ -671,49 +678,56 @@ class Probe {
                if (!is_object($vcards))
                        return false;
 
-               if ($vcards->length == 0)
-                       return false;
+               if ($vcards->length > 0) {
+                       $vcard = $vcards->item(0);
 
-               $vcard = $vcards->item(0);
+                       // 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"] == ""))
+                               $data["guid"] = $search->item(0)->nodeValue;
 
-               // 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"] == ""))
-                       $data["guid"] = $search->item(0)->nodeValue;
+                       $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
+                       if ($search->length > 0)
+                               $data["nick"] = $search->item(0)->nodeValue;
 
-               $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
-               if ($search->length > 0)
-                       $data["nick"] = $search->item(0)->nodeValue;
+                       $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
+                       if ($search->length > 0)
+                               $data["name"] = $search->item(0)->nodeValue;
 
-               $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
-               if ($search->length > 0)
-                       $data["name"] = $search->item(0)->nodeValue;
+                       $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
+                       if ($search->length > 0)
+                               $data["searchable"] = $search->item(0)->nodeValue;
 
-               $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
-               if ($search->length > 0)
-                       $data["searchable"] = $search->item(0)->nodeValue;
+                       $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
+                       if ($search->length > 0) {
+                               $data["pubkey"] = $search->item(0)->nodeValue;
+                               if (strstr($data["pubkey"], 'RSA '))
+                                       $data["pubkey"] = rsatopem($data["pubkey"]);
+                       }
 
-               $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
-               if ($search->length > 0) {
-                       $data["pubkey"] = $search->item(0)->nodeValue;
-                       if (strstr($data["pubkey"], 'RSA '))
-                               $data["pubkey"] = rsatopem($data["pubkey"]);
+                       $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
+                       if ($search->length > 0)
+                               $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
                }
 
-               $search = $xpath->query("//*[@id='pod_location']", $vcard); // */
-               if ($search->length > 0)
-                       $data["baseurl"] = trim($search->item(0)->nodeValue, "/");
-
                $avatar = array();
                $photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
                foreach ($photos AS $photo) {
                        $attr = array();
-                       foreach ($photo->attributes as $attribute)
+                       foreach ($photo->attributes as $attribute) {
                                $attr[$attribute->name] = trim($attribute->value);
+                       }
 
-                       if (isset($attr["src"]) AND isset($attr["width"]))
+                       if (isset($attr["src"]) AND 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"])) {
+                               $avatar[] = $attr["src"];
+                       }
                }
 
                if (sizeof($avatar)) {
@@ -1078,7 +1092,7 @@ class Probe {
 
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-               if(count($x) && count($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']);