X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FOnePoll.php;h=b2c49c9f1dfa5af17227ea438c2770e1588285e3;hb=23c56b108b43bd1964d78993fb7a164b09fc30f1;hp=99d5054ca3b8727ed9077d3410abdeb1f749e62c;hpb=6f290607de7f10cea7429aacd0b394fd3f4c4e69;p=friendica.git

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 99d5054ca3..b2c49c9f1d 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -23,13 +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\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Email;
@@ -101,7 +102,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 +153,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'], [HttpClientOptions::COOKIEJAR => $cookiejar]);
 		unlink($cookiejar);
 
 		if ($curlResult->isTimeout()) {
@@ -231,7 +232,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 +254,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 +265,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 +317,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 +388,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);