Merge pull request #3093 from annando/issue-3011

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index aa9f7d21df6eb858a9ddf0be5c083793a0b8a698..0b3c66412965df6fcd2bd2131863a7875baf0e16 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -324,7 +324,7 @@ class Probe {
                                !isset($parts["path"]))
                                return false;
 
-                       // todo: Ports?
+                       /// @todo: Ports?
                        $host = $parts["host"];
 
                        if ($host == 'twitter.com')
@@ -569,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);
@@ -591,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;
        }
 
@@ -711,11 +715,19 @@ class Probe {
                $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)) {
@@ -1080,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']);