X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=2d36ee8f47c49efdb91b42e6545b1dc470f0b868;hb=82f713cb7fbc45f108e811a425c81c11c3b094d2;hp=951a20b0124436a8bea02cb13c0422ddbd34f82a;hpb=820afa2284eb603c286921a302d5b827a1b47b9e;p=friendica.git diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 951a20b012..2d36ee8f47 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -4,75 +4,82 @@ */ namespace Friendica\Worker; +use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Core\Config; +use Friendica\Core\Logger; use Friendica\Core\PConfig; -use Friendica\Database\DBM; +use Friendica\Core\Protocol; +use Friendica\Database\DBA; +use Friendica\Model\APContact; use Friendica\Model\Contact; use Friendica\Model\Item; +use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Email; use Friendica\Protocol\PortableContact; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; +use Friendica\Util\Strings; use Friendica\Util\XML; -use dba; - -require_once 'include/dba.php'; class OnePoll { public static function execute($contact_id = 0, $command = '') { - $a = \Friendica\BaseObject::getApp(); - - require_once 'include/items.php'; + $a = BaseObject::getApp(); - logger('start'); + Logger::log('Start for contact ' . $contact_id); - $manual_id = 0; - $generation = 0; - $hub_update = false; $force = false; - $restart = false; if ($command == "force") { $force = true; } if (!$contact_id) { - logger('no contact'); + Logger::log('no contact'); return; } - $d = DateTimeFormat::utcNow(); - $contact = dba::selectFirst('contact', [], ['id' => $contact_id]); - if (!DBM::is_result($contact)) { - logger('Contact not found or cannot be used.'); + $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); + if (!DBA::isResult($contact)) { + Logger::log('Contact not found or cannot be used.'); return; } $importer_uid = $contact['uid']; - // load current friends if possible. - if (($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 (DBM::is_result($r)) { - if (!$r[0]['total']) { - PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']); - } + // 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); } } // 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)) { + 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(); + if ($last_updated) { - logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG); + Logger::log('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']) { @@ -85,59 +92,72 @@ class OnePoll } else { self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); Contact::markForArchival($contact); - logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG); - } - return; - } - - $xml = false; - - $t = $contact['last-update']; - - if ($contact['subhub']) { - $poll_interval = Config::get('system', 'pushpoll_frequency', 3); - $contact['priority'] = intval($poll_interval); - $hub_update = false; - - if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + 1 day")) { - $hub_update = true; + Logger::log('Contact archived'); + return; } - } else { - $hub_update = false; } - $last_update = (($contact['last-update'] <= NULL_DATE) - ? 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']); + 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 - dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + self::updateContact($contact, ['last-update' => $updated]); return; } 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']]); + 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); } } + // 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']); + } + } + } + + // We don't poll our followers + if ($contact["rel"] == Contact::FOLLOWER) { + Logger::log("Don't poll follower"); + 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')) { + Logger::log('Polling is disabled'); + return; + } + + // We don't poll AP contacts by now + if ($contact['network'] === Protocol::ACTIVITYPUB) { + Logger::log("Don't poll AP contact"); + return; + } + if ($importer_uid == 0) { - logger('Ignore public contacts'); + 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']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } @@ -145,20 +165,38 @@ class OnePoll intval($importer_uid) ); - if (!DBM::is_result($r)) { - logger('No self contact for user '.$importer_uid); + if (!DBA::isResult($r)) { + 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' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); return; } $importer = $r[0]; $url = ''; + $xml = false; - logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); + if ($contact['subhub']) { + $poll_interval = Config::get('system', 'pushpoll_frequency', 3); + $contact['priority'] = intval($poll_interval); + $hub_update = false; - if ($contact['network'] === NETWORK_DFRN) { + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($contact['last-update'] . " + 1 day")) { + $hub_update = true; + } + } else { + $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']}"); + + 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; @@ -174,52 +212,48 @@ class OnePoll if (!intval($contact['writable'])) { $fields = ['writable' => true]; - dba::update('contact', $fields, ['id' => $contact['id']]); + 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 ; + . '&perm=' . $perm; - $ret = Network::curl($url); + $curlResult = Network::curl($url); - if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) { // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]); Contact::markForArchival($contact); + Logger::log('Contact archived'); return; } - $handshake_xml = $ret['body']; - - $html_code = $a->get_curl_code(); - - logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA); + $handshake_xml = $curlResult->getBody(); + $html_code = $curlResult->getReturnCode(); + Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA); if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) { - logger("$url appears to be dead - marking for death "); - // 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. - - Contact::markForArchival($contact); + Logger::log("$url appears to be dead - marking for death "); // 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; } if (!strstr($handshake_xml, '<')) { - logger('response from ' . $url . ' did not contain XML.'); - - Contact::markForArchival($contact); + Logger::log('response from ' . $url . ' did not contain XML.'); $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); + Contact::markForArchival($contact); return; } @@ -227,28 +261,27 @@ class OnePoll $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. + Logger::log("$url replied status 1 - marking for death "); + // 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'] > NULL_DATE) { - logger("$url back from the dead - removing mark for death"); + } elseif ($contact['term-date'] > DBA::NULL_DATETIME) { Contact::unmarkForArchival($contact); } 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']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + Logger::log('Contact status is ' . $res->status); return; } if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) { $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])]; - dba::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } $postvars = []; @@ -272,12 +305,19 @@ class OnePoll $final_dfrn_id = substr($final_dfrn_id, 2); } + // 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; + } + if ($final_dfrn_id != $orig_id) { // did not decode properly - cannot trust this site - logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); + Logger::log('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']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); Contact::markForArchival($contact); return; } @@ -286,81 +326,82 @@ class OnePoll $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; $postvars['perm'] = 'rw'; - $xml = Network::post($contact['poll'], $postvars); + $xml = Network::post($contact['poll'], $postvars)->getBody(); - } elseif (($contact['network'] === NETWORK_OSTATUS) - || ($contact['network'] === NETWORK_DIASPORA) - || ($contact['network'] === NETWORK_FEED)) { + } elseif (($contact['network'] === Protocol::OSTATUS) + || ($contact['network'] === Protocol::DIASPORA) + || ($contact['network'] === Protocol::FEED)) { // Upgrading DB fields from an older Friendica version // Will only do this once per notify-enabled OStatus contact // or if relationship changes - $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); + $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0); // Contacts from OStatus are always writable - if ($contact['network'] === NETWORK_OSTATUS) { + if ($contact['network'] === Protocol::OSTATUS) { $stat_writeable = 1; } if ($stat_writeable != $contact['writable']) { $fields = ['writable' => $stat_writeable]; - dba::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } // Are we allowed to import from this person? - - if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked']) { + 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']]); + DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + Logger::log('Contact is blocked or only a follower'); return; } $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); - $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]); + $curlResult = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]); unlink($cookiejar); - if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { + if ($curlResult->isTimeout()) { // set the last-update so we don't keep polling - dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]); Contact::markForArchival($contact); + Logger::log('Contact archived'); return; } - $xml = $ret['body']; + $xml = $curlResult->getBody(); - } elseif ($contact['network'] === NETWORK_MAIL) { + } elseif ($contact['network'] === Protocol::MAIL) { + Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG); - logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG); - - $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1); + $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']]); + self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]); Contact::markForArchival($contact); + Logger::log('Contact archived'); return; } - logger("Mail: Enabled", LOGGER_DEBUG); + Logger::log("Mail: Enabled", Logger::DEBUG); $mbox = null; - $user = dba::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); + $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); $condition = ["`server` != '' AND `uid` = ?", $importer_uid]; - $mailconf = dba::selectFirst('mailacct', [], $condition); - if (DBM::is_result($user) && DBM::is_result($mailconf)) { + $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("Mail: Connect to " . $mailconf['user']); + Logger::log("Mail: Connect to " . $mailconf['user']); if ($mbox) { $fields = ['last_check' => DateTimeFormat::utcNow()]; - dba::update('mailacct', $fields, ['id' => $mailconf['id']]); - logger("Mail: Connected to " . $mailconf['user']); + DBA::update('mailacct', $fields, ['id' => $mailconf['id']]); + Logger::log("Mail: Connected to " . $mailconf['user']); } else { - logger("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true)); + Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true)); } } @@ -368,21 +409,22 @@ class OnePoll $msgs = Email::poll($mbox, $contact['addr']); if (count($msgs)) { - logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG); + Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG); $metas = Email::messageMeta($mbox, implode(',', $msgs)); + if (count($metas) != count($msgs)) { - logger("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); + 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("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); + Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA); $datarray = []; $datarray['verb'] = ACTIVITY_POST; $datarray['object-type'] = ACTIVITY_OBJ_NOTE; - $datarray['network'] = NETWORK_MAIL; + $datarray['network'] = Protocol::MAIL; // $meta = Email::messageMeta($mbox, $msg_uid); $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>')); @@ -391,8 +433,8 @@ class OnePoll $fields = ['deleted', 'id']; $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']]; $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { - logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG); + 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)) @@ -403,18 +445,18 @@ class OnePoll switch ($mailconf['action']) { case 0: - logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", LOGGER_DEBUG); + Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); break; case 1: - logger("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); imap_delete($mbox, $msg_uid, FT_UID); break; case 2: - logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); break; case 3: - logger("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); + 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); @@ -441,7 +483,7 @@ class OnePoll } $condition = ['uri' => $refs_arr, 'uid' => $importer_uid]; $parent = Item::selectFirst(['parent-uri'], $condition); - if (DBM::is_result($parent)) { + if (DBA::isResult($parent)) { $datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item } } @@ -456,9 +498,9 @@ class OnePoll $datarray['title'] .= $subpart->text; } } - $datarray['title'] = notags(trim($datarray['title'])); + $datarray['title'] = Strings::escapeTags(trim($datarray['title'])); - //$datarray['title'] = notags(trim($meta->subject)); + //$datarray['title'] = Strings::escapeTags(trim($meta->subject)); $datarray['created'] = DateTimeFormat::utc($meta->date); // Is it a reply? @@ -471,10 +513,10 @@ class OnePoll // 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' => NETWORK_MAIL]; + $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL]; $params = ['order' => ['created' => true]]; $parent = Item::selectFirst(['parent-uri'], $condition, $params); - if (DBM::is_result($parent)) { + if (DBA::isResult($parent)) { $datarray['parent-uri'] = $parent['parent-uri']; } } @@ -485,13 +527,13 @@ class OnePoll $r = Email::getMessage($mbox, $msg_uid, $reply); if (!$r) { - logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']); continue; } - $datarray['body'] = escape_tags($r['body']); + $datarray['body'] = Strings::escapeHtml($r['body']); $datarray['body'] = BBCode::limitBodySize($datarray['body']); - logger("Mail: Importing ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']); /// @TODO Adding a gravatar for the original author would be cool @@ -505,7 +547,7 @@ class OnePoll } } - $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname()); + $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName()); $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host; @@ -528,27 +570,27 @@ class OnePoll if ($datarray['parent-uri'] === $datarray['uri']) { $datarray['private'] = 1; } - if (($contact['network'] === NETWORK_MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) { + if (($contact['network'] === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) { $datarray['private'] = 1; $datarray['allow_cid'] = '<' . $contact['id'] . '>'; } - $stored_item = Item::insert($datarray); + Item::insert($datarray); switch ($mailconf['action']) { case 0: - logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", LOGGER_DEBUG); + Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); break; case 1: - logger("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); imap_delete($mbox, $msg_uid, FT_UID); break; case 2: - logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); + Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); break; case 3: - logger("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); + 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); @@ -558,18 +600,18 @@ class OnePoll } } } else { - logger("Mail: no mails for ".$mailconf['user']); + Logger::log("Mail: no mails for ".$mailconf['user']); } - logger("Mail: closing connection for ".$mailconf['user']); + Logger::log("Mail: closing connection for ".$mailconf['user']); imap_close($mbox); } } if ($xml) { - logger('received xml : ' . $xml, LOGGER_DATA); + Logger::log('received xml : ' . $xml, Logger::DATA); if (!strstr($xml, '<')) { - logger('post_handshake: response from ' . $url . ' did not contain XML.'); + Logger::log('post_handshake: response from ' . $url . ' did not contain XML.'); $fields = ['last-update' => DateTimeFormat::utcNow(), 'failure_update' => DateTimeFormat::utcNow()]; self::updateContact($contact, $fields); @@ -578,21 +620,21 @@ class OnePoll } - logger("Consume feed of contact ".$contact['id']); + Logger::log("Consume feed of contact ".$contact['id']); consume_feed($xml, $importer, $contact, $hub); // do it a second time for DFRN so that any children find their parents. - if ($contact['network'] === NETWORK_DFRN) { + if ($contact['network'] === Protocol::DFRN) { consume_feed($xml, $importer, $contact, $hub); } $hubmode = 'subscribe'; - if ($contact['network'] === NETWORK_DFRN || $contact['blocked']) { + if ($contact['network'] === Protocol::DFRN || $contact['blocked']) { $hubmode = 'unsubscribe'; } - if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) { + if (($contact['network'] === Protocol::OSTATUS || $contact['network'] == Protocol::FEED) && (! $contact['hub-verify'])) { $hub_update = true; } @@ -600,17 +642,20 @@ class OnePoll $hub_update = true; } - logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); + Logger::log("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update); - if (strlen($hub) && $hub_update && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED)) { - logger('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); + 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($hubs)) { foreach ($hubs as $h) { $h = trim($h); + if (!strlen($h)) { continue; } + subscribe_to_hub($h, $importer, $contact, $hubmode); } } @@ -619,19 +664,19 @@ class OnePoll $updated = DateTimeFormat::utcNow(); self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]); - dba::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]); + 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])) { + } elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) { $updated = DateTimeFormat::utcNow(); self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); - dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]); + DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]); Contact::markForArchival($contact); } else { - $updated = DateTimeFormat::utcNow(); - dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + self::updateContact($contact, ['last-update' => DateTimeFormat::utcNow()]); } + Logger::log('End'); return; } @@ -648,11 +693,12 @@ class OnePoll * @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 + * @param array $fields The fields that are updated + * @throws \Exception */ - private static function updateContact($contact, $fields) + private static function updateContact(array $contact, array $fields) { - dba::update('contact', $fields, ['id' => $contact['id']]); - dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); } }