From bf366dbf6f690278549c9a5bbb6c779c4fa5765e Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 17 Nov 2011 08:49:33 +0000 Subject: [PATCH] handle to,cc,bcc and replyto addresses the way, that spamassasin rules regarding TO_NO_BRKTS_DIRECT are not triggered, by adding a personal namepart to the address (generated from emailaddress), if only emailaddress is present --- felamimail/inc/class.bocompose.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/felamimail/inc/class.bocompose.inc.php b/felamimail/inc/class.bocompose.inc.php index 992546b96d..6b2e67bab6 100644 --- a/felamimail/inc/class.bocompose.inc.php +++ b/felamimail/inc/class.bocompose.inc.php @@ -719,7 +719,7 @@ $emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''); #$emailName = $bofelamimail->encodeHeader($addressObject->personal, 'q'); #$_mailObject->AddAddress($emailAddress, $emailName); - $_mailObject->AddAddress($emailAddress, str_replace(array('@'),' ',$addressObject->personal)); + $_mailObject->AddAddress($emailAddress, str_replace(array('@'),' ',($addressObject->personal?$addressObject->personal:$emailAddress))); } } @@ -730,7 +730,7 @@ $emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''); #$emailName = $bofelamimail->encodeHeader($addressObject->personal, 'q'); #$_mailObject->AddCC($emailAddress, $emailName); - $_mailObject->AddCC($emailAddress, str_replace(array('@'),' ',$addressObject->personal)); + $_mailObject->AddCC($emailAddress, str_replace(array('@'),' ',($addressObject->personal?$addressObject->personal:$emailAddress))); } } @@ -741,7 +741,7 @@ $emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''); #$emailName = $bofelamimail->encodeHeader($addressObject->personal, 'q'); #$_mailObject->AddBCC($emailAddress, $emailName); - $_mailObject->AddBCC($emailAddress, str_replace(array('@'),' ',$addressObject->personal)); + $_mailObject->AddBCC($emailAddress, str_replace(array('@'),' ',($addressObject->personal?$addressObject->personal:$emailAddress))); } } @@ -752,7 +752,7 @@ $emailAddress = $addressObject->mailbox. (!empty($addressObject->host) ? '@'.$addressObject->host : ''); #$emailName = $bofelamimail->encodeHeader($addressObject->personal, 'q'); #$_mailObject->AddBCC($emailAddress, $emailName); - $_mailObject->AddReplyto($emailAddress, str_replace(array('@'),' ',$addressObject->personal)); + $_mailObject->AddReplyto($emailAddress, str_replace(array('@'),' ',($addressObject->personal?$addressObject->personal:$emailAddress))); } }