]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/OnePoll.php
[Scrutinizer] Fix undeclared variables in src/ (except Protocol/)
[friendica.git] / src / Worker / OnePoll.php
index 356fce4337ff2a708c0c28185a0051b8cae39f4c..2594f4ec1dadf01a214e01bc370c5bf0598d59a2 100644 (file)
@@ -4,26 +4,29 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Protocol\Email;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 use dba;
 
-require_once 'include/follow.php';
+require_once 'include/dba.php';
 
-Class OnePoll
+class OnePoll
 {
        public static function execute($contact_id = 0, $command = '') {
                global $a;
 
-               require_once 'include/datetime.php';
                require_once 'include/items.php';
-               require_once 'include/email.php';
-               require_once 'include/queue_fn.php';
 
-               logger('onepoll: start');
+               logger('start');
 
                $manual_id  = 0;
                $generation = 0;
@@ -36,36 +39,18 @@ Class OnePoll
                }
 
                if (!$contact_id) {
-                       logger('onepoll: no contact');
+                       logger('no contact');
                        return;
                }
 
-               $d = datetime_convert();
-
-               // Only poll from those with suitable relationships,
-               // and which have a polling address and ignore Diaspora since
-               // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
-
-               $contacts = q("SELECT `contact`.* FROM `contact`
-                       WHERE (`rel` = %d OR `rel` = %d) AND `poll` != ''
-                       AND NOT `network` IN ('%s', '%s')
-                       AND `contact`.`id` = %d
-                       AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
-                       AND `contact`.`archive` = 0 LIMIT 1",
-                       intval(CONTACT_IS_SHARING),
-                       intval(CONTACT_IS_FRIEND),
-                       dbesc(NETWORK_FACEBOOK),
-                       dbesc(NETWORK_PUMPIO),
-                       intval($contact_id)
-               );
+               $d = DateTimeFormat::utcNow();
 
-               if (!count($contacts)) {
+               $contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
+               if (!DBM::is_result($contact)) {
                        logger('Contact not found or cannot be used.');
                        return;
                }
 
-               $contact = $contacts[0];
-
                $importer_uid = $contact['uid'];
 
                // load current friends if possible.
@@ -81,18 +66,25 @@ Class OnePoll
                        }
                }
 
