lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bug sur adresse email emetteur

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-08 19:13:52 +00:00
parent d6b80c6b94
commit 29d01521cc
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/lib/CMailFile.class.php
View File

@ -47,7 +47,8 @@
class CMailFile class CMailFile
{ {
var $subject; var $subject;
var $addr_from; var $addr_from_email;
var $addr_from_name;
var $addr_to; var $addr_to;
var $addr_cc; var $addr_cc;
var $addr_bcc; var $addr_bcc;
@ -60,8 +61,8 @@ class CMailFile
/** /**
\brief CMailFile \brief CMailFile
\param subject sujet \param subject sujet
\param to email destinataire \param to email destinataire ("Nom <email>" ou "email" ou "<email>")
\param from email emetteur \param from email emetteur ("Nom <email>" ou "email" ou "<email>")
\param msg message \param msg message
\param filename_list tableau de fichiers attachés \param filename_list tableau de fichiers attachés
\param mimetype_list tableau des types des fichiers attachés \param mimetype_list tableau des types des fichiers attachés
@ -76,7 +77,16 @@ class CMailFile
$this->mime_boundary = md5( uniqid("dolibarr") ); $this->mime_boundary = md5( uniqid("dolibarr") );
$this->subject = $subject; $this->subject = $subject;
$this->addr_from = $from; if (eregi('(.*)<(.+)>',$from,$regs))
{
$this->addr_from_name = trim($regs[1]);
$this->addr_from_email = trim($regs[2]);
}
else
{
$this->addr_from_name = $from;
$this->addr_from_email = $from;
}
$this->addr_to = $to; $this->addr_to = $to;
$this->addr_cc = $addr_cc; $this->addr_cc = $addr_cc;
$this->addr_bcc = $addr_bcc; $this->addr_bcc = $addr_bcc;
@ -240,10 +250,10 @@ class CMailFile
$out = ""; $out = "";
$out .= "X-Mailer: Dolibarr version " . DOL_VERSION ."\n"; $out .= "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";
$out .= "X-Sender: <$this->addr_from>\n"; $out .= "X-Sender: <$this->addr_from_email>\n";
$out .= "Return-path: <$this->addr_from>\n"; $out .= "Return-path: <$this->addr_from_email>\n";
$out .= "From: $this->addr_from <".$this->addr_from.">\n"; $out .= "From: $this->addr_from_name <".$this->addr_from_email.">\n";
if ($this->addr_cc) $out .= "Cc: ".$this->addr_cc."\n"; if ($this->addr_cc) $out .= "Cc: ".$this->addr_cc."\n";
if ($this->addr_bcc) $out .= "Bcc: ".$this->addr_bcc."\n"; if ($this->addr_bcc) $out .= "Bcc: ".$this->addr_bcc."\n";
@ -251,7 +261,7 @@ class CMailFile
// if($this->errors_to != "") // if($this->errors_to != "")
//$out = $out . "Errors-to: ".$this->errors_to."\n"; //$out = $out . "Errors-to: ".$this->errors_to."\n";
//dolibarr_syslog("CMailFile::write_smtpheaders $out"); dolibarr_syslog("CMailFile::write_smtpheaders $out");
return $out; return $out;
} }