X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=af2d1c9a16ef6d8254dbc8ca7b803e338097d324;hb=69e7c7fecac5d315930c52bfa9fb21954dcf8b5e;hp=5bbdf7c4e03f675347c1d0a442eea7573e62443e;hpb=54aee2aaa7500e0af6d032e75362ad1d1a5dc0f1;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 5bbdf7c4e0..af2d1c9a16 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -934,11 +934,13 @@ class Probe
 
 		$prof_data = [];
 
-		// The "addr" is not always part of the fetched data
-		if (!empty($data["addr"])) {
-			$prof_data["addr"] = $data["addr"];
+		if (empty($data["addr"]) || empty($data["nick"])) {
+			$probe_data = self::uri($profile_link);
+			$data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+			$data["nick"] = defaults($data, "nick", $probe_data["nick"]);
 		}
 
+		$prof_data["addr"]         = $data["addr"];
 		$prof_data["nick"]         = $data["nick"];
 		$prof_data["dfrn-request"] = $data["request"];
 		$prof_data["dfrn-confirm"] = $data["confirm"];
@@ -1603,7 +1605,8 @@ class Probe
 		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
 		$condition = ["`uid` = ? AND `server` != ''", $uid];
-		$mailacct = DBA::selectFirst('mailacct', ['pass', 'user'], $condition);
+		$fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+		$mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
 		if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
 			return false;