]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/OnePoll.php
Add docs
[friendica.git] / src / Worker / OnePoll.php
index 8523ce2e0b8d01db801a3f58be2a3df4ab47a189..3f8b98ead1e391854b5e6b8543e64562202931ed 100644 (file)
@@ -11,9 +11,10 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\User;
+use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
@@ -26,11 +27,9 @@ class OnePoll
 {
        public static function execute($contact_id = 0, $command = '')
        {
-               $a = BaseObject::getApp();
-
                Logger::log('Start for contact ' . $contact_id);
 
-               $force      = false;
+               $force = false;
 
                if ($command == "force") {
                        $force = true;
@@ -41,6 +40,9 @@ class OnePoll
                        return;
                }
 
+               if ($force) {
+                       Contact::updateFromProbe($contact_id, true);
+               }
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                if (!DBA::isResult($contact)) {
@@ -48,141 +50,65 @@ class OnePoll
                        return;
                }
 
-               $importer_uid = $contact['uid'];
-
-               // Possibly switch the remote contact to AP
-               if ($contact['network'] === Protocol::OSTATUS) {
-                       ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']);
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
-               }
-
-               // These three networks can be able to speak AP, so we are trying to fetch AP profile data here
-               if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN])) {
-                       $apcontact = APContact::getByURL($contact['url'], true);
-
-                       $updated = DateTimeFormat::utcNow();
-                       if (($contact['network'] === Protocol::ACTIVITYPUB) && empty($apcontact)) {
-                               self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       } elseif (!empty($apcontact)) {
-                               $fields = ['last-update' => $updated, 'success_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::unmarkForArchival($contact);
-                       }
+               if (($contact['network'] == Protocol::DFRN) && !Contact::isLegacyDFRNContact($contact)) {
+                       $protocol = Protocol::ACTIVITYPUB;
+               } else {
+                       $protocol = $contact['network'];
                }
 
-               // Diaspora users, archived users and followers are only checked if they still exist.
-               if (($contact['network'] != Protocol::ACTIVITYPUB) && ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER))) {
-                       $last_updated = PortableContact::lastUpdated($contact["url"], true);
-                       $updated = DateTimeFormat::utcNow();
+               $importer_uid = $contact['uid'];
 
-                       if ($last_updated) {
-                               Logger::log('Contact '.$contact['id'].' had last update on '.$last_updated, Logger::DEBUG);
+               $updated = DateTimeFormat::utcNow();
 
-                               // The last public item can be older than the last item we got
-                               if ($last_updated < $contact['last-item']) {
-                                       $last_updated = $contact['last-item'];
-                               }
+               if ($importer_uid == 0) {
+                       Logger::log('Ignore public contacts');
 
-                               $fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::unmarkForArchival($contact);
-                       } else {
-                               self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
+                       // set the last-update so we don't keep polling
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+                       return;
                }
 
-               // Update the contact entry
-               if (in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) {
-                       $updated = DateTimeFormat::utcNow();
-                       // Currently we can't check every AP implementation, so we don't do it at all
-                       if (($contact['network'] != Protocol::ACTIVITYPUB) && !PortableContact::reachable($contact['url'])) {
-                               Logger::log("Skipping probably dead contact ".$contact['url']);
-
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => $updated]);
-                               return;
-                       }
-
-                       if (!Contact::updateFromProbe($contact["id"])) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => $updated]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       } else {
-                               $fields = ['last-update' => $updated, 'success_update' => $updated];
-                               self::updateContact($contact, $fields);
-                               Contact::unmarkForArchival($contact);
-                       }
+               // Possibly switch the remote contact to AP
+               if ($protocol === Protocol::OSTATUS) {
+                       ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']);
+                       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
                }
 
                // load current friends if possible.
                if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) {
-                       $r = q("SELECT count(*) AS total FROM glink
-                               WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
-                               intval($contact['id'])
-                       );
-                       if (DBA::isResult($r)) {
-                               if (!$r[0]['total']) {
-                                       PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
-                               }
+                       if (!DBA::exists('glink', ["`cid` = ? AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", $contact['id']])) {
+                               PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
                        }
                }
 
-               // We don't poll our followers
-               if ($contact["rel"] == Contact::FOLLOWER) {
-                       Logger::log("Don't poll follower");
-
-                       // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                       return;
-               }
-
                // Don't poll if polling is deactivated (But we poll feeds and mails anyway)
-               if (!in_array($contact['network'], [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) {
+               if (!in_array($protocol, [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) {
                        Logger::log('Polling is disabled');
 
                        // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                        return;
                }
 
                // We don't poll AP contacts by now
-               if ($contact['network'] === Protocol::ACTIVITYPUB) {
+               if ($protocol === Protocol::ACTIVITYPUB) {
                        Logger::log("Don't poll AP contact");
 
                        // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                        return;
                }
 
-               if ($importer_uid == 0) {
-                       Logger::log('Ignore public contacts');
-
-                       // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                       return;
-               }
-
-               $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
-                       intval($importer_uid)
-               );
+               $importer = User::getOwnerDataById($importer_uid);
 
-               if (!DBA::isResult($r)) {
+               if (empty($importer)) {
                        Logger::log('No self contact for user '.$importer_uid);
 
                        // set the last-update so we don't keep polling
-                       DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                        return;
                }
 
-               $importer = $r[0];
                $url = '';
                $xml = false;
 
@@ -198,516 +124,557 @@ class OnePoll
                        $hub_update = false;
                }
 
-               $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
-                       ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
-                       : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
-               );
-
-               Logger::log("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
+               Logger::log("poll: ({$protocol}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
-               if ($contact['network'] === Protocol::DFRN) {
-                       $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
-                       if (intval($contact['duplex']) && $contact['dfrn-id']) {
-                               $idtosend = '0:' . $orig_id;
-                       }
-                       if (intval($contact['duplex']) && $contact['issued-id']) {
-                               $idtosend = '1:' . $orig_id;
-                       }
-
-                       // they have permission to write to us. We already filtered this in the contact query.
-                       $perm = 'rw';
+               $xml = '';
 
-                       // But this may be our first communication, so set the writable flag if it isn't set already.
-
-                       if (!intval($contact['writable'])) {
-                               $fields = ['writable' => true];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
-                       }
-
-                       $url = $contact['poll'] . '?dfrn_id=' . $idtosend
-                               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
-                               . '&type=data&last_update=' . $last_update
-                               . '&perm=' . $perm;
+               if ($protocol === Protocol::DFRN) {
+                       $xml = self::pollDFRN($contact, $updated);
+               } elseif (($protocol === Protocol::OSTATUS)
+                       || ($protocol === Protocol::DIASPORA)
+                       || ($protocol === Protocol::FEED)) {
+                       $xml = self::pollFeed($contact, $protocol, $updated);
+               } elseif ($protocol === Protocol::MAIL) {
+                       self::pollMail($contact, $importer_uid, $updated);
+               }
 
-                       $curlResult = Network::curl($url);
+               if (!empty($xml)) {
+                       Logger::log('received xml : ' . $xml, Logger::DATA);
+                       if (!strstr($xml, '<')) {
+                               Logger::log('post_handshake: response from ' . $url . ' did not contain XML.');
 
-                       if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
+                               $fields = ['last-update' => $updated, 'failure_update' => $updated];
+                               self::updateContact($contact, $fields);
                                Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
                                return;
                        }
 
-                       $handshake_xml = $curlResult->getBody();
-                       $html_code = $curlResult->getReturnCode();
 
-                       Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA);
+                       Logger::log("Consume feed of contact ".$contact['id']);
 
-                       if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
-                               // dead connection - might be a transient event, or this might
-                               // mean the software was uninstalled or the domain expired.
-                               // Will keep trying for one month.
-                               Logger::log("$url appears to be dead - marking for death ");
+                       consume_feed($xml, $importer, $contact, $hub);
 
-                               // set the last-update so we don't keep polling
-                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
+                       // do it a second time for DFRN so that any children find their parents.
+                       if ($protocol === Protocol::DFRN) {
+                               consume_feed($xml, $importer, $contact, $hub);
                        }
 
-                       if (!strstr($handshake_xml, '<')) {
-                               Logger::log('response from ' . $url . ' did not contain XML.');
+                       $hubmode = 'subscribe';
+                       if ($protocol === Protocol::DFRN || $contact['blocked']) {
+                               $hubmode = 'unsubscribe';
+                       }
 
-                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
+                       if (($protocol === Protocol::OSTATUS ||  $protocol == Protocol::FEED) && (! $contact['hub-verify'])) {
+                               $hub_update = true;
                        }
 
+                       if ($force) {
+                               $hub_update = true;
+                       }
 
-                       $res = XML::parseString($handshake_xml);
+                       Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$protocol." Relation: ".$contact['rel']." Update: ".$hub_update);
 
-                       if (intval($res->status) == 1) {
-                               // we may not be friends anymore. Will keep trying for one month.
-                               Logger::log("$url replied status 1 - marking for death ");
+                       if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $protocol == Protocol::FEED)) {
+                               Logger::log('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
+                               $hubs = explode(',', $hub);
 
-                               // set the last-update so we don't keep polling
-                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                       } elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
-                               Contact::unmarkForArchival($contact);
-                       }
+                               if (count($hubs)) {
+                                       foreach ($hubs as $h) {
+                                               $h = trim($h);
 
-                       if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                               Logger::log('Contact status is ' . $res->status);
-                               return;
-                       }
+                                               if (!strlen($h)) {
+                                                       continue;
+                                               }
 
-                       if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
-                               $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
+                                               subscribe_to_hub($h, $importer, $contact, $hubmode);
+                                       }
+                               }
                        }
 
-                       $postvars = [];
+                       self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
+                       Contact::unmarkForArchival($contact);
+               } elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
+                       self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
+                       Contact::markForArchival($contact);
+               } else {
+                       self::updateContact($contact, ['last-update' => $updated]);
+               }
 
-                       $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
-                       $challenge    = hex2bin((string) $res->challenge);
+               Logger::log('End');
+               return;
+       }
 
-                       $final_dfrn_id = '';
+       private static function RemoveReply($subject)
+       {
+               while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
+                       $subject = trim(substr($subject, 4));
+               }
 
-                       if ($contact['duplex'] && strlen($contact['prvkey'])) {
-                               openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
-                               openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
-                       } else {
-                               openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
-                               openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
-                       }
+               return $subject;
+       }
 
-                       $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+       /**
+        * @brief Updates a personal contact entry and the public contact entry
+        *
+        * @param array $contact The personal contact entry
+        * @param array $fields  The fields that are updated
+        * @throws \Exception
+        */
+       private static function updateContact(array $contact, array $fields)
+       {
+               DBA::update('contact', $fields, ['id' => $contact['id']]);
+               DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+       }
 
-                       if (strpos($final_dfrn_id, ':') == 1) {
-                               $final_dfrn_id = substr($final_dfrn_id, 2);
-                       }
+       /**
+        * @brief Poll DFRN contacts
+        *
+        * @param  array  $contact The personal contact entry
+        * @param  string $updated The updated date
+        * @return string polled XML
+        * @throws \Exception
+        */
+       private static function pollDFRN(array $contact, $updated)
+       {
+               $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
+               if (intval($contact['duplex']) && $contact['dfrn-id']) {
+                       $idtosend = '0:' . $orig_id;
+               }
+               if (intval($contact['duplex']) && $contact['issued-id']) {
+                       $idtosend = '1:' . $orig_id;
+               }
 
-                       // There are issues with the legacy DFRN transport layer.
-                       // Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it.
-                       if (empty($final_dfrn_id) || empty($orig_id)) {
-                               Logger::log('Contact has got no ID - quitting');
-                               return;
-                       }
+               // they have permission to write to us. We already filtered this in the contact query.
+               $perm = 'rw';
 
-                       if ($final_dfrn_id != $orig_id) {
-                               // did not decode properly - cannot trust this site
-                               Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
+               // But this may be our first communication, so set the writable flag if it isn't set already.
+               if (!intval($contact['writable'])) {
+                       $fields = ['writable' => true];
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
+               }
 
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
+               $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME)
+                       ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
+                       : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
+               );
 
-                       $postvars['dfrn_id'] = $idtosend;
-                       $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
-                       $postvars['perm'] = 'rw';
+               $url = $contact['poll'] . '?dfrn_id=' . $idtosend
+                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+                       . '&type=data&last_update=' . $last_update
+                       . '&perm=' . $perm;
 
-                       $xml = Network::post($contact['poll'], $postvars)->getBody();
+               $curlResult = Network::curl($url);
 
-               } elseif (($contact['network'] === Protocol::OSTATUS)
-                       || ($contact['network'] === Protocol::DIASPORA)
-                       || ($contact['network'] === Protocol::FEED)) {
+               if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) {
+                       // set the last-update so we don't keep polling
+                       self::updateContact($contact, ['last-update' => $updated]);
+                       Contact::markForArchival($contact);
+                       Logger::log('Contact archived');
+                       return false;
+               }
 
