Merge pull request #5679 from annando/neverending-notices

The neverending story of removing notices continues ...

diff --combined src/Network/Probe.php
index 408fd01dcbe6af2bf2dd3d6b4d2f3ba4d5652e61,33ced4105439b20b06ec5c6008c7708b428f6d87..af2d1c9a16ef6d8254dbc8ca7b803e338097d324
--- 1/src/Network/Probe.php
--- 2/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@@ -934,9 -934,10 +934,10 @@@ class Prob
  
                $prof_data = [];
  
-               if (empty($data["addr"])) {
+               if (empty($data["addr"]) || empty($data["nick"])) {
                        $probe_data = self::uri($profile_link);
-                       $data["addr"] = $probe_data["addr"];
+                       $data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+                       $data["nick"] = defaults($data, "nick", $probe_data["nick"]);
                }
  
                $prof_data["addr"]         = $data["addr"];
@@@ -1604,8 -1605,7 +1605,8 @@@
                $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;