composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

#691 Notifications not sent if some recicipients have an empty address -reintegrated from trunk

Browse Source 
SVN:2.0[2654]
This commit is contained in:
Romain Quetiez
2013-03-21 14:44:22 +00:00
parent 8c967e5e9d
commit 046deb125a
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/action.class.inc.php
View File

@@ -213,8 +213,12 @@ class ActionEmail extends ActionNotification
$aRecipients = array(); $aRecipients = array();
while ($oObj = $oSet->Fetch()) while ($oObj = $oSet->Fetch())
{ {
$aRecipients[] = $oObj->Get($sEmailAttCode); $sAddress = trim($oObj->Get($sEmailAttCode));
$this->m_iRecipients++; if (strlen($sAddress) > 0)
{
$aRecipients[] = $sAddress;
$this->m_iRecipients++;
}
} }
return implode(', ', $aRecipients); return implode(', ', $aRecipients);
} }

24
core/email.class.inc.php
View File

@@ -187,11 +187,29 @@ class EMail
return $this->m_oMessage->getSubject(); return $this->m_oMessage->getSubject();
} }
/**
* Helper to transform and sanitize addresses
* - get rid of empty addresses
*/
protected function AddressStringToArray($sAddressCSVList)
{
$aAddresses = array();
foreach(explode(',', $sAddressCSVList) as $sAddress)
{
$sAddress = trim($sAddress);
if (strlen($sAddress) > 0)
{
$aAddresses[] = $sAddress;
}
}
return $aAddresses;
}
public function SetRecipientTO($sAddress) public function SetRecipientTO($sAddress)
{ {
if (!empty($sAddress)) if (!empty($sAddress))
{ {
$aAddresses = explode(', ', $sAddress); $aAddresses = $this->AddressStringToArray($sAddress);
$this->m_oMessage->setTo($aAddresses); $this->m_oMessage->setTo($aAddresses);
} }
} }
@@ -226,7 +244,7 @@ class EMail
{ {
if (!empty($sAddress)) if (!empty($sAddress))
{ {
$aAddresses = explode(', ', $sAddress); $aAddresses = $this->AddressStringToArray($sAddress);
$this->m_oMessage->setCc($aAddresses); $this->m_oMessage->setCc($aAddresses);
} }
} }
@@ -235,7 +253,7 @@ class EMail
{ {
if (!empty($sAddress)) if (!empty($sAddress))
{ {
$aAddresses = explode(', ', $sAddress); $aAddresses = $this->AddressStringToArray($sAddress);
$this->m_oMessage->setBcc($aAddresses); $this->m_oMessage->setBcc($aAddresses);
} }
} }