-                       // Upgrading DB fields from an older Friendica version
-                       // Will only do this once per notify-enabled OStatus contact
-                       // or if relationship changes
+               $handshake_xml = $curlResult->getBody();
+               $html_code = $curlResult->getReturnCode();
 
-                       $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0);
+               Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA);
 
-                       // Contacts from OStatus are always writable
-                       if ($contact['network'] === Protocol::OSTATUS) {
-                               $stat_writeable = 1;
-                       }
+               if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
+                       // dead connection - might be a transient event, or this might
+                       // mean the software was uninstalled or the domain expired.
+                       // Will keep trying for one month.
+                       Logger::log("$url appears to be dead - marking for death ");
 
-                       if ($stat_writeable != $contact['writable']) {
-                               $fields = ['writable' => $stat_writeable];
-                               DBA::update('contact', $fields, ['id' => $contact['id']]);
-                       }
+                       // set the last-update so we don't keep polling
+                       $fields = ['last-update' => $updated, 'failure_update' => $updated];
+                       self::updateContact($contact, $fields);
+                       Contact::markForArchival($contact);
+                       return false;
+               }
 
-                       // Are we allowed to import from this person?
-                       if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
-                               // set the last-update so we don't keep polling
-                               DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-                               Logger::log('Contact is blocked or only a follower');
-                               return;
-                       }
+               if (!strstr($handshake_xml, '<')) {
+                       Logger::log('response from ' . $url . ' did not contain XML.');
 
-                       $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-                       $curlResult = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
-                       unlink($cookiejar);
+                       $fields = ['last-update' => $updated, 'failure_update' => $updated];
+                       self::updateContact($contact, $fields);
+                       Contact::markForArchival($contact);
+                       return false;
+               }
 
