Functions renamed

[mailer.git] / inc / phpmailer / class.phpmailer.php

diff --git a/inc/phpmailer/class.phpmailer.php b/inc/phpmailer/class.phpmailer.php
index 114effae2eee232351b37f14b953db15e1b31f55..afb71b25f508057fb5f9f29c8b982cfca5c40ee6 100644 (file)
--- a/inc/phpmailer/class.phpmailer.php
+++ b/inc/phpmailer/class.phpmailer.php
@@ -2,7 +2,7 @@
 /*~ class.phpmailer.php
 .---------------------------------------------------------------------------.
 |  Software: PHPMailer - PHP email class                                    |
-|   Version: 2.0.3                                                          |
+|   Version: 2.0.4                                                          |
 |   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
 |      Info: http://phpmailer.sourceforge.net                               |
 |   Support: http://sourceforge.net/projects/phpmailer/                     |
@@ -28,7 +28,7 @@
  * PHPMailer - PHP email transport class
  * @package PHPMailer
  * @author Andy Prevost
- * @copyright 2004 - 2008 Andy Prevost
+ * @copyright 2004 - 2009 Andy Prevost
  */
 
 class PHPMailer {
@@ -139,7 +139,7 @@ class PHPMailer {
    * Holds PHPMailer version.
    * @var string
    */
-  var $Version           = "2.0.3";
+  var $Version           = "2.0.4";
 
   /**
    * Sets the email address that a reading confirmation will be sent.
@@ -156,7 +156,7 @@ class PHPMailer {
   var $Hostname          = '';
 
   /**
-   * Sets the message id to be used in the Message-Id header.
+   * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
@@ -256,7 +256,7 @@ class PHPMailer {
   var $boundary        = array();
   var $language        = array();
   var $error_count     = 0;
-  var $LE              = "\r\n";
+  var $LE              = "\n";
   var $sign_cert_file  = "";
   var $sign_key_file   = "";
   var $sign_key_pass   = "";
@@ -904,9 +904,9 @@ class PHPMailer {
     }
 
     if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-Id',$this->MessageID);
+      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
     } else {
-      $result .= sprintf("Message-Id: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer (phpmailer.sourceforge.net) [version ' . $this->Version . ']');
@@ -1177,7 +1177,7 @@ class PHPMailer {
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
       if($disposition == 'inline') {
-        $mime[] = sprintf("Content-Id: <%s>%s", $cid, $this->LE);
+        $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
@@ -1474,7 +1474,7 @@ class PHPMailer {
    * image type.  For JPEG images use "image/jpeg" and for GIF images
    * use "image/gif".
    * @param string $path Path to the attachment.
-   * @param string $cid Content id of the attachment.  Use this to identify
+   * @param string $cid Content ID of the attachment.  Use this to identify
    *        the Id for accessing the image in an HTML form.
    * @param string $name Overrides the attachment name.
    * @param string $encoding File encoding (see $Encoding).