Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 13:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some Renames:

Browse source 
- EMail => EMail
- toEmail => toAddress
- fromEmail => fromAddress
This commit is contained in:
nupplaPhil 2020-01-26 23:47:16 +01:00
parent f6878b5bcf
commit 765a0d8892
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Object/EMail/IEmail.php
View file

@ -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

6
src/Object/EMail/ItemCCEMail.php
View file

@ -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');
}

26
src/Object/EMail.php → src/Object/Email.php
View file

@ -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;
}