Use a constant for the avatar base path

[friendica.git] / src / Worker / OnePoll.php

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 6d05e6cdc03286191b36f4daee66679e8e7c5135..66b9851cf2655f9dc8bdd3a38856737db89bd69c 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,12 +23,14 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
@@ -101,7 +103,7 @@ class OnePoll
 
                if ($success) {
                        self::updateContact($contact, ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
-                       Contact::unmarkForArchival($contact);   
+                       Contact::unmarkForArchival($contact);
                } else {
                        self::updateContact($contact, ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
                        Contact::markForArchival($contact);
@@ -152,8 +154,8 @@ class OnePoll
                        return false;
                }
 
-               $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpClient()->get($contact['poll'], [HttpClientOptions::COOKIEJAR => $cookiejar]);
+               $cookiejar = tempnam(System::getTempPath(), 'cookiejar-onepoll-');
+               $curlResult = DI::httpClient()->get($contact['poll'], HttpClientAccept::FEED_XML, [HttpClientOptions::COOKIEJAR => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {
@@ -172,7 +174,7 @@ class OnePoll
                        return false;
                }
 
-               Logger::notice('Consume feed of contact', ['id' => $contact['id'], 'url' => $contact['poll']]);
+               Logger::notice('Consume feed of contact', ['id' => $contact['id'], 'url' => $contact['poll'], 'Content-Type' => $curlResult->getHeader('Content-Type')]);
 
                return !empty(Feed::import($xml, $importer, $contact));
        }
@@ -231,7 +233,7 @@ class OnePoll
                        $metas = Email::messageMeta($mbox, implode(',', $msgs));
 
                        if (count($metas) != count($msgs)) {
-                               Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG);
+                               Logger::info("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas");
                        } else {
                                $msgs = array_combine($msgs, $metas);
 
@@ -253,7 +255,7 @@ class OnePoll
                                        $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
                                        $item = Post::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);
+                                               Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri']);
 
                                                // Only delete when mails aren't automatically moved or deleted
                                                if (($mailconf['action'] != 1) && ($mailconf['action'] != 3))
@@ -264,18 +266,18 @@ class OnePoll
 
                                                switch ($mailconf['action']) {
                                                        case 0:
-                                                               Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+                                                               Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
                                                                break;
                                                        case 1:
-                                                               Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                               Logger::notice("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']);
+                                                               Logger::notice("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']);
+                                                               Logger::notice("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);
@@ -316,7 +318,7 @@ class OnePoll
                                                        $datarray['title'] .= $subpart->text;
                                                }
                                        }
-                                       $datarray['title'] = Strings::escapeTags(trim($datarray['title']));
+                                       $datarray['title'] = trim($datarray['title']);
 
                                        //$datarray['title'] = Strings::escapeTags(trim($meta->subject));
                                        $datarray['created'] = DateTimeFormat::utc($meta->date);
@@ -387,28 +389,28 @@ class OnePoll
 
                                        $datarray = Email::getMessage($mbox, $msg_uid, $reply, $datarray);
                                        if (empty($datarray['body'])) {
-                                               Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
+                                               Logger::notice("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']);
                                                continue;
                                        }
 
-                                       Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
+                                       Logger::notice("Mail: Importing ".$msg_uid." for ".$mailconf['user']);
 
                                        Item::insert($datarray);
 
                                        switch ($mailconf['action']) {
                                                case 0:
-                                                       Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG);
+                                                       Logger::info("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.");
                                                        break;
                                                case 1:
-                                                       Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']);
+                                                       Logger::notice("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']);
+                                                       Logger::notice("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']);
+                                                       Logger::notice("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);