D3Public
/
devhelper
8
0
Fork 0
Code Pull Requests Releases Activity

in case of mail redirect changed some more informations to the redirection address

This commit is contained in:
Daniel Seifert 2019-10-16 14:59:57 +02:00
parent 73f38afc7f
commit bf9bd60921
1 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Modules/Core/d3_dev_oxemail.php
View File

@ -1,10 +1,5 @@
<?php <?php
namespace D3\Devhelper\Modules\Core;
use D3\Devhelper\Modules\Application\Model as ModuleModel;
use OxidEsales\Eshop\Core\Registry;
/** /**
* This Software is the property of Data Development and is protected * This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware. * by copyright law - it is NOT Freeware.
@ -20,6 +15,12 @@ use OxidEsales\Eshop\Core\Registry;
* @link http://www.oxidmodule.com * @link http://www.oxidmodule.com
*/ */
namespace D3\Devhelper\Modules\Core;
use D3\Devhelper\Modules\Application\Model as ModuleModel;
use OxidEsales\Eshop\Core\Exception\StandardException;
use OxidEsales\Eshop\Core\Registry;
class d3_dev_oxemail extends d3_dev_oxemail_parent class d3_dev_oxemail extends d3_dev_oxemail_parent
{ {
/** /**
@ -94,7 +95,7 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent
* *
* @return mixed|string * @return mixed|string
*/ */
public function d3GetInquiryMailContent($oInquiry, $sType) public function d3GetInquiryMailContent($oInquiry, $sType )
{ {
if (Registry::getConfig()->getActiveShop()->isProductiveMode()) { if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
return ''; return '';
@ -154,6 +155,10 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent
return $oSmarty->fetch($myConfig->getTemplatePath($sTpl, false)); return $oSmarty->fetch($myConfig->getTemplatePath($sTpl, false));
} }
/**
* @return bool
* @throws StandardException
*/
protected function _sendMail() protected function _sendMail()
{ {
if (Registry::getConfig()->getActiveShop()->isProductiveMode()) { if (Registry::getConfig()->getActiveShop()->isProductiveMode()) {
@ -161,6 +166,8 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent
} }
$this->d3clearRecipients(); $this->d3clearRecipients();
$this->d3clearReplies();
$this->d3clearReplyTo();
$this->d3clearCC(); $this->d3clearCC();
$this->d3clearBCC(); $this->d3clearBCC();
@ -190,6 +197,44 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent
$this->_aRecipients = $aRecipients; $this->_aRecipients = $aRecipients;
} }
public function d3clearReplies()
{
$aRecipients = array();
if (is_array($this->_aReplies) && count($this->_aReplies)) {
foreach ($this->_aReplies as $aRecInfo) {
if (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))
&& $sNewRecipient != $aRecInfo[0]
) {
$aRecInfo[1] = $aRecInfo[1]." (".$aRecInfo[0].")";
$aRecInfo[0] = $sNewRecipient;
$aRecipients[] = $aRecInfo;
} elseif (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))) {
$aRecipients[] = $aRecInfo;
}
}
}
$this->_aReplies = $aRecipients;
}
public function d3clearReplyTo()
{
$aRecipients = array();
if (is_array($this->ReplyTo) && count($this->ReplyTo)) {
foreach ($this->ReplyTo as $aRecInfo) {
if (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))
&& $sNewRecipient != $aRecInfo[0]
) {
$aRecInfo[1] = $aRecInfo[1]." (".$aRecInfo[0].")";
$aRecInfo[0] = $sNewRecipient;
$aRecipients[] = $aRecInfo;
} elseif (($sNewRecipient = $this->getNewRecipient($aRecInfo[0]))) {
$aRecipients[] = $aRecInfo;
}
}
}
$this->ReplyTo = $aRecipients;
}
public function d3clearCC() public function d3clearCC()
{ {
$aCc = array(); $aCc = array();
@ -230,6 +275,11 @@ class d3_dev_oxemail extends d3_dev_oxemail_parent
$this->bcc = $aCc; $this->bcc = $aCc;
} }
/**
* @param $sMailAddress
*
* @return bool|string
*/
public function getNewRecipient($sMailAddress) public function getNewRecipient($sMailAddress)
{ {
if (Registry::getConfig()->getConfigParam('blD3DevBlockMails')) { if (Registry::getConfig()->getConfigParam('blD3DevBlockMails')) {