-               /// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
-               /// @TODO Check whether this is possible with Redmatrix
-               if ($contact["network"] == NETWORK_DIASPORA) {
-                       if (PortableContact::updateNeeded($contact["created"], $contact["last-item"], $contact["failure_update"], $contact["success_update"])) {
-                               $last_updated = PortableContact::lastUpdated($contact["url"]);
-                               $updated = datetime_convert();
-                               if ($last_updated) {
-                                       $fields = array('last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated);
-                                       dba::update('contact', $fields, array('id' => $contact['id']));
-                               } else {
-                                       dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id']));
+               // Diaspora users, archived users and followers are only checked if they still exist.
+               if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+                       $last_updated = PortableContact::lastUpdated($contact["url"], true);
+                       $updated = DateTimeFormat::utcNow();
+                       if ($last_updated) {
+                               logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
+
+                               // The last public item can be older than the last item we got
+                               if ($last_updated < $contact['last-item']) {
+                                       $last_updated = $contact['last-item'];
                                }
+
+                               $fields = ['last-item' => $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('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG);
                        }
                        return;
                }
@@ -102,11 +94,11 @@ Class OnePoll
                $t = $contact['last-update'];
 
                if ($contact['subhub']) {
-                       $poll_interval = Config::get('system', 'pushpoll_frequency');
-                       $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
+                       $poll_interval = Config::get('system', 'pushpoll_frequency', 3);
+                       $contact['priority'] = intval($poll_interval);
                        $hub_update = false;
 
-                       if (datetime_convert('UTC', 'UTC', 'now') > datetime_convert('UTC', 'UTC', $t . " + 1 day")) {
+                       if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) {
                                $hub_update = true;
                        }
                } else {
@@ -114,20 +106,26 @@ Class OnePoll
                }
 
                $last_update = (($contact['last-update'] <= NULL_DATE)
-                       ? datetime_convert('UTC', 'UTC', 'now - 7 days', ATOM_TIME)
-                       : datetime_convert('UTC', 'UTC', $contact['last-update'], ATOM_TIME)
+                       ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM)
+                       : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM)
                );
 
                // Update the contact entry
                if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
                        if (!PortableContact::reachable($contact['url'])) {
                                logger("Skipping probably dead contact ".$contact['url']);
+
+                               // set the last-update so we don't keep polling
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        }
 
-                       if (!update_contact($contact["id"])) {
+                       if (!Contact::updateFromProbe($contact["id"])) {
                                Contact::markForArchival($contact);
                                logger('Contact is marked dead');
+
+                               // set the last-update so we don't keep polling
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        } else {
                                Contact::unmarkForArchival($contact);
@@ -136,6 +134,9 @@ Class OnePoll
 
                if ($importer_uid == 0) {
                        logger('Ignore public contacts');
+
+                       // set the last-update so we don't keep polling
+                       dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                        return;
                }
 
@@ -145,12 +146,16 @@ Class OnePoll
 
                if (!DBM::is_result($r)) {
                        logger('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']]);
                        return;
                }
 
                $importer = $r[0];
+               $url = '';
 
-               logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
+               logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
                if ($contact['network'] === NETWORK_DFRN) {
                        $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@@ -167,8 +172,8 @@ Class OnePoll
                        // But this may be our first communication, so set the writable flag if it isn't set already.
 
                        if (!intval($contact['writable'])) {
-                               $fields = array('writable' => true);
-                               dba::update('contact', $fields, array('id' => $contact['id']));
+                               $fields = ['writable' => true];
+                               dba::update('contact', $fields, ['id' => $contact['id']]);
                        }
 
                        $url = $contact['poll'] . '?dfrn_id=' . $idtosend
@@ -176,9 +181,12 @@ Class OnePoll
                                . '&type=data&last_update=' . $last_update
                                . '&perm=' . $perm ;
 
-                       $ret = z_fetch_url($url);
+                       $ret = Network::curl($url);
 
                        if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                               // set the last-update so we don't keep polling
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                               Contact::markForArchival($contact);
                                return;
                        }
 
@@ -186,7 +194,7 @@ Class OnePoll
 
                        $html_code = $a->get_curl_code();
 
-                       logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
+                       logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
 
                        if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
@@ -199,9 +207,8 @@ Class OnePoll
                                Contact::markForArchival($contact);
 
                                // set the last-update so we don't keep polling
-                               $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
-                               dba::update('contact', $fields, array('id' => $contact['id']));
-
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
+                               self::updateContact($contact, $fields);
                                return;
                        }
 
@@ -210,22 +217,21 @@ Class OnePoll
 
                                Contact::markForArchival($contact);
 
-                               $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
-                               dba::update('contact', $fields, array('id' => $contact['id']));
-
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
+                               self::updateContact($contact, $fields);
                                return;
                        }
 
 
-                       $res = parse_xml_string($handshake_xml);
+                       $res = XML::parseString($handshake_xml);
 
                        if (intval($res->status) == 1) {
                                logger("$url replied status 1 - marking for death ");
 
                                // we may not be friends anymore. Will keep trying for one month.
                                // set the last-update so we don't keep polling
-                               $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
-                               dba::update('contact', $fields, array('id' => $contact['id']));
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
+                               self::updateContact($contact, $fields);
 
                                Contact::markForArchival($contact);
                        } elseif ($contact['term-date'] > NULL_DATE) {
@@ -234,15 +240,17 @@ Class OnePoll
                        }
 
                        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']]);
                                return;
                        }
 
                        if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
-                               $fields = array('poco' => str_replace('/profile/', '/poco/', $contact['url']));
-                               dba::update('contact', $fields, array('id' => $contact['id']));
+                               $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
+                               dba::update('contact', $fields, ['id' => $contact['id']]);
                        }
 
-                       $postvars = array();
+                       $postvars = [];
 
                        $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
                        $challenge    = hex2bin((string) $res->challenge);
@@ -264,8 +272,12 @@ Class OnePoll
                        }
 
                        if ($final_dfrn_id != $orig_id) {
-                               logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
                                // did not decode properly - cannot trust this site
+                               logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_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;
                        }
 
@@ -273,7 +285,7 @@ Class OnePoll
                        $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
                        $postvars['perm'] = 'rw';
 
