From 765a0d889211a4b64e30a994472cf627319c2220 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sun, 26 Jan 2020 23:47:16 +0100 Subject: [PATCH] Some Renames: - EMail => EMail - toEmail => toAddress - fromEmail => fromAddress --- include/enotify.php | 6 ++---- src/Object/EMail/IEmail.php | 4 ++-- src/Object/EMail/ItemCCEMail.php | 6 +++--- src/Object/{EMail.php => Email.php} | 26 +++++++++++++------------- src/Util/Emailer.php | 6 +++--- 5 files changed, 23 insertions(+), 25 deletions(-) rename src/Object/{EMail.php => Email.php} (83%) diff --git a/include/enotify.php b/include/enotify.php index f55c9f6cc..3332f4a08 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -15,10 +15,8 @@ use Friendica\Model\ItemContent; use Friendica\Model\Notify; use Friendica\Model\User; use Friendica\Model\UserItem; -use Friendica\Object\EMail; +use Friendica\Object\Email; use Friendica\Protocol\Activity; -use Friendica\Util\DateTimeFormat; -use Friendica\Util\Emailer; /** * Creates a notification entry and possibly sends a mail @@ -610,7 +608,7 @@ function notification($params) '$content_allowed' => $content_allowed, ]); - $email = new EMail($sender_name, $sender_email, $sender_email, $params['to_email'], + $email = new Email($sender_name, $sender_email, $sender_email, $params['to_email'], $datarray['subject'], $email_html_body, $email_text_body, $datarray['headers'], $params['uid']); diff --git a/src/Object/EMail/IEmail.php b/src/Object/EMail/IEmail.php index 24df41b15..6a159c0ba 100644 --- a/src/Object/EMail/IEmail.php +++ b/src/Object/EMail/IEmail.php @@ -23,7 +23,7 @@ interface IEmail * * @return string */ - function getFromEmail(); + function getFromAddress(); /** * Gets the UID of the sender of this email @@ -44,7 +44,7 @@ interface IEmail * * @return string */ - function getToEmail(); + function getToAddress(); /** * Gets the subject of this email diff --git a/src/Object/EMail/ItemCCEMail.php b/src/Object/EMail/ItemCCEMail.php index c89636064..6ea1ae82e 100644 --- a/src/Object/EMail/ItemCCEMail.php +++ b/src/Object/EMail/ItemCCEMail.php @@ -7,12 +7,12 @@ use Friendica\App\BaseURL; use Friendica\Content\Text\HTML; use Friendica\Core\L10n; use Friendica\Model\Item; -use Friendica\Object\EMail; +use Friendica\Object\Email; /** * Class for creating CC emails based on a received item */ -class ItemCCEMail extends EMail +class ItemCCEMail extends Email { public function __construct(App $a, L10n $l10n, BaseURL $baseUrl, array $item, string $toEmail, string $authorThumb) { @@ -21,7 +21,7 @@ class ItemCCEMail extends EMail $disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= $l10n->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; if (!$item['title'] == '') { - $subject = EMail::encodeHeader($item['title'], 'UTF-8'); + $subject = Email::encodeHeader($item['title'], 'UTF-8'); } else { $subject = Email::encodeHeader('[Friendica]' . ' ' . $l10n->t('%s posted an update.', $a->user['username']), 'UTF-8'); } diff --git a/src/Object/EMail.php b/src/Object/Email.php similarity index 83% rename from src/Object/EMail.php rename to src/Object/Email.php index 5f152738d..7a6858b03 100644 --- a/src/Object/EMail.php +++ b/src/Object/Email.php @@ -7,19 +7,19 @@ use Friendica\Object\EMail\IEmail; /** * The default implementation of the IEmail interface * - * Provides the possibility to reuse the email instance with new recipients (@see EMail::withRecipient()) + * Provides the possibility to reuse the email instance with new recipients (@see Email::withRecipient()) */ -class EMail implements IEmail +class Email implements IEmail { /** @var string */ private $fromName; /** @var string */ - private $fromEmail; + private $fromAddress; /** @var string */ private $replyTo; /** @var string */ - private $toEmail; + private $toAddress; /** @var string */ private $subject; @@ -38,9 +38,9 @@ class EMail implements IEmail string $additionalMailHeader = '', int $toUid = null) { $this->fromName = $fromName; - $this->fromEmail = $fromEmail; + $this->fromAddress = $fromEmail; $this->replyTo = $replyTo; - $this->toEmail = $toEmail; + $this->toAddress = $toEmail; $this->subject = $subject; $this->msgHtml = $msgHtml; $this->msgText = $msgText; @@ -59,9 +59,9 @@ class EMail implements IEmail /** * {@inheritDoc} */ - public function getFromEmail() + public function getFromAddress() { - return $this->fromEmail; + return $this->fromAddress; } /** @@ -75,9 +75,9 @@ class EMail implements IEmail /** * {@inheritDoc} */ - public function getToEmail() + public function getToAddress() { - return $this->toEmail; + return $this->toAddress; } /** @@ -126,9 +126,9 @@ class EMail implements IEmail */ public function withRecipient(string $email, int $uid = null) { - $newEmail = clone $this; - $newEmail->toEmail = $email; - $newEmail->toUid = $uid; + $newEmail = clone $this; + $newEmail->toAddress = $email; + $newEmail->toUid = $uid; return $newEmail; } diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php index f2f1edecc..b8dc12704 100644 --- a/src/Util/Emailer.php +++ b/src/Util/Emailer.php @@ -59,7 +59,7 @@ class Emailer } $fromName = Email::encodeHeader(html_entity_decode($email->getFromName(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); - $fromEmail = $email->getFromEmail(); + $fromEmail = $email->getFromAddress(); $replyTo = $email->getReplyTo(); $messageSubject = Email::encodeHeader(html_entity_decode($email->getSubject(), ENT_QUOTES, 'UTF-8'), 'UTF-8'); @@ -102,7 +102,7 @@ class Emailer // send the message $hookdata = [ - 'to' => $email->getToEmail(), + 'to' => $email->getToAddress(), 'subject' => $messageSubject, 'body' => $multipartMessageBody, 'headers' => $messageHeader, @@ -123,7 +123,7 @@ class Emailer $hookdata['headers'], $hookdata['parameters'] ); - $this->logger->debug('header ' . 'To: ' . $email->getToEmail() . '\n' . $messageHeader); + $this->logger->debug('header ' . 'To: ' . $email->getToAddress() . '\n' . $messageHeader); $this->logger->debug('return value ' . (($res) ? 'true' : 'false')); return $res; }