diff --git a/apps/maarch_entreprise/tools/mails/htmlMimeMail.php b/apps/maarch_entreprise/tools/mails/htmlMimeMail.php index d0fa49af9bb698a504b9fcc93f99e9a9d68585c6..4cbff77662f7c55de4f271de2e9fc0942ea04558 100755 --- a/apps/maarch_entreprise/tools/mails/htmlMimeMail.php +++ b/apps/maarch_entreprise/tools/mails/htmlMimeMail.php @@ -16,7 +16,7 @@ * along with htmlMimeMail; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -* © Copyright 2004 Richard Heyes +* � Copyright 2004 Richard Heyes */ require_once(dirname(__FILE__) . '/mimePart.php'); @@ -710,17 +710,19 @@ class htmlMimeMail case 'mail': $subject = ''; if (!empty($this->headers['Subject'])) { - $subject = $this->_encodeHeader($this->headers['Subject'], $this->build_params['head_charset']); + //subject = $this->_encodeHeader($this->header['Subject'], $this->build_params['head_charset']); + $subject = $this->headers['Subject']; unset($this->headers['Subject']); } // Get flat representation of headers foreach ($this->headers as $name => $value) { - $headers[] = $name . ': ' . $this->_encodeHeader($value, $this->build_params['head_charset']); + //$headers[] = $name . ': ' . $this->_encodeHeader($value, $this->build_params['head_charset']); + $headers[] = $name . ': ' . $value; } - $to = $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); - + //$to = $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); + $to = implode(', ', $recipients); if (!empty($this->return_path)) { $result = mail($to, $subject, $this->output, implode(CRLF, $headers), '-f' . $this->return_path); } else { @@ -739,11 +741,13 @@ class htmlMimeMail case 'sendmail': // Get flat representation of headers foreach ($this->headers as $name => $value) { - $headers[] = $name . ': ' . $this->_encodeHeader($value, $this->build_params['head_charset']); + //$headers[] = $name . ': ' . $this->_encodeHeader($value, $this->build_params['head_charset']); + $headers[] = $name . ': ' . $value; } // Encode To: - $headers[] = 'To: ' . $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); + //$headers[] = 'To: ' . $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); + $headers[] = 'To: ' . implode(', ', $recipients); // Get return path arg for sendmail command if necessary $returnPath = ''; @@ -794,17 +798,17 @@ class htmlMimeMail if ($name == 'Bcc') { continue; } - //ajout d'une condition pour subject, car _encodeHeader ne prend pas les caractères spéciaux avec php7 en revanche fonctionne très bien avec php5.6 + //ajout d'une condition pour subject, car _encodeHeader ne prend pas les caract�res sp�ciaux avec php7 en revanche fonctionne tr�s bien avec php5.6 if ($name == 'Subject'){ $headers[] = $name . ': ' . $value; }else{ - $headers[] = $name . ': ' . $this->_encodeHeader($value, $this->build_params['head_charset']); + $headers[] = $name . ': ' . $value; } } // Add To header based on $recipients argument - $headers[] = 'To: ' . $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); - + //$headers[] = 'To: ' . $this->_encodeHeader(implode(', ', $recipients), $this->build_params['head_charset']); + $headers[] = 'To: ' . implode(', ', $recipients); // Add headers to send_params $send_params['headers'] = $headers; $send_params['recipients'] = array_values(array_unique($smtp_recipients));