Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / include / Probe.php

diff --git a/include/Probe.php b/include/Probe.php
index d266a384e6f0ea38f967606929eba3a713de32fa..6145daaaae5f7eea3dce174660a6cc84173bb58a 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;
        }
 
@@ -1081,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']);