rename
This commit is contained in:
@@ -88,7 +88,7 @@ class CheckFromAddress implements SaveHook
|
||||
|
||||
if (
|
||||
$system &&
|
||||
$this->configDataProvider->isOutboundEmailShared() &&
|
||||
$this->configDataProvider->isSystemOutboundAddressShared() &&
|
||||
$system->getEmailAddress() &&
|
||||
$fromAddress === strtolower($system->getEmailAddress())
|
||||
) {
|
||||
|
||||
@@ -42,7 +42,7 @@ class ConfigDataProvider
|
||||
return $this->config->get('outboundEmailFromAddress');
|
||||
}
|
||||
|
||||
public function isOutboundEmailShared(): bool
|
||||
public function isSystemOutboundAddressShared(): bool
|
||||
{
|
||||
return (bool) $this->config->get('outboundEmailIsShared');
|
||||
}
|
||||
|
||||
@@ -281,7 +281,7 @@ class AppService
|
||||
{
|
||||
$user = $this->user;
|
||||
|
||||
$outboundEmailIsShared = $this->emailConfigDataProvider->isOutboundEmailShared();
|
||||
$outboundEmailIsShared = $this->emailConfigDataProvider->isSystemOutboundAddressShared();
|
||||
$outboundEmailFromAddress = $this->emailConfigDataProvider->getSystemOutboundAddress();
|
||||
|
||||
$emailAddressList = [];
|
||||
|
||||
@@ -370,7 +370,7 @@ class SettingsService
|
||||
|
||||
if (
|
||||
!$this->acl->checkScope(Email::ENTITY_TYPE, Acl\Table::ACTION_CREATE) ||
|
||||
!$this->emailConfigDataProvider->isOutboundEmailShared()
|
||||
!$this->emailConfigDataProvider->isSystemOutboundAddressShared()
|
||||
) {
|
||||
unset($data->outboundEmailFromAddress);
|
||||
unset($data->outboundEmailFromName);
|
||||
|
||||
@@ -130,7 +130,7 @@ class SendService
|
||||
throw new BadRequest("Empty To address.");
|
||||
}
|
||||
|
||||
$systemIsShared = $this->configDataProvider->isOutboundEmailShared();
|
||||
$systemIsShared = $this->configDataProvider->isSystemOutboundAddressShared();
|
||||
$systemFromName = $this->config->get('outboundEmailFromName');
|
||||
$systemFromAddress = $this->configDataProvider->getSystemOutboundAddress();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user