From e1c0b4fe03756a51bd1112ff563cd2f1338f8417 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 4 Jul 2016 00:49:38 +0200 Subject: [PATCH] Warnings removed --- include/Probe.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/Probe.php b/include/Probe.php index 56eccc8c8a..51349c4f06 100644 --- a/include/Probe.php +++ b/include/Probe.php @@ -203,6 +203,8 @@ class Probe { $result = false; + logger("Probing ".$uri, LOGGER_DEBUG); + if (in_array($network, array("", NETWORK_DFRN))) $result = self::dfrn($webfinger); if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) @@ -223,6 +225,8 @@ class Probe { $result["addr"] = $addr; } + logger($uri." is ".$result["network"], LOGGER_DEBUG); + if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) { $pos = strpos($result["url"], $host); if ($pos) @@ -358,7 +362,8 @@ class Probe { elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { $data["pubkey"] = base64_decode($link["href"]); - if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + if (strstr($data["pubkey"], 'RSA ')) $data["pubkey"] = rsatopem($data["pubkey"]); } } @@ -487,7 +492,8 @@ class Probe { elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { $data["pubkey"] = base64_decode($link["href"]); - if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + if (strstr($data["pubkey"], 'RSA ')) $data["pubkey"] = rsatopem($data["pubkey"]); } } @@ -495,7 +501,7 @@ class Probe { if (!isset($data["url"]) OR ($hcard == "")) return false; - if (isset($webfinger["aliases"])) + if (is_array($webfinger["aliases"])) foreach ($webfinger["aliases"] AS $alias) if (normalise_link($alias) != normalise_link($data["url"]) AND !strstr($alias, "@")) $data["alias"] = $alias;