-                       if ($curlResult->isTimeout()) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
+               $res = XML::parseString($handshake_xml);
 
-                       $xml = $curlResult->getBody();
+               if (!is_object($res)) {
+                       Logger::info('Unparseable response', ['url' => $url]);
 
-               } elseif ($contact['network'] === Protocol::MAIL) {
-                       Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG);
+                       $fields = ['last-update' => $updated, 'failure_update' => $updated];
+                       self::updateContact($contact, $fields);
+                       Contact::markForArchival($contact);
+                       return false;
+               }
 
-                       $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
-                       if ($mail_disabled) {
-                               // set the last-update so we don't keep polling
-                               self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
-                               Contact::markForArchival($contact);
-                               Logger::log('Contact archived');
-                               return;
-                       }
+               if (intval($res->status) == 1) {
+                       // we may not be friends anymore. Will keep trying for one month.
+                       Logger::log("$url replied status 1 - marking for death ");
 
-                       Logger::log("Mail: Enabled", Logger::DEBUG);
-
-                       $mbox = null;
-                       $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
-
-                       $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
-                       $mailconf = DBA::selectFirst('mailacct', [], $condition);
-                       if (DBA::isResult($user) && DBA::isResult($mailconf)) {
-                               $mailbox = Email::constructMailboxName($mailconf);
-                               $password = '';
-                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
-                               $mbox = Email::connect($mailbox, $mailconf['user'], $password);
-                               unset($password);
-                               Logger::log("Mail: Connect to " . $mailconf['user']);
-                               if ($mbox) {
-                                       $fields = ['last_check' => DateTimeFormat::utcNow()];
-                                       DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
-                                       Logger::log("Mail: Connected to " . $mailconf['user']);
-                               } else {
-                                       Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
-                               }
-                       }
+                       // set the last-update so we don't keep polling
+                       $fields = ['last-update' => $updated, 'failure_update' => $updated];
+                       self::updateContact($contact, $fields);
+                       Contact::markForArchival($contact);
+               } elseif ($contact['term-date'] > DBA::NULL_DATETIME) {
+                       Contact::unmarkForArchival($contact);
+               }
 