-                       $xml = post_url($contact['poll'], $postvars);
+                       $xml = Network::post($contact['poll'], $postvars);
 
                } elseif (($contact['network'] === NETWORK_OSTATUS)
                        || ($contact['network'] === NETWORK_DIASPORA)
@@ -291,52 +303,60 @@ Class OnePoll
                        }
 
                        if ($stat_writeable != $contact['writable']) {
-                               $fields = array('writable' => $stat_writeable);
-                               dba::update('contact', $fields, array('id' => $contact['id']));
+                               $fields = ['writable' => $stat_writeable];
+                               dba::update('contact', $fields, ['id' => $contact['id']]);
                        }
 
                        // Are we allowed to import from this person?
 
                        if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) {
+                               // set the last-update so we don't keep polling
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                return;
                        }
 
                        $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-                       $ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar));
+                       $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
+                       unlink($cookiejar);
 
                        if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                               // set the last-update so we don't keep polling
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                               Contact::markForArchival($contact);
                                return;
                        }
 
                        $xml = $ret['body'];
 
-                       unlink($cookiejar);
-               } elseif ($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
+               } elseif ($contact['network'] === NETWORK_MAIL) {
 
                        logger("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
+                               dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+                               Contact::markForArchival($contact);
                                return;
                        }
 
                        logger("Mail: Enabled", LOGGER_DEBUG);
 
                        $mbox = null;
-                       $x = dba::select('user', array('prvkey'), array('uid' => $importer_uid), array('limit' => 1));
+                       $user = dba::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
 
-                       $condition = array("`server` != '' AND `uid` = ?", $importer_uid);
-                       $mailconf = dba::select('mailacct', array(), $condition, array('limit' => 1));
-                       if (DBM::is_result($x) && DBM::is_result($mailconf)) {
-                               $mailbox = construct_mailbox_name($mailconf);
+                       $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
+                       $mailconf = dba::selectFirst('mailacct', [], $condition);
+                       if (DBM::is_result($user) && DBM::is_result($mailconf)) {
+                               $mailbox = Email::constructMailboxName($mailconf);
                                $password = '';
-                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $x['prvkey']);
-                               $mbox = email_connect($mailbox, $mailconf['user'], $password);
+                               openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
+                               $mbox = Email::connect($mailbox, $mailconf['user'], $password);
                                unset($password);
                                logger("Mail: Connect to " . $mailconf['user']);
                                if ($mbox) {
-                                       $fields = array('last_check' => datetime_convert());
-                                       dba::update('mailacct', $fields, array('id' => $mailconf['id']));
+                                       $fields = ['last_check' => DateTimeFormat::utcNow()];
+                                       dba::update('mailacct', $fields, ['id' => $mailconf['id']]);
                                        logger("Mail: Connected to " . $mailconf['user']);
                                } else {
                                        logger("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
@@ -344,41 +364,39 @@ Class OnePoll
                        }
 
                        if ($mbox) {
-                               $msgs = email_poll($mbox, $contact['addr']);
+                               $msgs = Email::poll($mbox, $contact['addr']);
 
                                if (count($msgs)) {
                                        logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG);
 
-                                       $metas = email_msg_meta($mbox,implode(',', $msgs));
+                                       $metas = Email::messageMeta($mbox, implode(',', $msgs));
                                        if (count($metas) != count($msgs)) {
-                                               logger("onepoll: for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
+                                               logger("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("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
 
-                                                       $datarray = array();
+                                                       $datarray = [];
                                                        $datarray['verb'] = ACTIVITY_POST;
                                                        $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
-               //                                      $meta = email_msg_meta($mbox, $msg_uid);
-               //                                      $headers = email_msg_headers($mbox, $msg_uid);
+                                                       // $meta = Email::messageMeta($mbox, $msg_uid);
 
-                                                       $datarray['uri'] = msgid2iri(trim($meta->message_id, '<>'));
+                                                       $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
 
                                                        // Have we seen it before?
-                                                       $fields = array('deleted', 'id');
-                                                       $condition = array('uid' => $importer_uid, 'uri' => $datarray['uri']);
-                                                       $r = dba::select('item', $fields, $condition, array('limit' => 1));
-
-                                                       if (DBM::is_result($r)) {
+                                                       $fields = ['deleted', 'id'];
+                                                       $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
+                                                       $item = dba::selectFirst('item', $fields, $condition);
+                                                       if (DBM::is_result($item)) {
                                                                logger("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 && ! $r['deleted']) {
-                                                                               $fields = array('deleted' => true, 'changed' => datetime_convert());
-                                                                               dba::update('item', $fields, array('id' => $r['id']));
+                                                                       if ($meta->deleted && ! $item['deleted']) {
+                                                                               $fields = ['deleted' => true, 'changed' => DateTimeFormat::utcNow()];
+                                                                               Item::update($fields, ['id' => $item['id']]);
                                                                        }
 
                                                                switch ($mailconf['action']) {
@@ -416,7 +434,7 @@ Class OnePoll
                                                                $refs_arr = explode(' ', $raw_refs);
                                                                if (count($refs_arr)) {
                                                                        for ($x = 0; $x < count($refs_arr); $x ++) {
-                                                                               $refs_arr[$x] = "'" . msgid2iri(str_replace(array('<', '>', ' '),array('', '', ''),dbesc($refs_arr[$x]))) . "'";
+                                                                               $refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'";
                                                                        }
                                                                }
                                                                $qstr = implode(',', $refs_arr);
@@ -441,7 +459,7 @@ Class OnePoll
                                                        $datarray['title'] = notags(trim($datarray['title']));
 
                                                        //$datarray['title'] = notags(trim($meta->subject));
-                                                       $datarray['created'] = datetime_convert('UTC', 'UTC', $meta->date);
+                                                       $datarray['created'] = DateTimeFormat::utc($meta->date);
 
                                                        // Is it a reply?
                                                        $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") ||
@@ -466,13 +484,13 @@ Class OnePoll
                                                                $datarray['parent-uri'] = $datarray['uri'];
                                                        }
 
-                                                       $r = email_get_msg($mbox, $msg_uid, $reply);
+                                                       $r = Email::getMessage($mbox, $msg_uid, $reply);
                                                        if (!$r) {
                                                                logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
                                                                continue;
                                                        }
                                                        $datarray['body'] = escape_tags($r['body']);
-                                                       $datarray['body'] = limit_body_size($datarray['body']);
+                                                       $datarray['body'] = BBCode::limitBodySize($datarray['body']);
 
                                                        logger("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
 
@@ -516,12 +534,7 @@ Class OnePoll
                                                                $datarray['allow_cid'] = '<' . $contact['id'] . '>';
                                                        }
 
-                                                       $stored_item = item_store($datarray);
-
-                                                       $condition = array('parent-uri' => $datarray['parent-uri'], 'uid' => $importer_uid);
-                                                       dba::update('item', array('last-child' => false), $condition);
-
-                                                       dba::update('item', array('last-child' => true), array('id' => $stored_item));
+                                                       $stored_item = Item::insert($datarray);
 
                                                        switch ($mailconf['action']) {
                                                                case 0:
@@ -559,9 +572,9 @@ Class OnePoll
                        if (!strstr($xml, '<')) {
                                logger('post_handshake: response from ' . $url . ' did not contain XML.');
 
-                               $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert());
-                               dba::update('contact', $fields, array('id' => $contact['id']));
-
+                               $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()];
+                               self::updateContact($contact, $fields);
+                               Contact::markForArchival($contact);
                                return;
                        }
 
@@ -603,27 +616,41 @@ Class OnePoll
                                }
                        }
 
-                       $updated = datetime_convert();
+                       $updated = DateTimeFormat::utcNow();
 
-                       dba::update('contact', array('last-update' => $updated, 'success_update' => $updated), array('id' => $contact['id']));
-                       dba::update('gcontact', array('last_contact' => $updated), array('nurl' => $contact['nurl']));
-               } elseif (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) {
-                       $updated = datetime_convert();
+                       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"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) {
+                       $updated = DateTimeFormat::utcNow();
 
-                       dba::update('contact', array('last-update' => $updated, 'failure_update' => $updated), array('id' => $contact['id']));
-                       dba::update('gcontact', array('last_failure' => $updated), array('nurl' => $contact['nurl']));
+                       self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
+                       dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
+                       Contact::markForArchival($contact);
                } else {
-                       dba::update('contact', array('last-update' => $updated), array('id' => $contact['id']));
+                       $updated = DateTimeFormat::utcNow();
+                       dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
                }
 
                return;
        }
 
        private static function RemoveReply($subject) {
-               while (in_array(strtolower(substr($subject, 0, 3)), array("re:", "aw:"))) {
+               while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
                        $subject = trim(substr($subject, 4));
                }
 
                return $subject;
        }
+
+       /**
+        * @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
+        */
+       private static function updateContact($contact, $fields) {
+               dba::update('contact', $fields, ['id' => $contact['id']]);
+               dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+       }
 }