mirror of
https://github.com/friendica/friendica
synced 2025-01-31 05:39:48 +00:00
Replace Logger with DI::logger() in Email Protocol class
This commit is contained in:
parent
6ead2d1738
commit
d4afcc0b7e
1 changed files with 8 additions and 8 deletions
|
@ -8,10 +8,10 @@
|
||||||
namespace Friendica\Protocol;
|
namespace Friendica\Protocol;
|
||||||
|
|
||||||
use Friendica\Core\Hook;
|
use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Logger;
|
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use Friendica\Content\Text\HTML;
|
use Friendica\Content\Text\HTML;
|
||||||
use Friendica\Core\Protocol;
|
use Friendica\Core\Protocol;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
use IMAP\Connection;
|
use IMAP\Connection;
|
||||||
|
@ -38,12 +38,12 @@ class Email
|
||||||
|
|
||||||
$errors = imap_errors();
|
$errors = imap_errors();
|
||||||
if (!empty($errors)) {
|
if (!empty($errors)) {
|
||||||
Logger::notice('IMAP Errors occurred', ['errors' => $errors]);
|
DI::logger()->notice('IMAP Errors occurred', ['errors' => $errors]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$alerts = imap_alerts();
|
$alerts = imap_alerts();
|
||||||
if (!empty($alerts)) {
|
if (!empty($alerts)) {
|
||||||
Logger::notice('IMAP Alerts occurred: ', ['alerts' => $alerts]);
|
DI::logger()->notice('IMAP Alerts occurred: ', ['alerts' => $alerts]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($errors) && empty($alerts)) {
|
if (empty($errors) && empty($alerts)) {
|
||||||
|
@ -67,7 +67,7 @@ class Email
|
||||||
if (!$search1) {
|
if (!$search1) {
|
||||||
$search1 = [];
|
$search1 = [];
|
||||||
} else {
|
} else {
|
||||||
Logger::debug("Found mails from ".$email_addr);
|
DI::logger()->debug("Found mails from ".$email_addr);
|
||||||
Item::incrementInbound(Protocol::MAIL);
|
Item::incrementInbound(Protocol::MAIL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ class Email
|
||||||
if (!$search2) {
|
if (!$search2) {
|
||||||
$search2 = [];
|
$search2 = [];
|
||||||
} else {
|
} else {
|
||||||
Logger::debug("Found mails to ".$email_addr);
|
DI::logger()->debug("Found mails to ".$email_addr);
|
||||||
Item::incrementInbound(Protocol::MAIL);
|
Item::incrementInbound(Protocol::MAIL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ class Email
|
||||||
if (!$search3) {
|
if (!$search3) {
|
||||||
$search3 = [];
|
$search3 = [];
|
||||||
} else {
|
} else {
|
||||||
Logger::debug("Found mails cc ".$email_addr);
|
DI::logger()->debug("Found mails cc ".$email_addr);
|
||||||
Item::incrementInbound(Protocol::MAIL);
|
Item::incrementInbound(Protocol::MAIL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -131,7 +131,7 @@ class Email
|
||||||
$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
|
$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox, $uid, FT_UID) : null);
|
||||||
|
|
||||||
if (!$struc) {
|
if (!$struc) {
|
||||||
Logger::notice("IMAP structure couldn't be fetched", ['uid' => $uid]);
|
DI::logger()->notice("IMAP structure couldn't be fetched", ['uid' => $uid]);
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -395,7 +395,7 @@ class Email
|
||||||
|
|
||||||
//$message = '<html><body>' . $html . '</body></html>';
|
//$message = '<html><body>' . $html . '</body></html>';
|
||||||
//$message = html2plain($html);
|
//$message = html2plain($html);
|
||||||
Logger::notice('notifier: email delivery to ' . $addr);
|
DI::logger()->notice('notifier: email delivery to ' . $addr);
|
||||||
$success = mail($addr, $subject, $body, $headers);
|
$success = mail($addr, $subject, $body, $headers);
|
||||||
if ($success) {
|
if ($success) {
|
||||||
Item::incrementOutbound(Protocol::MAIL);
|
Item::incrementOutbound(Protocol::MAIL);
|
||||||
|
|
Loading…
Add table
Reference in a new issue