-                       if ($mbox) {
-                               $msgs = Email::poll($mbox, $contact['addr']);
+               if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
+                       // set the last-update so we don't keep polling
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+                       Logger::log('Contact status is ' . $res->status);
+                       return false;
+               }
 
-                               if (count($msgs)) {
-                                       Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG);
+               if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
+                       $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
+               }
 
-                                       $metas = Email::messageMeta($mbox, implode(',', $msgs));
+               $postvars = [];
 
-                                       if (count($metas) != count($msgs)) {
-                                               Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG);
-                                       } else {
-                                               $msgs = array_combine($msgs, $metas);
-
-                                               foreach ($msgs as $msg_uid => $meta) {
-                                                       Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA);
-
-                                                       $datarray = [];
-                                                       $datarray['verb'] = ACTIVITY_POST;
-                                                       $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
-                                                       $datarray['network'] = Protocol::MAIL;
-                                                       // $meta = Email::messageMeta($mbox, $msg_uid);
-
-                                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
-
-                                                       // Have we seen it before?
-                                                       $fields = ['deleted', 'id'];
-                                                       $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
-                                                       $item = Item::selectFirst($fields, $condition);
-                                                       if (DBA::isResult($item)) {
-                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG);
-
-                                                               // Only delete when mails aren't automatically moved or deleted
-                                                               if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
-                                                                       if ($meta->deleted && ! $item['deleted']) {
-                                                                               $fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()];
-                                                                               Item::update($fields, ['id' => $item['id']]);
-                                                                       }
-
-                                                               switch ($mailconf['action']) {
-                                                                       case 0:
-                                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
-                                                                               break;
-                                                                       case 1:
-                                                                               Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
-                                                                               imap_delete($mbox, $msg_uid, FT_UID);
-                                                                               break;
-                                                                       case 2:
-                                                                               Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
-                                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                               break;
-                                                                       case 3:
-                                                                               Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
-                                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                               if ($mailconf['movetofolder'] != "") {
-                                                                                       imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
-                                                                               }
-                                                                               break;
-                                                               }
-                                                               continue;
-                                                       }
+               $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
+               $challenge    = hex2bin((string) $res->challenge);
 
