X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FNetwork%2FProbe.php;h=af2d1c9a16ef6d8254dbc8ca7b803e338097d324;hb=69e7c7fecac5d315930c52bfa9fb21954dcf8b5e;hp=76c48c3d2de6c5b50bc6fb471ed3a546b62f72cf;hpb=0342f9e08437384401395a534807274831146e7e;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 76c48c3d2d..af2d1c9a16 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -933,6 +933,13 @@ class Probe
 		}
 
 		$prof_data = [];
+
+		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"];
@@ -1595,18 +1602,20 @@ class Probe
 			return false;
 		}
 
-		$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
-		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+		$condition = ["`uid` = ? AND `server` != ''", $uid];
+		$fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+		$mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
-		if (!DBA::isResult($x) || !DBA::isResult($r)) {
+		if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
 			return false;
 		}
 
-		$mailbox = Email::constructMailboxName($r[0]);
+		$mailbox = Email::constructMailboxName($mailacct);
 		$password = '';
-		openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
-		$mbox = Email::connect($mailbox, $r[0]['user'], $password);
+		openssl_private_decrypt(hex2bin($mailacct['pass']), $password, $user['prvkey']);
+		$mbox = Email::connect($mailbox, $mailacct['user'], $password);
 		if (!$mbox) {
 			return false;
 		}
@@ -1659,7 +1668,6 @@ class Probe
 		if (!empty($mbox)) {
 			imap_close($mbox);
 		}
-
 		return $data;
 	}