]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/OnePoll.php
Merge pull request #5862 from nupplaphil/rename_App_Methods
[friendica.git] / src / Worker / OnePoll.php
index afe1c43f159c4608ad87b636bd9e018226a49050..21e3b44b3e7345ba98c79361c8f5e92902c6d567 100644 (file)
@@ -8,6 +8,7 @@ use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -47,7 +48,7 @@ class OnePoll
                $d = DateTimeFormat::utcNow();
 
                $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
-               if (!DBA::is_result($contact)) {
+               if (!DBA::isResult($contact)) {
                        logger('Contact not found or cannot be used.');
                        return;
                }
@@ -60,7 +61,7 @@ class OnePoll
                                WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
                                intval($contact['id'])
                        );
-                       if (DBA::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                if (!$r[0]['total']) {
                                        PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
                                }
@@ -68,9 +69,10 @@ 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)) {
+               if ($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);
 
@@ -87,6 +89,7 @@ class OnePoll
                                Contact::markForArchival($contact);
                                logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG);
                        }
+
                        return;
                }
 
@@ -112,7 +115,7 @@ class OnePoll
                );
 
                // Update the contact entry
-               if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
+               if (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) || ($contact['network'] === Protocol::DFRN)) {
                        if (!PortableContact::reachable($contact['url'])) {
                                logger("Skipping probably dead contact ".$contact['url']);
 
@@ -145,7 +148,7 @@ class OnePoll
                        intval($importer_uid)
                );
 
-               if (!DBA::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        logger('No self contact for user '.$importer_uid);
 
                        // set the last-update so we don't keep polling
@@ -158,7 +161,7 @@ class OnePoll
 
                logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
-               if ($contact['network'] === NETWORK_DFRN) {
+               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;
@@ -193,11 +196,10 @@ class OnePoll
 
                        $handshake_xml = $ret['body'];
 
-                       $html_code = $a->get_curl_code();
+                       $html_code = Network::getCurl()->getCode();
 
                        logger('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 ");
 
@@ -288,18 +290,18 @@ class OnePoll
 
                        $xml = Network::post($contact['poll'], $postvars);
 
-               } 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;
                        }
 
@@ -310,7 +312,7 @@ class OnePoll
 
                        // 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']]);
                                return;
@@ -329,8 +331,7 @@ class OnePoll
 
                        $xml = $ret['body'];
 
-               } elseif ($contact['network'] === NETWORK_MAIL) {
-
+               } elseif ($contact['network'] === Protocol::MAIL) {
                        logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);
 
                        $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1);
@@ -348,7 +349,7 @@ class OnePoll
 
                        $condition = ["`server` != '' AND `uid` = ?", $importer_uid];
                        $mailconf = DBA::selectFirst('mailacct', [], $condition);
-                       if (DBA::is_result($user) && DBA::is_result($mailconf)) {
+                       if (DBA::isResult($user) && DBA::isResult($mailconf)) {
                                $mailbox = Email::constructMailboxName($mailconf);
                                $password = '';
                                openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
@@ -371,6 +372,7 @@ class OnePoll
                                        logger("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);
                                        } else {
@@ -382,7 +384,7 @@ class OnePoll
                                                        $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,7 +393,7 @@ class OnePoll
                                                        $fields = ['deleted', 'id'];
                                                        $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
                                                        $item = Item::selectFirst($fields, $condition);
-                                                       if (DBA::is_result($item)) {
+                                                       if (DBA::isResult($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
@@ -441,7 +443,7 @@ class OnePoll
                                                                }
                                                                $condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
                                                                $parent = Item::selectFirst(['parent-uri'], $condition);
-                                                               if (DBA::is_result($parent)) {
+                                                               if (DBA::isResult($parent)) {
                                                                        $datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
                                                                }
                                                        }
@@ -471,10 +473,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 (DBA::is_result($parent)) {
+                                                               if (DBA::isResult($parent)) {
                                                                        $datarray['parent-uri'] = $parent['parent-uri'];
                                                                }
                                                        }
@@ -505,7 +507,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,7 +530,7 @@ 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'] . '>';
                                                        }
@@ -583,16 +585,16 @@ class OnePoll
                        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;
                        }
 
@@ -602,15 +604,18 @@ class OnePoll
 
                        logger("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)) {
+                       if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) {
                                logger('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);
                                        }
                                }
@@ -621,7 +626,7 @@ class OnePoll
                        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])) {
+               } 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]);
@@ -650,7 +655,7 @@ class OnePoll
         * @param array $contact The personal contact entry
         * @param array $fields The fields that are updated
         */
-       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']]);