[telaen-cvs] telaen/inc class.phpmailer_extra.php,1.2,1.3

[Jim J. <ji...@us...>]

Update of /cvsroot/telaen/telaen/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30881/inc

Modified Files:
	class.phpmailer_extra.php 
Log Message:
PHPMailer has a bug where, if using the 'mail' Mailer,
CC addresses where not being appended to the headers!


Index: class.phpmailer_extra.php
===================================================================
RCS file: /cvsroot/telaen/telaen/inc/class.phpmailer_extra.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** class.phpmailer_extra.php	9 Mar 2006 18:26:14 -0000	1.2
--- class.phpmailer_extra.php	29 Mar 2006 16:03:52 -0000	1.3
***************
*** 35,39 ****
          // the To and Subject lines aren't added to the header,
          // thus we don't see them in the SENT folder. So, in
!         // this case, force them in
          if ($this->Mailer == "mail") {
              if (count($this->to) > 0)
--- 35,40 ----
          // the To and Subject lines aren't added to the header,
          // thus we don't see them in the SENT folder. So, in
!         // this case, force them in. Also, some other headers
!         // aren't correct, so fix 'em
          if ($this->Mailer == "mail") {
              if (count($this->to) > 0)
***************
*** 41,46 ****
              else
                  $fheader .= $this->HeaderLine("To", "undisclosed-recipients:;");
-             $fheader .= $this->HeaderLine("Subject", $this->EncodeHeader(trim($this->Subject)));
  
          }
          $this->FormattedMail = sprintf("%s\r\n\r\n%s",$fheader,$body);
--- 42,52 ----
              else
                  $fheader .= $this->HeaderLine("To", "undisclosed-recipients:;");
  
+             // Add in the Subject and CC lines
+             $fheader .= $this->HeaderLine("Subject", $this->EncodeHeader(trim($this->Subject)));
+             if(count($this->cc) > 0) {
+                 $fheader .= $this->AddrAppend("Cc", $this->cc);
+                 $header .= $this->AddrAppend("Cc", $this->cc);
+             }
          }
          $this->FormattedMail = sprintf("%s\r\n\r\n%s",$fheader,$body);