+               $final_dfrn_id = '';
 
-                                                       // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
-                                                       $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : '');
-                                                       if (!trim($raw_refs)) {
-                                                               $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : '');
-                                                       }
-                                                       $raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
-
-                                                       if ($raw_refs) {
-                                                               $refs_arr = explode(' ', $raw_refs);
-                                                               if (count($refs_arr)) {
-                                                                       for ($x = 0; $x < count($refs_arr); $x ++) {
-                                                                               $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
-                                                                       }
-                                                               }
-                                                               $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
-                                                               $parent = Item::selectFirst(['parent-uri'], $condition);
-                                                               if (DBA::isResult($parent)) {
-                                                                       $datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
-                                                               }
-                                                       }
+               if ($contact['duplex'] && strlen($contact['prvkey'])) {
+                       openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
+                       openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
+               } else {
+                       openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
+                       openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
+               }
 
-                                                       // Decoding the header
-                                                       $subject = imap_mime_header_decode($meta->subject);
-                                                       $datarray['title'] = "";
-                                                       foreach ($subject as $subpart) {
-                                                               if ($subpart->charset != "default") {
-                                                                       $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
-                                                               } else {
-                                                                       $datarray['title'] .= $subpart->text;
-                                                               }
-                                                       }
-                                                       $datarray['title'] = Strings::escapeTags(trim($datarray['title']));
-
-                                                       //$datarray['title'] = Strings::escapeTags(trim($meta->subject));
-                                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
-
-                                                       // Is it a reply?
-                                                       $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
-                                                               (substr(strtolower($datarray['title']), 0, 3) == "re-") ||
-                                                               ($raw_refs != ""));
-
-                                                       // Remove Reply-signs in the subject
-                                                       $datarray['title'] = self::RemoveReply($datarray['title']);
-
-                                                       // If it seems to be a reply but a header couldn't be found take the last message with matching subject
-                                                       if (empty($datarray['parent-uri']) && $reply) {
-                                                               $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
-                                                               $params = ['order' => ['created' => true]];
-                                                               $parent = Item::selectFirst(['parent-uri'], $condition, $params);
-                                                               if (DBA::isResult($parent)) {
-                                                                       $datarray['parent-uri'] = $parent['parent-uri'];
-                                                               }
-                                                       }
+               $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-                                                       if (empty($datarray['parent-uri'])) {
-                                                               $datarray['parent-uri'] = $datarray['uri'];
-                                                       }
+               if (strpos($final_dfrn_id, ':') == 1) {
+                       $final_dfrn_id = substr($final_dfrn_id, 2);
+               }
 
-                                                       $r = Email::getMessage($mbox, $msg_uid, $reply);
-                                                       if (!$r) {
-                                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
-                                                               continue;
-                                                       }
-                                                       $datarray['body'] = Strings::escapeHtml($r['body']);
-                                                       $datarray['body'] = BBCode::limitBodySize($datarray['body']);
+               // There are issues with the legacy DFRN transport layer.
+               // Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it.
+               if (empty($final_dfrn_id) || empty($orig_id)) {
+                       Logger::log('Contact has got no ID - quitting');
+                       return false;
+               }
 
-                                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+               if ($final_dfrn_id != $orig_id) {
+                       // did not decode properly - cannot trust this site
+                       Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
 
-                                                       /// @TODO Adding a gravatar for the original author would be cool
+                       // set the last-update so we don't keep polling
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+                       Contact::markForArchival($contact);
+                       return false;
+               }
 
-                                                       $from = imap_mime_header_decode($meta->from);
-                                                       $fromdecoded = "";
-                                                       foreach ($from as $frompart) {
-                                                               if ($frompart->charset != "default") {
-                                                                       $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
-                                                               } else {
-                                                                       $fromdecoded .= $frompart->text;
-                                                               }
-                                                       }
+               $postvars['dfrn_id'] = $idtosend;
+               $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+               $postvars['perm'] = 'rw';
 
-                                                       $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName());
+               return Network::post($contact['poll'], $postvars)->getBody();
+       }
 
