Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13229] XoopsCore/branches/2.5.x/2.5.7.3
|
From: <rgr...@us...> - 2017-01-01 01:51:09
|
Revision: 13229
http://sourceforge.net/p/xoops/svn/13229
Author: rgriffith
Date: 2017-01-01 01:51:06 +0000 (Sun, 01 Jan 2017)
Log Message:
-----------
Cumulative update
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7.3/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/index.html
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/LICENSE
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmailer.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.pop3.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.smtp.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/index.html
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/index.html
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/xoopsmultimailer.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/image.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/include/version.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/PHPMailerAutoload.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/VERSION
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmaileroauth.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmaileroauthgoogle.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/get_oauth_token.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-am.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ar.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-az.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-be.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-bg.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ca.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ch.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-cs.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-da.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-de.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-el.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-eo.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-es.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-et.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-fa.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-fi.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-fo.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-fr.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-gl.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-he.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-hr.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-hu.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-id.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-it.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ja.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ka.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ko.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-lt.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-lv.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ms.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-nb.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-pl.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-pt.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-pt_br.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ro.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-ru.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-sk.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-sl.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-sr.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-sv.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-tr.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-uk.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-vi.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-zh.php
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-zh_cn.php
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/ChangeLog.txt
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/README
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/docs.ini
XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/language/phpmailer.lang-en.php
Modified: XoopsCore/branches/2.5.x/2.5.7.3/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/docs/changelog.250.txt 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/docs/changelog.250.txt 2017-01-01 01:51:06 UTC (rev 13229)
@@ -1,6 +1,15 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
=================================
+2016/12/31: Version 2.5.7.3 Final
+=================================
+
+This patch for XOOPS 2.5.7 corrects security issues including the PHPMailer vulnerabilities.
+
+All XOOPS 2.5.7.2 users are advised to apply this patch as soon as possible. Any users that are running an older XOOPS version are advised to update to XOOPS 2.5.7.3 now.
+
+
+=================================
2016/02/02: Version 2.5.7.2 Final
=================================
Modified: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/index.html 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/index.html 2017-01-01 01:51:06 UTC (rev 13229)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Deleted: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/ChangeLog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/ChangeLog.txt 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/ChangeLog.txt 2017-01-01 01:51:06 UTC (rev 13229)
@@ -1,421 +0,0 @@
-ChangeLog
-
-NOTE: THIS VERSION OF PHPMAILER IS DESIGNED FOR PHP5/PHP6.
- IT WILL NOT WORK WITH PHP4.
-
-Version 5.2.1 (January 16, 2012)
-* Closed several bugs
-* Performance improvements
-* MsgHTML() now returns the message as required.
-* New method: GetSentMIMEMessage() (returns full copy of sent message)
-
-Version 5.2 (July 19, 2011)
-* protected MIME body and header
-* better DKIM DNS Resource Record support
-* better aly handling
-* htmlfilter class added to extras
-* moved to Apache Extras
-
-Version 5.1 (October 20, 2009)
-* fixed filename issue with AddStringAttachment (thanks to Tony)
-* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in
- addition to PHP mail()
-* added DKIM digital signing functionality
- New properties:
- - DKIM_domain (sets the domain name)
- - DKIM_private (holds DKIM private key)
- - DKIM_passphrase (holds your DKIM passphrase)
- - DKIM_selector (holds the DKIM "selector")
- - DKIM_identity (holds the identifying email address)
-* added callback function support
- - callback function parameters include:
- result, to, cc, bcc, subject and body
- * see the test/test_callback.php file for usage.
-* added "auto" identity functionality
- - can automatically add:
- - Return-path (if Sender not set)
- - Reply-To (if ReplyTo not set)
- - can be disabled:
- - $mail->SetFrom('you...@yo...','First Last',false);
- - or by adding the $mail->Sender and/or $mail->ReplyTo properties
- Note: "auto" identity added to help with emails ending up in spam
- or junk boxes because of missing headers
-
-Version 5.0.2 (May 24, 2009)
-* Fix for missing attachments when inline graphics are present
-* Fix for missing Cc in header when using SMTP (mail was sent,
- but not displayed in header -- Cc receiver only saw email To:
- line and no Cc line, but did get the email (To receiver
- saw same)
-
-Version 5.0.1 (April 05, 2009)
-* Temporary fix for missing attachments
-
-Version 5.0.0 (April 02, 2009)
-
-* With the release of this version, we are initiating a new version numbering
- system to differentiate from the PHP4 version of PHPMailer.
-* Most notable in this release is fully object oriented code.
-class.smtp.php:
-* Refactored class.smtp.php to support new exception handling
- code size reduced from 29.2 Kb to 25.6 Kb
-* Removed unnecessary functions from class.smtp.php:
- public function Expand($name) {
- public function Help($keyword="") {
- public function Noop() {
- public function Send($from) {
- public function SendOrMail($from) {
- public function Verify($name) {
-class.phpmailer.php:
-* Refactored class.phpmailer.php with new exception handling
-* Changed processing functionality of Sendmail and Qmail so they cannot be
- inadvertently used
-* removed getFile() function, just became a simple wrapper for
- file_get_contents()
-* added check for PHP version (will gracefully exit if not at least PHP 5.0)
-class.phpmailer.php enhancements
-* enhanced code to check if an attachment source is the same as an embedded or
- inline graphic source to eliminate duplicate attachments
-New /test_script
-* We have written a test script you can use to test the script as part of your
- installation. Once you press submit, the test script will send a multi-mime
- email with either the message you type in or an HTML email with an inline
- graphic. Two attachments are included in the email (one of the attachments
- is also the inline graphic so you can see that only one copy of the graphic
- is sent in the email). The test script will also display the functional
- script that you can copy/paste to your editor to duplicate the functionality.
-New examples
-* All new examples in both basic and advanced modes. Advanced examples show
- Exception handling.
-PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0
-* all new documentation
-
-Please note: the website has been updated to reflect the changes in PHPMailer
-version 5.0.0. http://phpmailer.codeworxtech.com/
-
-Version 2.3 (November 06, 2008)
-
-* added Arabic language (many thanks to Bahjat Al Mostafa)
-* removed English language from language files and made it a default within
- class.phpmailer.php - if no language is found, it will default to use
- the english language translation
-* fixed public/private declarations
-* corrected line 1728, $basedir to $directory
-* added $sign_cert_file to avoid improper duplicate use of $sign_key_file
-* corrected $this->Hello on line 612 to $this->Helo
-* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user
- if default is not acceptable
-* removed trim() from return results in EncodeQP
-* /test and three files it contained are removed from version 2.3
-* fixed phpunit.php for compliance with PHP5
-* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg);
-* We have removed the /phpdoc from the downloads. All documentation is now on
- the http://phpmailer.codeworxtech.com website.
-
-Version 2.2.1 () July 19 2008
-
-* fixed line 1092 in class.smtp.php (my apologies, error on my part)
-
-Version 2.2 () July 15 2008
-
-* Fixed redirect issue (display of UTF-8 in thank you redirect)
-* fixed error in getResponse function declaration (class.pop3.php)
-* PHPMailer now PHP6 compliant
-* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
-
-Version 2.1 (Wed, June 04 2008)
-
-** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
- IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
- APPRECIATED.
-
-* added S/MIME functionality (ability to digitally sign emails)
- BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
- The "Signed Emails" functionality adds the Sign method to pass the private key
- filename and the password to read it, and then email will be sent with
- content-type multipart/signed and with the digital signature attached.
-* fully compatible with E_STRICT error level
- - Please note:
- In about half the test environments this development version was subjected
- to, an error was thrown for the date() functions used (line 1565 and 1569).
- This is NOT a PHPMailer error, it is the result of an incorrectly configured
- PHP5 installation. The fix is to modify your 'php.ini' file and include the
- date.timezone = America/New York
- directive, to your own server timezone
- - If you do get this error, and are unable to access your php.ini file:
- In your PHP script, add
- date_default_timezone_set('America/Toronto');
- - do not try to use
- $myVar = date_default_timezone_get();
- as a test, it will throw an error.
-* added ability to define path (mainly for embedded images)
- function MsgHTML($message,$basedir='') ... where:
- $basedir is the fully qualified path
-* fixed MsgHTML() function:
- - Embedded Images where images are specified by <protocol>:// will not be altered or embedded
-* fixed the return value of SMTP exit code ( pclose )
-* addressed issue of multibyte characters in subject line and truncating
-* added ability to have user specified Message ID
- (default is still that PHPMailer create a unique Message ID)
-* corrected unidentified message type to 'application/octet-stream'
-* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
-* added check for added attachments
-* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
-
-Version 2.1.0beta2 (Sun, Dec 02 2007)
-* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
-* finished all testing, all known bugs corrected, enhancements tested
-- note: will NOT work with PHP4.
-
-please note, this is BETA software
-** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
-INTENDED STRICTLY FOR TESTING
-
-Version 2.1.0beta1
-please note, this is BETA software
-** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
-INTENDED STRICTLY FOR TESTING
-
-Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
-* implements new property to control VERP in class.smtp.php
- example (requires instantiating class.smtp.php):
- $mail->do_verp = true;
-* POP-before-SMTP functionality included, thanks to Richard Davey
- (see class.pop3.php & pop3_before_smtp_test.php for examples)
-* included example showing how to use PHPMailer with GMAIL
-* fixed the missing Cc in SendMail() and Mail()
-
-******************
-A note on sending bulk emails:
-
-If the email you are sending is not personalized, consider using the
-"undisclosed-recipient:;" strategy. That is, put all of your recipients
-in the Bcc field and set the To field to "undisclosed-recipients:;".
-It's a lot faster (only one send) and saves quite a bit on resources.
-Contrary to some opinions, this will not get you listed in spam engines -
-it's a legitimate way for you to send emails.
-
-A partial example for use with PHPMailer:
-
-$mail->AddAddress("undisclosed-recipients:;");
-$mail->AddBCC("em...@an...,em...@an...,em...@an...");
-
-Many email service providers restrict the number of emails that can be sent
-in any given time period. Often that is between 50 - 60 emails maximum
-per hour or per send session.
-
-If that's the case, then break up your Bcc lists into chunks that are one
-less than your limit, and put a pause in your script.
-*******************
-
-Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
-* dramatically simplified using inline graphics ... it's fully automated and requires no user input
-* added automatic document type detection for attachments and pictures
-* added MsgHTML() function to replace Body tag for HTML emails
-* fixed the SendMail security issues (input validation vulnerability)
-* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address
-* removed the need to use the AltBody method (set from the HTML, or default text used)
-* set the PHP Mail() function as the default (still support SendMail, SMTP Mail)
-* removed the need to set the IsHTML property (set automatically)
-* added Estonian language file by Indrek Päri
-* added header injection patch
-* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc.
- example of use:
- $mail->set('X-Priority', '3');
- $mail->set('X-MSMail-Priority', 'Normal');
-* fixed warning message in SMTP get_lines method
-* added TLS/SSL SMTP support
- example of use:
- $mail = new PHPMailer();
- $mail->Mailer = "smtp";
- $mail->Host = "smtp.example.com";
- $mail->SMTPSecure = "tls"; // option
- //$mail->SMTPSecure = "ssl"; // option
- ...
- $mail->Send();
-* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
-* Works with PHP installed as a module or as CGI-PHP
-- NOTE: will NOT work with PHP5 in E_STRICT error mode
-
-Version 1.73 (Sun, Jun 10 2005)
-* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
-* Now has a total of 20 translations
-* Fixed alt attachments bug: http://tinyurl.com/98u9k
-
-Version 1.72 (Wed, May 25 2004)
-* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
-* Received: Removed this method because spam filter programs like
-SpamAssassin reject this header.
-* Fixed error count bug.
-* SetLanguage default is now "language/".
-* Fixed magic_quotes_runtime bug.
-
-Version 1.71 (Tue, Jul 28 2003)
-* Made several speed enhancements
-* Added German and Italian translation files
-* Fixed HELO/AUTH bugs on keep-alive connects
-* Now provides an error message if language file does not load
-* Fixed attachment EOL bug
-* Updated some unclear documentation
-* Added additional tests and improved others
-
-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)
-* Added unit tests
-* Added SMTP timeout support (*nix only)
-* Added possibly temporary PluginDir variable for SMTP class
-* Added LE message line ending variable
-* Refactored boundary and attachment code
-* Eliminated SMTP class warnings
-* Added SendToQueue method for future queuing support
-
-Version 1.54 (Wed, Dec 19 2001)
-* Add some queuing support code
-* Fixed a pesky multi/alt bug
-* Messages are no longer forced to have "To" addresses
-
-Version 1.50 (Thu, Nov 08 2001)
-* Fix extra lines when not using SMTP mailer
-* Set WordWrap variable to int with a zero default
-
-Version 1.47 (Tue, Oct 16 2001)
-* Fixed Received header code format
-* Fixed AltBody order error
-* Fixed alternate port warning
-
-Version 1.45 (Tue, Sep 25 2001)
-* Added enhanced SMTP debug support
-* Added support for multiple ports on SMTP
-* Added Received header for tracing
-* Fixed AddStringAttachment encoding
-* Fixed possible header name quote bug
-* Fixed wordwrap() trim bug
-* Couple other small bug fixes
-
-Version 1.41 (Wed, Aug 22 2001)
-* Fixed AltBody bug w/o attachments
-* Fixed rfc_date() for certain mail servers
-
-Version 1.40 (Sun, Aug 12 2001)
-* Added multipart/alternative support (AltBody)
-* Documentation update
-* Fixed bug in Mercury MTA
-
-Version 1.29 (Fri, Aug 03 2001)
-* Added AddStringAttachment() method
-* Added SMTP authentication support
-
-Version 1.28 (Mon, Jul 30 2001)
-* Fixed a typo in SMTP class
-* Fixed header issue with Imail (win32) SMTP server
-* Made fopen() calls for attachments use "rb" to fix win32 error
-
-Version 1.25 (Mon, Jul 02 2001)
-* Added RFC 822 date fix (Patrice)
-* Added improved error handling by adding a $ErrorInfo variable
-* Removed MailerDebug variable (obsolete with new error handler)
-
-Version 1.20 (Mon, Jun 25 2001)
-* Added quoted-printable encoding (Patrice)
-* Set Version as public and removed PrintVersion()
-* Changed phpdoc to only display public variables and methods
-
-Version 1.19 (Thu, Jun 21 2001)
-* Fixed MS Mail header bug
-* Added fix for Bcc problem with mail(). *Does not work on Win32*
- (See PHP bug report: http://www.php.net/bugs.php?id=11616)
-* mail() no longer passes a fifth parameter when not needed
-
-Version 1.15 (Fri, Jun 15 2001)
-[Note: these changes contributed by Patrice Fournier]
-* Changed all remaining \n to \r\n
-* Bcc: header no longer writen to message except
-when sent directly to sendmail
-* Added a small message to non-MIME compliant mail reader
-* Added Sender variable to change the Sender email
-used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode
-* Changed boundary setting to a place it will be set only once
-* Removed transfer encoding for whole message when using multipart
-* Message body now uses Encoding in multipart messages
-* Can set encoding and type to attachments 7bit, 8bit
-and binary attachment are sent as is, base64 are encoded
-* Can set Encoding to base64 to send 8 bits body
-through 7 bits servers
-
-Version 1.10 (Tue, Jun 12 2001)
-* Fixed win32 mail header bug (printed out headers in message body)
-
-Version 1.09 (Fri, Jun 08 2001)
-* Changed date header to work with Netscape mail programs
-* Altered phpdoc documentation
-
-Version 1.08 (Tue, Jun 05 2001)
-* Added enhanced error-checking
-* Added phpdoc documentation to source
-
-Version 1.06 (Fri, Jun 01 2001)
-* Added optional name for file attachments
-
-Version 1.05 (Tue, May 29 2001)
-* Code cleanup
-* Eliminated sendmail header warning message
-* Fixed possible SMTP error
-
-Version 1.03 (Thu, May 24 2001)
-* Fixed problem where qmail sends out duplicate messages
-
-Version 1.02 (Wed, May 23 2001)
-* Added multiple recipient and attachment Clear* methods
-* Added Sendmail public variable
-* Fixed problem with loading SMTP library multiple times
-
-Version 0.98 (Tue, May 22 2001)
-* Fixed problem with redundant mail hosts sending out multiple messages
-* Added additional error handler code
-* Added AddCustomHeader() function
-* Added support for Microsoft mail client headers (affects priority)
-* Fixed small bug with Mailer variable
-* Added PrintVersion() function
-
-Version 0.92 (Tue, May 15 2001)
-* Changed file names to class.phpmailer.php and class.smtp.php to match
- current PHP class trend.
-* Fixed problem where body not being printed when a message is attached
-* Several small bug fixes
-
-Version 0.90 (Tue, April 17 2001)
-* Intial public release
Modified: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/LICENSE
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/LICENSE 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/LICENSE 2017-01-01 01:51:06 UTC (rev 13229)
@@ -312,7 +312,7 @@
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
- e) Verify that the user has already received a copy of these
+ e) verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Added: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/PHPMailerAutoload.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/PHPMailerAutoload.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/PHPMailerAutoload.php 2017-01-01 01:51:06 UTC (rev 13229)
@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHPMailer SPL autoloader.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <php...@sy...>
+ * @author Jim Jagielski (jimjag) <ji...@gm...>
+ * @author Andy Prevost (codeworxtech) <cod...@us...>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer SPL autoloader.
+ * @param string $classname The name of the class to load
+ */
+function PHPMailerAutoload($classname)
+{
+ //Can't use __DIR__ as it's only in PHP 5.3+
+ $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
+ if (is_readable($filename)) {
+ require $filename;
+ }
+}
+
+if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
+ //SPL autoloading was introduced in PHP 5.1.2
+ if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+ spl_autoload_register('PHPMailerAutoload', true, true);
+ } else {
+ spl_autoload_register('PHPMailerAutoload');
+ }
+} else {
+ /**
+ * Fall back to traditional autoload for old PHP versions
+ * @param string $classname The name of the class to load
+ */
+ function __autoload($classname)
+ {
+ PHPMailerAutoload($classname);
+ }
+}
Deleted: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/README
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/README 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/README 2017-01-01 01:51:06 UTC (rev 13229)
@@ -1,225 +0,0 @@
-/*******************************************************************
-* http://code.google.com/a/apache-extras.org/p/phpmailer/ *
-********************************************************************/
-
-PHPMailer
-Full Featured Email Transfer Class for PHP
-==========================================
-
-Version 5.2.1 (January 16, 2012)
-
-Patch release (see changelog.txt).
-
-Version 5.2.0 (July 19, 2011)
-
-With the release of this version, PHPMailer has moved to Apache
-Extras:
- http://code.google.com/a/apache-extras.org/p/phpmailer/
-
-Version 5.0.0 (April 02, 2009)
-
-With the release of this version, we are initiating a new version numbering
-system to differentiate from the PHP4 version of PHPMailer.
-
-Most notable in this release is fully object oriented code.
-
-We now have available the PHPDocumentor (phpdocs) documentation. This is
-separate from the regular download to keep file sizes down. Please see the
-download area of http://phpmailer.codeworxtech.com.
-
-We also have created a new test script (see /test_script) that you can use
-right out of the box. Copy the /test_script folder directly to your server (in
-the same structure ... with class.phpmailer.php and class.smtp.php in the
-folder above it. Then launch the test script with:
-http://www.yourdomain.com/phpmailer/test_script/index.php
-from this one script, you can test your server settings for mail(), sendmail (or
-qmail), and SMTP. This will email you a sample email (using contents.html for
-the email body) and two attachments. One of the attachments is used as an inline
-image to demonstrate how PHPMailer will automatically detect if attachments are
-the same source as inline graphics and only include one version. Once you click
-the Submit button, the results will be displayed including any SMTP debug
-information and send status. We will also display a version of the script that
-you can cut and paste to include in your projects. Enjoy!
-
-Version 2.3 (November 08, 2008)
-
-We have removed the /phpdoc from the downloads. All documentation is now on
-the http://phpmailer.codeworxtech.com website.
-
-The phpunit.php has been updated to support PHP5.
-
-For all other changes and notes, please see the changelog.
-
-Donations are accepted at PayPal with our id "pa...@wo...".
-
-Version 2.2 (July 15 2008)
-
-- see the changelog.
-
-Version 2.1 (June 04 2008)
-
-With this release, we are announcing that the development of PHPMailer for PHP5
-will be our focus from this date on. We have implemented all the enhancements
-and fixes from the latest release of PHPMailer for PHP4.
-
-Far more important, though, is that this release of PHPMailer (v2.1) is
-fully tested with E_STRICT error checking enabled.
-
-** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
- IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
- APPRECIATED.
-
-We have now added S/MIME functionality (ability to digitally sign emails).
-BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
-The "Signed Emails" functionality adds the Sign method to pass the private key
-filename and the password to read it, and then email will be sent with
-content-type multipart/signed and with the digital signature attached.
-
-A quick note on E_STRICT:
-
-- In about half the test environments the development version was subjected
- to, an error was thrown for the date() functions (used at line 1565 and 1569).
- This is NOT a PHPMailer error, it is the result of an incorrectly configured
- PHP5 installation. The fix is to modify your 'php.ini' file and include the
- date.timezone = America/New York
- directive, (for your own server timezone)
-- If you do get this error, and are unable to access your php.ini file, there is
- a workaround. In your PHP script, add
- date_default_timezone_set('America/Toronto');
-
- * do NOT try to use
- $myVar = date_default_timezone_get();
- as a test, it will throw an error.
-
-We have also included more example files to show the use of "sendmail", "mail()",
-"smtp", and "gmail".
-
-We are also looking for more programmers to join the volunteer development team.
-If you have an interest in this, please let us know.
-
-Enjoy!
-
-
-Version 2.1.0beta1 & beta2
-
-please note, this is BETA software
-** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
-INTENDED STRICTLY FOR TESTING
-
-** NOTE:
-
-As of November 2007, PHPMailer has a new project team headed by industry
-veteran Andy Prevost (codeworxtech). The first release in more than two
-years will focus on fixes, adding ease-of-use enhancements, provide
-basic compatibility with PHP4 and PHP5 using PHP5 backwards compatibility
-features. A new release is planned before year-end 2007 that will provide
-full compatiblity with PHP4 and PHP5, as well as more bug fixes.
-
-We are looking for project developers to assist in restoring PHPMailer to
-its leadership position. Our goals are to simplify use of PHPMailer, provide
-good documentation and examples, and retain backward compatibility to level
-1.7.3 standards.
-
-If you are interested in helping out, visit http://sourceforge.net/projects/phpmailer
-and indicate your interest.
-
-**
-
-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 = "fr...@ex...";
-$mail->FromName = "Mailer";
-$mail->AddAddress("jo...@ex...", "Josh Adams");
-$mail->AddAddress("el...@ex..."); // name is optional
-$mail->AddReplyTo("in...@ex...", "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
-
-Andy Prevost
Added: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/VERSION
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/VERSION (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/VERSION 2017-01-01 01:51:06 UTC (rev 13229)
@@ -0,0 +1 @@
+5.2.21
Modified: XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmailer.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmailer.php 2017-01-01 01:06:33 UTC (rev 13228)
+++ XoopsCore/branches/2.5.x/2.5.7.3/htdocs/class/mail/phpmailer/class.phpmailer.php 2017-01-01 01:51:06 UTC (rev 13229)
@@ -1,2756 +1,4025 @@
<?php
-/*~ class.phpmailer.php
-.---------------------------------------------------------------------------.
-| Software: PHPMailer - PHP email class |
-| Version: 5.2.1 |
-| Site: https://code.google.com/a/apache-extras.org/p/phpmailer/ |
-| ------------------------------------------------------------------------- |
-| Admin: Jim Jagielski (project admininistrator) |
-| Authors: Andy Prevost (codeworxtech) cod...@us... |
-| : Marcus Bointon (coolbru) co...@us... |
-| : Jim Jagielski (jimjag) ji...@gm... |
-| Founder: Brent R. Matzelle (original founder) |
-| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved. |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved. |
-| Copyright (c) 2001-2003, Brent R. Matzelle |
-| ------------------------------------------------------------------------- |
-| License: Distributed under the Lesser General Public License (LGPL) |
-| http://www.gnu.org/copyleft/lesser.html |
-| This program is distributed in the hope that it will be useful - WITHOUT |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
-| FITNESS FOR A PARTICULAR PURPOSE. |
-'---------------------------------------------------------------------------'
-*/
-
/**
- * PHPMailer - PHP email transport class
- * NOTE: Requires PHP version 5 or later
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5
* @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
- * @author Jim Jagielski
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <php...@sy...>
+ * @author Jim Jagielski (jimjag) <ji...@gm...>
+ * @author Andy Prevost (codeworxtech) <cod...@us...>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
* @copyright 2010 - 2012 Jim Jagielski
* @copyright 2004 - 2009 Andy Prevost
- * @version $Id$
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
*/
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
-
/**
- * Class PHPMailer
+ * PHPMailer - PHP email creation and transport class.
+ * @package PHPMailer
+ * @author Marcus Bointon (Synchro/coolbru) <php...@sy...>
+ * @author Jim Jagielski (jimjag) <ji...@gm...>
+ * @author Andy Prevost (codeworxtech) <cod...@us...>
+ * @author Brent R. Matzelle (original founder)
*/
class PHPMailer
{
- /////////////////////////////////////////////////
- // PROPERTIES, PUBLIC
- /////////////////////////////////////////////////
+ /**
+ * The PHPMailer Version number.
+ * @var string
+ */
+ public $Version = '5.2.21';
- /**
- * Email priority (1 = High, 3 = Normal, 5 = low).
- * @var int
- */
- public $Priority = 3;
+ /**
+ * Email priority.
+ * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+ * When null, the header is not set at all.
+ * @var integer
+ */
+ public $Priority = null;
- /**
- * Sets the CharSet of the message.
- * @var string
- */
- public $CharSet = 'iso-8859-1';
+ /**
+ * The character set of the message.
+ * @var string
+ */
+ public $CharSet = 'iso-8859-1';
- /**
- * Sets the Content-type of the message.
- * @var string
- */
- public $ContentType = 'text/plain';
+ /**
+ * The MIME Content-type of the message.
+ * @var string
+ */
+ public $ContentType = 'text/plain';
- /**
- * Sets the Encoding of the message. Options for this are
- * "8bit", "7bit", "binary", "base64", and "quoted-printable".
- * @var string
- */
- public $Encoding = '8bit';
+ /**
+ * The message encoding.
+ * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+ * @var string
+ */
+ public $Encoding = '8bit';
- /**
- * Holds the most recent mailer error message.
- * @var string
- */
- public $ErrorInfo = '';
+ /**
+ * Holds the most recent mailer error message.
+ * @var string
+ */
+ public $ErrorInfo = '';
- /**
- * Sets the From email address for the message.
- * @var string
- */
- public $From = 'root@localhost';
+ /**
+ * The From email address for the message.
+ * @var string
+ */
+ public $From = 'root@localhost';
- /**
- * Sets the From name of the message.
- * @var string
- */
- public $FromName = 'Root User';
+ /**
+ * The From name of the message.
+ * @var string
+ */
+ public $FromName = 'Root User';
- /**
- * Sets the Sender email (Return-Path) of the message. If not empty,
- * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
- * @var string
- */
- public $Sender = '';
+ /**
+ * The Sender email (Return-Path) of the message.
+ * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+ * @var string
+ */
+ public $Sender = '';
- /**
- * Sets the Subject of the message.
- * @var string
- */
- public $Subject = '';
+ /**
+ * The Return-Path of the message.
+ * If empty, it will be set to either From or Sender.
+ * @var string
+ * @deprecated Email senders should never set a return-path header;
+ * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+ * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+ */
+ public $ReturnPath = '';
- /**
- * Sets the Body of the message. This can be either an HTML or text body.
- * If HTML then run IsHTML(true).
- * @var string
- */
- public $Body = '';
+ /**
+ * The Subject of the message.
+ * @var string
+ */
+ public $Subject = '';
- /**
- * 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.
- * @var string
- */
- public $AltBody = '';
+ /**
+ * An HTML or plain text message body.
+ * If HTML then call isHTML(true).
+ * @var string
+ */
+ public $Body = '';
- /**
- * Stores the complete compiled MIME message body.
- * @var string
- * @access protected
- */
- protected $MIMEBody = '';
+ /**
+ * The plain-text message body.
+ * This body can be read by mail clients that do not have HTML email
+ * capability such as mutt & Eudora.
+ * Clients that can read HTML will view the normal Body.
+ * @var string
+ */
+ public $AltBody = '';
- /**
- * Stores the complete compiled MIME message headers.
- * @var string
- * @access protected
- */
- protected $MIMEHeader = '';
+ /**
+ * An iCal message part body.
+ * Only supported in simple alt or alt_inline message types
+ * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+ * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+ * @link http://kigkonsult.se/iCalcreator/
+ * @var string
+ */
+ public $Ical = '';
- /**
- * Stores the complete sent MIME message (Body and Headers)
- * @var string
- * @access protected
- */
- protected $SentMIMEMessage = '';
+ /**
+ * The complete compiled MIME message body.
+ * @access protected
+ * @var string
+ */
+ protected $MIMEBody = '';
- /**
- * Sets word wrapping on the body of the message to a given number of
- * characters.
- * @var int
- */
- public $WordWrap = 0;
+ /**
+ * The complete compiled MIME message headers.
+ * @var string
+ * @access protected
+ */
+ protected $MIMEHeader = '';
- /**
- * Method to send mail: ("mail", "sendmail", or "smtp").
- * @var string
- */
- public $Mailer = 'mail';
+ /**
+ * Extra headers that createHeader() doesn't fold in.
+ * @var string
+ * @access protected
+ */
+ protected $mailHeader = '';
- /**
- * Sets the path of the sendmail program.
- * @var string
- */
- public $Sendmail = '/usr/sbin/sendmail';
+ /**
+ * Word-wrap the message body to this number of chars.
+ * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+ * @var integer
+ */
+ public $WordWrap = 0;
- /**
- * Path to PHPMailer plugins. Useful if the SMTP class
- * is in a different directory than the PHP include path.
- * @var string
- */
- public $PluginDir = '';
+ /**
+ * Which method to use to send mail.
+ * Options: "mail", "sendmail", or "smtp".
+ * @var string
+ */
+ public $Mailer = 'mail';
- /**
- * Sets the email address that a reading confirmation will be sent.
- * @var string
- */
- public $ConfirmReadingTo = '';
+ /**
+ * The path to the sendmail program.
+ * @var string
+ */
+ public $Sendmail = '/usr/sbin/sendmail';
- /**
- * 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
- */
- public $Hostname = '';
+ /**
+ * Whether mail() uses a fully sendmail-compatible MTA.
+ * One which supports sendmail's "-oi -f" options.
+ * @var boolean
+ */
+ public $UseSendmailOptions = true;
- /**
- * Sets the message ID to be used in the Message-Id header.
- * If empty, a unique id will be generated.
- * @var string
- */
- public $MessageID = '';
+ /**
+ * Path to PHPMailer plugins.
+ * Useful if the SMTP class is not in the PHP include path.
+ * @var string
+ * @deprecated Should not be needed now there is an autoloader.
+ */
+ public $PluginDir = '';
- /////////////////////////////////////////////////
- // PROPERTIES FOR SMTP
- /////////////////////////////////////////////////
+ /**
+ * The email address that a reading confirmation should be sent to, also known as read receipt.
+ * @var string
+ */
+ public $ConfirmReadingTo = '';
- /**
- * 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.example.com:25;smtp2.example.com").
- * Hosts will be tried in order.
- * @var string
- */
- public $Host = 'localhost';
+ /**
+ * The hostname to use in the Message-ID header and as default HELO string.
+ * If empty, PHPMailer attempts to find one with, in order,
+ * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+ * 'localhost.localdomain'.
+ * @var string
+ */
+ public $Hostname = '';
- /**
- * Sets the default SMTP server port.
- * @var int
- */
- public $Port = 25;
+ /**
+ * An ID to be used in the Message-ID header.
+ * If empty, a unique id will be generated.
+ * You can set your own, but it must be in the format "<id@domain>",
+ * as defined in RFC5322 section 3.6.4 or it will be ignored.
+ * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+ * @var string
+ */
+ public $MessageID = '';
- /**
- * Sets the SMTP HELO of the message (Default is $Hostname).
- * @var string
- */
- public $Helo = '';
+ /**
+ * The message Date to be used in the Date header.
+ * If empty, the current date will be added.
+ * @var string
+ */
+ public $MessageDate = '';
- /**
- * Sets connection prefix.
- * Options are "", "ssl" or "tls"
- * @var string
- */
- public $SMTPSecure = '';
+ /**
+ * SMTP hosts.
+ * Either a single hostname or multiple semicolon-delimited hostnames.
+ * You can also specify a different port
+ * for each host by using this format: [hostname:port]
+ * (e.g. "smtp1.example.com:25;smtp2.example.com").
+ * You can also specify encryption type, for example:
+ * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+ * Hosts will be tried in order.
+ * @var string
+ */
+ public $Host = 'localhost';
- /**
- * Sets SMTP authentication. Utilizes the Username and Password variables.
- * @var bool
- */
- public $SMTPAuth = false;
+ /**
+ * The default SMTP server port.
+ * @var integer
+ * @TODO Why is this needed when the SMTP class takes care of it?
+ */
+ public $Port = 25;
- /**
- * Sets SMTP username.
- * @var string
- */
- public $Username = '';
+ /**
+ * The SMTP HELO of the message.
+ * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+ * one with the same method described above for $Hostname.
+ * @var string
+ * @see PHPMailer::$Hostname
+ */
+ public $Helo = '';
- /**
- * Sets SMTP password.
- * @var string
- */
- public $Password = '';
+ /**
+ * What kind of encryption to use on the SMTP connection.
+ * Options: '', 'ssl' or 'tls'
+ * @var string
+ */
+ public $SMTPSecure = '';
- /**
- * Sets the SMTP server timeout in seconds.
- * This function will not work with the win32 version.
- * @var int
- */
- public $Timeout = 10;
+ /**
+ * Whether to enable TLS encryption automatically if a server supports it,
+ * even if `SMTPSecure` is not set to 'tls'.
+ * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+ * @var boolean
+ */
+ public $SMTPAutoTLS = true;
- /**
- * Sets SMTP class debugging on or off.
- * @var bool
- */
- public $SMTPDebug = false;
+ /**
+ * Whether to use SMTP authentication.
+ * Uses the Username and Password properties.
+ * @var boolean
+ * @see PHPMailer::$Username
+ * @see PHPMailer::$Password
+ */
+ public $SMTPAuth = false;
- /**
- * 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
- */
- public $SMTPKeepAlive = false;
+ /**
+ * Options array passed to stream_context_create when connecting via SMTP.
+ * @var array
+ */
+ public $SMTPOptions = array();
- /**
- * Provides the ability to have the TO field process individual
- * emails, instead of sending to entire TO addresses
- * @var bool
- */
- public $SingleTo = false;
+ /**
+ * SMTP username.
+ * @var string
+ */
+ public $Username = '';
- /**
- * If SingleTo is true, this provides the array to hold the email addresses
- * @var bool
- */
- public $SingleToArray = array();
+ /**
+ * SMTP password.
+ * @var string
+ */
+ public $Password = '';
- /**
- * Provides the ability to change the line ending
- * @var string
- */
- public $LE = "\n";
+ /**
+ * SMTP auth type.
+ * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified
+ * @var string
+ */
+ public $AuthType = '';
- /**
- * Used with DKIM DNS Resource Record
- * @var string
- */
- public $DKIM_selector = 'phpmailer';
+ /**
+ * SMTP realm.
+ * Used for NTLM auth
+ * @var string
+ */
+ public $Realm = '';
- /**
- * Used with DKIM DNS Resource Record
- * optional, in format of email address 'yo...@yo...'
- * @var string
- */
- public $DKIM_identity = '';
+ /**
+ * SMTP workstation.
+ * Used for NTLM auth
+ * @var string
+ */
+ public $Workstation = '';
- /**
- * Used with DKIM DNS Resource Record
- * @var string
- */
- public $DKIM_passphrase = '';
+ /**
+ * The SMTP server timeout in seconds.
+ * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+ * @var integer
+ */
+ public $Timeout = 300;
- /**
- * Used with DKIM DNS Resource Record
- * optional, in format of email address 'yo...@yo...'
- * @var string
- */
- public $DKIM_domain = '';
+ /**
+ * SMTP class debug output mode.
+ * Debug output level.
+ * Options:
+ * * `0` No output
+ * * `1` Commands
+ * * `2` Data and commands
+ * * `3` As 2 plus connection status
+ * * `4` Low-level data output
+ * @var integer
+ * @see SMTP::$do_debug
+ */
+ public $SMTPDebug = 0;
- /**
- * Used with DKIM DNS Resource Record
- * optional, in format of email address 'yo...@yo...'
- * @var string
- */
- public $DKIM_private = '';
+ /**
+ * How to handle debug output.
+ * Options:
+ * * `echo` Output plain-text as-is, appropriate for CLI
+ * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+ * * `error_log` Output to error log as configured in php.ini
+ *
+ * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+ * <code>
+ * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+ * </code>
+ * @var string|callable
+ * @see SMTP::$Debugoutput
+ */
+ public $Debugoutput = 'echo';
- /**
- * Callback Action function name
- * the function that handles the result of the send email action. Parameters:
- * bool $result result of the send action
- * string $to email address of the recipient
- * string $cc cc email addresses
- * string $bcc bcc email addresses
- * string $subject the subject
- * string $body the email body
- * @var string
- */
- public $action_function = ''; //'callbackAction';
+ /**
+ * Whether to keep SMTP connection open after each message.
+ * If this is set to true then to close the connection
+ * requires an explicit call to smtpClose().
+ * @var boolean
+ */
+ public $SMTPKeepAlive = false;
- /**
- * Sets the PHPMailer Version number
- * @var string
- */
- public $Version = '5.2.1';
+ /**
+ * Whether to split multiple to addresses into multiple messages
+ * or send them all in one message.
+ * Only supported in `mail` and `sendmail` transports, not in SMTP.
+ * @var boolean
+ */
+ public $SingleTo = false;
- /**
- * What to use in the X-Mailer header
- * @var string
- */
- public $XMailer = '';
+ /**
+ * Storage for addresses when SingleTo is enabled.
+ * @var array
+ * @TODO This should really not be public
+ */
+ public $SingleToArray = array();
- /////////////////////////////////////////////////
- // PROPERTIES, PRIVATE AND PROTECTED
- /////////////////////////////////////////////////
+ /**
+ * Whether to generate VERP addresses on send.
+ * Only applicable when sending via SMTP.
+ * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
+ * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+ * @var boolean
+ */
+ public $do_verp = false;
- protected $smtp = NULL;
- protected $to = array();
- protected $cc = array();
- protected $bcc = array();
- protected $ReplyTo = array();
- protected $all_recipients = array();
- protected $attachment = array();
- protected $CustomHeader = array();
- protected $message_type = '';
- protected $boundary = array();
- protected $language = array();
- protected $error_count = 0;
- protected $sign_cert_file = '';
- protected $sign_key_file = '';
- protected $sign_key_pass = '';
- protected $exceptions = false;
+ /**
+ * Whether to allow sending messages with an empty body.
+ * @var boolean
+ */
+ public $AllowEmpty = false;
- /////////////////////////////////////////////////
- // CONSTANTS
- /////////////////////////////////////////////////
+ /**
+ * The default line ending.
+ * @note The default remains "\n". We force CRLF where we know
+ * it must be used via self::CRLF.
+ * @var string
+ */
+ public $LE = "\n";
- const STOP_MESSAGE = 0; // message only, continue processing
- const STOP_CONTINUE = 1; // message?, likely ok to continue processing
- const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
+ /**
+ * DKIM selector.
+ * @var string
+ */
+ public $DKIM_selector = '';
- /////////////////////////////////////////////////
- // METHODS, VARIABLES
- /////////////////////////////////////////////////
+ /**
+ * DKIM Identity.
+ * Usually the email address used as the source of the email.
+ * @var string
+ */
+ public $DKIM_identity = '';
- /**
- * Constructor
- * @param boolean $exceptions Should we throw external exceptions?
- */
- public function __construct($exceptions = false)
- {
- $this->e...
[truncated message content] |
