friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Avid notices and warnings (#5546)

This commit is contained in:
Michael Vogel 2018-08-02 19:07:20 +02:00 committed by Tobias Diekershoff
parent 65d752d03c
commit 2c8c803d64
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Protocol/PortableContact.php
View File

@ -1645,7 +1645,9 @@ class PortableContact
if ($retdata["success"] && !empty($retdata["body"])) { if ($retdata["success"] && !empty($retdata["body"])) {
$data = json_decode($retdata["body"], true); $data = json_decode($retdata["body"], true);
self::discoverServer($data, 2); if (!empty($data)) {
self::discoverServer($data, 2);
}
if (Config::get('system', 'poco_discovery') > 1) { if (Config::get('system', 'poco_discovery') > 1) {
$timeframe = Config::get('system', 'poco_discovery_since'); $timeframe = Config::get('system', 'poco_discovery_since');
@ -1665,7 +1667,11 @@ class PortableContact
if ($retdata["success"] && !empty($retdata["body"])) { if ($retdata["success"] && !empty($retdata["body"])) {
logger("Fetch all global contacts from the server " . $server["nurl"], LOGGER_DEBUG); logger("Fetch all global contacts from the server " . $server["nurl"], LOGGER_DEBUG);
$success = self::discoverServer(json_decode($retdata["body"], true)); $data = json_decode($retdata["body"], true);
if (!empty($data)) {
$success = self::discoverServer($data);
}
} }
if (!$success && (Config::get('system', 'poco_discovery') > 2)) { if (!$success && (Config::get('system', 'poco_discovery') > 2)) {
@ -1760,7 +1766,11 @@ class PortableContact
$retdata = Network::curl($url); $retdata = Network::curl($url);
if (!empty($retdata['success'])) { if (!empty($retdata['success'])) {
self::discoverServer(json_decode($retdata['body'], true), 3); $data = json_decode($retdata["body"], true);
if (!empty($data)) {
self::discoverServer($data, 3);
}
} }
} }
} }

5
src/Util/Network.php
View File

@ -494,10 +494,11 @@ class Network
$h = substr($addr, strpos($addr, '@') + 1); $h = substr($addr, strpos($addr, '@') + 1);
if (($h) && (dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) { // Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true; return true;
} }
if (($h) && dns_get_record($h, DNS_CNAME + DNS_MX)) { if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
return true; return true;
} }
return false; return false;