-                                                       $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
+       /**
+        * @brief Poll Feed/OStatus contacts
+        *
+        * @param  array  $contact The personal contact entry
+        * @param  string $protocol The used protocol of the contact
+        * @param  string $updated The updated date
+        * @return string polled XML
+        * @throws \Exception
+        */
+       private static function pollFeed(array $contact, $protocol, $updated)
+       {
+               // Upgrading DB fields from an older Friendica version
+               // Will only do this once per notify-enabled OStatus contact
+               // or if relationship changes
 
-                                                       if (isset($fromarr[0]->personal)) {
-                                                               $fromname = $fromarr[0]->personal;
-                                                       } else {
-                                                               $fromname = $frommail;
-                                                       }
+               $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0);
 
-                                                       $datarray['author-name'] = $fromname;
-                                                       $datarray['author-link'] = "mailto:".$frommail;
-                                                       $datarray['author-avatar'] = $contact['photo'];
+               // Contacts from OStatus are always writable
+               if ($protocol === Protocol::OSTATUS) {
+                       $stat_writeable = 1;
+               }
 
-                                                       $datarray['owner-name'] = $contact['name'];
-                                                       $datarray['owner-link'] = "mailto:".$contact['addr'];
-                                                       $datarray['owner-avatar'] = $contact['photo'];
+               if ($stat_writeable != $contact['writable']) {
+                       $fields = ['writable' => $stat_writeable];
+                       DBA::update('contact', $fields, ['id' => $contact['id']]);
+               }
 
-                                                       $datarray['uid'] = $importer_uid;
-                                                       $datarray['contact-id'] = $contact['id'];
-                                                       if ($datarray['parent-uri'] === $datarray['uri']) {
-                                                               $datarray['private'] = 1;
-                                                       }
-                                                       if (($contact['network'] === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
-                                                               $datarray['private'] = 1;
-                                                               $datarray['allow_cid'] = '<' . $contact['id'] . '>';
-                                                       }
+               // Are we allowed to import from this person?
+               if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
+                       // set the last-update so we don't keep polling
+                       DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+                       Logger::log('Contact is blocked or only a follower');
+                       return false;
+               }
 
-                                                       Item::insert($datarray);
-
-                                                       switch ($mailconf['action']) {
-                                                               case 0:
-                                                                       Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
-                                                                       break;
-                                                               case 1:
-                                                                       Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
-                                                                       imap_delete($mbox, $msg_uid, FT_UID);
-                                                                       break;
-                                                               case 2:
-                                                                       Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
-                                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                       break;
-                                                               case 3:
-                                                                       Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
-                                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
-                                                                       if ($mailconf['movetofolder'] != "") {
-                                                                               imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
-                                                                       }
-                                                                       break;
-                                                       }
-                                               }
-                                       }
-                               } else {
-                                       Logger::log("Mail: no mails for ".$mailconf['user']);
-                               }
+               $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
+               $curlResult = Network::curl($contact['poll'], false, ['cookiejar' => $cookiejar]);
+               unlink($cookiejar);
 
-                               Logger::log("Mail: closing connection for ".$mailconf['user']);
-                               imap_close($mbox);
-                       }
+               if ($curlResult->isTimeout()) {
+                       // set the last-update so we don't keep polling
+                       self::updateContact($contact, ['last-update' => $updated]);
+                       Contact::markForArchival($contact);
+                       Logger::log('Contact archived');
+                       return false;
                }
 
-               if ($xml) {
-                       Logger::log('received xml : ' . $xml, Logger::DATA);
-                       if (!strstr($xml, '<')) {
-                               Logger::log('post_handshake: response from ' . $url . ' did not contain XML.');
+               return $curlResult->getBody();
+       }
 
-                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
-                               self::updateContact($contact, $fields);
-                               Contact::markForArchival($contact);
-                               return;
-                       }
+       /**
+        * @brief Poll Mail contacts
+        *
+        * @param  array   $contact      The personal contact entry
+        * @param  integer $importer_uid The UID of the importer
+        * @param  string  $updated      The updated date
+        * @throws \Exception
+        */
+       private static function pollMail(array $contact, $importer_uid, $updated)
+       {
+               Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG);
 
+               $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
+               if ($mail_disabled) {
+                       // set the last-update so we don't keep polling
+                       self::updateContact($contact, ['last-update' => $updated]);
+                       Contact::markForArchival($contact);
+                       Logger::log('Contact archived');
+                       return;
+               }
 
-                       Logger::log("Consume feed of contact ".$contact['id']);
+               Logger::log("Mail: Enabled", Logger::DEBUG);
 
-                       consume_feed($xml, $importer, $contact, $hub);
+               $mbox = null;
+               $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
 
