X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=9a4ce757a854a9220c51f8e33063de4658680650;hb=33ac7a529fbfd6d389bd836d18550235ebc3b50d;hp=c1fb5350c3dc7f91a955cc8b2585a33e4c9397b9;hpb=c566ca74a5425faba48654de55ec44009448802b;p=friendica.git diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index c1fb5350c3..9a4ce757a8 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -7,12 +7,12 @@ namespace Friendica\Worker; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Database\DBM; -use Friendica\Object\Contact; +use Friendica\Model\Contact; use Friendica\Protocol\Email; use Friendica\Protocol\PortableContact; use dba; -require_once 'include/follow.php'; +require_once 'include/dba.php'; Class OnePoll { @@ -42,7 +42,7 @@ Class OnePoll $d = datetime_convert(); - $contact = dba::select('contact', [], ['id' => $contact_id], ['limit' => 1]); + $contact = dba::selectFirst('contact', [], ['id' => $contact_id]); if (!DBM::is_result($contact)) { logger('Contact not found or cannot be used.'); return; @@ -65,7 +65,7 @@ Class OnePoll // 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"]); + $last_updated = PortableContact::lastUpdated($contact["url"], true); $updated = datetime_convert(); if ($last_updated) { logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG); @@ -75,11 +75,11 @@ Class OnePoll $last_updated = $contact['last-item']; } - $fields = array('last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated); + $fields = ['last-item' => $last_updated, 'last-update' => $updated, 'success_update' => $updated]; self::updateContact($contact, $fields); Contact::unmarkForArchival($contact); } else { - self::updateContact($contact, array('last-update' => $updated, 'failure_update' => $updated)); + self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); Contact::markForArchival($contact); logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG); } @@ -91,8 +91,8 @@ 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")) { @@ -117,7 +117,7 @@ Class OnePoll return; } - if (!update_contact($contact["id"])) { + if (!Contact::updateFromProbe($contact["id"])) { Contact::markForArchival($contact); logger('Contact is marked dead'); @@ -168,8 +168,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 @@ -203,7 +203,7 @@ 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()); + $fields = ['last-update' => datetime_convert(), 'failure_update' => datetime_convert()]; self::updateContact($contact, $fields); return; } @@ -213,7 +213,7 @@ Class OnePoll Contact::markForArchival($contact); - $fields = array('last-update' => datetime_convert(), 'failure_update' => datetime_convert()); + $fields = ['last-update' => datetime_convert(), 'failure_update' => datetime_convert()]; self::updateContact($contact, $fields); return; } @@ -226,7 +226,7 @@ Class OnePoll // 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()); + $fields = ['last-update' => datetime_convert(), 'failure_update' => datetime_convert()]; self::updateContact($contact, $fields); Contact::markForArchival($contact); @@ -242,11 +242,11 @@ Class OnePoll } 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); @@ -299,8 +299,8 @@ 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? @@ -312,7 +312,7 @@ Class OnePoll } $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); - $ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar)); + $ret = z_fetch_url($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]); unlink($cookiejar); if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { @@ -339,20 +339,20 @@ Class OnePoll 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)) { + $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']); + 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' => datetime_convert()]; + 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)); @@ -374,7 +374,7 @@ Class OnePoll 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::messageMeta($mbox, $msg_uid); @@ -382,18 +382,17 @@ Class OnePoll $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' => datetime_convert()]; + dba::update('item', $fields, ['id' => $item['id']]); } switch ($mailconf['action']) { @@ -431,7 +430,7 @@ Class OnePoll $refs_arr = explode(' ', $raw_refs); if (count($refs_arr)) { for ($x = 0; $x < count($refs_arr); $x ++) { - $refs_arr[$x] = "'" . Email::msgid2iri(str_replace(array('<', '>', ' '),array('', '', ''),dbesc($refs_arr[$x]))) . "'"; + $refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'"; } } $qstr = implode(',', $refs_arr); @@ -533,10 +532,10 @@ Class OnePoll $stored_item = item_store($datarray); - $condition = array('parent-uri' => $datarray['parent-uri'], 'uid' => $importer_uid); - dba::update('item', array('last-child' => false), $condition); + $condition = ['parent-uri' => $datarray['parent-uri'], 'uid' => $importer_uid]; + dba::update('item', ['last-child' => false], $condition); - dba::update('item', array('last-child' => true), array('id' => $stored_item)); + dba::update('item', ['last-child' => true], ['id' => $stored_item]); switch ($mailconf['action']) { case 0: @@ -574,7 +573,7 @@ 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()); + $fields = ['last-update' => datetime_convert(), 'failure_update' => datetime_convert()]; self::updateContact($contact, $fields); Contact::markForArchival($contact); return; @@ -620,24 +619,25 @@ Class OnePoll $updated = datetime_convert(); - self::updateContact($contact, array('last-update' => $updated, 'success_update' => $updated)); - dba::update('gcontact', array('last_contact' => $updated), array('nurl' => $contact['nurl'])); + 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"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED))) { + } elseif (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) { $updated = datetime_convert(); - self::updateContact($contact, array('last-update' => $updated, 'failure_update' => $updated)); - 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 = datetime_convert(); + 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)); } @@ -651,7 +651,7 @@ Class OnePoll * @param array $fields The fields that are updated */ private static function updateContact($contact, $fields) { - dba::update('contact', $fields, array('id' => $contact['id'])); - dba::update('contact', $fields, array('uid' => 0, 'nurl' => $contact['nurl'])); + dba::update('contact', $fields, ['id' => $contact['id']]); + dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); } }