From 706be214656a95f583bd895abd7b42720befd01b Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Sun, 27 Jul 2003 13:26:07 +0000
Subject: [PATCH] Upgraded phpmailer to 1.70

---
 lib/phpmailer/ChangeLog.txt                  |   33 +
 lib/phpmailer/README                         |  187 +-
 lib/phpmailer/class.phpmailer.php            | 1416 +++++++-------
 lib/phpmailer/class.smtp.php                 | 1785 +++++++++---------
 lib/phpmailer/docs/extending.html            |  148 --
 lib/phpmailer/docs/faq.html                  |   66 -
 lib/phpmailer/docs/timeoutfix.diff           |   23 -
 lib/phpmailer/language/phpmailer.lang-br.php |   21 +
 lib/phpmailer/language/phpmailer.lang-en.php |   24 +
 lib/phpmailer/phpdoc/allclasses-frame.html   |   25 -
 lib/phpmailer/phpdoc/deprecated-list.html    |   87 -
 lib/phpmailer/phpdoc/help-doc.html           |  136 --
 lib/phpmailer/phpdoc/index-all.html          |  293 ---
 lib/phpmailer/phpdoc/index.html              |   22 -
 lib/phpmailer/phpdoc/overview-tree.html      |   92 -
 lib/phpmailer/phpdoc/packages.html           |   26 -
 lib/phpmailer/phpdoc/phpmailer.html          | 1043 ----------
 lib/phpmailer/phpdoc/serialized-form.html    |   87 -
 lib/phpmailer/phpdoc/stylesheet.css          |   29 -
 lib/phpmailer/test/phpmailer_test.php        |  546 ------
 lib/phpmailer/test/phpunit.php               |  376 ----
 lib/phpmailer/test/rocks.png                 |  Bin 1280 -> 0 bytes
 22 files changed, 1756 insertions(+), 4709 deletions(-)
 delete mode 100644 lib/phpmailer/docs/extending.html
 delete mode 100644 lib/phpmailer/docs/faq.html
 delete mode 100644 lib/phpmailer/docs/timeoutfix.diff
 create mode 100644 lib/phpmailer/language/phpmailer.lang-br.php
 create mode 100644 lib/phpmailer/language/phpmailer.lang-en.php
 delete mode 100644 lib/phpmailer/phpdoc/allclasses-frame.html
 delete mode 100644 lib/phpmailer/phpdoc/deprecated-list.html
 delete mode 100644 lib/phpmailer/phpdoc/help-doc.html
 delete mode 100644 lib/phpmailer/phpdoc/index-all.html
 delete mode 100644 lib/phpmailer/phpdoc/index.html
 delete mode 100644 lib/phpmailer/phpdoc/overview-tree.html
 delete mode 100644 lib/phpmailer/phpdoc/packages.html
 delete mode 100644 lib/phpmailer/phpdoc/phpmailer.html
 delete mode 100644 lib/phpmailer/phpdoc/serialized-form.html
 delete mode 100644 lib/phpmailer/phpdoc/stylesheet.css
 delete mode 100644 lib/phpmailer/test/phpmailer_test.php
 delete mode 100644 lib/phpmailer/test/phpunit.php
 delete mode 100644 lib/phpmailer/test/rocks.png

diff --git a/lib/phpmailer/ChangeLog.txt b/lib/phpmailer/ChangeLog.txt
index 5241078425..5753e97ce6 100644
--- a/lib/phpmailer/ChangeLog.txt
+++ b/lib/phpmailer/ChangeLog.txt
@@ -1,5 +1,38 @@
 ChangeLog
 