-                       // do it a second time for DFRN so that any children find their parents.
-                       if ($contact['network'] === Protocol::DFRN) {
-                               consume_feed($xml, $importer, $contact, $hub);
+               $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
+               $mailconf = DBA::selectFirst('mailacct', [], $condition);
+               if (DBA::isResult($user) && DBA::isResult($mailconf)) {
+                       $mailbox = Email::constructMailboxName($mailconf);
+                       $password = '';
+                       openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
+                       $mbox = Email::connect($mailbox, $mailconf['user'], $password);
+                       unset($password);
+                       Logger::log("Mail: Connect to " . $mailconf['user']);
+                       if ($mbox) {
+                               $fields = ['last_check' => $updated];
+                               DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
+                               Logger::log("Mail: Connected to " . $mailconf['user']);
+                       } else {
+                               Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
                        }
+               }
 
-                       $hubmode = 'subscribe';
-                       if ($contact['network'] === Protocol::DFRN || $contact['blocked']) {
-                               $hubmode = 'unsubscribe';
-                       }
+               if (!$mbox) {
+                       return;
+               }
 
-                       if (($contact['network'] === Protocol::OSTATUS ||  $contact['network'] == Protocol::FEED) && (! $contact['hub-verify'])) {
-                               $hub_update = true;
-                       }
+               $msgs = Email::poll($mbox, $contact['addr']);
 
-                       if ($force) {
-                               $hub_update = true;
-                       }
+               if (count($msgs)) {
+                       Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG);
 
-                       Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
+                       $metas = Email::messageMeta($mbox, implode(',', $msgs));
 
-                       if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) {
-                               Logger::log('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
-                               $hubs = explode(',', $hub);
+                       if (count($metas) != count($msgs)) {
+                               Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG);
+                       } else {
+                               $msgs = array_combine($msgs, $metas);
+
+                               foreach ($msgs as $msg_uid => $meta) {
+                                       Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA);
+
+                                       $datarray = [];
+                                       $datarray['verb'] = Activity::POST;
+                                       $datarray['object-type'] = Activity\ObjectType::NOTE;
+                                       $datarray['network'] = Protocol::MAIL;
+                                       // $meta = Email::messageMeta($mbox, $msg_uid);
+
+                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
+
+                                       // Have we seen it before?
+                                       $fields = ['deleted', 'id'];
+                                       $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
+                                       $item = Item::selectFirst($fields, $condition);
+                                       if (DBA::isResult($item)) {
+                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG);
+
+                                               // Only delete when mails aren't automatically moved or deleted
+                                               if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
+                                                       if ($meta->deleted && ! $item['deleted']) {
+                                                               $fields = ['deleted' => true, 'changed' => $updated];
+                                                               Item::update($fields, ['id' => $item['id']]);
+                                                       }
 
-                               if (count($hubs)) {
-                                       foreach ($hubs as $h) {
-                                               $h = trim($h);
+                                               switch ($mailconf['action']) {
+                                                       case 0:
+                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+                                                               break;
+                                                       case 1:
+                                                               Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                               imap_delete($mbox, $msg_uid, FT_UID);
+                                                               break;
+                                                       case 2:
+                                                               Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                               break;
+                                                       case 3:
+                                                               Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
+                                                               imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                               if ($mailconf['movetofolder'] != "") {
+                                                                       imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
+                                                               }
+                                                               break;
+                                               }
+                                               continue;
+                                       }
 
-                                               if (!strlen($h)) {
-                                                       continue;
+                                       // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally.
+                                       $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : '');
+                                       if (!trim($raw_refs)) {
+                                               $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : '');
+                                       }
+                                       $raw_refs = trim($raw_refs);  // Don't allow a blank reference in $refs_arr
+
+                                       if ($raw_refs) {
+                                               $refs_arr = explode(' ', $raw_refs);
+                                               if (count($refs_arr)) {
+                                                       for ($x = 0; $x < count($refs_arr); $x ++) {
+                                                               $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
+                                                       }
+                                               }
+                                               $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
+                                               $parent = Item::selectFirst(['parent-uri'], $condition);
+                                               if (DBA::isResult($parent)) {
+                                                       $datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
                                                }
+                                       }
 
-                                               subscribe_to_hub($h, $importer, $contact, $hubmode);
+                                       // Decoding the header
+                                       $subject = imap_mime_header_decode($meta->subject);
+                                       $datarray['title'] = "";
+                                       foreach ($subject as $subpart) {
+                                               if ($subpart->charset != "default") {
+                                                       $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
+                                               } else {
+                                                       $datarray['title'] .= $subpart->text;
+                                               }
+                                       }
+                                       $datarray['title'] = Strings::escapeTags(trim($datarray['title']));
+
+                                       //$datarray['title'] = Strings::escapeTags(trim($meta->subject));
+                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
+
+                                       // Is it a reply?
+                                       $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
+                                               (substr(strtolower($datarray['title']), 0, 3) == "re-") ||
+                                               ($raw_refs != ""));
+
+                                       // Remove Reply-signs in the subject
+                                       $datarray['title'] = self::RemoveReply($datarray['title']);
+
+                                       // If it seems to be a reply but a header couldn't be found take the last message with matching subject
+                                       if (empty($datarray['parent-uri']) && $reply) {
+                                               $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL];
+                                               $params = ['order' => ['created' => true]];
+                                               $parent = Item::selectFirst(['parent-uri'], $condition, $params);
+                                               if (DBA::isResult($parent)) {
+                                                       $datarray['parent-uri'] = $parent['parent-uri'];
+                                               }
                                        }
