More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index aa9f7d21df6eb858a9ddf0be5c083793a0b8a698..e0d0be2a8edfd322af99edda269e51ed36a0fd74 100644 (file)
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -232,7 +232,7 @@ class Probe {
                if ($data["photo"] != "")
                        $data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
                else
-                       $data["photo"] = App::get_baseurl().'/images/person-175.jpg';
+                       $data["photo"] = $a->get_baseurl().'/images/person-175.jpg';
 
                if (!isset($data["name"]) OR ($data["name"] == "")) {
                        if (isset($data["nick"]))
@@ -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;
        }
 
@@ -1080,7 +1084,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']);