+Version 1.70 (Mon, Jun 20 2003)
+* Added SMTP keep-alive support
+* Added IsError method for error detection
+* Added error message translation support (SetLanguage)
+* Refactored many methods to increase library performance
+* Hello now sends the newer EHLO message before HELO as per RFC 2821
+* Removed the boundary class and replaced it with GetBoundary
+* Removed queue support methods
+* New $Hostname variable
+* New Message-ID header
+* Received header reformat
+* Helo variable default changed to $Hostname
+* Removed extra spaces in Content-Type definition (#667182)
+* Return-Path should be set to Sender when set
+* Adds Q or B encoding to headers when necessary
+* quoted-encoding should now encode NULs \000
+* Fixed encoding of body/AltBody (#553370)
+* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
+* Multiple bug fixes
+
+Version 1.65 (Fri, Aug 09 2002)
+* Fixed non-visible attachment bug (#585097) for Outlook
+* SMTP connections are now closed after each transaction
+* Fixed SMTP::Expand return value
+* Converted SMTP class documentation to phpDocumentor format
+
+Version 1.62 (Wed, Jun 26 2002)
+* Fixed multi-attach bug
+* Set proper word wrapping
+* Reduced memory use with attachments
+* Added more debugging
+* Changed documentation to phpDocumentor format
+
 Version 1.60 (Sat, Mar 30 2002)
 * Sendmail pipe and address patch (Christian Holtje)
 * Added embedded image and read confirmation support (A. Ognio)
diff --git a/lib/phpmailer/README b/lib/phpmailer/README
index 18f66ed738..137349aff1 100644
--- a/lib/phpmailer/README
+++ b/lib/phpmailer/README
@@ -1,85 +1,102 @@
-phpmailer - PHP email class
-==============================
-http://phpmailer.sourceforge.net
-
-Please read LICENSE for information on this softwares availability and
-distribution.
-
-Class Features:
-- Send emails with multiple TOs, CCs, BCCs and REPLY-TOs
-- Redundant SMTP servers
-- Multipart/alternative emails for mail clients that do not read HTML email
-- Support for 8bit, base64, binary, and quoted-printable encoding
-- Uses the same methods as the very popular AspEmail active server (COM) component
-- SMTP authentication
-- Word wrap
-- Many more...
-
-Why you might need it:
-
-Many PHP developers utilize email in their code.  The only PHP function
-that supports this is the mail() function.  However, it does not expose
-any of the popular features that many email clients use nowadays like
-HTML-based emails and attachments. There are two proprietary
-development tools out there that have all the functionality built into
-easy to use classes: AspEmail(tm) and AspMail.  Both of these
-programs are COM components only available on Windows.  They are also a
-little pricey for smaller projects.
-
-Since I do Linux development I’ve missed these tools for my PHP coding.
-So I built a version myself that implements the same methods (object
-calls) that the Windows-based components do. It is open source and the
-LGPL license allows you to place the class in your proprietary PHP
-projects.
-
-
-Installation:
-
-Copy class.phpmailer.php into your php.ini include_path. If you are
-using the SMTP mailer then place class.smtp.php in your path as well.
-
-Example
-
-<?php
-require("class.phpmailer.php");
-
-$mail = new phpmailer();
-
-$mail->IsSMTP();                                      // set mailer to use SMTP
-$mail->Host = "smtp1.site.com;smtp2.site.com";        // specify main and backup server
-$mail->SMTPAuth = true     // turn on SMTP authentication
-$mail->Username = "jswan"  // SMTP username
-$mail->Password = "secret" // SMTP password
-
-$mail->From = "from@email.com";
-$mail->FromName = "Mailer";
-$mail->AddAddress("josh@site.com", "Josh Adams");
-$mail->AddAddress("ellen@site.com");                  // name is optional
-$mail->AddReplyTo("info@site.com", "Information");
-
-$mail->WordWrap = 50;                                 // set word wrap to 50 characters
-$mail->AddAttachment("/var/tmp/file.tar.gz");         // add attachments
-$mail->AddAttachment("/tmp/image.jpg", "new.jpg");    // optional name
-$mail->IsHTML(true);                                  // set email format to HTML
-
-$mail->Subject = "Here is the subject";
-$mail->Body    = "This is the HTML message body <b>in bold!</b>";
-$mail->AltBody = "This is the body in plain text for non-HTML mail clients";
-
-if(!$mail->Send())
-{
-   echo "Message could not be sent. <p>";
-   echo "Mailer Error: " . $mail->ErrorInfo;
-   exit;
-}
-
-echo "Message has been sent";
-?>
-
-CHANGELOG
-
-See ChangeLog.txt
-
-Download: http://sourceforge.net/project/showfiles.php?group_id=26031
-
-Brent R. Matzelle <bmatzelle@yahoo.com>
+PHPMailer
+Full Featured Email Transfer Class for PHP
+==========================================
+
+http://phpmailer.sourceforge.net/
+
+This software is licenced under the LGPL.  Please read LICENSE for information on the
+software availability and distribution.
+
+Class Features:
+- Send emails with multiple TOs, CCs, BCCs and REPLY-TOs
+- Redundant SMTP servers
+- Multipart/alternative emails for mail clients that do not read HTML email
+- Support for 8bit, base64, binary, and quoted-printable encoding
+- Uses the same methods as the very popular AspEmail active server (COM) component
+- SMTP authentication
+- Native language support
+- Word wrap, and more!
+
+Why you might need it:
+
+Many PHP developers utilize email in their code.  The only PHP function
+that supports this is the mail() function.  However, it does not expose
+any of the popular features that many email clients use nowadays like
+HTML-based emails and attachments. There are two proprietary
+development tools out there that have all the functionality built into
+easy to use classes: AspEmail(tm) and AspMail.  Both of these
+programs are COM components only available on Windows.  They are also a
+little pricey for smaller projects.
+
+Since I do Linux development I’ve missed these tools for my PHP coding.
+So I built a version myself that implements the same methods (object
+calls) that the Windows-based components do. It is open source and the
+LGPL license allows you to place the class in your proprietary PHP
+projects.
+
+
+Installation:
+
+Copy class.phpmailer.php into your php.ini include_path. If you are
+using the SMTP mailer then place class.smtp.php in your path as well.
+In the language directory you will find several files like 
+phpmailer.lang-en.php.  If you look right before the .php extension 
+that there are two letters.  These represent the language type of the 
+translation file.  For instance "en" is the English file and "br" is 
+the Portuguese file.  Chose the file that best fits with your language 
+and place it in the PHP include path.  If your language is English 
+then you have nothing more to do.  If it is a different language then 
+you must point PHPMailer to the correct translation.  To do this, call 
+the PHPMailer SetLanguage method like so:
+
+// To load the Portuguese version
+$mail->SetLanguage("br", "/optional/path/to/language/directory");
+
+That's it.  You should now be ready to use PHPMailer!
+
+
+A Simple Example:
+
+<?php
+require("class.phpmailer.php");
+
+$mail = new PHPMailer();
+
+$mail->IsSMTP();                                      // set mailer to use SMTP
+$mail->Host = "smtp1.example.com;smtp2.example.com";  // specify main and backup server
+$mail->SMTPAuth = true     // turn on SMTP authentication
+$mail->Username = "jswan"  // SMTP username
+$mail->Password = "secret" // SMTP password
+
+$mail->From = "from@example.com";
+$mail->FromName = "Mailer";
+$mail->AddAddress("josh@example.net", "Josh Adams");
+$mail->AddAddress("ellen@example.com");                  // name is optional
+$mail->AddReplyTo("info@example.com", "Information");
+
+$mail->WordWrap = 50;                                 // set word wrap to 50 characters
+$mail->AddAttachment("/var/tmp/file.tar.gz");         // add attachments
+$mail->AddAttachment("/tmp/image.jpg", "new.jpg");    // optional name
+$mail->IsHTML(true);                                  // set email format to HTML
+
+$mail->Subject = "Here is the subject";
+$mail->Body    = "This is the HTML message body <b>in bold!</b>";
+$mail->AltBody = "This is the body in plain text for non-HTML mail clients";
+
+if(!$mail->Send())
+{
+   echo "Message could not be sent. <p>";
+   echo "Mailer Error: " . $mail->ErrorInfo;
+   exit;
+}
+
+echo "Message has been sent";
+?>
+
+CHANGELOG
+
+See ChangeLog.txt
+
+Download: http://sourceforge.net/project/showfiles.php?group_id=26031
+
+Brent R. Matzelle
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php
index 481b1bbc97..69a81b966e 100644
--- a/lib/phpmailer/class.phpmailer.php
+++ b/lib/phpmailer/class.phpmailer.php
@@ -1,98 +1,88 @@
 <?php
 ////////////////////////////////////////////////////
-// phpmailer - PHP email class
-//
-// Version 1.60, Created 03/30/2002
+// PHPMailer - PHP email class
 //
 // Class for sending email using either
 // sendmail, PHP mail(), or SMTP.  Methods are
 // based upon the standard AspEmail(tm) classes.
 //
-// Author: Brent R. Matzelle <bmatzelle@yahoo.com>
+// Copyright (C) 2001 - 2003  Brent R. Matzelle
 //
 // License: LGPL, see LICENSE
 ////////////////////////////////////////////////////
 
 /**
- * phpmailer - PHP email transport class
+ * PHPMailer - PHP email transport class
+ * @package PHPMailer
  * @author Brent R. Matzelle
+ * @copyright 2001 - 2003 Brent R. Matzelle
  */
-class phpmailer
+class PHPMailer
 {
     /////////////////////////////////////////////////
     // PUBLIC VARIABLES
     /////////////////////////////////////////////////
 
     /**
-     * Email priority (1 = High, 3 = Normal, 5 = low). Default value is 3.
-     * @public
-     * @type int
+     * Email priority (1 = High, 3 = Normal, 5 = low).
+     * @var int
      */
     var $Priority          = 3;
 
     /**
-     * Sets the CharSet of the message. Default value is "iso-8859-1".
-     * @public
-     * @type string
+     * Sets the CharSet of the message.
+     * @var string
      */
     var $CharSet           = "iso-8859-1";
 
     /**
-     * Sets the Content-type of the message. Default value is "text/plain".
-     * @public
-     * @type string
+     * Sets the Content-type of the message.
+     * @var string
      */
     var $ContentType        = "text/plain";
 
     /**
-     * Sets the Encoding of the message. Options for this are "8bit" (default),
+     * Sets the Encoding of the message. Options for this are "8bit",
      * "7bit", "binary", "base64", and "quoted-printable".
-     * @public
-     * @type string
+     * @var string
      */
     var $Encoding          = "8bit";
 
     /**
-     * Holds the most recent mailer error message. Default value is "".
-     * @public
-     * @type string
+     * Holds the most recent mailer error message.
+     * @var string
      */
     var $ErrorInfo         = "";
 
     /**
-     * Sets the From email address for the message. Default value is "root@localhost".
-     * @public
-     * @type string
+     * Sets the From email address for the message.
+     * @var string
      */
     var $From               = "root@localhost";
 
     /**
-     * Sets the From name of the message. Default value is "Root User".
-     * @public
-     * @type string
+     * Sets the From name of the message.
+     * @var string
      */
     var $FromName           = "Root User";
 
     /**
      * Sets the Sender email of the message. If not empty, will be sent via -f to sendmail
-     * or as 'MAIL FROM' in smtp mode. Default value is "".
-     * @public
-     * @type string
+     * or as 'MAIL FROM' in smtp mode.
+     * @var string
      */
     var $Sender            = "";
 
     /**
-     * Sets the Subject of the message. Default value is "".
-     * @public
-     * @type string
+     * Sets the Subject of the message.
+     * @var string
      */
     var $Subject           = "";
 
     /**
      * Sets the Body of the message.  This can be either an HTML or text body.
-     * If HTML then run IsHTML(true). Default value is "".
-     * @public
-     * @type string
+     * If HTML then run IsHTML(true).
+     * @var string
      */
     var $Body               = "";
 
@@ -101,73 +91,55 @@ class phpmailer
      * email to multipart/alternative.  This body can be read by mail
      * clients that do not have HTML email capability such as mutt. Clients
      * that can read HTML will view the normal Body.
-     * Default value is "".
-     * @public
-     * @type string
+     * @var string
      */
     var $AltBody           = "";
 
     /**
      * Sets word wrapping on the body of the message to a given number of 
-     * characters. Default value is 0 (off).
-     * @public
-     * @type int
+     * characters.
+     * @var int
      */
     var $WordWrap          = 0;
 
     /**
      * Method to send mail: ("mail", "sendmail", or "smtp").
-     * Default value is "mail".
-     * @public
-     * @type string
+     * @var string
      */
     var $Mailer            = "mail";
 
     /**
-     * Sets the path of the sendmail program. Default value is
-     * "/usr/sbin/sendmail".
-     * @public
-     * @type string
+     * Sets the path of the sendmail program.
+     * @var string
      */
     var $Sendmail          = "/usr/sbin/sendmail";
-
-    /**
-     *  Turns Microsoft mail client headers on and off.  Useful mostly
-     *  for older clients. Default value is false (off).
-     *  @public
-     *  @type bool
-     */
-    var $UseMSMailHeaders = false;
     
     /**
-     * Path to phpmailer plugins.  This is now only useful if the SMTP class 
+     * Path to PHPMailer plugins.  This is now only useful if the SMTP class 
      * is in a different directory than the PHP include path.  
-     * Default is empty ("").
-     * @public
-     * @type string
+     * @var string
      */
     var $PluginDir         = "";
 
     /**
-     *  Holds phpmailer version.
-     *  @public
-     *  @type string
+     *  Holds PHPMailer version.
+     *  @var string
      */
-    var $Version           = "1.54";
+    var $Version           = "1.70";
 
     /**
-     * Sets the email address that a reading confirmation will be sent. Default value is "".
-     * @public
-     * @type string
+     * Sets the email address that a reading confirmation will be sent.
+     * @var string
      */
     var $ConfirmReadingTo  = "";
 
     /**
-     *  Sets the line endings of the message.  Default is "\n";
-     *  @public
-     *  @type string
+     *  Sets the hostname to use in Message-Id and Received headers
+     *  and as default HELO string. If empty, the value returned
+     *  by SERVER_NAME is used or 'localhost.localdomain'.
+     *  @var string
      */
-    var $LE           = "\n";
+    var $Hostname          = "";
 
 
     /////////////////////////////////////////////////
@@ -178,127 +150,88 @@ class phpmailer
      *  Sets the SMTP hosts.  All hosts must be separated by a
      *  semicolon.  You can also specify a different port
      *  for each host by using this format: [hostname:port]
-     *  (e.g. "smtp1.domain.com:25;smtp2.domain.com").
+     *  (e.g. "smtp1.example.com:25;smtp2.example.com").
      *  Hosts will be tried in order.
-     *  Default value is "localhost".
-     *  @public
-     *  @type string
+     *  @var string
      */
     var $Host        = "localhost";
 
     /**
-     *  Sets the default SMTP server port. Default value is 25.
-     *  @public
-     *  @type int
+     *  Sets the default SMTP server port.
+     *  @var int
      */
     var $Port        = 25;
 
     /**
-     *  Sets the SMTP HELO of the message.
-     *  Default value is "localhost.localdomain".
-     *  @public
-     *  @type string
+     *  Sets the SMTP HELO of the message (Default is $Hostname).
+     *  @var string
      */
-    var $Helo        = "localhost.localdomain";
+    var $Helo        = "";
 
     /**
      *  Sets SMTP authentication. Utilizes the Username and Password variables.
-     *  Default value is false (off).
-     *  @public
-     *  @type bool
+     *  @var bool
      */
     var $SMTPAuth     = false;
 
     /**
-     *  Sets SMTP username. Default value is "".
-     *  @public
-     *  @type string
+     *  Sets SMTP username.
+     *  @var string
      */
     var $Username     = "";
 
     /**
-     *  Sets SMTP password. Default value is "".
-     *  @public
-     *  @type string
+     *  Sets SMTP password.
+     *  @var string
      */
     var $Password     = "";
 
     /**
      *  Sets the SMTP server timeout in seconds. This function will not 
-     *  work with the win32 version. Default value is 10.
-     *  @public
-     *  @type int
+     *  work with the win32 version.
+     *  @var int
      */
     var $Timeout      = 10;
 
     /**
-     *  Sets SMTP class debugging on or off. Default value is false (off).
-     *  @public
-     *  @type bool
+     *  Sets SMTP class debugging on or off.
+     *  @var bool
      */
     var $SMTPDebug    = false;
 
-
-    /////////////////////////////////////////////////
-    // PRIVATE VARIABLES
-    /////////////////////////////////////////////////
-
     /**
-     *  Holds all "To" addresses.
-     *  @type array
+     * Prevents the SMTP connection from being closed after each mail 
+     * sending.  If this is set to true then to close the connection 
+     * requires an explicit call to SmtpClose(). 
+     * @var bool
      */
-    var $to              = array();
+    var $SMTPKeepAlive = false;
 
-    /**
-     *  Holds all "CC" addresses.
-     *  @type array
+    /**#@+
+     * @access private
      */
+    var $smtp            = NULL;
+    var $to              = array();
     var $cc              = array();
-
-    /**
-     *  Holds all "BCC" addresses.
-     *  @type array
-     */
     var $bcc             = array();
-
-    /**
-     *  Holds all "Reply-To" addresses.
-     *  @type array
-     */
     var $ReplyTo         = array();
-
-    /**
-     *  Holds all string and binary attachments.
-     *  @type array
-     */
     var $attachment      = array();
-
-    /**
-     *  Holds all custom headers.
-     *  @type array
-     */
     var $CustomHeader    = array();
-
-    /**
-     *  Holds the type of the message.
-     *  @type string
-     */
     var $message_type    = "";
-
-    /**
-     *  Holds the message boundaries.
-     *  @type string array
-     */
     var $boundary        = array();
-
+    var $language        = array();
+    var $error_count     = 0;
+    var $LE              = "\n";
+    /**#@-*/
+    
     /////////////////////////////////////////////////
     // VARIABLE METHODS
     /////////////////////////////////////////////////
 
     /**
-     * Sets message type to HTML.  Returns void.
-     * @public
-     * @returns void
+     * Sets message type to HTML.  
+     * @param bool $bool
+     * @return void
      */
     function IsHTML($bool) {
         if($bool == true)
@@ -309,9 +242,7 @@ class phpmailer
 
     /**
      * Sets Mailer to send message using SMTP.
-     * Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function IsSMTP() {
         $this->Mailer = "smtp";
@@ -319,9 +250,7 @@ class phpmailer
 
     /**
      * Sets Mailer to send message using PHP mail() function.
-     * Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function IsMail() {
         $this->Mailer = "mail";
@@ -329,21 +258,17 @@ class phpmailer
 
     /**
      * Sets Mailer to send message using the $Sendmail program.
-     * Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function IsSendmail() {
         $this->Mailer = "sendmail";
     }
 
     /**
-     * Sets Mailer to send message using the qmail MTA.  Returns void.
-     * @public
-     * @returns void
+     * Sets Mailer to send message using the qmail MTA. 
+     * @return void
      */
     function IsQmail() {
-        //$this->Sendmail = "/var/qmail/bin/qmail-inject";
         $this->Sendmail = "/var/qmail/bin/sendmail";
         $this->Mailer = "sendmail";
     }
@@ -354,9 +279,10 @@ class phpmailer
     /////////////////////////////////////////////////
 
     /**
-     * Adds a "To" address.  Returns void.
-     * @public
-     * @returns void
+     * Adds a "To" address.  
+     * @param string $address
+     * @param string $name
+     * @return void
      */
     function AddAddress($address, $name = "") {
         $cur = count($this->to);
@@ -367,12 +293,11 @@ class phpmailer
     /**
      * Adds a "Cc" address. Note: this function works
      * with the SMTP mailer on win32, not with the "mail"
-     * mailer.  This is a PHP bug that has been submitted
-     * on http://bugs.php.net. The *NIX version of PHP
-     * functions correctly. Returns void.
-     * @public
-     * @returns void
-     */
+     * mailer.  
+     * @param string $address
+     * @param string $name
+     * @return void
+    */
     function AddCC($address, $name = "") {
         $cur = count($this->cc);
         $this->cc[$cur][0] = trim($address);
@@ -382,12 +307,10 @@ class phpmailer
     /**
      * Adds a "Bcc" address. Note: this function works
      * with the SMTP mailer on win32, not with the "mail"
-     * mailer.  This is a PHP bug that has been submitted
-     * on http://bugs.php.net. The *NIX version of PHP
-     * functions correctly.
-     * Returns void.
-     * @public
-     * @returns void
+     * mailer.  
+     * @param string $address
+     * @param string $name
+     * @return void
      */
     function AddBCC($address, $name = "") {
         $cur = count($this->bcc);
@@ -396,9 +319,10 @@ class phpmailer
     }
 
     /**
-     * Adds a "Reply-to" address.  Returns void.
-     * @public
-     * @returns void
+     * Adds a "Reply-to" address.  
+     * @param string $address
+     * @param string $name
+     * @return void
      */
     function AddReplyTo($address, $name = "") {
         $cur = count($this->ReplyTo);
@@ -414,9 +338,8 @@ class phpmailer
     /**
      * Creates message and assigns Mailer. If the message is
      * not sent successfully then it returns false.  Use the ErrorInfo
-     * variable to view description of the error.  Returns bool.
-     * @public
-     * @returns bool
+     * variable to view description of the error.  
+     * @return bool
      */
     function Send() {
         $header = "";
@@ -424,7 +347,7 @@ class phpmailer
 
         if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
         {
-            $this->error_handler("You must provide at least one recipient email address");
+            $this->SetError($this->Lang("provide_address"));
             return false;
         }
 
@@ -432,35 +355,31 @@ class phpmailer
         if(!empty($this->AltBody))
             $this->ContentType = "multipart/alternative";
 
-        // Attach sender information & date
-        $header = $this->received();
-        $header .= sprintf("Date: %s%s", $this->rfc_date(), $this->LE);
-        $header .= $this->create_header();
-
-        if(!$body = $this->create_body())
-            return false;
+        $this->SetMessageType();
+        $header .= $this->CreateHeader();
+        $body = $this->CreateBody();
 
-        //echo "<pre>".$header . $body . "</pre>"; // debugging
+        if($body == "") { return false; }
 
         // Choose the mailer
         if($this->Mailer == "sendmail")
         {
-          if(!$this->sendmail_send($header, $body))
+          if(!$this->SendmailSend($header, $body))
               return false;
         }
         elseif($this->Mailer == "mail")
         {
-          if(!$this->mail_send($header, $body))
+          if(!$this->MailSend($header, $body))
               return false;
         }
         elseif($this->Mailer == "smtp")
         {
-          if(!$this->smtp_send($header, $body))
+          if(!$this->SmtpSend($header, $body))
               return false;
         }
         else
         {
-            $this->error_handler(sprintf("%s mailer is not supported", $this->Mailer));
+            $this->SetError($this->Mailer . $this->Lang("mailer_not_supported"));
             return false;
         }
 
@@ -468,112 +387,11 @@ class phpmailer
     }
     
     /**
-     * Sends mail message to an assigned queue directory.  Has an optional 
-     * sendTime argument.  This is used when the user wants the 
-     * message to be sent from the queue at a predetermined time. 
-     * The data must be a valid timestamp like that returned from 
-     * the time() or strtotime() functions.  Returns false on failure 
-     * or the message file name if success.
-     * @public
-     * @returns string
-     */
-    function SendToQueue($queue_path, $send_time = 0) {
-        $message = array();
-        $header = "";
-        $body = "";
-        
-        // If invalid or empty just set to the current time
-        if($send_time == 0)
-            $send_time = time();
-        
-        if(!is_dir($queue_path))
-        {
-            $this->error_handler("The supplied queue directory does not exist");
-            return false;
-        }
-
-        if((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
-        {
-            $this->error_handler("You must provide at least one recipient email address");
-            return false;
-        }
-
-        // Set whether the message is multipart/alternative
-        if(!empty($this->AltBody))
-            $this->ContentType = "multipart/alternative";
-
-        $header = $this->create_header();
-        if(!$body = $this->create_body())
-            return false;
-
-        // Seed randomizer
-        mt_srand(time());
-        $msg_id = md5(uniqid(mt_rand()));
-        
-        $fp = fopen($queue_path . $msg_id . ".pqm", "wb");
-        if(!$fp)
-        {
-            $this->error_handler(sprintf("Could not write to %s directory", $queue_path));
-            return false;
-        }
-       
-        $message[] = sprintf("----START PQM HEADER----%s", $this->LE);
-        $message[] = sprintf("SendTime: %s%s", $send_time, $this->LE);
-        $message[] = sprintf("Mailer: %s%s", $this->Mailer, $this->LE);
-
-        // Choose the mailer
-        if($this->Mailer == "sendmail")
-        {
-            $message[] = sprintf("Sendmail: %s%s", $this->Sendmail, $this->LE);
-            $message[] = sprintf("Sender: %s%s", $this->Sender, $this->LE);
-        }
-        elseif($this->Mailer == "mail")
-        {
-            $message[] = sprintf("Sender: %s%s", $this->Sender, $this->LE);
-            $message[] = sprintf("Subject: %s%s", $this->Subject, $this->LE);
-            $message[] = sprintf("to: %s%s", $this->addr_list($this->to), $this->LE);
-        }
-        elseif($this->Mailer == "smtp")
-        {
-            $message[] = sprintf("Host: %s%s", $this->Host, $this->LE);
-            $message[] = sprintf("Port: %d%s", $this->Port, $this->LE);
-            $message[] = sprintf("Helo: %s%s", $this->Helo, $this->LE);
-            $message[] = sprintf("Timeout: %d%s", $this->Timeout, $this->LE);
-            
-            if($this->SMTPAuth)
-                $auth_no = 1;
-            else
-                $auth_no = 0;
-            $message[] = sprintf("SMTPAuth: %d%s", $auth_no, $this->LE);
-            $message[] = sprintf("Username: %s%s", $this->Username, $this->LE);
-            $message[] = sprintf("Password: %s%s", $this->Password, $this->LE);
-            $message[] = sprintf("From: %s%s", $this->From, $this->LE);
-
-            $message[] = sprintf("to: %s%s", $this->addr_list($this->to), $this->LE);
-            $message[] = sprintf("cc: %s%s", $this->addr_list($this->cc), $this->LE);
-            $message[] = sprintf("bcc: %s%s", $this->addr_list($this->bcc), $this->LE);
-        }
-        else
-        {
-            $this->error_handler(sprintf("%s mailer is not supported", $this->Mailer));
-            return false;
-        }
-
-        $message[] = sprintf("----END PQM HEADER----%s", $this->LE); // end of pqm header        
-        $message[] = $header;
-        $message[] = $body;
-       
-        fwrite($fp, join("", $message));
-
-        return ($msg_id . ".pqm");
-    }
-
-    /**
-     * Sends mail using the $Sendmail program.  Returns bool.
-     * @private
-     * @returns bool
+     * Sends mail using the $Sendmail program.  
+     * @access private
+     * @return bool
      */
-    function sendmail_send($header, $body) {
+    function SendmailSend($header, $body) {
         if ($this->Sender != "")
             $sendmail = sprintf("%s -oi -f %s -t", $this->Sendmail, $this->Sender);
         else
@@ -581,7 +399,7 @@ class phpmailer
 
         if(!@$mail = popen($sendmail, "w"))
         {
-            $this->error_handler(sprintf("Could not execute %s", $this->Sendmail));
+            $this->SetError($this->Lang("execute") . $this->Sendmail);
             return false;
         }
 
@@ -591,7 +409,7 @@ class phpmailer
         $result = pclose($mail) >> 8 & 0xFF;
         if($result != 0)
         {
-            $this->error_handler(sprintf("Could not execute %s", $this->Sendmail));
+            $this->SetError($this->Lang("execute") . $this->Sendmail);
             return false;
         }
 
@@ -599,13 +417,11 @@ class phpmailer
     }
 
     /**
-     * Sends mail using the PHP mail() function.  Returns bool.
-     * @private
-     * @returns bool
+     * Sends mail using the PHP mail() function.  
+     * @access private
+     * @return bool
      */
-    function mail_send($header, $body) {
-        //$to = substr($this->addr_append("To", $this->to), 4, -2);
-
+    function MailSend($header, $body) {
         // Cannot add Bcc's to the $to
         $to = $this->to[0][0]; // no extra comma
         for($i = 1; $i < count($this->to); $i++)
@@ -619,21 +435,18 @@ class phpmailer
 
         if ($this->Sender != "" && PHP_VERSION >= "4.0.5")
         {
-            // The fifth parameter to mail is only available in PHP >= 4.0.5
             $params = sprintf("-oi -f %s", $this->Sender);
-            $rt = @mail($to, $this->Subject, $body, $header, $params);
+            $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, $header, $params);
         }
         else
-        {
-            $rt = @mail($to, $this->Subject, $body, $header);
-        }
+            $rt = @mail($to, $this->EncodeHeader($this->Subject), $body, $header);
 
         if (isset($old_from))
             ini_set("sendmail_from", $old_from);
 
         if(!$rt)
         {
-            $this->error_handler("Could not instantiate mail()");
+            $this->SetError($this->Lang("instantiate"));
             return false;
         }
 
@@ -644,86 +457,61 @@ class phpmailer
      * Sends mail via SMTP using PhpSMTP (Author:
      * Chris Ryan).  Returns bool.  Returns false if there is a
      * bad MAIL FROM, RCPT, or DATA input.
-     * @private
-     * @returns bool
+     * @access private
+     * @return bool
      */
-    function smtp_send($header, $body) {
+    function SmtpSend($header, $body) {
         // Include SMTP class code, but not twice
         include_once($this->PluginDir . "class.smtp.php");
-
-        $smtp = new SMTP;
-
-        $smtp->do_debug = $this->SMTPDebug;
-
-        // Try to connect to all SMTP servers
-        $hosts = explode(";", $this->Host);
-        $index = 0;
-        $connection = false;
-        $smtp_from = "";
+        $error = "";
         $bad_rcpt = array();
-        $e = "";
 
-        // Retry while there is no connection
-        while($index < count($hosts) && $connection == false)
-        {
-            if(strstr($hosts[$index], ":"))
-                list($host, $port) = explode(":", $hosts[$index]);
-            else
-            {
-                $host = $hosts[$index];
-                $port = $this->Port;
-            }
-
-            if($smtp->Connect($host, $port, $this->Timeout))
-                $connection = true;
-            //printf("%s host could not connect<br>", $hosts[$index]); //debug only
-            $index++;
-        }
-        if(!$connection)
+        if($this->smtp == NULL)
         {
-            $this->error_handler("SMTP Error: could not connect to SMTP host server(s)");
-            return false;
+            if(!$this->SmtpConnect())
+                return false;
         }
 
         // Must perform HELO before authentication
-        $smtp->Hello($this->Helo);
+        if ($this->Helo != '')
+            $this->smtp->Hello($this->Helo);
+        else
+            $this->smtp->Hello($this->ServerHostname());
 
         // If user requests SMTP authentication
         if($this->SMTPAuth)
         {
-            if(!$smtp->Authenticate($this->Username, $this->Password))
+            if(!$this->smtp->Authenticate($this->Username, $this->Password))
             {
-                $this->error_handler("SMTP Error: Could not authenticate");
+                $this->SetError($this->Lang("authenticate"));
+                $this->smtp->Reset();
                 return false;
             }
         }
 
-        if ($this->Sender == "")
-            $smtp_from = $this->From;
-        else
-            $smtp_from = $this->Sender;
-
-        if(!$smtp->Mail(sprintf("<%s>", $smtp_from)))
+        $smtp_from = ($this->Sender == "") ? $this->From : $this->Sender;
+        if(!$this->smtp->Mail($smtp_from))
         {
-            $e = sprintf("SMTP Error: From address [%s] failed", $smtp_from);
-            $this->error_handler($e);
+            $error = $this->Lang("from_failed") . $smtp_from;
+            $this->SetError($error);
+            $this->smtp->Reset();
             return false;
         }
 
         // Attempt to send attach all recipients
         for($i = 0; $i < count($this->to); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->to[$i][0])))
+            if(!$this->smtp->Recipient($this->to[$i][0]))
                 $bad_rcpt[] = $this->to[$i][0];
         }
         for($i = 0; $i < count($this->cc); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->cc[$i][0])))
+            if(!$this->smtp->Recipient($this->cc[$i][0]))
                 $bad_rcpt[] = $this->cc[$i][0];
         }
         for($i = 0; $i < count($this->bcc); $i++)
         {
-            if(!$smtp->Recipient(sprintf("<%s>", $this->bcc[$i][0])))
+            if(!$this->smtp->Recipient($this->bcc[$i][0]))
                 $bad_rcpt[] = $this->bcc[$i][0];
         }
 
@@ -732,81 +520,137 @@ class phpmailer
         {
             for($i = 0; $i < count($bad_rcpt); $i++)
             {
-                if($i != 0)
-                    $e .= ", ";
-                $e .= $bad_rcpt[$i];
+                if($i != 0) { $error .= ", "; }
+                $error .= $bad_rcpt[$i];
             }
-            $e = sprintf("SMTP Error: The following recipients failed [%s]", $e);
-            $this->error_handler($e);
-
+            $error = $this->Lang("recipients_failed") . $error;
+            $this->SetError($error);
+            $this->smtp->Reset();
             return false;
         }
 
-
-        if(!$smtp->Data(sprintf("%s%s", $header, $body)))
+        if(!$this->smtp->Data($header . $body))
         {
-            $this->error_handler("SMTP Error: Data not accepted");
+            $this->SetError($this->Lang("data_not_accepted"));
+            $this->smtp->Reset();
             return false;
         }
-        $smtp->Quit();
+        if($this->SMTPKeepAlive == true)
+            $this->smtp->Reset();
+        else
+            $this->SmtpClose();
 
         return true;
     }
 
+    /**
+     * Initiates a connection to an SMTP server.  Returns false if the 
+     * operation failed.
+     * @access private
+     * @return bool
+     */
+    function SmtpConnect() {
+        if($this->smtp == NULL) { $this->smtp = new SMTP(); }
+
+        $this->smtp->do_debug = $this->SMTPDebug;
+        $hosts = explode(";", $this->Host);
+        $index = 0;
+        $connection = ($this->smtp->Connected()); 
+
+        // Retry while there is no connection
+        while($index < count($hosts) && $connection == false)
+        {
+            if(strstr($hosts[$index], ":"))
+                list($host, $port) = explode(":", $hosts[$index]);
+            else
+            {
+                $host = $hosts[$index];
+                $port = $this->Port;
+            }
+
+            if($this->smtp->Connect($host, $port, $this->Timeout))
+                $connection = true;
+            $index++;
+        }
+        if(!$connection)
+            $this->SetError($this->Lang("connect_host"));
+
+        return $connection;
+    }
+
+    /**
+     * Closes the active SMTP session if one exists.
+     * @return void
+     */
+    function SmtpClose() {
+        if($this->smtp != NULL)
+        {
+            if($this->smtp->Connected())
+            {
+                $this->smtp->Quit();
+                $this->smtp->Close();
+            }
+        }
+    }
+
+    /**
+     * Sets the language for all class error messages.  Returns false 
+     * if it cannot load the language file.  The default language type
+     * is English.
+     * @param string $lang_type Type of language (e.g. Portuguese: "br")
+     * @param string $lang_path Path to the language file directory
+     * @access public
+     * @return bool
+     */
+    function SetLanguage($lang_type, $lang_path = "") {
+        if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php'))
+            include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
+        else if(file_exists($lang_path.'phpmailer.lang-en.php'))
+            include($lang_path.'phpmailer.lang-en.php');
+        else
+        {
+            $this->SetError("Could not load language file");
+            return false;
+        }
+        $this->language = $PHPMAILER_LANG;
+    
+        return true;
+    }
 
     /////////////////////////////////////////////////
     // MESSAGE CREATION METHODS
     /////////////////////////////////////////////////
 
     /**
-     * Creates recipient headers.  Returns string.
-     * @private
-     * @returns string
+     * Creates recipient headers.  
+     * @access private
+     * @return string
      */
-    function addr_append($type, $addr) {
+    function AddrAppend($type, $addr) {
         $addr_str = $type . ": ";
-        $addr_str .= $this->addr_format($addr[0]);
+        $addr_str .= $this->AddrFormat($addr[0]);
         if(count($addr) > 1)
         {
             for($i = 1; $i < count($addr); $i++)
-            {
-                $addr_str .= sprintf(", %s", $this->addr_format($addr[$i]));
-            }
+                $addr_str .= sprintf(", %s", $this->AddrFormat($addr[$i]));
             $addr_str .= $this->LE;
         }
         else
             $addr_str .= $this->LE;
 
-        return($addr_str);
-    }
-    
-    /**
-     * Creates a semicolon delimited list for use in pqm files.
-     * @private
-     * @returns string
-     */
-    function addr_list($list_array) {
-        $addr_list = "";
-        for($i = 0; $i < count($list_array); $i++)
-        {
-            if($i > 0)
-                $addr_list .= ";";
-            $addr_list .= $list_array[$i][0];
-        }
-        
-        return $addr_list;
+        return $addr_str;
     }
     
     /**
      * Formats an address correctly. 
-     * @private
-     * @returns string
+     * @access private
+     * @return string
      */
-    function addr_format($addr) {
+    function AddrFormat($addr) {
         if(empty($addr[1]))
             $formatted = $addr[0];
         else
-            $formatted = sprintf('"%s" <%s>', addslashes($addr[1]), $addr[0]);
+            $formatted = sprintf('%s <%s>', $this->EncodeHeader($addr[1], 'phrase'), $addr[0]);
 
         return $formatted;
     }
@@ -814,19 +658,16 @@ class phpmailer
     /**
      * Wraps message for use with mailers that do not
      * automatically perform wrapping and for quoted-printable.
-     * Original written by philippe.  Returns string.
-     * @private
-     * @returns string
+     * Original written by philippe.  
+     * @access private
+     * @return string
      */
-    function word_wrap($message, $length, $qp_mode = false) {
-        if ($qp_mode)
-        $soft_break = sprintf(" =%s", $this->LE);
-        else
-        $soft_break = $this->LE;
+    function WrapText($message, $length, $qp_mode = false) {
+        $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
 
-        $message = $this->fix_eol($message);
+        $message = $this->FixEOL($message);
         if (substr($message, -1) == $this->LE)
-        $message = substr($message, 0, -1);
+            $message = substr($message, 0, -1);
 
         $line = explode($this->LE, $message);
         $message = "";
@@ -879,10 +720,8 @@ class phpmailer
               else
               {
                 $buf_o = $buf;
-                if ($e == 0)
-                    $buf .= $word;
-                else
-                    $buf .= " " . $word;
+                $buf .= ($e == 0) ? $word : (" " . $word); 
+
                 if (strlen($buf) > $length and $buf_o != "")
                 {
                     $message .= $buf_o . $soft_break;
@@ -893,199 +732,261 @@ class phpmailer
           $message .= $buf . $this->LE;
         }
 
-        return ($message);
+        return $message;
+    }
+    
+    /**
+     * Set the body wrapping.
+     * @access private
+     * @return void
+     */
+    function SetWordWrap() {
+        if($this->WordWrap < 1)
+            return;
+            
+        switch($this->message_type)
+        {
+           case "alt":
+              // fall through
+           case "alt_attachment":
+              $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
+              break;
+           default:
+              $this->Body = $this->WrapText($this->Body, $this->WordWrap);
+              break;
+        }
     }
 
     /**
-     * Assembles message header.  Returns a string if successful
-     * or false if unsuccessful.
-     * @private
-     * @returns string
+     * Assembles message header.  
+     * @access private
+     * @return string
      */
-    function create_header() {
-        $header = array();
+    function CreateHeader() {
+        $result = "";
         
         // Set the boundaries
         $uniq_id = md5(uniqid(time()));
         $this->boundary[1] = "b1_" . $uniq_id;
         $this->boundary[2] = "b2_" . $uniq_id;
 
+        $result .= $this->Received();
+        $result .= $this->HeaderLine("Date", $this->RFCDate());
+        if($this->Sender == "")
+            $result .= $this->HeaderLine("Return-Path", trim($this->From));
+        else
+            $result .= $this->HeaderLine("Return-Path", trim($this->Sender));
+        
         // To be created automatically by mail()
-        if(($this->Mailer != "mail") && (count($this->to) > 0))
-            $header[] = $this->addr_append("To", $this->to);
+        if($this->Mailer != "mail")
+        {
+            if(count($this->to) > 0)
+                $result .= $this->AddrAppend("To", $this->to);
+            else if (count($this->cc) == 0)
+                $result .= $this->HeaderLine("To", "undisclosed-recipients:;");
+        }
+
+        $from = array();
+        $from[0][0] = trim($this->From);
+        $from[0][1] = $this->FromName;
+        $result .= $this->AddrAppend("From", $from); 
 
-        $header[] = sprintf("From: \"%s\" <%s>%s", addslashes($this->FromName), 
-                            trim($this->From), $this->LE);
         if(count($this->cc) > 0)
-            $header[] = $this->addr_append("Cc", $this->cc);
+            $result .= $this->AddrAppend("Cc", $this->cc);
 
         // sendmail and mail() extract Bcc from the header before sending
         if((($this->Mailer == "sendmail") || ($this->Mailer == "mail")) && (count($this->bcc) > 0))
-            $header[] = $this->addr_append("Bcc", $this->bcc);
+            $result .= $this->AddrAppend("Bcc", $this->bcc);
 
         if(count($this->ReplyTo) > 0)
-            $header[] = $this->addr_append("Reply-to", $this->ReplyTo);
+            $result .= $this->AddrAppend("Reply-to", $this->ReplyTo);
 
         // mail() sets the subject itself
         if($this->Mailer != "mail")
-            $header[] = sprintf("Subject: %s%s", trim($this->Subject), $this->LE);
+            $result .= $this->HeaderLine("Subject", $this->EncodeHeader(trim($this->Subject)));
 
-        $header[] = sprintf("X-Priority: %d%s", $this->Priority, $this->LE);
-        $header[] = sprintf("X-Mailer: phpmailer [version %s]%s", $this->Version, $this->LE);
-        $header[] = sprintf("Return-Path: %s%s", trim($this->From), $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 [version " . $this->Version . "]");
         
         if($this->ConfirmReadingTo != "")
-            $header[] = sprintf("Disposition-Notification-To: <%s>%s", 
-                            trim($this->ConfirmReadingTo), $this->LE);
+        {
+            $result .= $this->HeaderLine("Disposition-Notification-To", 
+                       "<" . trim($this->ConfirmReadingTo) . ">");
+        }
 
         // Add custom headers
         for($index = 0; $index < count($this->CustomHeader); $index++)
-            $header[] = sprintf("%s%s", $this->CustomHeader[$index], $this->LE);
-
-        if($this->UseMSMailHeaders)
-            $header[] = $this->AddMSMailHeaders();
-
-        $header[] = sprintf("MIME-Version: 1.0%s", $this->LE);
-
-        // Determine what type of message this is        
-        if(count($this->attachment) < 1 && strlen($this->AltBody) < 1)
-            $this->message_type = "plain";
-        else
         {
-            if(count($this->attachment) > 0)
-                $this->message_type = "attachments";
-            if(strlen($this->AltBody) > 0 && count($this->attachment) < 1)
-                $this->message_type = "alt";
-            if(strlen($this->AltBody) > 0 && count($this->attachment) > 0)
-                $this->message_type = "alt_attachments";
+            $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), 
+                       $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
         }
-        
+        $result .= $this->HeaderLine("MIME-Version", "1.0");
+
         switch($this->message_type)
         {
             case "plain":
-                $header[] = sprintf("Content-Transfer-Encoding: %s%s", 
-                                    $this->Encoding, $this->LE);
-                $header[] = sprintf("Content-Type: %s; charset = \"%s\"",
+                $result .= $this->HeaderLine("Content-Transfer-Encoding", $this->Encoding);
+                $result .= sprintf("Content-Type: %s; charset=\"%s\"",
                                     $this->ContentType, $this->CharSet);
                 break;
             case "attachments":
+                // fall through
             case "alt_attachments":
                 if($this->EmbeddedImageCount() > 0)
                 {
-                    $header[] = sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 
+                    $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 
                                     "multipart/related", $this->LE, $this->LE, 
                                     $this->boundary[1], $this->LE);
                 }
                 else
                 {
-                    $header[] = sprintf("Content-Type: %s;%s",
-                                    "multipart/mixed", $this->LE);
-                    $header[] = sprintf("\tboundary=\"%s\"%s", $this->boundary[1], $this->LE);
+                    $result .= $this->HeaderLine("Content-Type", "multipart/mixed;");
+                    $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
                 }
                 break;
             case "alt":
-                $header[] = sprintf("Content-Type: %s;%s",
-                                    "multipart/alternative", $this->LE);
-                $header[] = sprintf("\tboundary=\"%s\"%s", $this->boundary[1], $this->LE);
+                $result .= $this->HeaderLine("Content-Type", "multipart/alternative;");
+                $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
                 break;
         }
 
-        // No additional lines when using mail() function
         if($this->Mailer != "mail")
-            $header[] = $this->LE.$this->LE;
+            $result .= $this->LE.$this->LE;
 
-        return(join("", $header));
+        return $result;
     }
 
     /**
-     * Assembles the message body.  Returns a string if successful
-     * or false if unsuccessful.
-     * @private
-     * @returns string
+     * Assembles the message body.  Returns an empty string on failure.
+     * @access private
+     * @return string
      */
-    function create_body() {
-        $body = array();
+    function CreateBody() {
+        $result = "";
 
-        // wordwrap the message body if set
-        if($this->WordWrap > 0)
-            $this->Body = $this->word_wrap($this->Body, $this->WordWrap);
+        $this->SetWordWrap();
 
         switch($this->message_type)
         {
             case "alt":
-                // Return text of body
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource();
-    
-                $body[] = sprintf("%s%s", $this->AltBody, $this->LE.$this->LE);
-    
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/html";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource();
+                $result .= $this->GetBoundary($this->boundary[1], "", 
+                                              "text/plain", "");
+                $result .= $this->EncodeString($this->AltBody, $this->Encoding);
+                $result .= $this->LE.$this->LE;
+                $result .= $this->GetBoundary($this->boundary[1], "", 
+                                              "text/html", "");
                 
-                $body[] = sprintf("%s%s", $this->Body, $this->LE.$this->LE);
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE.$this->LE;
     
-                // End the boundary
-                $body[] = sprintf("%s--%s--%s", $this->LE, 
-                                  $this->boundary[1], $this->LE.$this->LE);
+                $result .= $this->EndBoundary($this->boundary[1]);
                 break;
             case "plain":
-                $body[] = $this->Body;
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
                 break;
             case "attachments":
-                $bndry = new Boundary($this->boundary[1]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = $this->ContentType;
-                $bndry->Encoding = $this->Encoding;
-                $body[] = sprintf("%s%s%s%s", $bndry->GetSource(false), $this->LE, 
-                                 $this->Body, $this->LE);
+                $result .= $this->GetBoundary($this->boundary[1], "", "", "");
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE;
      
-                if(!$body[] = $this->attach_all())
-                    return false;
+                $result .= $this->AttachAll();
                 break;
             case "alt_attachments":
-                $body[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-                $body[] = sprintf("Content-Type: %s;%s" .
-                                  "\tboundary=\"%s\"%s",
+                $result .= sprintf("--%s%s", $this->boundary[1], $this->LE);
+                $result .= sprintf("Content-Type: %s;%s" .
+                                   "\tboundary=\"%s\"%s",
                                    "multipart/alternative", $this->LE, 
                                    $this->boundary[2], $this->LE.$this->LE);
     
                 // Create text body
-                $bndry = new Boundary($this->boundary[2]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/plain";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource() . $this->LE;
-    
-                $body[] = sprintf("%s%s", $this->AltBody, $this->LE.$this->LE);
+                $result .= $this->GetBoundary($this->boundary[2], "", 
+                                              "text/plain", "") . $this->LE;
+
+                $result .= $this->EncodeString($this->AltBody, $this->Encoding);
+                $result .= $this->LE.$this->LE;
     
                 // Create the HTML body
-                $bndry = new Boundary($this->boundary[2]);
-                $bndry->CharSet = $this->CharSet;
-                $bndry->ContentType = "text/html";
-                $bndry->Encoding = $this->Encoding;
-                $body[] = $bndry->GetSource() . $this->LE;
+                $result .= $this->GetBoundary($this->boundary[2], "", 
+                                              "text/html", "") . $this->LE;
     
-                $body[] = sprintf("%s%s", $this->Body, $this->LE.$this->LE);
+                $result .= $this->EncodeString($this->Body, $this->Encoding);
+                $result .= $this->LE.$this->LE;
 
-                $body[] = sprintf("%s--%s--%s", $this->LE, 
-                                  $this->boundary[2], $this->LE.$this->LE);
+                $result .= $this->EndBoundary($this->boundary[2]);
                 
-                if(!$body[] = $this->attach_all())
-                    return false;
+                $result .= $this->AttachAll();
                 break;
         }
-        // Add the encode string code here
-        $sBody = join("", $body);
-        $sBody = $this->encode_string($sBody, $this->Encoding);
+        if($this->IsError())
+            $result = "";
+
+        return $result;
+    }
+
+    /**
+     * Returns the start of a message boundary.
+     * @access private
+     */
+    function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+        $result = "";
+        if($charSet == "") { $charSet = $this->CharSet; }
+        if($contentType == "") { $contentType = $this->ContentType; }
+        if($encoding == "") { $encoding = $this->Encoding; }
+
+        $result .= $this->TextLine("--" . $boundary);
+        $result .= sprintf("Content-Type: %s; charset = \"%s\"", 
+                            $contentType, $charSet);
+        $result .= $this->HeaderLine("Content-Transfer-Encoding", $encoding);
+        $result .= $this->LE;
+       
+        return $result;
+    }
+    
+    /**
+     * Returns the end of a message boundary.
+     * @access private
+     */
+    function EndBoundary($boundary) {
+        return $this->LE . "--" . $boundary . "--" . $this->LE; 
+    }
+    
+    /**
+     * Sets the message type.
+     * @access private
+     * @return void
+     */
+    function SetMessageType() {
+        if(count($this->attachment) < 1 && strlen($this->AltBody) < 1)
+            $this->message_type = "plain";
+        else
+        {
+            if(count($this->attachment) > 0)
+                $this->message_type = "attachments";
+            if(strlen($this->AltBody) > 0 && count($this->attachment) < 1)
+                $this->message_type = "alt";
+            if(strlen($this->AltBody) > 0 && count($this->attachment) > 0)
+                $this->message_type = "alt_attachments";
+        }
+    }
 
-        return $sBody;
+    /**
+     * Returns a formatted header line.
+     * @access private
+     * @return string
+     */
+    function HeaderLine($name, $value) {
+        return $name . ": " . $value . $this->LE;
     }
 
+    /**
+     * Returns a formatted mail line.
+     * @access private
+     * @return string
+     */
+    function TextLine($value) {
+        return $value . $this->LE;
+    }
 
     /////////////////////////////////////////////////
     // ATTACHMENT METHODS
@@ -1093,17 +994,19 @@ class phpmailer
 
     /**
      * Adds an attachment from a path on the filesystem.
-     * Checks if attachment is valid and then adds
-     * the attachment to the list.
      * Returns false if the file could not be found
      * or accessed.
-     * @public
-     * @returns bool
-     */
-    function AddAttachment($path, $name = "", $encoding = "base64", $type = "application/octet-stream") {
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension type.
+     * @return bool
+     */
+    function AddAttachment($path, $name = "", $encoding = "base64", 
+                           $type = "application/octet-stream") {
         if(!@is_file($path))
         {
-            $this->error_handler(sprintf("Could not access [%s] file", $path));
+            $this->SetError($this->Lang("file_access") . $path);
             return false;
         }
 
@@ -1127,11 +1030,11 @@ class phpmailer
 
     /**
      * Attaches all fs, string, and binary attachments to the message.
-     * Returns a string if successful or false if unsuccessful.
-     * @private
-     * @returns string
+     * Returns an empty string on failure.
+     * @access private
+     * @return string
      */
-    function attach_all() {
+    function AttachAll() {
         // Return text of body
         $mime = array();
 
@@ -1139,15 +1042,12 @@ class phpmailer
         for($i = 0; $i < count($this->attachment); $i++)
         {
             // Check for string attachment
-            $isString = $this->attachment[$i][5];
-            if ($isString)
-            {
+            $bString = $this->attachment[$i][5];
+            if ($bString)
                 $string = $this->attachment[$i][0];
-            }
             else
-            {
                 $path = $this->attachment[$i][0];
-            }
+
             $filename    = $this->attachment[$i][1];
             $name        = $this->attachment[$i][2];
             $encoding    = $this->attachment[$i][3];
@@ -1161,69 +1061,67 @@ class phpmailer
 
             if($disposition == "inline")
                 $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-            else
-                $mime[] = sprintf("Content-ID: <%s>%s", $name, $this->LE);
 
             $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", 
                               $disposition, $name, $this->LE.$this->LE);
 
             // Encode as string attachment
-            if($isString)
+            if($bString)
             {
-                if(!$mime[] = sprintf("%s%s", $this->encode_string($string, $encoding), 
-                                       $this->LE.$this->LE))
-                  return false;
+                $mime[] = $this->EncodeString($string, $encoding);
+                if($this->IsError()) { return ""; }
+                $mime[] = $this->LE.$this->LE;
             }
             else
             {
-                if(!$mime[] = sprintf("%s%s", $this->encode_file($path, $encoding), 
-                                      $this->LE.$this->LE))
-                  return false;
-
-            $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
-
+                $mime[] = $this->EncodeFile($path, $encoding);                
+                if($this->IsError()) { return ""; }
+                $mime[] = $this->LE.$this->LE;
             }
         }
 
-        return(join("", $mime));
+        $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
+
+        return join("", $mime);
     }
     
     /**
-     * Encodes attachment in requested format.  Returns a
-     * string if successful or false if unsuccessful.
-     * @private
-     * @returns string
+     * Encodes attachment in requested format.  Returns an
+     * empty string on failure.
+     * @access private
+     * @return string
      */
-    function encode_file ($path, $encoding = "base64") {
+    function EncodeFile ($path, $encoding = "base64") {
         if(!@$fd = fopen($path, "rb"))
         {
-            $this->error_handler(sprintf("File Error: Could not open file %s", $path));
-            return false;
+            $this->SetError($this->Lang("file_open") . $path);
+            return "";
         }
-        $file = fread($fd, filesize($path));
-        $encoded = $this->encode_string($file, $encoding);
+        $file_buffer = fread($fd, filesize($path));
+        $file_buffer = $this->EncodeString($file_buffer, $encoding);
         fclose($fd);
 
-        return($encoded);
+        return $file_buffer;
     }
 
     /**
-     * Encodes string to requested format. Returns a
-     * string if successful or false if unsuccessful.
-     * @private
-     * @returns string
+     * Encodes string to requested format. Returns an
+     * empty string on failure.
+     * @access private
+     * @return string
      */
-    function encode_string ($str, $encoding = "base64") {
+    function EncodeString ($str, $encoding = "base64") {
+        $encoded = "";
         switch(strtolower($encoding)) {
           case "base64":
               // chunk_split is found in PHP >= 3.0.6
-              $encoded = chunk_split(base64_encode($str));
+              $encoded = chunk_split(base64_encode($str), 76, $this->LE);
               break;
 
           case "7bit":
           case "8bit":
-              $encoded = $this->fix_eol($str);
-              if (substr($encoded, -2) != $this->LE)
+              $encoded = $this->FixEOL($str);
+              if (substr($encoded, -(strlen($this->LE))) != $this->LE)
                 $encoded .= $this->LE;
               break;
 
@@ -1232,35 +1130,117 @@ class phpmailer
               break;
 
           case "quoted-printable":
-              $encoded = $this->encode_qp($str);
+              $encoded = $this->EncodeQP($str);
               break;
 
           default:
-              $this->error_handler(sprintf("Unknown encoding: %s", $encoding));
-              return false;
+              $this->SetError($this->Lang("encoding") . $encoding);
+              break;
         }
-        return($encoded);
+        return $encoded;
     }
 
     /**
-     * Encode string to quoted-printable.  Returns a string.
-     * @private
-     * @returns string
+     * Encode a header string to best of Q, B, quoted or none.  
+     * @access private
+     * @return string
      */
-    function encode_qp ($str) {
-        $encoded = $this->fix_eol($str);
-        if (substr($encoded, -2) != $this->LE)
+    function EncodeHeader ($str, $position = 'text') {
+      $x = 0;
+      
+      switch (strtolower($position)) {
+        case 'phrase':
+          if (!preg_match('/[\200-\377]/', $str)) {
+            // Can't use addslashes as we don't know what value has magic_quotes_sybase.
+            $encoded = addcslashes($str, "\0..\37\177\\\"");
+
+            if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str))
+              return ($encoded);
+            else
+              return ("\"$encoded\"");
+          }
+          $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+          break;
+        case 'comment':
+          $x = preg_match_all('/[()"]/', $str, $matches);
+          // Fall-through
+        case 'text':
+        default:
+          $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+          break;
+      }
+
+      if ($x == 0)
+        return ($str);
+
+      $maxlen = 75 - 7 - strlen($this->CharSet);
+      // Try to select the encoding which should produce the shortest output
+      if (strlen($str)/3 < $x) {
+        $encoding = 'B';
+        $encoded = base64_encode($str);
+        $maxlen -= $maxlen % 4;
+        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+      } else {
+        $encoding = 'Q';
+        $encoded = $this->EncodeQ($str, $position);
+        $encoded = $this->WrapText($encoded, $maxlen, true);
+        $encoded = str_replace("=".$this->LE, "\n", trim($encoded));
+      }
+
+      $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
+      $encoded = trim(str_replace("\n", $this->LE, $encoded));
+      
+      return $encoded;
+    }
+    
+    /**
+     * Encode string to quoted-printable.  
+     * @access private
+     * @return string
+     */
+    function EncodeQP ($str) {
+        $encoded = $this->FixEOL($str);
+        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
             $encoded .= $this->LE;
 
         // Replace every high ascii, control and = characters
-        $encoded = preg_replace("/([\001-\010\013\014\016-\037\075\177-\377])/e",
+        $encoded = preg_replace('/([\000-\010\013\014\016-\037\075\177-\377])/e',
                   "'='.sprintf('%02X', ord('\\1'))", $encoded);
         // Replace every spaces and tabs when it's the last character on a line
         $encoded = preg_replace("/([\011\040])".$this->LE."/e",
                   "'='.sprintf('%02X', ord('\\1')).'".$this->LE."'", $encoded);
 
         // Maximum line length of 76 characters before CRLF (74 + space + '=')
-        $encoded = $this->word_wrap($encoded, 74, true);
+        $encoded = $this->WrapText($encoded, 74, true);
+
+        return $encoded;
+    }
+
+    /**
+     * Encode string to q encoding.  
+     * @access private
+     * @return string
+     */
+    function EncodeQ ($str, $position = "text") {
+        // There should not be any EOL in the string
+        $encoded = preg_replace("[\r\n]", "", $str);
+
+        switch (strtolower($position)) {
+          case "phrase":
+            $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+            break;
+          case "comment":
+            $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
+          case "text":
+          default:
+            // Replace every high ascii, control =, ? and _ characters
+            $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
+                  "'='.sprintf('%02X', ord('\\1'))", $encoded);
+            break;
+        }
+        
+        // Replace every spaces to _ (more readable than =20)
+        $encoded = str_replace(" ", "_", $encoded);
 
         return $encoded;
     }
@@ -1269,10 +1249,14 @@ class phpmailer
      * Adds a string or binary attachment (non-filesystem) to the list.
      * This method can be used to attach ascii or binary data,
      * such as a BLOB record from a database.
-     * @public
-     * @returns void
-     */
-    function AddStringAttachment($string, $filename, $encoding = "base64", $type = "application/octet-stream") {
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension type.
+     * @return void
+     */
+    function AddStringAttachment($string, $filename, $encoding = "base64", 
+                                 $type = "application/octet-stream") {
         // Append to $attachment array
         $cur = count($this->attachment);
         $this->attachment[$cur][0] = $string;
@@ -1287,17 +1271,21 @@ class phpmailer
     
     /**
      * Adds an embedded attachment.  This can include images, sounds, and 
-     * just about any other document.  
-     * @param cid this is the Content Id of the attachment.  Use this to identify
+     * just about any other document.
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment.  Use this to identify 
      *        the Id for accessing the image in an HTML form.
-     * @public
-     * @returns bool
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension type.
+     * @return bool
      */
-    function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", $type = "application/octet-stream") {
+    function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", 
+                              $type = "application/octet-stream") {
     
         if(!@is_file($path))
         {
-            $this->error_handler(sprintf("Could not access [%s] file", $path));
+            $this->SetError($this->Lang("file_access") . $path);
             return false;
         }
 
@@ -1321,18 +1309,18 @@ class phpmailer
     
     /**
      * Returns the number of embedded images in an email.
-     * @private
-     * @returns int
+     * @access private
+     * @return int
      */
     function EmbeddedImageCount() {
-        $ret = 0;
+        $result = 0;
         for($i = 0; $i < count($this->attachment); $i++)
         {
             if($this->attachment[$i][6] == "inline")
-                $ret++;
+                $result++;
         }
         
-        return $ret;
+        return $result;
     }
 
     /////////////////////////////////////////////////
@@ -1341,8 +1329,7 @@ class phpmailer
 
     /**
      * Clears all recipients assigned in the TO array.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearAddresses() {
         $this->to = array();
@@ -1350,8 +1337,7 @@ class phpmailer
 
     /**
      * Clears all recipients assigned in the CC array.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearCCs() {
         $this->cc = array();
@@ -1359,8 +1345,7 @@ class phpmailer
 
     /**
      * Clears all recipients assigned in the BCC array.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearBCCs() {
         $this->bcc = array();
@@ -1368,8 +1353,7 @@ class phpmailer
 
     /**
      * Clears all recipients assigned in the ReplyTo array.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearReplyTos() {
         $this->ReplyTo = array();
@@ -1378,8 +1362,7 @@ class phpmailer
     /**
      * Clears all recipients assigned in the TO, CC and BCC
      * array.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearAllRecipients() {
         $this->to = array();
@@ -1390,8 +1373,7 @@ class phpmailer
     /**
      * Clears all previously set filesystem, string, and binary
      * attachments.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearAttachments() {
         $this->attachment = array();
@@ -1399,8 +1381,7 @@ class phpmailer
 
     /**
      * Clears all custom headers.  Returns void.
-     * @public
-     * @returns void
+     * @return void
      */
     function ClearCustomHeaders() {
         $this->CustomHeader = array();
@@ -1414,55 +1395,67 @@ class phpmailer
     /**
      * Adds the error message to the error container.
      * Returns void.
-     * @private
-     * @returns void
+     * @access private
+     * @return void
      */
-    function error_handler($msg) {
+    function SetError($msg) {
+        $this->error_count++;
         $this->ErrorInfo = $msg;
     }
 
     /**
      * Returns the proper RFC 822 formatted date. Returns string.
-     * @private
-     * @returns string
+     * @access private
+     * @return string
      */
-    function rfc_date() {
+    function RFCDate() {
         $tz = date("Z");
         $tzs = ($tz < 0) ? "-" : "+";
         $tz = abs($tz);
         $tz = ($tz/3600)*100 + ($tz%3600)/60;
-        $date = sprintf("%s %s%04d", date("D, j M Y H:i:s"), $tzs, $tz);
-        return $date;
+        $result = sprintf("%s %s%04d", date("D, j M Y H:i:s"), $tzs, $tz);
+
+        return $result;
     }
 
     /**
-     * Returns received header for message tracing. Returns string.
-     * @private
-     * @returns string
+     * Returns Received header for message tracing. Returns string.
+     * @access private
+     * @return string
      */
-    function received() {
-        // Check for vars because they might not exist.  Possibly
-        // write a small retrieval function (that mailer can use too!)
+    function Received() {
+        if ($this->ServerVar('SERVER_NAME') != '')
+        {
+            $protocol = ($this->ServerVar('HTTPS') == 'on') ? 'HTTPS' : 'HTTP';
+            $remote = $this->ServerVar('REMOTE_HOST');
+            if($remote == "")
+                $remote = 'phpmailer';
+            $remote .= ' (['.$this->ServerVar('REMOTE_ADDR').'])';
+        }
+        else
+        {
+            $protocol = 'local';
+            $remote = $this->ServerVar('USER');
+            if($remote == '')
+                $remote = 'phpmailer';
+        }
 
-        $str = sprintf("Received: from phpmailer ([%s]) by %s " .
-               "with HTTP;%s\t %s%s",
-               $this->get_server_var("REMOTE_ADDR"),
-               $this->get_server_var("SERVER_NAME"),
-               $this->LE,
-               $this->rfc_date(),
-               $this->LE);
+        $result = sprintf("Received: from %s %s\tby %s " .
+                          "with %s (PHPMailer);%s\t%s%s", $remote, $this->LE,
+                          $this->ServerHostname(), $protocol, $this->LE,
+                          $this->RFCDate(), $this->LE);
 
-        return $str;
+        return $result;
     }
     
     /**
      * Returns the appropriate server variable.  Should work with both 
      * PHP 4.1.0+ as well as older versions.  Returns an empty string 
      * if nothing is found.
-     * @private
-     * @returns mixed
+     * @access private
+     * @return mixed
      */
-    function get_server_var($varName) {
+    function ServerVar($varName) {
         global $HTTP_SERVER_VARS;
         global $HTTP_ENV_VARS;
 
@@ -1480,135 +1473,62 @@ class phpmailer
     }
 
     /**
-     * Changes every end of line from CR or LF to CRLF.  Returns string.
-     * @private
-     * @returns string
+     * Returns the server hostname or 'localhost.localdomain' if unknown.
+     * @access private
+     * @return string
      */
-    function fix_eol($str) {
-        $str = str_replace("\r\n", "\n", $str);
-        $str = str_replace("\r", "\n", $str);
-        $str = str_replace("\n", $this->LE, $str);
-        return $str;
-    }
+    function ServerHostname() {
+        if ($this->Hostname != "")
+            $result = $this->Hostname;
+        elseif ($this->ServerVar('SERVER_NAME') != "")
+            $result = $this->ServerVar('SERVER_NAME');
+        else
+            $result = "localhost.localdomain";
 
-    /**
-     * Adds a custom header.  Returns void.
-     * @public
-     * @returns void
-     */
-    function AddCustomHeader($custom_header) {
-        $this->CustomHeader[] = $custom_header;
+        return $result;
     }
 
     /**
-     * Adds all the Microsoft message headers.  Returns string.
-     * @private
-     * @returns string
+     * Returns a message in the appropriate language.
+     * @access private
+     * @return string
      */
-    function AddMSMailHeaders() {
-        $MSHeader = "";
-        if($this->Priority == 1)
-            $MSPriority = "High";
-        elseif($this->Priority == 5)
-            $MSPriority = "Low";
+    function Lang($key) {
+        if(count($this->language) < 1)
+            $this->SetLanguage("en"); // set the default language
+    
+        if(isset($this->language[$key]))
+            return $this->language[$key];
         else
-            $MSPriority = "Medium";
-
-        $MSHeader .= sprintf("X-MSMail-Priority: %s%s", $MSPriority, $this->LE);
-        $MSHeader .= sprintf("Importance: %s%s", $MSPriority, $this->LE);
-
-        return($MSHeader);
+            return "";
     }
-
-}
-
-
-/**
- * Boundary - MIME message boundary class
- * @author Brent R. Matzelle
- */
-class Boundary
-{
-    /**
-     * Sets the boundary ID.
-     * @private
-     * @type string
-     */
-    var $ID = 0;
-
-    /**
-     * Sets the boundary Content Type.
-     * @public
-     * @type string
-     */
-    var $ContentType = "text/plain";
-
+    
     /**
-     * Sets the Encoding.
-     * @public
-     * @type string
+     * Returns true if an error occurred.
+     * @return bool
      */
-    var $Encoding = "";
+    function IsError() {
+        return ($this->error_count > 0);
+    }
 
     /**
-     * Sets an attachment disposition.
-     * @public
-     * @type string
+     * Changes every end of line from CR or LF to CRLF.  Returns string.
+     * @access private
+     * @return string
      */
-    var $Disposition = "";
+    function FixEOL($str) {
+        $str = str_replace("\r\n", "\n", $str);
+        $str = str_replace("\r", "\n", $str);
+        $str = str_replace("\n", $this->LE, $str);
+        return $str;
+    }
 
     /**
-     * Sets an attachment file name.
-     * @public
-     * @type string
-     */
-    var $FileName = "";
-    
-    /**
-     * Sets the Char set.
-     * @public
-     * @type string
-     */
-    var $CharSet = "";
-    
-    /**
-     *  Sets the line endings of the message.  Default is "\n";
-     *  @public
-     *  @type string
-     */
-    var $LE           = "\n";
-    
-    /**
-     * Main constructor.
+     * Adds a custom header.  Returns void.
+     * @return void
      */
-    function Boundary($boundary_id) {
-        $this->ID = $boundary_id;
-    }
-    
-    /**
-     * Returns the source of the boundary.
-     * @public
-     * @returns string
-     */
-    function GetSource($bLineEnding = true) {
-        $ret = array();
-        $mime[] = sprintf("--%s%s", $this->ID, $this->LE);
-        $mime[] = sprintf("Content-Type: %s; charset = \"%s\"%s", 
-                          $this->ContentType, $this->CharSet, $this->LE);
-        //$mime[] = sprintf("Content-Transfer-Encoding: %s%s", $this->Encoding, 
-        //                  $this->LE);
-        
-        if(strlen($this->Disposition) > 0)
-        {
-            $mime[] = sprintf("Content-Disposition: %s;");
-            if(strlen($this->FileName) > 0)
-                $mime[] = sprinf("filename=\"%s\"", $this->$this->FileName);
-        }
-        
-        if($bLineEnding)
-            $mime[] = $this->LE;
-
-        return join("", $mime);
+    function AddCustomHeader($custom_header) {
+        $this->CustomHeader[] = explode(":", $custom_header, 2);
     }
 }
 
diff --git a/lib/phpmailer/class.smtp.php b/lib/phpmailer/class.smtp.php
index c169be674d..a401374556 100644
--- a/lib/phpmailer/class.smtp.php
+++ b/lib/phpmailer/class.smtp.php
@@ -1,1008 +1,1039 @@
 <?php
-    /*
-     * File: smtp.php
-     *
-     * Description: Define an SMTP class that can be used to connect
-     *              and communicate with any SMTP server. It implements
-     *              all the SMTP functions defined in RFC821 except TURN.
-     *
-     * Creator: Chris Ryan <chris@greatbridge.com>
-     * Created: 03/26/2001
-     *
-     * TODO:
-     *     - Move all the duplicate code to a utility function
-     *           Most of the functions have the first lines of
-     *           code do the same processing. If this can be moved
-     *           into a utility function then it would reduce the
-     *           overall size of the code significantly.
+////////////////////////////////////////////////////
+// SMTP - PHP SMTP class
+//
+// Version 1.02
+//
+// Define an SMTP class that can be used to connect
+// and communicate with any SMTP server. It implements
+// all the SMTP functions defined in RFC821 except TURN.
+//
+// Author: Chris Ryan
+//
+// License: LGPL, see LICENSE
+////////////////////////////////////////////////////
+
+/**
+ * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
+ * commands except TURN which will always return a not implemented
+ * error. SMTP also provides some utility methods for sending mail
+ * to an SMTP server.
+ * @package PHPMailer
+ * @author Chris Ryan
+ */
+class SMTP
+{
+    /**
+     *  SMTP server port
+     *  @var int
      */
+    var $SMTP_PORT = 25;
+    
+    /**
+     *  SMTP reply line ending
+     *  @var string
+     */
+    var $CRLF = "\r\n";
+    
+    /**
+     *  Sets whether debugging is turned on
+     *  @var bool
+     */
+    var $do_debug;       # the level of debug to perform
 
-    /*
-     * STMP is rfc 821 compliant and implements all the rfc 821 SMTP
-     * commands except TURN which will always return a not implemented
-     * error. SMTP also provides some utility methods for sending mail
-     * to an SMTP server.
+    /**#@+
+     * @access private
      */
-    class SMTP {
-        var $SMTP_PORT = 25; # the default SMTP PORT
-        var $CRLF = "\r\n";  # CRLF pair
-
-        var $smtp_conn;      # the socket to the server
-        var $error;          # error if any on the last call
-        var $helo_rply;      # the reply the server sent to us for HELO
-
-        var $do_debug;       # the level of debug to perform
-
-        /*
-         * SMTP()
-         *
-         * Initialize the class so that the data is in a known state.
-         */
-        function SMTP() {
-            $this->smtp_conn = 0;
-            $this->error = null;
-            $this->helo_rply = null;
-
-            $this->do_debug = 0;
-        }
-
-        /************************************************************
-         *                    CONNECTION FUNCTIONS                  *
-         ***********************************************************/
-
-        /*
-         * Connect($host, $port=0, $tval=30)
-         *
-         * Connect to the server specified on the port specified.
-         * If the port is not specified use the default SMTP_PORT.
-         * If tval is specified then a connection will try and be
-         * established with the server for that number of seconds.
-         * If tval is not specified the default is 30 seconds to
-         * try on the connection.
-         *
-         * SMTP CODE SUCCESS: 220
-         * SMTP CODE FAILURE: 421
-         */
-        function Connect($host,$port=0,$tval=30) {
-            # set the error val to null so there is no confusion
-            $this->error = null;
-
-            # make sure we are __not__ connected
-            if($this->connected()) {
-                # ok we are connected! what should we do?
-                # for now we will just give an error saying we
-                # are already connected
-                $this->error =
-                    array("error" => "Already connected to a server");
-                return false;
-            }
+    var $smtp_conn;      # the socket to the server
+    var $error;          # error if any on the last call
+    var $helo_rply;      # the reply the server sent to us for HELO
+    /**#@-*/
+
+    /**
+     * Initialize the class so that the data is in a known state.
+     * @access public
+     * @return void
+     */
+    function SMTP() {
+        $this->smtp_conn = 0;
+        $this->error = null;
+        $this->helo_rply = null;
 
-            if(empty($port)) {
-                $port = $this->SMTP_PORT;
-            }
+        $this->do_debug = 0;
+    }
 
-            #connect to the smtp server
-            $this->smtp_conn = fsockopen($host,    # the host of the server
-                                         $port,    # the port to use
-                                         $errno,   # error number if any
-                                         $errstr,  # error message if any
-                                         $tval);   # give up after ? secs
-            # verify we connected properly
-            if(empty($this->smtp_conn)) {
-                $this->error = array("error" => "Failed to connect to server",
-                                     "errno" => $errno,
-                                     "errstr" => $errstr);
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": $errstr ($errno)" . $this->CRLF;
-                }
-                return false;
+    /*************************************************************
+     *                    CONNECTION FUNCTIONS                  *
+     ***********************************************************/
+
+    /**
+     * Connect to the server specified on the port specified.
+     * If the port is not specified use the default SMTP_PORT.
+     * If tval is specified then a connection will try and be
+     * established with the server for that number of seconds.
+     * If tval is not specified the default is 30 seconds to
+     * try on the connection.
+     *
+     * SMTP CODE SUCCESS: 220
+     * SMTP CODE FAILURE: 421
+     * @access public
+     * @return bool
+     */
+    function Connect($host,$port=0,$tval=30) {
+        # set the error val to null so there is no confusion
+        $this->error = null;
+
+        # make sure we are __not__ connected
+        if($this->connected()) {
+            # ok we are connected! what should we do?
+            # for now we will just give an error saying we
+            # are already connected
+            $this->error =
+                array("error" => "Already connected to a server");
+            return false;
+        }
+
+        if(empty($port)) {
+            $port = $this->SMTP_PORT;
+        }
+
+        #connect to the smtp server
+        $this->smtp_conn = fsockopen($host,    # the host of the server
+                                     $port,    # the port to use
+                                     $errno,   # error number if any
+                                     $errstr,  # error message if any
+                                     $tval);   # give up after ? secs
+        # verify we connected properly
+        if(empty($this->smtp_conn)) {
+            $this->error = array("error" => "Failed to connect to server",
+                                 "errno" => $errno,
+                                 "errstr" => $errstr);
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": $errstr ($errno)" . $this->CRLF;
             }
+            return false;
+        }
 
-            # sometimes the SMTP server takes a little longer to respond
-            # so we will give it a longer timeout for the first read
-            // Windows still does not have support for this timeout function
-            if(substr(PHP_OS, 0, 3) != "WIN")
-               socket_set_timeout($this->smtp_conn, 1, 0);
+        # sometimes the SMTP server takes a little longer to respond
+        # so we will give it a longer timeout for the first read
+        // Windows still does not have support for this timeout function
+        if(substr(PHP_OS, 0, 3) != "WIN")
+           socket_set_timeout($this->smtp_conn, $tval, 0);
 
-            # get any announcement stuff
-            $announce = $this->get_lines();
+        # get any announcement stuff
+        $announce = $this->get_lines();
 
-            # set the timeout  of any socket functions at 1/10 of a second
-            //if(function_exists("socket_set_timeout"))
-            //   socket_set_timeout($this->smtp_conn, 0, 100000);
+        # set the timeout  of any socket functions at 1/10 of a second
+        //if(function_exists("socket_set_timeout"))
+        //   socket_set_timeout($this->smtp_conn, 0, 100000);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
+        }
 
-            return true;
+        return true;
+    }
+
+    /**
+     * Performs SMTP authentication.  Must be run after running the
+     * Hello() method.  Returns true if successfully authenticated.
+     * @access public
+     * @return bool
+     */
+    function Authenticate($username, $password) {
+        // Start authentication
+        fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($code != 334) {
+            $this->error =
+                array("error" => "AUTH not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
+            }
+            return false;
         }
 
-        /*
-         * Authenticate()
-         *
-         * Performs SMTP authentication.  Must be run after running the
-         * Hello() method.  Returns true if successfully authenticated.
-         */
-        function Authenticate($username, $password) {
-            // Start authentication
-            fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
+        // Send encoded username
+        fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($code != 334) {
-                $this->error =
-                    array("error" => "AUTH not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
+        if($code != 334) {
+            $this->error =
+                array("error" => "Username not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            // Send encoded username
-            fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
+        // Send encoded password
+        fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($code != 334) {
-                $this->error =
-                    array("error" => "Username not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
+        if($code != 235) {
+            $this->error =
+                array("error" => "Password not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            // Send encoded password
-            fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        return true;
+    }
 
-            if($code != 235) {
-                $this->error =
-                    array("error" => "Password not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
+    /**
+     * Returns true if connected to a server otherwise false
+     * @access private
+     * @return bool
+     */
+    function Connected() {
+        if(!empty($this->smtp_conn)) {
+            $sock_status = socket_get_status($this->smtp_conn);
+            if($sock_status["eof"]) {
+                # hmm this is an odd situation... the socket is
+                # valid but we aren't connected anymore
                 if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
+                    echo "SMTP -> NOTICE:" . $this->CRLF .
+                         "EOF caught while checking if connected";
                 }
+                $this->Close();
                 return false;
             }
-
-            return true;
-        }
-
-        /*
-         * Connected()
-         *
-         * Returns true if connected to a server otherwise false
-         */
-        function Connected() {
-            if(!empty($this->smtp_conn)) {
-                $sock_status = socket_get_status($this->smtp_conn);
-                if($sock_status["eof"]) {
-                    # hmm this is an odd situation... the socket is
-                    # valid but we aren't connected anymore
-                    if($this->do_debug >= 1) {
-                        echo "SMTP -> NOTICE:" . $this->CRLF .
-                             "EOF caught while checking if connected";
-                    }
-                    $this->Close();
-                    return false;
-                }
-                return true; # everything looks good
-            }
-            return false;
+            return true; # everything looks good
         }
+        return false;
+    }
 
-        /*
-         * Close()
-         *
-         * Closes the socket and cleans up the state of the class.
-         * It is not considered good to use this function without
-         * first trying to use QUIT.
-         */
-        function Close() {
-            $this->error = null; # so there is no confusion
-            $this->helo_rply = null;
-            if(!empty($this->smtp_conn)) {
-                # close the connection and cleanup
-                fclose($this->smtp_conn);
-                $this->smtp_conn = 0;
-            }
+    /**
+     * Closes the socket and cleans up the state of the class.
+     * It is not considered good to use this function without
+     * first trying to use QUIT.
+     * @access public
+     * @return void
+     */
+    function Close() {
+        $this->error = null; # so there is no confusion
+        $this->helo_rply = null;
+        if(!empty($this->smtp_conn)) {
+            # close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = 0;
         }
+    }
 
 
-        /**************************************************************
-         *                        SMTP COMMANDS                       *
-         *************************************************************/
-
-        /*
-         * Data($msg_data)
-         *
-         * Issues a data command and sends the msg_data to the server
-         * finializing the mail transaction. $msg_data is the message
-         * that is to be send with the headers. Each header needs to be
-         * on a single line followed by a <CRLF> with the message headers
-         * and the message body being seperated by and additional <CRLF>.
-         *
-         * Implements rfc 821: DATA <CRLF>
-         *
-         * SMTP CODE INTERMEDIATE: 354
-         *     [data]
-         *     <CRLF>.<CRLF>
-         *     SMTP CODE SUCCESS: 250
-         *     SMTP CODE FAILURE: 552,554,451,452
-         * SMTP CODE FAILURE: 451,554
-         * SMTP CODE ERROR  : 500,501,503,421
-         */
-        function Data($msg_data) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Data() without being connected");
-                return false;
-            }
+    /***************************************************************
+     *                        SMTP COMMANDS                       *
+     *************************************************************/
 
-            fputs($this->smtp_conn,"DATA" . $this->CRLF);
+    /**
+     * Issues a data command and sends the msg_data to the server
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being seperated by and additional <CRLF>.
+     *
+     * Implements rfc 821: DATA <CRLF>
+     *
+     * SMTP CODE INTERMEDIATE: 354
+     *     [data]
+     *     <CRLF>.<CRLF>
+     *     SMTP CODE SUCCESS: 250
+     *     SMTP CODE FAILURE: 552,554,451,452
+     * SMTP CODE FAILURE: 451,554
+     * SMTP CODE ERROR  : 500,501,503,421
+     * @access public
+     * @return bool
+     */
+    function Data($msg_data) {
+        $this->error = null; # so no confusion is caused
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Data() without being connected");
+            return false;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        fputs($this->smtp_conn,"DATA" . $this->CRLF);
 
-            if($code != 354) {
-                $this->error =
-                    array("error" => "DATA command not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            # the server is ready to accept data!
-            # according to rfc 821 we should not send more than 1000
-            # including the CRLF
-            # characters on a single line so we will break the data up
-            # into lines by \r and/or \n then if needed we will break
-            # each of those into smaller lines to fit within the limit.
-            # in addition we will be looking for lines that start with
-            # a period '.' and append and additional period '.' to that
-            # line. NOTE: this does not count towards are limit.
-
-            # normalize the line breaks so we know the explode works
-            $msg_data = str_replace("\r\n","\n",$msg_data);
-            $msg_data = str_replace("\r","\n",$msg_data);
-            $lines = explode("\n",$msg_data);
-
-            # we need to find a good way to determine is headers are
-            # in the msg_data or if it is a straight msg body
-            # currently I'm assuming rfc 822 definitions of msg headers
-            # and if the first field of the first line (':' sperated)
-            # does not contain a space then it _should_ be a header
-            # and we can process all lines before a blank "" line as
-            # headers.
-            $field = substr($lines[0],0,strpos($lines[0],":"));
-            $in_headers = false;
-            if(!empty($field) && !strstr($field," ")) {
-                $in_headers = true;
+        if($code != 354) {
+            $this->error =
+                array("error" => "DATA command not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            $max_line_length = 998; # used below; set here for ease in change
+        # the server is ready to accept data!
+        # according to rfc 821 we should not send more than 1000
+        # including the CRLF
+        # characters on a single line so we will break the data up
+        # into lines by \r and/or \n then if needed we will break
+        # each of those into smaller lines to fit within the limit.
+        # in addition we will be looking for lines that start with
+        # a period '.' and append and additional period '.' to that
+        # line. NOTE: this does not count towards are limit.
+
+        # normalize the line breaks so we know the explode works
+        $msg_data = str_replace("\r\n","\n",$msg_data);
+        $msg_data = str_replace("\r","\n",$msg_data);
+        $lines = explode("\n",$msg_data);
+
+        # we need to find a good way to determine is headers are
+        # in the msg_data or if it is a straight msg body
+        # currently I'm assuming rfc 822 definitions of msg headers
+        # and if the first field of the first line (':' sperated)
+        # does not contain a space then it _should_ be a header
+        # and we can process all lines before a blank "" line as
+        # headers.
+        $field = substr($lines[0],0,strpos($lines[0],":"));
+        $in_headers = false;
+        if(!empty($field) && !strstr($field," ")) {
+            $in_headers = true;
+        }
 
-            while(list(,$line) = @each($lines)) {
-                $lines_out = null;
-                if($line == "" && $in_headers) {
-                    $in_headers = false;
-                }
-                # ok we need to break this line up into several
-                # smaller lines
-                while(strlen($line) > $max_line_length) {
-                    $pos = strrpos(substr($line,0,$max_line_length)," ");
-                    $lines_out[] = substr($line,0,$pos);
-                    $line = substr($line,$pos + 1);
-                    # if we are processing headers we need to
-                    # add a LWSP-char to the front of the new line
-                    # rfc 822 on long msg headers
-                    if($in_headers) {
-                        $line = "\t" . $line;
-                    }
+        $max_line_length = 998; # used below; set here for ease in change
+
+        while(list(,$line) = @each($lines)) {
+            $lines_out = null;
+            if($line == "" && $in_headers) {
+                $in_headers = false;
+            }
+            # ok we need to break this line up into several
+            # smaller lines
+            while(strlen($line) > $max_line_length) {
+                $pos = strrpos(substr($line,0,$max_line_length)," ");
+                $lines_out[] = substr($line,0,$pos);
+                $line = substr($line,$pos + 1);
+                # if we are processing headers we need to
+                # add a LWSP-char to the front of the new line
+                # rfc 822 on long msg headers
+                if($in_headers) {
+                    $line = "\t" . $line;
                 }
-                $lines_out[] = $line;
-
-                # now send the lines to the server
-                while(list(,$line_out) = @each($lines_out)) {
-                    if(strlen($line_out) > 0)
-                    {
-                        if(substr($line_out, 0, 1) == ".") {
-                            $line_out = "." . $line_out;
-                        }
+            }
+            $lines_out[] = $line;
+
+            # now send the lines to the server
+            while(list(,$line_out) = @each($lines_out)) {
+                if(strlen($line_out) > 0)
+                {
+                    if(substr($line_out, 0, 1) == ".") {
+                        $line_out = "." . $line_out;
                     }
-                    fputs($this->smtp_conn,$line_out . $this->CRLF);
                 }
+                fputs($this->smtp_conn,$line_out . $this->CRLF);
             }
+        }
 
-            # ok all the message data has been sent so lets get this
-            # over with aleady
-            fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+        # ok all the message data has been sent so lets get this
+        # over with aleady
+        fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "DATA not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * Expand($name)
-         *
-         * Expand takes the name and asks the server to list all the
-         * people who are members of the _list_. Expand will return
-         * back and array of the result or false if an error occurs.
-         * Each value in the array returned has the format of:
-         *     [ <full-name> <sp> ] <path>
-         * The definition of <path> is defined in rfc 821
-         *
-         * Implements rfc 821: EXPN <SP> <string> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE FAILURE: 550
-         * SMTP CODE ERROR  : 500,501,502,504,421
-         */
-        function Expand($name) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Expand() without being connected");
-                return false;
+        if($code != 250) {
+            $this->error =
+                array("error" => "DATA not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return true;
+    }
 
-            fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
+    /**
+     * Expand takes the name and asks the server to list all the
+     * people who are members of the _list_. Expand will return
+     * back and array of the result or false if an error occurs.
+     * Each value in the array returned has the format of:
+     *     [ <full-name> <sp> ] <path>
+     * The definition of <path> is defined in rfc 821
+     *
+     * Implements rfc 821: EXPN <SP> <string> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE FAILURE: 550
+     * SMTP CODE ERROR  : 500,501,502,504,421
+     * @access public
+     * @return string array
+     */
+    function Expand($name) {
+        $this->error = null; # so no confusion is caused
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Expand() without being connected");
+            return false;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "EXPN not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            # parse the reply and place in our array to return to user
-            $entries = explode($this->CRLF,$rply);
-            while(list(,$l) = @each($entries)) {
-                $list[] = substr($l,4);
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            return $rval;
-        }
-
-        /*
-         * Hello($host="")
-         *
-         * Sends the HELO command to the smtp server.
-         * This makes sure that we and the server are in
-         * the same known state.
-         *
-         * Implements from rfc 821: HELO <SP> <domain> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE ERROR  : 500, 501, 504, 421
-         */
-        function Hello($host="") {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Hello() without being connected");
-                return false;
+        if($code != 250) {
+            $this->error =
+                array("error" => "EXPN not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            # if a hostname for the HELO wasn't specified determine
-            # a suitable one to send
-            if(empty($host)) {
-                # we need to determine some sort of appopiate default
-                # to send to the server
-                $host = "localhost";
-            }
+        # parse the reply and place in our array to return to user
+        $entries = explode($this->CRLF,$rply);
+        while(list(,$l) = @each($entries)) {
+            $list[] = substr($l,4);
+        }
 
-            fputs($this->smtp_conn,"HELO " . $host . $this->CRLF);
+        return $list;
+    }
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+    /**
+     * Sends the HELO command to the smtp server.
+     * This makes sure that we and the server are in
+     * the same known state.
+     *
+     * Implements from rfc 821: HELO <SP> <domain> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE ERROR  : 500, 501, 504, 421
+     * @access public
+     * @return bool
+     */
+    function Hello($host="") {
+        $this->error = null; # so no confusion is caused
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
-            }
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Hello() without being connected");
+            return false;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "HELO not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
+        # if a hostname for the HELO wasn't specified determine
+        # a suitable one to send
+        if(empty($host)) {
+            # we need to determine some sort of appopiate default
+            # to send to the server
+            $host = "localhost";
+        }
 
-            $this->helo_rply = $rply;
-
-            return true;
-        }
-
-        /*
-         * Help($keyword="")
-         *
-         * Gets help information on the keyword specified. If the keyword
-         * is not specified then returns generic help, ussually contianing
-         * A list of keywords that help is available on. This function
-         * returns the results back to the user. It is up to the user to
-         * handle the returned data. If an error occurs then false is
-         * returned with $this->error set appropiately.
-         *
-         * Implements rfc 821: HELP [ <SP> <string> ] <CRLF>
-         *
-         * SMTP CODE SUCCESS: 211,214
-         * SMTP CODE ERROR  : 500,501,502,504,421
-         *
-         */
-        function Help($keyword="") {
-            $this->error = null; # to avoid confusion
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Help() without being connected");
+        // Send extended hello first (RFC 2821)
+        if(!$this->SendHello("EHLO", $host))
+        {
+            if(!$this->SendHello("HELO", $host))
                 return false;
-            }
+        }
 
-            $extra = "";
-            if(!empty($keyword)) {
-                $extra = " " . $keyword;
-            }
+        return true;
+    }
 
-            fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
+    /**
+     * Sends a HELO/EHLO command.
+     * @access private
+     * @return bool
+     */
+    function SendHello($hello, $host) {
+        fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER: " . $this->CRLF . $rply;
+        }
 
-            if($code != 211 && $code != 214) {
-                $this->error =
-                    array("error" => "HELP not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
+        if($code != 250) {
+            $this->error =
+                array("error" => $hello . " not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            return $rply;
-        }
-
-        /*
-         * Mail($from)
-         *
-         * Starts a mail transaction from the email address specified in
-         * $from. Returns true if successful or false otherwise. If True
-         * the mail transaction is started and then one or more Recipient
-         * commands may be called followed by a Data command.
-         *
-         * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE SUCCESS: 552,451,452
-         * SMTP CODE SUCCESS: 500,501,421
-         */
-        function Mail($from) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Mail() without being connected");
-                return false;
-            }
+        $this->helo_rply = $rply;
+        
+        return true;
+    }
 
-            fputs($this->smtp_conn,"MAIL FROM:" . $from . $this->CRLF);
+    /**
+     * Gets help information on the keyword specified. If the keyword
+     * is not specified then returns generic help, ussually contianing
+     * A list of keywords that help is available on. This function
+     * returns the results back to the user. It is up to the user to
+     * handle the returned data. If an error occurs then false is
+     * returned with $this->error set appropiately.
+     *
+     * Implements rfc 821: HELP [ <SP> <string> ] <CRLF>
+     *
+     * SMTP CODE SUCCESS: 211,214
+     * SMTP CODE ERROR  : 500,501,502,504,421
+     * @access public
+     * @return string
+     */
+    function Help($keyword="") {
+        $this->error = null; # to avoid confusion
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Help() without being connected");
+            return false;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        $extra = "";
+        if(!empty($keyword)) {
+            $extra = " " . $keyword;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "MAIL not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * Noop()
-         *
-         * Sends the command NOOP to the SMTP server.
-         *
-         * Implements from rfc 821: NOOP <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE ERROR  : 500, 421
-         */
-        function Noop() {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Noop() without being connected");
-                return false;
-            }
+        fputs($this->smtp_conn,"HELP" . $extra . $this->CRLF);
 
-            fputs($this->smtp_conn,"NOOP" . $this->CRLF);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        if($code != 211 && $code != 214) {
+            $this->error =
+                array("error" => "HELP not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "NOOP not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * Quit($close_on_error=true)
-         *
-         * Sends the quit command to the server and then closes the socket
-         * if there is no error or the $close_on_error argument is true.
-         *
-         * Implements from rfc 821: QUIT <CRLF>
-         *
-         * SMTP CODE SUCCESS: 221
-         * SMTP CODE ERROR  : 500
-         */
-        function Quit($close_on_error=true) {
-            $this->error = null; # so there is no confusion
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Quit() without being connected");
-                return false;
-            }
+        return $rply;
+    }
 
-            # send the quit command to the server
-            fputs($this->smtp_conn,"quit" . $this->CRLF);
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command.
+     *
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,421
+     * @access public
+     * @return bool
+     */
+    function Mail($from) {
+        $this->error = null; # so no confusion is caused
 
-            # get any good-bye messages
-            $byemsg = $this->get_lines();
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Mail() without being connected");
+            return false;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
-            }
+        fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $this->CRLF);
 
-            $rval = true;
-            $e = null;
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            $code = substr($byemsg,0,3);
-            if($code != 221) {
-                # use e as a tmp var cause Close will overwrite $this->error
-                $e = array("error" => "SMTP server rejected quit command",
-                           "smtp_code" => $code,
-                           "smtp_rply" => substr($byemsg,4));
-                $rval = false;
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $e["error"] . ": " .
-                             $byemsg . $this->CRLF;
-                }
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            if(empty($e) || $close_on_error) {
-                $this->Close();
+        if($code != 250) {
+            $this->error =
+                array("error" => "MAIL not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return true;
+    }
 
-            return $rval;
-        }
-
-        /*
-         * Recipient($to)
-         *
-         * Sends the command RCPT to the SMTP server with the TO: argument of $to.
-         * Returns true if the recipient was accepted false if it was rejected.
-         *
-         * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250,251
-         * SMTP CODE FAILURE: 550,551,552,553,450,451,452
-         * SMTP CODE ERROR  : 500,501,503,421
-         */
-        function Recipient($to) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Recipient() without being connected");
-                return false;
-            }
+    /**
+     * Sends the command NOOP to the SMTP server.
+     *
+     * Implements from rfc 821: NOOP <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE ERROR  : 500, 421
+     * @access public
+     * @return bool
+     */
+    function Noop() {
+        $this->error = null; # so no confusion is caused
 
-            fputs($this->smtp_conn,"RCPT TO:" . $to . $this->CRLF);
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Noop() without being connected");
+            return false;
+        }
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        fputs($this->smtp_conn,"NOOP" . $this->CRLF);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($code != 250 && $code != 251) {
-                $this->error =
-                    array("error" => "RCPT not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * Reset()
-         *
-         * Sends the RSET command to abort and transaction that is
-         * currently in progress. Returns true if successful false
-         * otherwise.
-         *
-         * Implements rfc 821: RSET <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE ERROR  : 500,501,504,421
-         */
-        function Reset() {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Reset() without being connected");
-                return false;
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        if($code != 250) {
+            $this->error =
+                array("error" => "NOOP not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return true;
+    }
 
-            fputs($this->smtp_conn,"RSET" . $this->CRLF);
+    /**
+     * Sends the quit command to the server and then closes the socket
+     * if there is no error or the $close_on_error argument is true.
+     *
+     * Implements from rfc 821: QUIT <CRLF>
+     *
+     * SMTP CODE SUCCESS: 221
+     * SMTP CODE ERROR  : 500
+     * @access public
+     * @return bool
+     */
+    function Quit($close_on_error=true) {
+        $this->error = null; # so there is no confusion
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Quit() without being connected");
+            return false;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        # send the quit command to the server
+        fputs($this->smtp_conn,"quit" . $this->CRLF);
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "RSET failed",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
+        # get any good-bye messages
+        $byemsg = $this->get_lines();
 
-            return true;
-        }
-
-        /*
-         * Send($from)
-         *
-         * Starts a mail transaction from the email address specified in
-         * $from. Returns true if successful or false otherwise. If True
-         * the mail transaction is started and then one or more Recipient
-         * commands may be called followed by a Data command. This command
-         * will send the message to the users terminal if they are logged
-         * in.
-         *
-         * Implements rfc 821: SEND <SP> FROM:<reverse-path> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE SUCCESS: 552,451,452
-         * SMTP CODE SUCCESS: 500,501,502,421
-         */
-        function Send($from) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Send() without being connected");
-                return false;
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
+        }
+
+        $rval = true;
+        $e = null;
+
+        $code = substr($byemsg,0,3);
+        if($code != 221) {
+            # use e as a tmp var cause Close will overwrite $this->error
+            $e = array("error" => "SMTP server rejected quit command",
+                       "smtp_code" => $code,
+                       "smtp_rply" => substr($byemsg,4));
+            $rval = false;
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $e["error"] . ": " .
+                         $byemsg . $this->CRLF;
             }
+        }
 
-            fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
+        if(empty($e) || $close_on_error) {
+            $this->Close();
+        }
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        return $rval;
+    }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+    /**
+     * Sends the command RCPT to the SMTP server with the TO: argument of $to.
+     * Returns true if the recipient was accepted false if it was rejected.
+     *
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250,251
+     * SMTP CODE FAILURE: 550,551,552,553,450,451,452
+     * SMTP CODE ERROR  : 500,501,503,421
+     * @access public
+     * @return bool
+     */
+    function Recipient($to) {
+        $this->error = null; # so no confusion is caused
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "SEND not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * SendAndMail($from)
-         *
-         * Starts a mail transaction from the email address specified in
-         * $from. Returns true if successful or false otherwise. If True
-         * the mail transaction is started and then one or more Recipient
-         * commands may be called followed by a Data command. This command
-         * will send the message to the users terminal if they are logged
-         * in and send them an email.
-         *
-         * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE SUCCESS: 552,451,452
-         * SMTP CODE SUCCESS: 500,501,502,421
-         */
-        function SendAndMail($from) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                    "error" => "Called SendAndMail() without being connected");
-                return false;
-            }
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Recipient() without being connected");
+            return false;
+        }
 
-            fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+        fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
-            }
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "SAML not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        /*
-         * SendOrMail($from)
-         *
-         * Starts a mail transaction from the email address specified in
-         * $from. Returns true if successful or false otherwise. If True
-         * the mail transaction is started and then one or more Recipient
-         * commands may be called followed by a Data command. This command
-         * will send the message to the users terminal if they are logged
-         * in or mail it to them if they are not.
-         *
-         * Implements rfc 821: SOML <SP> FROM:<reverse-path> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE SUCCESS: 552,451,452
-         * SMTP CODE SUCCESS: 500,501,502,421
-         */
-        function SendOrMail($from) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                    "error" => "Called SendOrMail() without being connected");
-                return false;
+        if($code != 250 && $code != 251) {
+            $this->error =
+                array("error" => "RCPT not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Sends the RSET command to abort and transaction that is
+     * currently in progress. Returns true if successful false
+     * otherwise.
+     *
+     * Implements rfc 821: RSET <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE ERROR  : 500,501,504,421
+     * @access public
+     * @return bool
+     */
+    function Reset() {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Reset() without being connected");
+            return false;
+        }
 
-            fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
+        fputs($this->smtp_conn,"RSET" . $this->CRLF);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        if($code != 250) {
+            $this->error =
+                array("error" => "RSET failed",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
 
-            if($code != 250) {
-                $this->error =
-                    array("error" => "SOML not accepted from server",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
+        return true;
+    }
+
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command. This command
+     * will send the message to the users terminal if they are logged
+     * in.
+     *
+     * Implements rfc 821: SEND <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,502,421
+     * @access public
+     * @return bool
+     */
+    function Send($from) {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Send() without being connected");
+            return false;
+        }
+
+        fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
+
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        if($code != 250) {
+            $this->error =
+                array("error" => "SEND not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
-            return true;
-        }
-
-        /*
-         * Turn()
-         *
-         * This is an optional command for SMTP that this class does not
-         * support. This method is here to make the RFC821 Definition
-         * complete for this class and __may__ be implimented in the future
-         *
-         * Implements from rfc 821: TURN <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250
-         * SMTP CODE FAILURE: 502
-         * SMTP CODE ERROR  : 500, 503
-         */
-        function Turn() {
-            $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                            "is not implemented");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     *
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,502,421
+     * @access public
+     * @return bool
+     */
+    function SendAndMail($from) {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                "error" => "Called SendAndMail() without being connected");
+            return false;
+        }
+
+        fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
+
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        if($code != 250) {
+            $this->error =
+                array("error" => "SAML not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
             if($this->do_debug >= 1) {
-                echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
             return false;
         }
+        return true;
+    }
 
-        /*
-         * Verify($name)
-         *
-         * Verifies that the name is recognized by the server.
-         * Returns false if the name could not be verified otherwise
-         * the response from the server is returned.
-         *
-         * Implements rfc 821: VRFY <SP> <string> <CRLF>
-         *
-         * SMTP CODE SUCCESS: 250,251
-         * SMTP CODE FAILURE: 550,551,553
-         * SMTP CODE ERROR  : 500,501,502,421
-         */
-        function Verify($name) {
-            $this->error = null; # so no confusion is caused
-
-            if(!$this->connected()) {
-                $this->error = array(
-                        "error" => "Called Verify() without being connected");
-                return false;
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command. This command
+     * will send the message to the users terminal if they are logged
+     * in or mail it to them if they are not.
+     *
+     * Implements rfc 821: SOML <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,502,421
+     * @access public
+     * @return bool
+     */
+    function SendOrMail($from) {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                "error" => "Called SendOrMail() without being connected");
+            return false;
+        }
+
+        fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
+
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        if($code != 250) {
+            $this->error =
+                array("error" => "SOML not accepted from server",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * This is an optional command for SMTP that this class does not
+     * support. This method is here to make the RFC821 Definition
+     * complete for this class and __may__ be implimented in the future
+     *
+     * Implements from rfc 821: TURN <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE FAILURE: 502
+     * SMTP CODE ERROR  : 500, 503
+     * @access public
+     * @return bool
+     */
+    function Turn() {
+        $this->error = array("error" => "This method, TURN, of the SMTP ".
+                                        "is not implemented");
+        if($this->do_debug >= 1) {
+            echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
+        }
+        return false;
+    }
+
+    /**
+     * Verifies that the name is recognized by the server.
+     * Returns false if the name could not be verified otherwise
+     * the response from the server is returned.
+     *
+     * Implements rfc 821: VRFY <SP> <string> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250,251
+     * SMTP CODE FAILURE: 550,551,553
+     * SMTP CODE ERROR  : 500,501,502,421
+     * @access public
+     * @return int
+     */
+    function Verify($name) {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Verify() without being connected");
+            return false;
+        }
+
+        fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
 
-            fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
 
-            $rply = $this->get_lines();
-            $code = substr($rply,0,3);
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
 
-            if($this->do_debug >= 2) {
-                echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        if($code != 250 && $code != 251) {
+            $this->error =
+                array("error" => "VRFY failed on name '$name'",
+                      "smtp_code" => $code,
+                      "smtp_msg" => substr($rply,4));
+            if($this->do_debug >= 1) {
+                echo "SMTP -> ERROR: " . $this->error["error"] .
+                         ": " . $rply . $this->CRLF;
             }
+            return false;
+        }
+        return $rply;
+    }
 
-            if($code != 250 && $code != 251) {
-                $this->error =
-                    array("error" => "VRFY failed on name '$name'",
-                          "smtp_code" => $code,
-                          "smtp_msg" => substr($rply,4));
-                if($this->do_debug >= 1) {
-                    echo "SMTP -> ERROR: " . $this->error["error"] .
-                             ": " . $rply . $this->CRLF;
-                }
-                return false;
+    /*******************************************************************
+     *                       INTERNAL FUNCTIONS                       *
+     ******************************************************************/
+
+    /**
+     * Read in as many lines as possible
+     * either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access private
+     * @return string
+     */
+    function get_lines() {
+        $data = "";
+        while($str = fgets($this->smtp_conn,515)) {
+            if($this->do_debug >= 4) {
+                echo "SMTP -> get_lines(): \$data was \"$data\"" .
+                         $this->CRLF;
+                echo "SMTP -> get_lines(): \$str is \"$str\"" .
+                         $this->CRLF;
             }
-            return $rply;
-        }
-
-        /******************************************************************
-         *                       INTERNAL FUNCTIONS                       *
-         ******************************************************************/
-
-        /*
-         * get_lines()
-         *
-         * __internal_use_only__: read in as many lines as possible
-         * either before eof or socket timeout occurs on the operation.
-         * With SMTP we can tell if we have more lines to read if the
-         * 4th character is '-' symbol. If it is a space then we don't
-         * need to read anything else.
-         */
-        function get_lines() {
-            $data = "";
-            while($str = fgets($this->smtp_conn,515)) {
-                if($this->do_debug >= 4) {
-                    echo "SMTP -> get_lines(): \$data was \"$data\"" .
-                             $this->CRLF;
-                    echo "SMTP -> get_lines(): \$str is \"$str\"" .
-                             $this->CRLF;
-                }
-                $data .= $str;
-                if($this->do_debug >= 4) {
-                    echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
-                }
-                # if the 4th character is a space then we are done reading
-                # so just break the loop
-                if(substr($str,3,1) == " ") { break; }
+            $data .= $str;
+            if($this->do_debug >= 4) {
+                echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
             }
-            return $data;
+            # if the 4th character is a space then we are done reading
+            # so just break the loop
+            if(substr($str,3,1) == " ") { break; }
         }
-
+        return $data;
     }
 
+}
+
 
  ?>
diff --git a/lib/phpmailer/docs/extending.html b/lib/phpmailer/docs/extending.html
deleted file mode 100644
index 25002aafd6..0000000000
--- a/lib/phpmailer/docs/extending.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<html>
-<head>
-<title>Examples using phpmailer</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h2>Examples using phpmailer</h2>
-
-<h3>1. Advanced Example</h3>
-<p>
-
-This demonstrates sending out multiple email messages with binary attachments
-from a MySQL database with multipart/alternative support.<p>
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("class.phpmailer.php");
-
-$mail = new phpmailer();
-
-$mail->From     = "list@mydomain.com";
-$mail->FromName = "List manager";
-$mail->Host     = "smtp1.site.com;smtp2.site.com";
-$mail->Mailer   = "smtp";
-
-@MYSQL_CONNECT("localhost","root","password");
-@mysql_select_db("my_company");
-$query  = "SELECT full_name, email, photo FROM employee WHERE id=$id";
-$result = @MYSQL_QUERY($query);
-
-while ($row = mysql_fetch_array ($result))
-{
-    // HTML body
-    $body  = "Hello &lt;font size=\"4\"&gt;" . $row["full_name"] . "&lt;/font&gt;, &lt;p&gt;";
-    $body .= "&lt;i&gt;Your&lt;/i&gt; personal photograph to this message.&lt;p&gt;";
-    $body .= "Sincerely, &lt;br&gt;";
-    $body .= "phpmailer List manager";
-
-    // Plain text body (for mail clients that cannot read HTML)
-    $text_body  = "Hello " . $row["full_name"] . ", \n\n";
-    $text_body .= "Your personal photograph to this message.\n\n";
-    $text_body .= "Sincerely, \n";
-    $text_body .= "phpmailer List manager";
-
-    $mail->Body    = $body;
-    $mail->AltBody = $text_body;
-    $mail->AddAddress($row["email"], $row["full_name");
-    $mail->AddStringAttachment($row["photo"], "YourPhoto.jpg");
-
-    if(!$mail->Send())
-        echo "There has been a mail error sending to " . $row["email"] . "&lt;br&gt;";
-
-    // Clear all addresses and attachments for next loop
-    $mail->ClearAddresses();
-    $mail->ClearAttachments();
-}
-</pre>
-</td>
-</tr>
-</table>
-<p>
-
-<h3>2. Extending phpmailer</h3>
-<p>
-
-Extending classes with inheritance is one of the most
-powerful features of object-oriented
-programming.  It allows you to make changes to the
-original class for your
-own personal use without hacking the original
-classes.  Plus, it is very
-easy to do. I've provided an example:
-
-<p>
-Here's a class that extends the phpmailer class and sets the defaults
-for the particular site:<br>
-PHP include file: <b>mail.inc.php</b>
-<p>
-
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("class.phpmailer.php");
-
-class my_phpmailer extends phpmailer {
-    // Set default variables for all new objects
-    var $From     = "from@email.com";
-    var $FromName = "Mailer";
-    var $Host     = "smtp1.site.com;smtp2.site.com";
-    var $Mailer   = "smtp";                         // Alternative to IsSMTP()
-    var $WordWrap = 75;
-
-    // Replace the default error_handler
-    function error_handler($msg) {
-        print("My Site Error");
-        print("Description:");
-        printf("%s", $msg);
-        exit;
-    }
-
-    // Create an additional function
-    function do_something($something) {
-        // Place your new code here
-    }
-}
-</td>
-</tr>
-</table>
-<br>
-
-Now here's a normal PHP page in the site, which will have all the defaults set
-above:<br>
-Normal PHP file: <b>mail_test.php</b>
-<p>
-
-<table cellpadding="4" border="1" width="80%">
-<tr>
-<td bgcolor="#CCCCCC">
-<pre>
-require("mail.inc.php");
-
-// Instantiate your new class
-$mail = new my_phpmailer;
-
-// Now you only need to add the necessary stuff
-$mail->AddAddress("josh@site.com", "Josh Adams");
-$mail->Subject = "Here is the subject";
-$mail->Body    = "This is the message body";
-$mail->AddAttachment("c:/temp/11-10-00.zip", "new_name.zip");  // optional name
-
-if(!$mail->Send())
-{
-   echo "There was an error sending the message";
-   exit;
-}
-
-echo "Message was sent successfully";
-</pre>
-</td>
-</tr>
-</table>
-</p>
-
-</body>
-</html>
diff --git a/lib/phpmailer/docs/faq.html b/lib/phpmailer/docs/faq.html
deleted file mode 100644
index 18dfafda9c..0000000000
--- a/lib/phpmailer/docs/faq.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<head>
-<title>phpmailer FAQ</title>
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<h2>phpmailer FAQ</h2>
-
-<p>
-<b>I'm using the SMTP mailer and I keep on getting a timeout message 
-well before the X seconds I set it for.  What gives?</b>
-<br>
-PHP versions 4.0.4pl1 and earlier have a bug in which sockets timeout 
-early.  You can fix this by re-compiling PHP 4.0.4pl1 with this fix: 
-<a href="timeoutfix.diff">timeoutfix.diff</a>. Otherwise you can wait 
-for the new PHP release.
-</p>
-
-<p>
-<b>I am concerned that using include files will take up too much
-processing time on my computer.  How can I make it run faster?</b>
-<br>
-PHP by itself is very fast.  Much faster than ASP or JSP running on
-the same type of server.  This is because it has very little overhead compared
-to its competitors and it pre-compiles all of
-its code before it runs each script (in PHP4).  However, all of
-this compiling and re-compiling can take up a lot of valuable
-computer resources.  However, there are programs out there that compile
-PHP code and store it in memory (or on mmaped files) to reduce the
-processing immensely.  Two of these: <a href="http://apc.communityconnect.com">APC
-(Alternative PHP Cache)</a> and <a href="http://bwcache.bware.it/index.htm">Afterburner</a> 
-(<a href="http://www.mm4.de/php4win/mod_php4_win32/">Win32 download</a>) 
-are excellent free tools that do just this.  If you have the money
-you might also try <a href="http://www.zend.com">Zend Cache</a>, it is
-even faster than the open source varieties.  All of these tools make your
-scripts run faster while also reducing the load on your server. I have tried
-them myself and they are quite stable too.
-</p>
-
-
-<p>
-<b>What mailer gives me the best performance?</b>
-<br>
-On a single machine the mail() or sendmail mailers give you the best 
-performance because they do not have the added overhead of SMTP.
-If you have you have your mail server on a another machine then
-SMTP is your only option, but you do get the benefit of redundant
-mail servers.
-</p>
-
-<p>
-<b>When I try to attach a file with on my server I get a 
-"Could not find {file} on filesystem error".  Why is this?</b>
-<br>
-If you are using a Unix machine this is probably because the user 
-running your web server does not have read access to the directory 
-in question.  If you are using Windows, then the problem probably is 
-that you have used single backslashes to denote directories ("\").  
-A single backslash has a special meaning to PHP so these are not 
-valid.  Instead use double backslashes ("\\") or a single forward 
-slash ("/").
-</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/lib/phpmailer/docs/timeoutfix.diff b/lib/phpmailer/docs/timeoutfix.diff
deleted file mode 100644
index 8821f001b3..0000000000
--- a/lib/phpmailer/docs/timeoutfix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-*** /usr/local/src/php-4.0.4pl1/ext/standard/fsock.c.old	Mon Mar 26 13:07:40 2001
---- /usr/local/src/php-4.0.4pl1/ext/standard/fsock.c	Mon Mar 26 13:12:03 2001
-***************
-*** 559,564 ****
---- 559,565 ----
-  
-  static void php_sockread_total(php_sockbuf *sock, size_t maxread)
-  {
-+         sock->timeout_event = 0;
-  	while(!sock->eof && TOREAD(sock) < maxread && !sock->timeout_event) {
-  		php_sockread_internal(sock);
-  	}
-***************
-*** 619,624 ****
---- 620,627 ----
-  	}
-  
-  	SEARCHCR();
-+ 
-+         sock->timeout_event = 0;
-  
-  	if(!p) {
-  		if(sock->is_blocked) {
diff --git a/lib/phpmailer/language/phpmailer.lang-br.php b/lib/phpmailer/language/phpmailer.lang-br.php
new file mode 100644
index 0000000000..b948c264f3
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-br.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * Portuguese Version
+ * By Paulo Henrique Garcia - paulo@controllerweb.com.br
+ */
+
+$PHPMAILER_LANG = array();
+$PHPMAILER_LANG["provide_address"] = 'Você deve fornecer pelo menos um endereço de destinatário de email.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailer não suportado.';
+$PHPMAILER_LANG["execute"] = 'Não foi possível executar: ';
+$PHPMAILER_LANG["instantiate"] = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG["authenticate"] = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG["from_failed"] = 'Os endereços de rementente a seguir falharam: ';
+$PHPMAILER_LANG["recipients_failed"] = 'Erro de SMTP: Os endereços de destinatário a seguir falharam: ';
+$PHPMAILER_LANG["data_not_accepted"] = 'Erro de SMTP: Dados não aceitos.';
+$PHPMAILER_LANG["connect_host"] = 'Erro de SMTP: Não foi possível conectar com o servidor SMTP.';
+$PHPMAILER_LANG["file_access"] = 'Não foi possível acessar o arquivo: ';
+$PHPMAILER_LANG["file_open"] = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
+$PHPMAILER_LANG["encoding"] = 'Codificação desconhecida: ';
+?>
diff --git a/lib/phpmailer/language/phpmailer.lang-en.php b/lib/phpmailer/language/phpmailer.lang-en.php
new file mode 100644
index 0000000000..c5a6da82c7
--- /dev/null
+++ b/lib/phpmailer/language/phpmailer.lang-en.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHPMailer language file.  
+ * English Version
+ */
+
+$PHPMAILER_LANG = array();
+
+$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' .
+                                     'recipient email address.';
+$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
+$PHPMAILER_LANG["execute"] = 'Could not execute: ';
+$PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
+$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
+$PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
+$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' .
+                                       'recipients failed: ';
+$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
+$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';
+$PHPMAILER_LANG["file_access"] = 'Could not access file: ';
+$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: ';
+$PHPMAILER_LANG["encoding"] = 'Unknown encoding: ';
+?>
+
diff --git a/lib/phpmailer/phpdoc/allclasses-frame.html b/lib/phpmailer/phpdoc/allclasses-frame.html
deleted file mode 100644
index 75bd6e9863..0000000000
--- a/lib/phpmailer/phpdoc/allclasses-frame.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-All Classes
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="phpmailer.html" TARGET="classFrame">phpmailer</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/deprecated-list.html b/lib/phpmailer/phpdoc/deprecated-list.html
deleted file mode 100644
index c3cede0f24..0000000000
--- a/lib/phpmailer/phpdoc/deprecated-list.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-: Deprecated List
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/help-doc.html b/lib/phpmailer/phpdoc/help-doc.html
deleted file mode 100644
index 5529f786a8..0000000000
--- a/lib/phpmailer/phpdoc/help-doc.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-: API Help
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Exceptions<LI>Errors</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, inner class and inner interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Inner Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-all.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames.  All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet. </EM>
-</FONT>
-<BR>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/index-all.html b/lib/phpmailer/phpdoc/index-all.html
deleted file mode 100644
index 5633608f8e..0000000000
--- a/lib/phpmailer/phpdoc/index-all.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Sat Mar 30 14:15:49 EST 2002 -->
-<TITLE>
-: Index
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<A HREF="#_$_">$</A> <A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_I_">I</A> <A HREF="#_P_">P</A> <A HREF="#_S_">S</A> <HR>
-<A NAME="_$_"><!-- --></A><H2>
-<B>$</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html#$AltBody"><B>$AltBody</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the text-only body of the message.
-<DT><A HREF="phpmailer.html#$Body"><B>$Body</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the Body of the message.
-<DT><A HREF="phpmailer.html#$CharSet"><B>$CharSet</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the CharSet of the message.
-<DT><A HREF="Boundary.html#$CharSet"><B>$CharSet</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets the Char set.
-<DT><A HREF="phpmailer.html#$ConfirmReadingTo"><B>$ConfirmReadingTo</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the email address that a reading confirmation will be sent.
-<DT><A HREF="phpmailer.html#$ContentType"><B>$ContentType</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the Content-type of the message.
-<DT><A HREF="Boundary.html#$ContentType"><B>$ContentType</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets the boundary Content Type.
-<DT><A HREF="Boundary.html#$Disposition"><B>$Disposition</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets an attachment disposition.
-<DT><A HREF="phpmailer.html#$Encoding"><B>$Encoding</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the Encoding of the message.
-<DT><A HREF="Boundary.html#$Encoding"><B>$Encoding</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets the Encoding.
-<DT><A HREF="phpmailer.html#$ErrorInfo"><B>$ErrorInfo</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Holds the most recent mailer error message.
-<DT><A HREF="Boundary.html#$FileName"><B>$FileName</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets an attachment file name.
-<DT><A HREF="phpmailer.html#$From"><B>$From</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the From email address for the message.
-<DT><A HREF="phpmailer.html#$FromName"><B>$FromName</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the From name of the message.
-<DT><A HREF="phpmailer.html#$Helo"><B>$Helo</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the SMTP HELO of the message.
-<DT><A HREF="phpmailer.html#$Host"><B>$Host</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the SMTP hosts.
-<DT><A HREF="phpmailer.html#$LE"><B>$LE</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the line endings of the message.
-<DT><A HREF="Boundary.html#$LE"><B>$LE</B></A> - 
-Variable in class <A HREF="Boundary.html">Boundary</A>
-<DD>Sets the line endings of the message.
-<DT><A HREF="phpmailer.html#$Mailer"><B>$Mailer</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Method to send mail: ("mail", "sendmail", or "smtp").
-<DT><A HREF="phpmailer.html#$Password"><B>$Password</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets SMTP password.
-<DT><A HREF="phpmailer.html#$PluginDir"><B>$PluginDir</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Path to phpmailer plugins.
-<DT><A HREF="phpmailer.html#$Port"><B>$Port</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the default SMTP server port.
-<DT><A HREF="phpmailer.html#$Priority"><B>$Priority</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Email priority (1 = High, 3 = Normal, 5 = low).
-<DT><A HREF="phpmailer.html#$Sender"><B>$Sender</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the Sender email of the message.
-<DT><A HREF="phpmailer.html#$Sendmail"><B>$Sendmail</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the path of the sendmail program.
-<DT><A HREF="phpmailer.html#$SMTPAuth"><B>$SMTPAuth</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets SMTP authentication.
-<DT><A HREF="phpmailer.html#$Subject"><B>$Subject</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets the Subject of the message.
-<DT><A HREF="phpmailer.html#$UseMSMailHeaders"><B>$UseMSMailHeaders</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Turns Microsoft mail client headers on and off.
-<DT><A HREF="phpmailer.html#$Username"><B>$Username</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets SMTP username.
-<DT><A HREF="phpmailer.html#$Version"><B>$Version</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Holds phpmailer version.
-<DT><A HREF="phpmailer.html#$WordWrap"><B>$WordWrap</B></A> - 
-Variable in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets word wrapping on the body of the message to a given number of 
- characters.
-</DL>
-<HR>
-<A NAME="_A_"><!-- --></A><H2>
-<B>A</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html#AddAddress(var, var)"><B>AddAddress(var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a "To" address.
-<DT><A HREF="phpmailer.html#AddAttachment(var, var, var, var)"><B>AddAttachment(var, var, var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds an attachment from a path on the filesystem.
-<DT><A HREF="phpmailer.html#AddBCC(var, var)"><B>AddBCC(var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a "Bcc" address.
-<DT><A HREF="phpmailer.html#AddCC(var, var)"><B>AddCC(var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a "Cc" address.
-<DT><A HREF="phpmailer.html#AddCustomHeader(var)"><B>AddCustomHeader(var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a custom header.
-<DT><A HREF="phpmailer.html#AddEmbeddedImage(var, var, var, var, var)"><B>AddEmbeddedImage(var, var, var, var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds an embedded attachment.
-<DT><A HREF="phpmailer.html#AddReplyTo(var, var)"><B>AddReplyTo(var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a "Reply-to" address.
-<DT><A HREF="phpmailer.html#AddStringAttachment(var, var, var, var)"><B>AddStringAttachment(var, var, var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Adds a string or binary attachment (non-filesystem) to the list.
-</DL>
-<HR>
-<A NAME="_B_"><!-- --></A><H2>
-<B>B</B></H2>
-<DL>
-<DT><A HREF="Boundary.html"><B>Boundary</B></A> - class <A HREF="Boundary.html">Boundary</A>.<DD>Boundary - MIME message boundary class<DT><A HREF="Boundary.html#Boundary(var)"><B>Boundary(var)</B></A> - 
-Constructor for class <A HREF="Boundary.html">Boundary</A>
-<DD>Main constructor.
-</DL>
-<HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html#ClearAddresses()"><B>ClearAddresses()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all recipients assigned in the TO array.
-<DT><A HREF="phpmailer.html#ClearAllRecipients()"><B>ClearAllRecipients()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all recipients assigned in the TO, CC and BCC
- array.
-<DT><A HREF="phpmailer.html#ClearAttachments()"><B>ClearAttachments()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all previously set filesystem, string, and binary
- attachments.
-<DT><A HREF="phpmailer.html#ClearBCCs()"><B>ClearBCCs()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all recipients assigned in the BCC array.
-<DT><A HREF="phpmailer.html#ClearCCs()"><B>ClearCCs()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all recipients assigned in the CC array.
-<DT><A HREF="phpmailer.html#ClearCustomHeaders()"><B>ClearCustomHeaders()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all custom headers.
-<DT><A HREF="phpmailer.html#ClearReplyTos()"><B>ClearReplyTos()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Clears all recipients assigned in the ReplyTo array.
-</DL>
-<HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="Boundary.html#GetSource(var)"><B>GetSource(var)</B></A> - 
-Method in class <A HREF="Boundary.html">Boundary</A>
-<DD>Returns the source of the boundary.
-</DL>
-<HR>
-<A NAME="_I_"><!-- --></A><H2>
-<B>I</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html#IsHTML(var)"><B>IsHTML(var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets message type to HTML.
-<DT><A HREF="phpmailer.html#IsMail()"><B>IsMail()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets Mailer to send message using PHP mail() function.
-<DT><A HREF="phpmailer.html#IsQmail()"><B>IsQmail()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets Mailer to send message using the qmail MTA.
-<DT><A HREF="phpmailer.html#IsSendmail()"><B>IsSendmail()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets Mailer to send message using the $Sendmail program.
-<DT><A HREF="phpmailer.html#IsSMTP()"><B>IsSMTP()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sets Mailer to send message using SMTP.
-</DL>
-<HR>
-<A NAME="_P_"><!-- --></A><H2>
-<B>P</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html"><B>phpmailer</B></A> - class <A HREF="phpmailer.html">phpmailer</A>.<DD>phpmailer - PHP email transport class<DT><A HREF="phpmailer.html#phpmailer()"><B>phpmailer()</B></A> - 
-Constructor for class <A HREF="phpmailer.html">phpmailer</A>
-<DD>&nbsp;
-</DL>
-<HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="phpmailer.html#Send()"><B>Send()</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Creates message and assigns Mailer.
-<DT><A HREF="phpmailer.html#SendToQueue(var, var)"><B>SendToQueue(var, var)</B></A> - 
-Method in class <A HREF="phpmailer.html">phpmailer</A>
-<DD>Sends mail message to an assigned queue directory.
-</DL>
-<HR>
-<A HREF="#_$_">$</A> <A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_G_">G</A> <A HREF="#_I_">I</A> <A HREF="#_P_">P</A> <A HREF="#_S_">S</A> 
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-all.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/index.html b/lib/phpmailer/phpdoc/index.html
deleted file mode 100644
index 5d8db44aa5..0000000000
--- a/lib/phpmailer/phpdoc/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd>
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001-->
-<TITLE>
-Generated Documentation (Untitled)
-</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%">
-<FRAME src="allclasses-frame.html" name="packageFrame">
-<FRAME src="phpmailer.html" name="classFrame">
-</FRAMESET>
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to <A HREF="phpmailer.html">Non-frame version.</A></NOFRAMES>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/overview-tree.html b/lib/phpmailer/phpdoc/overview-tree.html
deleted file mode 100644
index 5ee7898d14..0000000000
--- a/lib/phpmailer/phpdoc/overview-tree.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-: Class Hierarchy
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class <A HREF="phpmailer.html"><B>phpmailer</B></A></UL>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/packages.html b/lib/phpmailer/phpdoc/packages.html
deleted file mode 100644
index b2e9a48d01..0000000000
--- a/lib/phpmailer/phpdoc/packages.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<BR>
-
-<BR>
-
-<BR>
-<CENTER>
-The front page has been relocated.Please see:
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="index.html">Frame version</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="phpmailer.html">Non-frame version.</A></CENTER>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/phpmailer.html b/lib/phpmailer/phpdoc/phpmailer.html
deleted file mode 100644
index ecf7e097ad..0000000000
--- a/lib/phpmailer/phpdoc/phpmailer.html
+++ /dev/null
@@ -1,1043 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Sat Mar 30 14:15:49 EST 2002 -->
-<TITLE>
-: Class  phpmailer
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="Boundary.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="phpmailer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-Class  phpmailer</H2>
-<PRE>
-<B>phpmailer</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>phpmailer</B></DL>
-
-<P>
-phpmailer - PHP email transport class
-<P>
-<HR>
-
-<P>
-<!-- ======== INNER CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$AltBody">$AltBody</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the text-only body of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Body">$Body</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the Body of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$CharSet">$CharSet</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the CharSet of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$ConfirmReadingTo">$ConfirmReadingTo</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the email address that a reading confirmation will be sent.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$ContentType">$ContentType</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the Content-type of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Encoding">$Encoding</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the Encoding of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$ErrorInfo">$ErrorInfo</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Holds the most recent mailer error message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$From">$From</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the From email address for the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$FromName">$FromName</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the From name of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Helo">$Helo</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the SMTP HELO of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Host">$Host</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the SMTP hosts.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$LE">$LE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the line endings of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Mailer">$Mailer</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Method to send mail: ("mail", "sendmail", or "smtp").</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Password">$Password</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets SMTP password.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$PluginDir">$PluginDir</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Path to phpmailer plugins.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Port">$Port</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the default SMTP server port.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Priority">$Priority</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Email priority (1 = High, 3 = Normal, 5 = low).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Sender">$Sender</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the Sender email of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Sendmail">$Sendmail</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the path of the sendmail program.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;bool</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$SMTPAuth">$SMTPAuth</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets SMTP authentication.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Subject">$Subject</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the Subject of the message.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;bool</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$UseMSMailHeaders">$UseMSMailHeaders</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Turns Microsoft mail client headers on and off.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Username">$Username</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets SMTP username.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$Version">$Version</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Holds phpmailer version.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#$WordWrap">$WordWrap</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets word wrapping on the body of the message to a given number of 
- characters.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="phpmailer.html#phpmailer()">phpmailer</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddAddress(var, var)">AddAddress</A></B>(var&nbsp;$address,
-           var&nbsp;$name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a "To" address.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;bool</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddAttachment(var, var, var, var)">AddAttachment</A></B>(var&nbsp;$path,
-              var&nbsp;$name,
-              var&nbsp;$encoding,
-              var&nbsp;$type)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds an attachment from a path on the filesystem.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddBCC(var, var)">AddBCC</A></B>(var&nbsp;$address,
-       var&nbsp;$name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a "Bcc" address.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddCC(var, var)">AddCC</A></B>(var&nbsp;$address,
-      var&nbsp;$name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a "Cc" address.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddCustomHeader(var)">AddCustomHeader</A></B>(var&nbsp;$custom_header)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a custom header.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;bool</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddEmbeddedImage(var, var, var, var, var)">AddEmbeddedImage</A></B>(var&nbsp;$path,
-                 var&nbsp;$cid,
-                 var&nbsp;$name,
-                 var&nbsp;$encoding,
-                 var&nbsp;$type)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds an embedded attachment.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddReplyTo(var, var)">AddReplyTo</A></B>(var&nbsp;$address,
-           var&nbsp;$name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a "Reply-to" address.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#AddStringAttachment(var, var, var, var)">AddStringAttachment</A></B>(var&nbsp;$string,
-                    var&nbsp;$filename,
-                    var&nbsp;$encoding,
-                    var&nbsp;$type)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Adds a string or binary attachment (non-filesystem) to the list.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearAddresses()">ClearAddresses</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all recipients assigned in the TO array.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearAllRecipients()">ClearAllRecipients</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all recipients assigned in the TO, CC and BCC
- array.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearAttachments()">ClearAttachments</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all previously set filesystem, string, and binary
- attachments.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearBCCs()">ClearBCCs</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all recipients assigned in the BCC array.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearCCs()">ClearCCs</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all recipients assigned in the CC array.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearCustomHeaders()">ClearCustomHeaders</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all custom headers.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#ClearReplyTos()">ClearReplyTos</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Clears all recipients assigned in the ReplyTo array.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#IsHTML(var)">IsHTML</A></B>(var&nbsp;$bool)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets message type to HTML.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#IsMail()">IsMail</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets Mailer to send message using PHP mail() function.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#IsQmail()">IsQmail</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets Mailer to send message using the qmail MTA.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#IsSendmail()">IsSendmail</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets Mailer to send message using the $Sendmail program.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#IsSMTP()">IsSMTP</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets Mailer to send message using SMTP.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;bool</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#Send()">Send</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates message and assigns Mailer.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;string</CODE></FONT></TD>
-<TD><CODE><B><A HREF="phpmailer.html#SendToQueue(var, var)">SendToQueue</A></B>(var&nbsp;$queue_path,
-            var&nbsp;$send_time)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sends mail message to an assigned queue directory.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="$Priority"><!-- --></A><H3>
-$Priority</H3>
-<PRE>
-public int <B>$Priority</B></PRE>
-<DL>
-<DD>Email priority (1 = High, 3 = Normal, 5 = low). Default value is 3.</DL>
-<HR>
-
-<A NAME="$CharSet"><!-- --></A><H3>
-$CharSet</H3>
-<PRE>
-public string <B>$CharSet</B></PRE>
-<DL>
-<DD>Sets the CharSet of the message. Default value is "iso-8859-1".</DL>
-<HR>
-
-<A NAME="$ContentType"><!-- --></A><H3>
-$ContentType</H3>
-<PRE>
-public string <B>$ContentType</B></PRE>
-<DL>
-<DD>Sets the Content-type of the message. Default value is "text/plain".</DL>
-<HR>
-
-<A NAME="$Encoding"><!-- --></A><H3>
-$Encoding</H3>
-<PRE>
-public string <B>$Encoding</B></PRE>
-<DL>
-<DD>Sets the Encoding of the message. Options for this are "8bit" (default),
- "7bit", "binary", "base64", and "quoted-printable".</DL>
-<HR>
-
-<A NAME="$ErrorInfo"><!-- --></A><H3>
-$ErrorInfo</H3>
-<PRE>
-public string <B>$ErrorInfo</B></PRE>
-<DL>
-<DD>Holds the most recent mailer error message. Default value is "".</DL>
-<HR>
-
-<A NAME="$From"><!-- --></A><H3>
-$From</H3>
-<PRE>
-public string <B>$From</B></PRE>
-<DL>
-<DD>Sets the From email address for the message. Default value is "root@localhost".</DL>
-<HR>
-
-<A NAME="$FromName"><!-- --></A><H3>
-$FromName</H3>
-<PRE>
-public string <B>$FromName</B></PRE>
-<DL>
-<DD>Sets the From name of the message. Default value is "Root User".</DL>
-<HR>
-
-<A NAME="$Sender"><!-- --></A><H3>
-$Sender</H3>
-<PRE>
-public string <B>$Sender</B></PRE>
-<DL>
-<DD>Sets the Sender email of the message. If not empty, will be sent via -f to sendmail
- or as 'MAIL FROM' in smtp mode. Default value is "".</DL>
-<HR>
-
-<A NAME="$Subject"><!-- --></A><H3>
-$Subject</H3>
-<PRE>
-public string <B>$Subject</B></PRE>
-<DL>
-<DD>Sets the Subject of the message. Default value is "".</DL>
-<HR>
-
-<A NAME="$Body"><!-- --></A><H3>
-$Body</H3>
-<PRE>
-public string <B>$Body</B></PRE>
-<DL>
-<DD>Sets the Body of the message.  This can be either an HTML or text body.
- If HTML then run IsHTML(true). Default value is "".</DL>
-<HR>
-
-<A NAME="$AltBody"><!-- --></A><H3>
-$AltBody</H3>
-<PRE>
-public string <B>$AltBody</B></PRE>
-<DL>
-<DD>Sets the text-only body of the message.  This automatically sets the
- email to multipart/alternative.  This body can be read by mail
- clients that do not have HTML email capability such as mutt. Clients
- that can read HTML will view the normal Body.
- Default value is "".</DL>
-<HR>
-
-<A NAME="$WordWrap"><!-- --></A><H3>
-$WordWrap</H3>
-<PRE>
-public int <B>$WordWrap</B></PRE>
-<DL>
-<DD>Sets word wrapping on the body of the message to a given number of 
- characters. Default value is 0 (off).</DL>
-<HR>
-
-<A NAME="$Mailer"><!-- --></A><H3>
-$Mailer</H3>
-<PRE>
-public string <B>$Mailer</B></PRE>
-<DL>
-<DD>Method to send mail: ("mail", "sendmail", or "smtp").
- Default value is "mail".</DL>
-<HR>
-
-<A NAME="$Sendmail"><!-- --></A><H3>
-$Sendmail</H3>
-<PRE>
-public string <B>$Sendmail</B></PRE>
-<DL>
-<DD>Sets the path of the sendmail program. Default value is
- "/usr/sbin/sendmail".</DL>
-<HR>
-
-<A NAME="$UseMSMailHeaders"><!-- --></A><H3>
-$UseMSMailHeaders</H3>
-<PRE>
-public bool <B>$UseMSMailHeaders</B></PRE>
-<DL>
-<DD>Turns Microsoft mail client headers on and off.  Useful mostly
-  for older clients. Default value is false (off).</DL>
-<HR>
-
-<A NAME="$PluginDir"><!-- --></A><H3>
-$PluginDir</H3>
-<PRE>
-public string <B>$PluginDir</B></PRE>
-<DL>
-<DD>Path to phpmailer plugins.  This is now only useful if the SMTP class 
- is in a different directory than the PHP include path.  
- Default is empty ("").</DL>
-<HR>
-
-<A NAME="$Version"><!-- --></A><H3>
-$Version</H3>
-<PRE>
-public string <B>$Version</B></PRE>
-<DL>
-<DD>Holds phpmailer version.</DL>
-<HR>
-
-<A NAME="$ConfirmReadingTo"><!-- --></A><H3>
-$ConfirmReadingTo</H3>
-<PRE>
-public string <B>$ConfirmReadingTo</B></PRE>
-<DL>
-<DD>Sets the email address that a reading confirmation will be sent. Default value is "".</DL>
-<HR>
-
-<A NAME="$LE"><!-- --></A><H3>
-$LE</H3>
-<PRE>
-public string <B>$LE</B></PRE>
-<DL>
-<DD>Sets the line endings of the message.  Default is "\n";</DL>
-<HR>
-
-<A NAME="$Host"><!-- --></A><H3>
-$Host</H3>
-<PRE>
-public string <B>$Host</B></PRE>
-<DL>
-<DD>Sets the SMTP hosts.  All hosts must be separated by a
-  semicolon.  You can also specify a different port
-  for each host by using this format: [hostname:port]
-  (e.g. "smtp1.domain.com:25;smtp2.domain.com").
-  Hosts will be tried in order.
-  Default value is "localhost".</DL>
-<HR>
-
-<A NAME="$Port"><!-- --></A><H3>
-$Port</H3>
-<PRE>
-public int <B>$Port</B></PRE>
-<DL>
-<DD>Sets the default SMTP server port. Default value is 25.</DL>
-<HR>
-
-<A NAME="$Helo"><!-- --></A><H3>
-$Helo</H3>
-<PRE>
-public string <B>$Helo</B></PRE>
-<DL>
-<DD>Sets the SMTP HELO of the message.
-  Default value is "localhost.localdomain".</DL>
-<HR>
-
-<A NAME="$SMTPAuth"><!-- --></A><H3>
-$SMTPAuth</H3>
-<PRE>
-public bool <B>$SMTPAuth</B></PRE>
-<DL>
-<DD>Sets SMTP authentication. Utilizes the Username and Password variables.
-  Default value is false (off).</DL>
-<HR>
-
-<A NAME="$Username"><!-- --></A><H3>
-$Username</H3>
-<PRE>
-public string <B>$Username</B></PRE>
-<DL>
-<DD>Sets SMTP username. Default value is "".</DL>
-<HR>
-
-<A NAME="$Password"><!-- --></A><H3>
-$Password</H3>
-<PRE>
-public string <B>$Password</B></PRE>
-<DL>
-<DD>Sets SMTP password. Default value is "".</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="phpmailer()"><!-- --></A><H3>
-phpmailer</H3>
-<PRE>
-public <B>phpmailer</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="IsHTML(var)"><!-- --></A><H3>
-IsHTML</H3>
-<PRE>
-public void <B>IsHTML</B>(var&nbsp;$bool)</PRE>
-<DL>
-<DD>Sets message type to HTML.  Returns void.</DL>
-<HR>
-
-<A NAME="IsSMTP()"><!-- --></A><H3>
-IsSMTP</H3>
-<PRE>
-public void <B>IsSMTP</B>()</PRE>
-<DL>
-<DD>Sets Mailer to send message using SMTP.
- Returns void.</DL>
-<HR>
-
-<A NAME="IsMail()"><!-- --></A><H3>
-IsMail</H3>
-<PRE>
-public void <B>IsMail</B>()</PRE>
-<DL>
-<DD>Sets Mailer to send message using PHP mail() function.
- Returns void.</DL>
-<HR>
-
-<A NAME="IsSendmail()"><!-- --></A><H3>
-IsSendmail</H3>
-<PRE>
-public void <B>IsSendmail</B>()</PRE>
-<DL>
-<DD>Sets Mailer to send message using the $Sendmail program.
- Returns void.</DL>
-<HR>
-
-<A NAME="IsQmail()"><!-- --></A><H3>
-IsQmail</H3>
-<PRE>
-public void <B>IsQmail</B>()</PRE>
-<DL>
-<DD>Sets Mailer to send message using the qmail MTA.  Returns void.</DL>
-<HR>
-
-<A NAME="AddAddress(var, var)"><!-- --></A><H3>
-AddAddress</H3>
-<PRE>
-public void <B>AddAddress</B>(var&nbsp;$address,
-                       var&nbsp;$name)</PRE>
-<DL>
-<DD>Adds a "To" address.  Returns void.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$name</CODE> - <b>Default Value</b>: ""</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddCC(var, var)"><!-- --></A><H3>
-AddCC</H3>
-<PRE>
-public void <B>AddCC</B>(var&nbsp;$address,
-                  var&nbsp;$name)</PRE>
-<DL>
-<DD>Adds a "Cc" address. Note: this function works
- with the SMTP mailer on win32, not with the "mail"
- mailer.  This is a PHP bug that has been submitted
- on http:     * functions correctly. Returns void.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$name</CODE> - <b>Default Value</b>: ""</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddBCC(var, var)"><!-- --></A><H3>
-AddBCC</H3>
-<PRE>
-public void <B>AddBCC</B>(var&nbsp;$address,
-                   var&nbsp;$name)</PRE>
-<DL>
-<DD>Adds a "Bcc" address. Note: this function works
- with the SMTP mailer on win32, not with the "mail"
- mailer.  This is a PHP bug that has been submitted
- on http:     * functions correctly.
- Returns void.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$name</CODE> - <b>Default Value</b>: ""</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddReplyTo(var, var)"><!-- --></A><H3>
-AddReplyTo</H3>
-<PRE>
-public void <B>AddReplyTo</B>(var&nbsp;$address,
-                       var&nbsp;$name)</PRE>
-<DL>
-<DD>Adds a "Reply-to" address.  Returns void.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$name</CODE> - <b>Default Value</b>: ""</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="Send()"><!-- --></A><H3>
-Send</H3>
-<PRE>
-public bool <B>Send</B>()</PRE>
-<DL>
-<DD>Creates message and assigns Mailer. If the message is
- not sent successfully then it returns false.  Use the ErrorInfo
- variable to view description of the error.  Returns bool.</DL>
-<HR>
-
-<A NAME="SendToQueue(var, var)"><!-- --></A><H3>
-SendToQueue</H3>
-<PRE>
-public string <B>SendToQueue</B>(var&nbsp;$queue_path,
-                          var&nbsp;$send_time)</PRE>
-<DL>
-<DD>Sends mail message to an assigned queue directory.  Has an optional 
- sendTime argument.  This is used when the user wants the 
- message to be sent from the queue at a predetermined time. 
- The data must be a valid timestamp like that returned from 
- the time() or strtotime() functions.  Returns false on failure 
- or the message file name if success.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$send_time</CODE> - <b>Default Value</b>: 0</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddAttachment(var, var, var, var)"><!-- --></A><H3>
-AddAttachment</H3>
-<PRE>
-public bool <B>AddAttachment</B>(var&nbsp;$path,
-                          var&nbsp;$name,
-                          var&nbsp;$encoding,
-                          var&nbsp;$type)</PRE>
-<DL>
-<DD>Adds an attachment from a path on the filesystem.
- Checks if attachment is valid and then adds
- the attachment to the list.
- Returns false if the file could not be found
- or accessed.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$name</CODE> - <b>Default Value</b>: ""<DD><CODE>$encoding</CODE> - <b>Default Value</b>: "base64"<DD><CODE>$type</CODE> - <b>Default Value</b>: "application/octet-stream"</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddStringAttachment(var, var, var, var)"><!-- --></A><H3>
-AddStringAttachment</H3>
-<PRE>
-public void <B>AddStringAttachment</B>(var&nbsp;$string,
-                                var&nbsp;$filename,
-                                var&nbsp;$encoding,
-                                var&nbsp;$type)</PRE>
-<DL>
-<DD>Adds a string or binary attachment (non-filesystem) to the list.
- This method can be used to attach ascii or binary data,
- such as a BLOB record from a database.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>$encoding</CODE> - <b>Default Value</b>: "base64"<DD><CODE>$type</CODE> - <b>Default Value</b>: "application/octet-stream"</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="AddEmbeddedImage(var, var, var, var, var)"><!-- --></A><H3>
-AddEmbeddedImage</H3>
-<PRE>
-public bool <B>AddEmbeddedImage</B>(var&nbsp;$path,
-                             var&nbsp;$cid,
-                             var&nbsp;$name,
-                             var&nbsp;$encoding,
-                             var&nbsp;$type)</PRE>
-<DL>
-<DD>Adds an embedded attachment.  This can include images, sounds, and 
- just about any other document.<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>cid</CODE> - this is the Content Id of the attachment.  Use this to identify
-        the Id for accessing the image in an HTML form.<DD><CODE>$name</CODE> - <b>Default Value</b>: ""<DD><CODE>$encoding</CODE> - <b>Default Value</b>: "base64"<DD><CODE>$type</CODE> - <b>Default Value</b>: "application/octet-stream"</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="ClearAddresses()"><!-- --></A><H3>
-ClearAddresses</H3>
-<PRE>
-public void <B>ClearAddresses</B>()</PRE>
-<DL>
-<DD>Clears all recipients assigned in the TO array.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearCCs()"><!-- --></A><H3>
-ClearCCs</H3>
-<PRE>
-public void <B>ClearCCs</B>()</PRE>
-<DL>
-<DD>Clears all recipients assigned in the CC array.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearBCCs()"><!-- --></A><H3>
-ClearBCCs</H3>
-<PRE>
-public void <B>ClearBCCs</B>()</PRE>
-<DL>
-<DD>Clears all recipients assigned in the BCC array.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearReplyTos()"><!-- --></A><H3>
-ClearReplyTos</H3>
-<PRE>
-public void <B>ClearReplyTos</B>()</PRE>
-<DL>
-<DD>Clears all recipients assigned in the ReplyTo array.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearAllRecipients()"><!-- --></A><H3>
-ClearAllRecipients</H3>
-<PRE>
-public void <B>ClearAllRecipients</B>()</PRE>
-<DL>
-<DD>Clears all recipients assigned in the TO, CC and BCC
- array.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearAttachments()"><!-- --></A><H3>
-ClearAttachments</H3>
-<PRE>
-public void <B>ClearAttachments</B>()</PRE>
-<DL>
-<DD>Clears all previously set filesystem, string, and binary
- attachments.  Returns void.</DL>
-<HR>
-
-<A NAME="ClearCustomHeaders()"><!-- --></A><H3>
-ClearCustomHeaders</H3>
-<PRE>
-public void <B>ClearCustomHeaders</B>()</PRE>
-<DL>
-<DD>Clears all custom headers.  Returns void.</DL>
-<HR>
-
-<A NAME="AddCustomHeader(var)"><!-- --></A><H3>
-AddCustomHeader</H3>
-<PRE>
-public void <B>AddCustomHeader</B>(var&nbsp;$custom_header)</PRE>
-<DL>
-<DD>Adds a custom header.  Returns void.</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="Boundary.html"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="phpmailer.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY: &nbsp;INNER&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL: &nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/serialized-form.html b/lib/phpmailer/phpdoc/serialized-form.html
deleted file mode 100644
index b8b5b648d9..0000000000
--- a/lib/phpmailer/phpdoc/serialized-form.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN""http://www.w3.org/TR/REC-html40/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Tue Jun 05 13:47:44 EDT 2001 -->
-<TITLE>
-Serialized Form
-</TITLE>
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-</HEAD>
-<BODY BGCOLOR="white">
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_top"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-<CENTER>
-<H1>
-Serialized Form</H1>
-</CENTER>
-<HR>
-
-<!-- ========== START OF NAVBAR ========== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" TARGET="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="serialized-form.html" TARGET="_top"><B>NO FRAMES</B></A></FONT></TD>
-</TR>
-</TABLE>
-<!-- =========== END OF NAVBAR =========== -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/lib/phpmailer/phpdoc/stylesheet.css b/lib/phpmailer/phpdoc/stylesheet.css
deleted file mode 100644
index 07dc9eaf38..0000000000
--- a/lib/phpmailer/phpdoc/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults  */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: normal; font-family: normal }
-.FrameHeadingFont { font-size: normal; font-family: normal }
-.FrameItemFont    { font-size: normal; font-family: normal }
-
-/* Example of smaller, sans-serif font in frames */
-/* .FrameItemFont  { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;}/* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;}/* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/lib/phpmailer/test/phpmailer_test.php b/lib/phpmailer/test/phpmailer_test.php
deleted file mode 100644
index 545740cffb..0000000000
--- a/lib/phpmailer/test/phpmailer_test.php
+++ /dev/null
@@ -1,546 +0,0 @@
-<?php
-/*******************
-  Unit Test
-  Type: phpmailer class
-********************/
-
-$INCLUDE_DIR = "";
-
-require("phpunit.php");
-require($INCLUDE_DIR . "class.phpmailer.php");
-error_reporting(E_ALL);
-
-/**
- * Performs authentication tests
- */
-class phpmailerTest extends TestCase
-{
-    /**
-     * Holds the default phpmailer instance.
-     * @private
-     * @type object
-     */
-    var $Mail = false;
-
-    /**
-     * Holds the SMTP mail host.
-     * @public
-     * @type string
-     */
-    var $Host = "";
-    
-    /**
-     * Holds the change log.
-     * @private
-     * @type string array
-     */
-    var $ChangeLog = array();
-    
-     /**
-     * Holds the note log.
-     * @private
-     * @type string array
-     */
-    var $NoteLog = array();   
-
-    /**
-     * Class constuctor.
-     */
-    function phpmailerTest($name) {
-        /* must define this constructor */
-        $this->TestCase( $name );
-    }
-    
-    /**
-     * Run before each test is started.
-     */
-    function setUp() {
-        global $global_vars;
-        global $INCLUDE_DIR;
-
-        $this->Mail = new phpmailer();
-
-        $this->Mail->Priority = 3;
-        $this->Mail->Encoding = "8bit";
-        $this->Mail->CharSet = "iso-8859-1";
-        $this->Mail->From = "unit_test@phpmailer.sf.net";
-        $this->Mail->FromName = "Unit Tester";
-        $this->Mail->Sender = "";
-        $this->Mail->Subject = "Unit Test";
-        $this->Mail->Body = "";
-        $this->Mail->AltBody = "";
-        $this->Mail->WordWrap = 0;
-        $this->Mail->Host = $global_vars["mail_host"];
-        $this->Mail->Port = 25;
-        $this->Mail->Helo = "localhost.localdomain";
-        $this->Mail->SMTPAuth = false;
-        $this->Mail->Username = "";
-        $this->Mail->Password = "";
-        $this->Mail->PluginDir = $INCLUDE_DIR;
-		$this->Mail->AddReplyTo("no_reply@phpmailer.sf.net", "Reply Guy");
-
-        if(strlen($this->Mail->Host) > 0)
-            $this->Mail->Mailer = "smtp";
-        else
-        {
-            $this->Mail->Mailer = "mail";
-            $this->Sender = "unit_test@phpmailer.sf.net";
-        }
-        
-        global $global_vars;
-        $this->SetAddress($global_vars["mail_to"]);
-        
-        // This is where you might place additional To, Bcc, etc addresses
-    }     
-
-    /**
-     * Run after each test is completed.
-     */
-    function tearDown() {
-        // Clean global variables
-        $this->Mail = false;
-        $this->ChangeLog = array();
-        $this->NoteLog = array();
-    }
-
-
-    /**
-     * Build the body of the message in the appropriate format.
-     * @private
-     * @returns void
-     */
-    function BuildBody() {
-        $this->CheckChanges();
-        
-        // Determine line endings for message        
-        if($this->Mail->ContentType == "text/html" || strlen($this->Mail->AltBody) > 0)
-        {
-            $eol = "<br/>";
-            $bullet = "<li>";
-            $bullet_start = "<ul>";
-            $bullet_end = "</ul>";
-        }
-        else
-        {
-            $eol = "\n";
-            $bullet = " - ";
-            $bullet_start = "";
-            $bullet_end = "";
-        }
-        
-        $ReportBody = "";
-        
-        $ReportBody .= "---------------------" . $eol;
-        $ReportBody .= "Unit Test Information" . $eol;
-        $ReportBody .= "---------------------" . $eol;
-        $ReportBody .= "phpmailer version: " . $this->Mail->Version . $eol;
-        $ReportBody .= "Content Type: " . $this->Mail->ContentType . $eol;
-        
-        if(strlen($this->Mail->Host) > 0)
-            $ReportBody .= "Host: " . $this->Mail->Host . $eol;
-        
-        // If attachments then create an attachment list
-        if(count($this->Mail->attachment) > 0)
-        {
-            $ReportBody .= "Attachments";
-            $ReportBody .= $bullet_start;
-            for($i = 0; $i < count($this->Mail->attachment); $i++)
-            {
-                $ReportBody .= $bullet . "Name: " . $this->Mail->attachment[$i][1] . ", ";
-                $ReportBody .= "Encoding: " . $this->Mail->attachment[$i][3] . ", ";
-                $ReportBody .= "Type: " . $this->Mail->attachment[$i][4] . $eol;
-            }
-            $ReportBody .= $bullet_end . $eol;
-        }
-        
-        // If there are changes then list them
-        if(count($this->ChangeLog) > 0)
-        {
-            $ReportBody .= "Changes" . $eol;
-            $ReportBody .= "-------" . $eol;
-
-            $ReportBody .= $bullet_start;
-            for($i = 0; $i < count($this->ChangeLog); $i++)
-            {
-                $ReportBody .= $bullet . $this->ChangeLog[$i][0] . " was changed to [" . 
-                               $this->ChangeLog[$i][1] . "]" . $eol;
-            }
-            $ReportBody .= $bullet_end . $eol . $eol;
-        }
-        
-        // If there are notes then list them
-        if(count($this->NoteLog) > 0)
-        {
-            $ReportBody .= "Notes" . $eol;
-            $ReportBody .= "-----" . $eol;
-
-            $ReportBody .= $bullet_start;
-            for($i = 0; $i < count($this->NoteLog); $i++)
-            {
-                $ReportBody .= $bullet . $this->NoteLog[$i] . $eol;
-            }
-            $ReportBody .= $bullet_end;
-        }
-        
-        // Re-attach the original body
-        $this->Mail->Body .= $eol . $eol . $ReportBody;
-    }
-    
-    /**
-     * Check which default settings have been changed for the report.
-     * @private
-     * @returns void
-     */
-    function CheckChanges() {
-        if($this->Mail->Priority != 3)
-            $this->AddChange("Priority", $this->Mail->Priority);
-        if($this->Mail->Encoding != "8bit")
-            $this->AddChange("Encoding", $this->Mail->Encoding);
-        if($this->Mail->CharSet != "iso-8859-1")
-            $this->AddChange("CharSet", $this->Mail->CharSet);
-        if($this->Mail->Sender != "")
-            $this->AddChange("Sender", $this->Mail->Sender);
-        if($this->Mail->WordWrap != 0)
-            $this->AddChange("WordWrap", $this->Mail->WordWrap);
-        if($this->Mail->Mailer != "mail")
-            $this->AddChange("Mailer", $this->Mail->Mailer);
-        if($this->Mail->Port != 25)
-            $this->AddChange("Port", $this->Mail->Port);
-        if($this->Mail->Helo != "localhost.localdomain")
-            $this->AddChange("Helo", $this->Mail->Helo);
-        if($this->Mail->SMTPAuth)
-            $this->AddChange("SMTPAuth", "true");
-    }
-    
-    /**
-     * Adds a change entry.
-     * @private
-     * @returns void
-     */
-    function AddChange($sName, $sNewValue) {
-        $cur = count($this->ChangeLog);
-        $this->ChangeLog[$cur][0] = $sName;
-        $this->ChangeLog[$cur][1] = $sNewValue;
-    }
-    
-    /**
-     * Adds a simple note to the message.
-     * @public
-     * @returns void
-     */
-    function AddNote($sValue) {
-        $this->NoteLog[] = $sValue;
-    }
-
-    /**
-     * Adds all of the addresses
-     * @public
-     * @returns void
-     */
-    function SetAddress($sAddress, $sName = "", $sType = "to") {
-        switch($sType)
-        {
-            case "to":
-                $this->Mail->AddAddress($sAddress, $sName);
-                break;
-            case "cc":
-                $this->Mail->AddCC($sAddress, $sName);
-                break;
-            case "bcc":
-                $this->Mail->AddBCC($sAddress, $sName);
-                break;
-        }
-    }
-
-    /////////////////////////////////////////////////
-    // UNIT TESTS
-    /////////////////////////////////////////////////
-
-    /**
-     * Try a plain message.
-     */
-    function test_WordWrap() {
-
-        $this->Mail->WordWrap = 40;
-        $my_body = "Here is the main body of this message.  It should " .
-                   "be quite a few lines.  It should be wrapped at the " .
-                   "40 characters.  Make sure that it is.";
-        $nBodyLen = strlen($my_body);
-        $my_body .= "\n\nThis is the above body length: " . $nBodyLen;
-
-        $this->Mail->Body = $my_body;
-        $this->Mail->Subject .= ": Wordwrap";
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Try a plain message.
-     */
-    function test_Low_Priority() {
-    
-        $this->Mail->Priority = 5;
-        $this->Mail->Body = "Here is the main body.  There should be " .
-                            "a reply to address in this message.";
-        $this->Mail->Subject .= ": Low Priority";
-        $this->Mail->AddReplyTo("nobody@nobody.com", "Nobody (Unit Test)");
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Simple plain file attachment test.
-     */
-    function test_Plain_FileAttachment() {
-
-        $this->Mail->Body = "Here is the text body";
-        $this->Mail->Subject .= ": Plain and FileAttachment";
-        
-        if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Simple plain string attachment test.
-     */
-    function test_Plain_StringAttachment() {
-
-        $this->Mail->Body = "Here is the text body";
-        $this->Mail->Subject .= ": Plain and StringAttachment";
-        
-        $sAttachment = "These characters are the content of the " .
-                       "string attachment.\nThis might be taken from a ".
-                       "database or some other such thing. ";
-        
-        $this->Mail->AddStringAttachment($sAttachment, "string_attach.txt");
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Plain quoted-printable message.
-     */
-    function test_Quoted_Printable() {
-
-        $this->Mail->Body = "Here is the main body";
-        $this->Mail->Subject .= ": Plain and Quoted-printable";
-        $this->Mail->Encoding = "quoted-printable";
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Try a plain message.
-     */
-    function test_Html() {
-    
-        $this->Mail->IsHTML(true);
-        $this->Mail->Subject .= ": HTML only";
-        
-        $this->Mail->Body = "This is a <b>test message</b> written in HTML. </br>" .
-                            "Go to <a href=\"http://phpmailer.sourceforge.net/\">" .
-                            "http://phpmailer.sourceforge.net/</a> for new versions of " .
-                            "phpmailer.  <p/> Thank you!";
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Simple HTML and attachment test
-     */
-    function test_HTML_Attachment() {
-
-        $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
-        $this->Mail->Subject .= ": HTML and Attachment";
-        $this->Mail->IsHTML(true);
-        
-        if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * An embedded attachment test.
-     */
-    function test_Embedded_Image() {
-
-        $this->Mail->Body = "Embedded Image: <img alt=\"phpmailer\" src=\"cid:my-attach\">" .
-                     "Here is an image!</a>";
-        $this->Mail->Subject .= ": Embedded Image";
-        $this->Mail->IsHTML(true);
-        
-        if(!$this->Mail->AddEmbeddedImage("rocks.png", "my-attach", "rocks.png"))
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-        
-        if($this->Mail->EmbeddedImageCount() < 0)
-        {
-            $this->assert(false, "Embedded image count below 1");
-            return;
-        }
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Simple multipart/alternative test.
-     */
-    function test_AltBody() {
-
-        $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
-        $this->Mail->AltBody = "This is the text part of the email.";
-        $this->AddNote("This is a mulipart alternative email");
-        $this->Mail->Subject .= ": AltBody";
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }
-
-    /**
-     * Simple HTML and attachment test
-     */
-    function test_AltBody_Attachment() {
-
-        $this->Mail->Body = "This is the <b>HTML</b> part of the email.";
-        $this->Mail->AltBody = "This is the text part of the email.";
-        $this->Mail->Subject .= ": AltBody and Attachment";
-        $this->Mail->IsHTML(true);
-        
-        if(!$this->Mail->AddAttachment("phpmailer_test.php", "test_attach.txt"))
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-
-        $this->BuildBody();
-        if(!$this->Mail->Send())
-        {
-            $this->assert(false, $this->Mail->ErrorInfo);
-            return;
-        }
-    
-        $this->assert(true);
-    }    
-    
-}  
- 
-/**
- * Create and run test instance.
- */
- 
-if(isset($HTTP_GET_VARS))
-    $global_vars = $HTTP_GET_VARS;
-else
-    $global_vars = $_REQUEST;
-
-if(isset($global_vars["submitted"]))
-{
-    echo "Test results:<br>";
-    $suite = new TestSuite( "phpmailerTest" );
-    
-    $testRunner = new TestRunner;
-    $testRunner->run($suite);
-    echo "<hr noshade/>";
-}
-
-function get($sName) {
-    global $global_vars;
-    if(isset($global_vars[$sName]))
-        return $global_vars[$sName];
-    else
-        return "";
-}
-
-?>
-
-<html>
-<body>
-<h3>phpmailer Unit Test</h3>
-By entering a SMTP hostname it will automatically perform tests with SMTP.
-
-<form name="phpmailer_unit" action="phpmailer_test.php" method="get">
-<input type="hidden" name="submitted" value="1"/>
-To Address: <input type="text" size="50" name="mail_to" value="<?php echo get("mail_to"); ?>"/>
-<br/>
-Bcc Address: <input type="text" size="50" name="mail_bcc" value="<?php echo get("mail_bcc"); ?>"/>
-<br/>
-SMTP Hostname: <input type="text" size="50" name="mail_host" value="<?php echo get("mail_host"); ?>"/>
-<p/>
-<input type="submit" value="Run Test"/>
-
-</form>
-</body>
-</html>
diff --git a/lib/phpmailer/test/phpunit.php b/lib/phpmailer/test/phpunit.php
deleted file mode 100644
index 1ce4cb9ed5..0000000000
--- a/lib/phpmailer/test/phpunit.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-//
-// PHP framework for testing, based on the design of "JUnit".
-//
-// Written by Fred Yankowski <fred@ontosys.com>
-//            OntoSys, Inc  <http://www.OntoSys.com>
-//
-// $Id$
-
-// Copyright (c) 2000 Fred Yankowski
-
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use, copy,
-// modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE |
-		E_CORE_ERROR | E_CORE_WARNING);
-
-/*
-interface Test {
-  function run(&$aTestResult);
-  function countTestCases();
-}
-*/
-
-function trace($msg) {
-  return;
-  print($msg);
-  flush();
-}
-
-
-class Exception {
-    /* Emulate a Java exception, sort of... */
-  var $message;
-  function Exception($message) {
-    $this->message = $message;
-  }
-  function getMessage() {
-    return $this->message;
-  }
-}
-
-class Assert {
-  function assert($boolean, $message=0) {
-    if (! $boolean)
-      $this->fail($message);
-  }
-
-  function assertEquals($expected, $actual, $message=0) {
-    if ($expected != $actual) {
-      $this->failNotEquals($expected, $actual, "expected", $message);
-    }
-  }
-
-  function assertRegexp($regexp, $actual, $message=false) {
-    if (! preg_match($regexp, $actual)) {
-      $this->failNotEquals($regexp, $actual, "pattern", $message);
-    }
-  }
-
-  function failNotEquals($expected, $actual, $expected_label, $message=0) {
-    // Private function for reporting failure to match.
-    $str = $message ? ($message . ' ') : '';
-    $str .= "($expected_label/actual)<br>";
-    $htmlExpected = htmlspecialchars($expected);
-    $htmlActual = htmlspecialchars($actual);
-    $str .= sprintf("<pre>%s\n--------\n%s</pre>",
-		    $htmlExpected, $htmlActual);
-    $this->fail($str);
-  }
-}
-
-class TestCase extends Assert /* implements Test */ {
-  /* Defines context for running tests.  Specific context -- such as
-     instance variables, global variables, global state -- is defined
-     by creating a subclass that specializes the setUp() and
-     tearDown() methods.  A specific test is defined by a subclass
-     that specializes the runTest() method. */
-  var $fName;
-  var $fResult;
-  var $fExceptions = array();
-
-  function TestCase($name) {
-    $this->fName = $name;
-  }
-
-  function run($testResult=0) {
-    /* Run this single test, by calling the run() method of the
-       TestResult object which will in turn call the runBare() method
-       of this object.  That complication allows the TestResult object
-       to do various kinds of progress reporting as it invokes each
-       test.  Create/obtain a TestResult object if none was passed in.
-       Note that if a TestResult object was passed in, it must be by
-       reference. */
-    if (! $testResult)
-      $testResult = $this->_createResult();
-    $this->fResult = $testResult;
-    $testResult->run(&$this);
-    $this->fResult = 0;
-    return $testResult;
-  }
-
-  function countTestCases() {
-    return 1;
-  }
-
-  function runTest() {
-    $name = $this->name();
-    // Since isset($this->$name) is false, no way to run defensive checks
-    $this->$name();
-  }
-
-  function setUp() /* expect override */ {
-    //print("TestCase::setUp()<br>\n");
-  }
-
-  function tearDown() /* possible override */ {
-    //print("TestCase::tearDown()<br>\n");
-  }
-
-  ////////////////////////////////////////////////////////////////
-
-
-  function _createResult() /* protected */ {
-    /* override this to use specialized subclass of TestResult */
-    return new TestResult;
-  }
-
-  function fail($message=0) {
-    //printf("TestCase::fail(%s)<br>\n", ($message) ? $message : '');
-    /* JUnit throws AssertionFailedError here.  We just record the
-       failure and carry on */
-    $this->fExceptions[] = new Exception(&$message);
-  }
-
-  function error($message) {
-    /* report error that requires correction in the test script
-       itself, or (heaven forbid) in this testing infrastructure */
-    printf('<b>ERROR: ' . $message . '</b><br>');
-    $this->fResult->stop();
-  }
-
-  function failed() {
-    return count($this->fExceptions);
-  }
-
-  function getExceptions() {
-    return $this->fExceptions;
-  }
-
-  function name() {
-    return $this->fName;
-  }
-
-  function runBare() {
-    $this->setup();
-    $this->runTest();
-    $this->tearDown();
-  }
-}
-
-
-class TestSuite /* implements Test */ {
-  /* Compose a set of Tests (instances of TestCase or TestSuite), and
-     run them all. */
-  var $fTests = array();
-
-  function TestSuite($classname=false) {
-    if ($classname) {
-      // Find all methods of the given class whose name starts with
-      // "test" and add them to the test suite.  We are just _barely_
-      // able to do this with PHP's limited introspection...  Note
-      // that PHP seems to store method names in lower case, and we
-      // have to avoid the constructor function for the TestCase class
-      // superclass.  This will fail when $classname starts with
-      // "Test" since that will have a constructor method that will
-      // get matched below and then treated (incorrectly) as a test
-      // method.  So don't name any TestCase subclasses as "Test..."!
-      if (floor(phpversion()) >= 4) {
-	// PHP4 introspection, submitted by Dylan Kuhn
-	$names = get_class_methods($classname);
-	while (list($key, $method) = each($names)) {
-	  if (preg_match('/^test/', $method) && $method != "testcase") {  
-	    $this->addTest(new $classname($method));
-	  }
-	}
-      }
-      else {
-	$dummy = new $classname("dummy");
-	$names = (array) $dummy;
-	while (list($key, $value) = each($names)) {
-	  $type = gettype($value);
-	  if ($type == "user function" && preg_match('/^test/', $key)
-	  && $key != "testcase") {  
-	    $this->addTest(new $classname($key));
-	  }
-	}
-      }
-    }
-  }
-
-  function addTest($test) {
-    /* Add TestCase or TestSuite to this TestSuite */
-    $this->fTests[] = $test;
-  }
-
-  function run(&$testResult) {
-    /* Run all TestCases and TestSuites comprising this TestSuite,
-       accumulating results in the given TestResult object. */
-    reset($this->fTests);
-    while (list($na, $test) = each($this->fTests)) {
-      if ($testResult->shouldStop())
-	break;
-      $test->run(&$testResult);
-    }
-  }
-
-  function countTestCases() {
-    /* Number of TestCases comprising this TestSuite (including those
-       in any constituent TestSuites) */
-    $count = 0;
-    reset($fTests);
-    while (list($na, $test_case) = each($this->fTests)) {
-      $count += $test_case->countTestCases();
-    }
-    return $count;
-  }
-}
-
-
-class TestFailure {
-  /* Record failure of a single TestCase, associating it with the
-     exception(s) that occurred */
-  var $fFailedTestName;
-  var $fExceptions;
-
-  function TestFailure(&$test, &$exceptions) {
-    $this->fFailedTestName = $test->name();
-    $this->fExceptions = $exceptions;
-  }
-
-  function getExceptions() {
-      return $this->fExceptions;
-  }
-  function getTestName() {
-    return $this->fFailedTestName;
-  }
-}
-
-
-class TestResult {
-  /* Collect the results of running a set of TestCases. */
-  var $fFailures = array();
-  var $fRunTests = 0;
-  var $fStop = false;
-
-  function TestResult() { }
-
-  function _endTest($test) /* protected */ {
-      /* specialize this for end-of-test action, such as progress
-	 reports  */
-  }
-
-  function getFailures() {
-    return $this->fFailures;
-  }
-
-  function run($test) {
-    /* Run a single TestCase in the context of this TestResult */
-    $this->_startTest($test);
-    $this->fRunTests++;
-
-    $test->runBare();
-
-    /* this is where JUnit would catch AssertionFailedError */
-    $exceptions = $test->getExceptions();
-    if ($exceptions)
-      $this->fFailures[] = new TestFailure(&$test, &$exceptions);
-    $this->_endTest($test);
-  }
-
-  function countTests() {
-    return $this->fRunTests;
-  }
-
-  function shouldStop() {
-    return $this->fStop;
-  }
-
-  function _startTest($test) /* protected */ {
-      /* specialize this for start-of-test actions */
-  }
-
-  function stop() {
-    /* set indication that the test sequence should halt */
-    $fStop = true;
-  }
-
-  function countFailures() {
-    return count($this->fFailures);
-  }
-}
-
-
-class TextTestResult extends TestResult {
-  /* Specialize TestResult to produce text/html report */
-  function TextTestResult() {
-    $this->TestResult();  // call superclass constructor
-  }
-  
-  function report() {
-    /* report result of test run */
-    $nRun = $this->countTests();
-    $nFailures = $this->countFailures();
-    printf("<p>%s test%s run<br>", $nRun, ($nRun == 1) ? '' : 's');
-    printf("%s failure%s.<br>\n", $nFailures, ($nFailures == 1) ? '' : 's');
-    if ($nFailures == 0)
-      return;
-
-    print("<ol>\n");
-    $failures = $this->getFailures();
-    while (list($i, $failure) = each($failures)) {
-      $failedTestName = $failure->getTestName();
-      printf("<li>%s\n", $failedTestName);
-
-      $exceptions = $failure->getExceptions();
-      print("<ul>");
-      while (list($na, $exception) = each($exceptions))
-	printf("<li>%s\n", $exception->getMessage());
-      print("</ul>");
-    }
-    print("</ol>\n");
-  }
-
-  function _startTest($test) {
-    printf("%s ", $test->name());
-    flush();
-  }
-
-  function _endTest($test) {
-    $outcome = $test->failed()
-       ? "<font color=\"red\">FAIL</font>"
-       : "<font color=\"green\">ok</font>";
-    printf("$outcome<br>\n");
-    flush();
-  }
-}
-
-
-class TestRunner {
-  /* Run a suite of tests and report results. */
-  function run($suite) {
-    $result = new TextTestResult;
-    $suite->run($result);
-    $result->report();
-  }
-}
-
-?>
diff --git a/lib/phpmailer/test/rocks.png b/lib/phpmailer/test/rocks.png
deleted file mode 100644
index 02de5a7aa3507dcec1e4349520ba3e8d8f7da4d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1280
zcmeAS@N?(olHy`uVBq!ia0vp^tw5~K!2~4N<;e5_DVB6cUq=Rpjs4tz5?O(Kwj^(N
z7lt)J7K6`}lP`c2XMsm#F#`j)5C}6~x?A@LD9B#o>FdgViCLDPN5AUi^*W$IwVp1H
zAr*7p&f1@M+e+k^|GQka$^gd77pzXAva3|tw#@qU#D{GY+ZFCDwG1cEE579X#FX@$
z>FgwH&r=2B{84unZkVCiZ2N-g>I8;;hdm>XmCd=c^yvZlCI_MawKnqnCmAdw)?ZJ!
z(AIo@e{`ec)BgLq2R?8-ZjY0&|8nTZLh)n#dkyMdw0?Bf?~$)c{BwaDo7B9IhZmN_
zh%E0uYH;3Pyt^=vfg$lt&fag6k0_-)7M*|G)$q*c&0lYID|HLld!D<NeQ3t5&%yG4
zRc=bu#)$AOwf-IWl=pK@j7W>2e%F$=%SRuTY%I{2>Z{`vAZ>PV)}|}nN;w+U!QCIM
z%dF3Q&h>n}=zwN&#1b}<hC|=j|6Kj|C^WRxsl+L!b)oBt%*z7DSe_qlS7Hc=|M)X{
z8t1w2z$eRJ+MEsxWo3B3*rVW|@f62~+^Y`@k~Y5#k(HHylE1Z6i~sFGuDV%^+I~wM
zH4I~D@axDv$C>;ib(x>mdBz9tFM3#&2Z?-_RqK4ZYm+e055CrlA)a-UVp<is$~0u3
z{S?3cwnd@mYfO1)sGmTI?`Hc4|C9G0npkIZeQ{JgpS}O(I)M|VuUs#FO;%@UFfcoB
zbh^}h(zB;uni-h49Q+p1Ut)H4laAre^ujf-_Lnya==Yg-J<D8G_DKDt&1nM{h6}~9
zSC|=^icNAtr=5=d6f*B5KWE~Zg<rIIp0?a~zj#r&@$gPr!?K?nu7!ne)$z9Xefnzh
zB~|yH*w%%@EYdT-=+t@@W->FR%v^PFVTssrYu_S`qZP4zZaccRhpt_9sylhjwpf+<
z?Unnqytf|Oq_caO<g=dw36axgthpV0@7dBikIAY<&I}BnDx!}}-5OXgc3eI6Wk6SD
z!{jLuEeR~Umnrr{w(N1S-LyvQj%VF2rVE^fM<V72?fjj4f%Bp3Mef5bT=Q2|p8aWX
zzVO<n&-(fIAGv&ZAjr;cKP#<%*`f7&;!lb+#-0SK+^%ytEB10l;Fp~Cikwwv9!31^
zu<ps4<fVQj$Li}N3FG9*X&TOJ9|u_Z2OqRtH);74j&th|3HVpsys$8&!0x=!SBoQo
z-#&Q1-@V!59s9vQiQa)5W5k2G>TOat-{V}jySM+ZLcry9!jFnfUInkZcQYhKM%L?N
z&;!?rRVNa)m=6Fgxg2tDuEA9ET|#r_i?D{h*tzce28%w4!-tRgPZEBrw|%nx;k`%s
zmfAYKyY+2b?$bqXn&r8-ISa3Ed-Xbga%WV_rQePT^77kD|K`Wu-}?6KQP#RWxwn}c
zwyiVVWYOa4alSPF_O^E6V7L1351I46v}`n=eDeF}VulLinF~}7&9IfYQ}efLn#`@T
z=<5}~4|Vgtn(q9aBQi8J`g;4eTz<CP*vG$Ad-neRG0|Y#s#W!NwTB|Nl>Ytu=Z+lD
zh7)#nVsqqgZL{jmKBw#CAyMYrd^hQ7_PL8!4qsoNfBW0BM@jw%&i;>o+4}Q$48E+4
clFJ|2pD+7py<ELJ5>#+`y85}Sb4q9e08zkVlmGw#

-- 
2.39.5