-                               }
-                       }
 
-                       $updated = DateTimeFormat::utcNow();
+                                       if (empty($datarray['parent-uri'])) {
+                                               $datarray['parent-uri'] = $datarray['uri'];
+                                       }
 
-                       self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
-                       DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
-                       Contact::unmarkForArchival($contact);
-               } elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
-                       $updated = DateTimeFormat::utcNow();
+                                       $r = Email::getMessage($mbox, $msg_uid, $reply);
+                                       if (!$r) {
+                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+                                               continue;
+                                       }
+                                       $datarray['body'] = Strings::escapeHtml($r['body']);
+                                       $datarray['body'] = BBCode::limitBodySize($datarray['body']);
 
-                       self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
-                       DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
-                       Contact::markForArchival($contact);
-               } else {
-                       self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]);
-               }
+                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
 
-               Logger::log('End');
-               return;
-       }
+                                       /// @TODO Adding a gravatar for the original author would be cool
 
-       private static function RemoveReply($subject)
-       {
-               while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
-                       $subject = trim(substr($subject, 4));
-               }
+                                       $from = imap_mime_header_decode($meta->from);
+                                       $fromdecoded = "";
+                                       foreach ($from as $frompart) {
+                                               if ($frompart->charset != "default") {
+                                                       $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
+                                               } else {
+                                                       $fromdecoded .= $frompart->text;
+                                               }
+                                       }
 
-               return $subject;
-       }
+                                       $fromarr = imap_rfc822_parse_adrlist($fromdecoded, BaseObject::getApp()->getHostName());
 
-       /**
-        * @brief Updates a personal contact entry and the public contact entry
-        *
-        * @param array $contact The personal contact entry
-        * @param array $fields  The fields that are updated
-        * @throws \Exception
-        */
-       private static function updateContact(array $contact, array $fields)
-       {
-               DBA::update('contact', $fields, ['id' => $contact['id']]);
-               DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+                                       $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
+
+                                       if (isset($fromarr[0]->personal)) {
+                                               $fromname = $fromarr[0]->personal;
+                                       } else {
+                                               $fromname = $frommail;
+                                       }
+
+                                       $datarray['author-name'] = $fromname;
+                                       $datarray['author-link'] = "mailto:".$frommail;
+                                       $datarray['author-avatar'] = $contact['photo'];
+
+                                       $datarray['owner-name'] = $contact['name'];
+                                       $datarray['owner-link'] = "mailto:".$contact['addr'];
+                                       $datarray['owner-avatar'] = $contact['photo'];
+
+                                       $datarray['uid'] = $importer_uid;
+                                       $datarray['contact-id'] = $contact['id'];
+                                       if ($datarray['parent-uri'] === $datarray['uri']) {
+                                               $datarray['private'] = 1;
+                                       }
+                                       if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) {
+                                               $datarray['private'] = 1;
+                                               $datarray['allow_cid'] = '<' . $contact['id'] . '>';
+                                       }
+
+                                       Item::insert($datarray);
+
+                                       switch ($mailconf['action']) {
+                                               case 0:
+                                                       Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+                                                       break;
+                                               case 1:
+                                                       Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                       imap_delete($mbox, $msg_uid, FT_UID);
+                                                       break;
+                                               case 2:
+                                                       Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']);
+                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                       break;
+                                               case 3:
+                                                       Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']);
+                                                       imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID);
+                                                       if ($mailconf['movetofolder'] != "") {
+                                                               imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID);
+                                                       }
+                                                       break;
+                                       }
+                               }
+                       }
+               } else {
+                       Logger::log("Mail: no mails for ".$mailconf['user']);
+               }
+
+               Logger::log("Mail: closing connection for ".$mailconf['user']);
+               imap_close($mbox);
        }
 }