/[dolibarr]/dolibarr/htdocs/lib/CMailFile.class.php
ViewVC logotype

Diff of /dolibarr/htdocs/lib/CMailFile.class.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.15 by eldy, Thu Aug 11 19:14:40 2005 UTC revision 1.16 by eldy, Thu Sep 8 19:13:52 2005 UTC
# Line 47  Line 47 
47  class CMailFile  class CMailFile
48  {  {
49      var $subject;      var $subject;
50      var $addr_from;      var $addr_from_email;
51        var $addr_from_name;
52      var $addr_to;      var $addr_to;
53      var $addr_cc;      var $addr_cc;
54      var $addr_bcc;      var $addr_bcc;
# Line 60  class CMailFile Line 61  class CMailFile
61      /**      /**
62              \brief CMailFile              \brief CMailFile
63              \param subject              sujet              \param subject              sujet
64              \param to                   email destinataire              \param to                   email destinataire ("Nom <email>" ou "email" ou "<email>")
65              \param from                 email emetteur              \param from                 email emetteur ("Nom <email>" ou "email" ou "<email>")
66              \param msg                  message              \param msg                  message
67              \param filename_list        tableau de fichiers attachés              \param filename_list        tableau de fichiers attachés
68              \param mimetype_list        tableau des types des fichiers attachés              \param mimetype_list        tableau des types des fichiers attachés
# Line 76  class CMailFile Line 77  class CMailFile
77          $this->mime_boundary = md5( uniqid("dolibarr") );          $this->mime_boundary = md5( uniqid("dolibarr") );
78    
79          $this->subject = $subject;          $this->subject = $subject;
80          $this->addr_from = $from;          if (eregi('(.*)<(.+)>',$from,$regs))
81            {
82                $this->addr_from_name  = trim($regs[1]);
83                $this->addr_from_email = trim($regs[2]);
84            }
85            else
86            {
87                $this->addr_from_name  = $from;
88                $this->addr_from_email = $from;
89            }
90          $this->addr_to = $to;          $this->addr_to = $to;
91          $this->addr_cc = $addr_cc;          $this->addr_cc = $addr_cc;
92          $this->addr_bcc = $addr_bcc;          $this->addr_bcc = $addr_bcc;
# Line 240  class CMailFile Line 250  class CMailFile
250          $out = "";          $out = "";
251    
252          $out .= "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";          $out .= "X-Mailer: Dolibarr version " . DOL_VERSION ."\n";
253          $out .= "X-Sender: <$this->addr_from>\n";          $out .= "X-Sender: <$this->addr_from_email>\n";
254    
255          $out .= "Return-path: <$this->addr_from>\n";          $out .= "Return-path: <$this->addr_from_email>\n";
256          $out .= "From: $this->addr_from <".$this->addr_from.">\n";          $out .= "From: $this->addr_from_name <".$this->addr_from_email.">\n";
257    
258          if ($this->addr_cc)  $out .= "Cc: ".$this->addr_cc."\n";          if ($this->addr_cc)  $out .= "Cc: ".$this->addr_cc."\n";
259          if ($this->addr_bcc) $out .= "Bcc: ".$this->addr_bcc."\n";          if ($this->addr_bcc) $out .= "Bcc: ".$this->addr_bcc."\n";
# Line 251  class CMailFile Line 261  class CMailFile
261          //    if($this->errors_to != "")          //    if($this->errors_to != "")
262          //$out = $out . "Errors-to: ".$this->errors_to."\n";          //$out = $out . "Errors-to: ".$this->errors_to."\n";
263    
264          //dolibarr_syslog("CMailFile::write_smtpheaders $out");          dolibarr_syslog("CMailFile::write_smtpheaders $out");
265          return $out;          return $out;
266      }      }
267    

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26