[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17466] upgrade phpmailer from upstream
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17466] upgrade phpmailer from upstream |
|
Date: |
Mon, 25 Dec 2017 12:36:10 -0500 (EST) |
Revision: 17466
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17466
Author: sigurdne
Date: 2017-12-25 12:36:09 -0500 (Mon, 25 Dec 2017)
Log Message:
-----------
upgrade phpmailer from upstream
Modified Paths:
--------------
trunk/phpgwapi/inc/class.mailer_smtp.inc.php
trunk/phpgwapi/inc/class.send.inc.php
trunk/phpgwapi/inc/phpmailer/LICENSE
trunk/phpgwapi/inc/phpmailer/README.md
trunk/phpgwapi/inc/phpmailer/VERSION
trunk/phpgwapi/inc/phpmailer/get_oauth_token.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-eo.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-fr.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-id.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-nb.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-nl.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-pt_br.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-tr.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-zh_cn.php
Added Paths:
-----------
trunk/phpgwapi/inc/phpmailer/SECURITY.md
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-ba.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-rs.php
trunk/phpgwapi/inc/phpmailer/src/
trunk/phpgwapi/inc/phpmailer/src/Exception.php
trunk/phpgwapi/inc/phpmailer/src/OAuth.php
trunk/phpgwapi/inc/phpmailer/src/PHPMailer.php
trunk/phpgwapi/inc/phpmailer/src/POP3.php
trunk/phpgwapi/inc/phpmailer/src/SMTP.php
Removed Paths:
-------------
trunk/phpgwapi/inc/phpmailer/PHPMailerAutoload.php
trunk/phpgwapi/inc/phpmailer/changelog.md
trunk/phpgwapi/inc/phpmailer/class.phpmailer.php
trunk/phpgwapi/inc/phpmailer/class.phpmaileroauth.php
trunk/phpgwapi/inc/phpmailer/class.phpmaileroauthgoogle.php
trunk/phpgwapi/inc/phpmailer/class.pop3.php
trunk/phpgwapi/inc/phpmailer/class.smtp.php
trunk/phpgwapi/inc/phpmailer/composer.json
trunk/phpgwapi/inc/phpmailer/composer.lock
trunk/phpgwapi/inc/phpmailer/docs/
trunk/phpgwapi/inc/phpmailer/examples/
trunk/phpgwapi/inc/phpmailer/extras/
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-br.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-cz.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-dk.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-no.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-se.php
trunk/phpgwapi/inc/phpmailer/language/phpmailer.lang-sr.php
trunk/phpgwapi/inc/phpmailer/test/
Modified: trunk/phpgwapi/inc/class.mailer_smtp.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.mailer_smtp.inc.php 2017-12-24 12:58:44 UTC
(rev 17465)
+++ trunk/phpgwapi/inc/class.mailer_smtp.inc.php 2017-12-25 17:36:09 UTC
(rev 17466)
@@ -12,8 +12,14 @@
/**
* @see phpmailer
*/
-// require_once PHPGW_INCLUDE_ROOT .
'/phpgwapi/inc/phpmailer/class.phpmailer.php';
- require_once PHPGW_INCLUDE_ROOT .
'/phpgwapi/inc/phpmailer/PHPMailerAutoload.php';
+// require_once PHPGW_INCLUDE_ROOT .
'/phpgwapi/inc/phpmailer/PHPMailerAutoload.php';
+
+ use PHPMailer\PHPMailer\PHPMailer;
+ use PHPMailer\PHPMailer\Exception;
+
+ require PHPGW_INCLUDE_ROOT .
'/phpgwapi/inc/phpmailer/src/Exception.php';
+ require PHPGW_INCLUDE_ROOT .
'/phpgwapi/inc/phpmailer/src/PHPMailer.php';
+ require PHPGW_INCLUDE_ROOT . '/phpgwapi/inc/phpmailer/src/SMTP.php';
/**
* Send email messages via SMTP
Modified: trunk/phpgwapi/inc/class.send.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.send.inc.php 2017-12-24 12:58:44 UTC (rev
17465)
+++ trunk/phpgwapi/inc/class.send.inc.php 2017-12-25 17:36:09 UTC (rev
17466)
@@ -11,6 +11,7 @@
* @version $Id$
*/
+ use PHPMailer\PHPMailer\Exception;
/**
* SMTP mailer
*
@@ -75,13 +76,15 @@
unset($from);
if ( count($from_array) == 2 )
{
- $mail->From = trim($from_array[1],'>');
- $mail->FromName = $from_array[0];
+ $mail->setFrom( trim( $from_array[1],'>' ),
$from_array[0]);
+// $mail->From = trim($from_array[1],'>');
+// $mail->FromName = $from_array[0];
}
else
{
- $mail->From = $from_array[0];
- $mail->FromName = $sender;
+ $mail->setFrom($from_array[0], $sender );
+// $mail->From = $from_array[0];
+// $mail->FromName = $sender;
}
$delimiter = ';';
$to = explode($delimiter, $to);
@@ -141,6 +144,11 @@
$mail->IsSMTP();
$mail->Subject = $subject;
$mail->Body = $body;
+ /**
+ * Implement me...
+ */
+// $mail->AltBody = 'This is the body in plain text for
non-HTML mail clients';
+
$mail->addCustomHeader('X-Mailer: fmsystem
(http://www.fmsystem.no)');
if($receive_notification)
{
@@ -210,9 +218,9 @@
#$mail->SMTPDebug = 10;
try
{
- $mail->Send();
+ $mail->send();
}
- catch (phpmailerException $e)
+ catch (Exception $e)
{
$this->errorInfo = $mail->ErrorInfo;
throw $e;
Modified: trunk/phpgwapi/inc/phpmailer/LICENSE
===================================================================
--- trunk/phpgwapi/inc/phpmailer/LICENSE 2017-12-24 12:58:44 UTC (rev
17465)
+++ trunk/phpgwapi/inc/phpmailer/LICENSE 2017-12-25 17:36:09 UTC (rev
17466)
@@ -2,7 +2,7 @@
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -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
@@ -485,7 +485,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
Also add information on how to contact you by electronic and paper mail.
@@ -500,5 +500,3 @@
Ty Coon, President of Vice
That's all there is to it!
-
-
Deleted: trunk/phpgwapi/inc/phpmailer/PHPMailerAutoload.php
===================================================================
--- trunk/phpgwapi/inc/phpmailer/PHPMailerAutoload.php 2017-12-24 12:58:44 UTC
(rev 17465)
+++ trunk/phpgwapi/inc/phpmailer/PHPMailerAutoload.php 2017-12-25 17:36:09 UTC
(rev 17466)
@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPMailer SPL autoloader.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <address@hidden>
- * @author Jim Jagielski (jimjag) <address@hidden>
- * @author Andy Prevost (codeworxtech) <address@hidden>
- * @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);
- }
-}
Modified: trunk/phpgwapi/inc/phpmailer/README.md
===================================================================
--- trunk/phpgwapi/inc/phpmailer/README.md 2017-12-24 12:58:44 UTC (rev
17465)
+++ trunk/phpgwapi/inc/phpmailer/README.md 2017-12-25 17:36:09 UTC (rev
17466)
@@ -9,105 +9,132 @@
[](https://packagist.org/packages/phpmailer/phpmailer)
[](https://packagist.org/packages/phpmailer/phpmailer)
[](https://packagist.org/packages/phpmailer/phpmailer)
[](https://packagist.org/packages/phpmailer/phpmailer)
## Class Features
-
- Probably the world's most popular code for sending email from PHP!
- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii,
Joomla! and many more
- Integrated SMTP support - send without a local mail server
-- Send emails with multiple TOs, CCs, BCCs and REPLY-TOs
+- Send emails with multiple To, CC, BCC and Reply-to addresses
- Multipart/alternative emails for mail clients that do not read HTML email
+- Add attachments, including inline
- Support for UTF-8 content and 8bit, base64, binary, and quoted-printable
encodings
-- SMTP authentication with LOGIN, PLAIN, NTLM and CRAM-MD5 mechanisms over SSL
and TLS transports
+- SMTP authentication with LOGIN, PLAIN, CRAM-MD5 and XOAUTH2 mechanisms over
SSL and SMTP+STARTTLS transports
+- Validates email addresses automatically
+- Protect against header injection attacks
- Error messages in 47 languages!
- DKIM and S/MIME signing support
-- Compatible with PHP 5.0 and later
+- Compatible with PHP 5.5 and later
+- Namespaced to prevent name clashes
- Much 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 provide any
assistance for making use of popular features such as HTML-based emails and
attachments.
-Many PHP developers utilize email in their code. The only PHP function that
supports this is the mail() function. However, it does not provide any
assistance for making use of popular features such as HTML-based emails and
attachments.
-
-Formatting email correctly is surprisingly difficult. There are myriad
overlapping RFCs, requiring tight adherence to horribly complicated formatting
and encoding rules - the vast majority of code that you'll find online that
uses the mail() function directly is just plain wrong!
+Formatting email correctly is surprisingly difficult. There are myriad
overlapping RFCs, requiring tight adherence to horribly complicated formatting
and encoding rules - the vast majority of code that you'll find online that
uses the `mail()` function directly is just plain wrong!
*Please* don't be tempted to do it yourself - if you don't use PHPMailer,
there are many other excellent libraries that you should look at before rolling
your own - try SwiftMailer, Zend_Mail, eZcomponents etc.
-The PHP mail() function usually sends via a local mail server, typically
fronted by a `sendmail` binary on Linux, BSD and OS X platforms, however,
Windows usually doesn't include a local mail server; PHPMailer's integrated
SMTP implementation allows email sending on Windows platforms without a local
mail server.
+The PHP `mail()` function usually sends via a local mail server, typically
fronted by a `sendmail` binary on Linux, BSD and OS X platforms, however,
Windows usually doesn't include a local mail server; PHPMailer's integrated
SMTP implementation allows email sending on Windows platforms without a local
mail server.
## License
-
This software is distributed under the [LGPL
2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license. Please read LICENSE
for information on the
software availability and distribution.
## Installation & loading
+PHPMailer is available on
[Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic
versioning), and installation via composer is the recommended way to install
PHPMailer. Just add this line to your `composer.json` file:
-PHPMailer is available via
[Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using
semantic versioning), so just add this line to your `composer.json` file:
-
```json
-"phpmailer/phpmailer": "~5.2"
+"phpmailer/phpmailer": "~6.0"
```
-or
+or run
```sh
composer require phpmailer/phpmailer
```
-Alternatively, copy the contents of the PHPMailer folder into somewhere that's
in your PHP `include_path` setting. If you don't speak git or just want a
tarball, click the 'zip' button at the top of the page in GitHub.
+Note that the `vendor` folder and the `vendor/autoload.php` script are
generated by composer; they are not part of PHPMailer.
-If you're not using composer's autoloader, PHPMailer provides an
SPL-compatible autoloader, and that is the preferred way of loading the library
- just `require '/path/to/PHPMailerAutoload.php';` and everything should work.
The autoloader does not throw errors if it can't find classes so it prepends
itself to the SPL list, allowing your own (or your framework's) autoloader to
catch errors. SPL autoloading was introduced in PHP 5.1.0, so if you are using
a version older than that you will need to require/include each class manually.
+If you want to use the Gmail XOAUTH2 authentication class, you will also need
to add a dependency on the `league/oauth2-client` package in your
`composer.json`.
-PHPMailer does *not* declare a namespace because namespaces were only
introduced in PHP 5.3.
+Alternatively, if you're not using composer, copy the contents of the
PHPMailer folder into one of the `include_path` directories specified in your
PHP configuration and load each class file manually:
+```php
+<?php
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require 'path/to/PHPMailer/src/Exception.php';
+require 'path/to/PHPMailer/src/PHPMailer.php';
+require 'path/to/PHPMailer/src/SMTP.php';
+```
+
+If you're not using the `SMTP` class explicitly (you're probably not), you
don't need a `use` line for the SMTP class.
+
+If you don't speak git or just want a tarball, click the 'zip' button on the
right of the project page in GitHub, though note that docs and examples are not
included in the tarball.
+
+## Upgrading from 5.2
+The biggest changes are that source files are now in the `src/` folder, and
PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several
important effects β [read the upgrade
guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for
more details.
+
+## Legacy versions
+PHPMailer 5.2 (which is compatible with PHP 5.0 - 7.0) is no longer being
supported for feature updates, and will only be receiving security updates from
now on. You will find the latest version of 5.2 in the [5.2-stable
branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable), and future
versions of 5.2 will be tagged with 5.2.x version numbers, so existing composer
configs should remain working. If you're using PHP 5.5 or later, we recommend
you make the necessary changes to switch to the 6.0 release.
+
### Minimal installation
+While installing the entire package manually or with composer is simple,
convenient and reliable, you may want to include only vital files in your
project. At the very least you will need
[src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php).
If you're using SMTP, you'll need
[src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php),
and if you're using POP-before SMTP, you'll need
[src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php).
You can skip the
[language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder
if you're not showing errors to users and can make do with English-only errors.
If you're using XOAUTH2 you will need
[src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php)
as well as the composer dependencies for the services you wish to authenticate
with. Really, it's much easier to use composer!
-While installing the entire package manually or with composer is simple,
convenient and reliable, you may want to include only vital files in your
project. At the very least you will need
[class.phpmailer.php](class.phpmailer.php). If you're using SMTP, you'll need
[class.smtp.php](class.smtp.php), and if you're using POP-before SMTP, you'll
need [class.pop3.php](class.pop3.php). For all of these, we recommend you use
[the autoloader](PHPMailerAutoload.php) too as otherwise you will either have
to `require` all classes manually or use some other autoloader. You can skip
the [language](language/) folder if you're not showing errors to users and can
make do with English-only errors. You may need the additional classes in the
[extras](extras/) folder if you are using those features, including NTLM
authentication and ics generation.
-
## A Simple Example
```php
<?php
-require 'PHPMailerAutoload.php';
+// Import PHPMailer classes into the global namespace
+// These must be at the top of your script, not inside a function
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
-$mail = new PHPMailer;
+//Load composer's autoloader
+require 'vendor/autoload.php';
-//$mail->SMTPDebug = 3; // Enable verbose debug
output
+$mail = new PHPMailer(true); // Passing `true`
enables exceptions
+try {
+ //Server settings
+ $mail->SMTPDebug = 2; // Enable verbose
debug output
+ $mail->isSMTP(); // Set mailer to use
SMTP
+ $mail->Host = 'smtp1.example.com;smtp2.example.com'; // Specify main and
backup SMTP servers
+ $mail->SMTPAuth = true; // Enable SMTP
authentication
+ $mail->Username = 'address@hidden'; // SMTP username
+ $mail->Password = 'secret'; // SMTP password
+ $mail->SMTPSecure = 'tls'; // Enable TLS
encryption, `ssl` also accepted
+ $mail->Port = 587; // TCP port to
connect to
-$mail->isSMTP(); // Set mailer to use SMTP
-$mail->Host = 'smtp1.example.com;smtp2.example.com'; // Specify main and
backup SMTP servers
-$mail->SMTPAuth = true; // Enable SMTP
authentication
-$mail->Username = 'address@hidden'; // SMTP username
-$mail->Password = 'secret'; // SMTP password
-$mail->SMTPSecure = 'tls'; // Enable TLS
encryption, `ssl` also accepted
-$mail->Port = 587; // TCP port to connect to
+ //Recipients
+ $mail->setFrom('address@hidden', 'Mailer');
+ $mail->addAddress('address@hidden', 'Joe User'); // Add a recipient
+ $mail->addAddress('address@hidden'); // Name is optional
+ $mail->addReplyTo('address@hidden', 'Information');
+ $mail->addCC('address@hidden');
+ $mail->addBCC('address@hidden');
-$mail->From = 'address@hidden';
-$mail->FromName = 'Mailer';
-$mail->addAddress('address@hidden', 'Joe User'); // Add a recipient
-$mail->addAddress('address@hidden'); // Name is optional
-$mail->addReplyTo('address@hidden', 'Information');
-$mail->addCC('address@hidden');
-$mail->addBCC('address@hidden');
+ //Attachments
+ $mail->addAttachment('/var/tmp/file.tar.gz'); // Add attachments
+ $mail->addAttachment('/tmp/image.jpg', 'new.jpg'); // Optional name
-$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
+ //Content
+ $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';
-$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()) {
+ $mail->send();
+ echo 'Message has been sent';
+} catch (Exception $e) {
echo 'Message could not be sent.';
echo 'Mailer Error: ' . $mail->ErrorInfo;
-} else {
- echo 'Message has been sent';
}
```
-You'll find plenty more to play with in the [examples](examples/) folder.
+You'll find plenty more to play with in the
[examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder.
That's it. You should now be ready to use PHPMailer!
## Localization
-PHPMailer defaults to English, but in the [language](language/) folder you'll
find numerous (46 at the time of writing!) translations for PHPMailer error
messages that you may encounter. Their filenames contain [ISO
639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the
translations, for example `fr` for French. To specify a language, you need to
tell PHPMailer which one to use, like this:
+PHPMailer defaults to English, but in the
[language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder
you'll find numerous (46 at the time of writing!) translations for PHPMailer
error messages that you may encounter. Their filenames contain [ISO
639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the
translations, for example `fr` for French. To specify a language, you need to
tell PHPMailer which one to use, like this:
```php
// To load the French version
@@ -114,52 +141,63 @@
$mail->setLanguage('fr', '/optional/path/to/language/directory/');
```
-We welcome corrections and new languages - if you're looking for corrections
to do, run the [phpmailerLangTest.php](test/phpmailerLangTest.php) script in
the tests folder and it will show any missing translations.
+We welcome corrections and new languages - if you're looking for corrections
to do, run the
[PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php)
script in the tests folder and it will show any missing translations.
## Documentation
+Start reading at the [GitHub
wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble,
this should be the first place you look as it's the most frequently updated.
-Examples of how to use PHPMailer for common scenarios can be found in the
[examples](examples/) folder. If you're looking for a good starting point, we
recommend you start with [the gmail example](examples/gmail.phps).
+Examples of how to use PHPMailer for common scenarios can be found in the
[examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder.
If you're looking for a good starting point, we recommend you start with [the
Gmail
example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
-There are tips and a troubleshooting guide in the [GitHub
wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble,
this should be the first place you look as it's the most frequently updated.
+Note that in order to reduce PHPMailer's deployed code footprint, the examples
are no longer included if you load PHPMailer via composer or via [GitHub's zip
file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so
you'll need to either clone the git repository or use the above links to get to
the examples directly.
Complete generated API documentation is [available
online](http://phpmailer.github.io/PHPMailer/).
-You'll find some basic user-level docs in the [docs](docs/) folder, and you
can generate complete API-level documentation using the
[generatedocs.sh](docs/generatedocs.sh) shell script in the docs folder, though
you'll need to install [PHPDocumentor](http://www.phpdoc.org) first. You may
find [the unit tests](test/phpmailerTest.php) a good source of how to do
various operations such as encryption.
+You can generate complete API-level documentation by running `phpdoc` in the
top-level folder, and documentation will appear in teh `docs` folder, though
you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may
find [the unit
tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/phpmailerTest.php)
a good source of how to do various operations such as encryption.
-If the documentation doesn't cover what you need, search the [many questions
on StackOverflow](http://stackoverflow.com/questions/tagged/phpmailer), and
before you ask a question about "SMTP Error: Could not connect to SMTP host.",
[read the troubleshooting
guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
+If the documentation doesn't cover what you need, search the [many questions
on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and
before you ask a question about "SMTP Error: Could not connect to SMTP host.",
[read the troubleshooting
guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
## Tests
+There is a PHPUnit test script in the
[test](https://github.com/PHPMailer/PHPMailer/tree/master/test/) folder.
PHPMailer uses PHPUnit 4.8 - we would use 5.x but we need to run on PHP 5.5.
-There is a PHPUnit test script in the [test](test/) folder.
-
Build status: [](https://travis-ci.org/PHPMailer/PHPMailer)
If this isn't passing, is there something you can do to help?
+## Security
+
+Please disclose any vulnerabilities found responsibly - report any security
problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local
file disclosure vulnerability,
[CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223).
If content passed into `msgHTML()` is sourced from unfiltered user input,
relative paths can map to absolute local file paths and added as attachments.
Also note that `addAttachment` (just like `file_get_contents`, `passthru`,
`unlink`, etc) should not be passed user-sourced params either! Reported by
Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are
vulnerable to
[CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045)
a remote code execution vulnerability, responsibly reported by [Dawid
Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html),
and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to
[CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033)
a critical remote code execution vulnerability, responsibly reported by [Dawid
Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md)
for more detail on security issues.
+
## Contributing
-
Please submit bug reports, suggestions and pull requests to the [GitHub issue
tracker](https://github.com/PHPMailer/PHPMailer/issues).
We're particularly interested in fixing edge-cases, expanding test coverage
and updating translations.
-With the move to the PHPMailer GitHub organisation, you'll need to update any
remote URLs referencing the old GitHub location with a command like this from
within your clone:
+If you found a mistake in the docs, or want to add something, go ahead and
amend the wiki - anyone can edit it.
+If you have git clones from prior to the move to the PHPMailer GitHub
organisation, you'll need to update any remote URLs referencing the old GitHub
location with a command like this from within your clone:
+
```sh
git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
```
-Please *don't* use the SourceForge or Google Code projects any more.
+Please *don't* use the SourceForge or Google Code projects any more; they are
obsolete and no longer maintained.
## Sponsorship
-
Development time and resources for PHPMailer are provided by
[Smartmessages.net](https://info.smartmessages.net/), a powerful email
marketing system.
<a href="https://info.smartmessages.net/";><img
src="https://www.smartmessages.net/img/smartmessages-logo.svg"; width="250"
height="28" alt="Smartmessages email marketing"></a>
-Other contributions are gladly received, whether in beer πΊ, T-shirts π, Amazon
wishlist raids, or cold, hard cash π°.
+Other contributions are gladly received, whether in beer πΊ, T-shirts π, Amazon
wishlist raids, or cold, hard cash π°. If you'd like to donate to say "thank
you" to maintainers or contributors, please contact them through individual
profile pages via [the contributors
page](https://github.com/PHPMailer/PHPMailer/graphs/contributors).
## Changelog
-
See [changelog](changelog.md).
## History
@@ -166,9 +204,9 @@
- PHPMailer was originally written in 2001 by Brent R. Matzelle as a
[SourceForge project](http://sourceforge.net/projects/phpmailer/).
- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the
project in 2004.
- Became an Apache incubator project on Google Code in 2010, managed by Jim
Jagielski.
-- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer).
-- Jim and Marcus decide to join forces and use GitHub as the canonical and
official repo for PHPMailer.
-- PHPMailer moves to the [PHPMailer
organisation](https://github.com/PHPMailer) on GitHub.
+- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer) in
2008.
+- Jim and Marcus decide to join forces and use GitHub as the canonical and
official repo for PHPMailer in 2013.
+- PHPMailer moves to the [PHPMailer
organisation](https://github.com/PHPMailer) on GitHub in 2013.
### What's changed since moving from SourceForge?
- Official successor to the SourceForge and Google Code projects.
Added: trunk/phpgwapi/inc/phpmailer/SECURITY.md
===================================================================
--- trunk/phpgwapi/inc/phpmailer/SECURITY.md (rev 0)
+++ trunk/phpgwapi/inc/phpmailer/SECURITY.md 2017-12-25 17:36:09 UTC (rev
17466)
@@ -0,0 +1,26 @@
+# Security notices relating to PHPMailer
+
+Please disclose any vulnerabilities found responsibly - report any security
problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS
vulnerability in one of the code examples,
[CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503).
The `code_generator.phps` example did not filter user input prior to output.
This file is distributed with a `.phps` extension, so it it not normally
executable unless it is explicitly renamed, so it is safe by default. There was
also an undisclosed potential XSS vulnerability in the default exception
handler (unused by default). Patches for both issues kindly provided by Patrick
Monnerat of the Fedora Project.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local
file disclosure vulnerability,
[CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223).
If content passed into `msgHTML()` is sourced from unfiltered user input,
relative paths can map to absolute local file paths and added as attachments.
Also note that `addAttachment` (just like `file_get_contents`, `passthru`,
`unlink`, etc) should not be passed user-sourced params either! Reported by
Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are
vulnerable to
[CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045)
a remote code execution vulnerability, responsibly reported by [Dawid
Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html),
and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to
[CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033)
a remote code execution vulnerability, responsibly reported by [Dawid
Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to
[CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476)
an SMTP CRLF injection bug permitting arbitrary message sending.
+
+PHPMailer versions prior to 5.2.10 (released May 2015) are vulnerable to
[CVE-2008-5619](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5619),
a remote code execution vulnerability in the bundled html2text library. This
file was removed in 5.2.10, so if you are using a version prior to that and
make use of the html2text function, it's vitally important that you upgrade and
remove this file.
+
+PHPMailer versions prior to 2.0.7 and 2.2.1 are vulnerable to
[CVE-2012-0796](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0796),
an email header injection attack.
+
+Joomla 1.6.0 uses PHPMailer in an unsafe way, allowing it to reveal local file
paths, reported in
[CVE-2011-3747](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3747).
+
+PHPMailer didn't sanitise the `$lang_path` parameter in `SetLanguage`. This
wasn't a problem in itself, but some apps (PHPClassifieds, ATutor) also failed
to sanitise user-provided parameters passed to it, permitting semi-arbitrary
local file inclusion, reported in
[CVE-2010-4914](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4914),
[CVE-2007-2021](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-2021)
and
[CVE-2006-5734](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-5734).
+
+PHPMailer 1.7.2 and earlier contained a possible DDoS vulnerability reported
in
[CVE-2005-1807](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-1807).
+
+PHPMailer 1.7 and earlier (June 2003) have a possible vulnerability in the
`SendmailSend` method where shell commands may not be sanitised. Reported in
[CVE-2007-3215](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-3215).
+
Modified: trunk/phpgwapi/inc/phpmailer/VERSION
===================================================================
--- trunk/phpgwapi/inc/phpmailer/VERSION 2017-12-24 12:58:44 UTC (rev
17465)
+++ trunk/phpgwapi/inc/phpmailer/VERSION 2017-12-25 17:36:09 UTC (rev
17466)
@@ -1 +1 @@
-5.2.23
+6.0.2
\ No newline at end of file
Deleted: trunk/phpgwapi/inc/phpmailer/changelog.md
===================================================================
--- trunk/phpgwapi/inc/phpmailer/changelog.md 2017-12-24 12:58:44 UTC (rev
17465)
+++ trunk/phpgwapi/inc/phpmailer/changelog.md 2017-12-25 17:36:09 UTC (rev
17466)
@@ -1,602 +0,0 @@
-# ChangeLog
-
-* Don't switch to quoted-printable for long lines if already using base64
-* Fixed Travis-CI config when run on PHP 7
-* Add address parser for RFC822-format addresses
-* Update MS Office MIME types
-* Don't convert line breaks when using quoted-printable encoding
-* Handle MS Exchange returning an invalid empty AUTH-type list in EHLO
-
-## Version 5.2.10 (May 4th 2015)
-* Add custom header getter
-* Use `application/javascript` for .js attachments
-* Improve RFC2821 compliance for timelimits, especially for end-of-data
-* Add Azerbaijani translations (Thanks to @mirjalal)
-* Minor code cleanup for robustness
-* Add Indonesian translations (Thanks to @ceceprawiro)
-* Avoid `error_log` Debugoutput naming clash
-* Add ability to parse server capabilities in response to EHLO (useful for
SendGrid etc)
-* Amended default values for WordWrap to match RFC
-* Remove html2text converter class (has incompatible license)
-* Provide new mechanism for injecting html to text converters
-* Improve pointers to docs and support in README
-* Add example file upload script
-* Refactor and major cleanup of EasyPeasyICS, now a lot more usable
-* Make set() method simpler and more reliable
-* Add Malay translation (Thanks to @nawawi)
-* Add Bulgarian translation (Thanks to @mialy)
-* Add Armenian translation (Thanks to Hrayr Grigoryan)
-* Add Slovenian translation (Thanks to Klemen TuΕ‘ar)
-* More efficient word wrapping
-* Add support for S/MIME signing with additional CA certificate (thanks to
@IgitBuh)
-* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372)
-* Improved checks and error messages for missing extensions
-* Store and report SMTP errors more consistently
-* Add MIME multipart preamble for better Outlook compatibility
-* Enable TLS encryption automatically if the server offers it
-* Provide detailed errors when individual recipients fail
-* Report more errors when connecting
-* Add extras classes to composer classmap
-* Expose stream_context_create options via new SMTPOptions property
-* Automatic encoding switch to quoted-printable if message lines are too long
-* Add Korean translation (Thanks to @ChalkPE)
-* Provide a pointer to troubleshooting docs on SMTP connection failure
-
-## Version 5.2.9 (Sept 25th 2014)
-* **Important: The autoloader is no longer autoloaded by the PHPMailer class**
-* Update html2text from https://github.com/mtibben/html2text
-* Improve Arabic translations (Thanks to @tarekdj)
-* Consistent handling of connection variables in SMTP and POP3
-* PHPDoc cleanup
-* Update composer to use PHPUnit 4.1
-* Pass consistent params to callbacks
-* More consistent handling of error states and debug output
-* Use property defaults, remove constructors
-* Remove unreachable code
-* Use older regex validation pattern for troublesome PCRE library versions
-* Improve PCRE detection in older PHP versions
-* Handle debug output consistently, and always in UTF-8
-* Allow user-defined debug output method via a callable
-* msgHTML now converts data URIs to embedded images
-* SMTP::getLastReply() will now always be populated
-* Improved example code in README
-* Ensure long filenames in Content-Disposition are encoded correctly
-* Simplify SMTP debug output mechanism, clarify levels with constants
-* Add SMTP connection check example
-* Simplify examples, don't use mysql* functions
-
-## Version 5.2.8 (May 14th 2014)
-* Increase timeout to match RFC2821 section 4.5.3.2 and thus not fail
greetdelays, fixes #104
-* Add timestamps to default debug output
-* Add connection events and new level 3 to debug output options
-* Chinese language update (Thanks to @binaryoung)
-* Allow custom Mailer types (Thanks to @michield)
-* Cope with spaces around SMTP host specs
-* Fix processing of multiple hosts in connect string
-* Added Galician translation (Thanks to @donatorouco)
-* Autoloader now prepends
-* Docs updates
-* Add Latvian translation (Thanks to @eddsstudio)
-* Add Belarusian translation (Thanks to @amaksymiuk)
-* Make autoloader work better on older PHP versions
-* Avoid double-encoding if mbstring is overloading mail()
-* Add Portuguese translation (Thanks to @Jonadabe)
-* Make quoted-printable encoder respect line ending setting
-* Improve Chinese translation (Thanks to @PeterDaveHello)
-* Add Georgian translation (Thanks to @akalongman)
-* Add Greek translation (Thanks to @lenasterg)
-* Fix serverHostname on PHP < 5.3
-* Improve performance of SMTP class
-* Implement automatic 7bit downgrade
-* Add Vietnamese translation (Thanks to @vinades)
-* Improve example images, switch to PNG
-* Add Croatian translation (Thanks to @hrvoj3e)
-* Remove setting the Return-Path and deprecate the Return-path property - it's
just wrong!
-* Fix language file loading if CWD has changed (@stephandesouza)
-* Add HTML5 email validation pattern
-* Improve Turkish translations (Thanks to @yasinaydin)
-* Improve Romanian translations (Thanks to @aflorea)
-* Check php.ini for path to sendmail/qmail before using default
-* Improve Farsi translation (Thanks to @MHM5000)
-* Don't use quoted-printable encoding for multipart types
-* Add Serbian translation (Thanks to ajevremovic at gmail.com)
-* Remove useless PHP5 check
-* Use SVG for build status badges
-* Store MessageDate on creation
-* Better default behaviour for validateAddress
-
-## Version 5.2.7 (September 12th 2013)
-* Add Ukrainian translation from @Krezalis
-* Support for do_verp
-* Fix bug in CRAM-MD5 AUTH
-* Propagate Debugoutput option to SMTP class (@Reblutus)
-* Determine MIME type of attachments automatically
-* Add cross-platform, multibyte-safe pathinfo replacement (with tests) and use
it
-* Add a new 'html' Debugoutput type
-* Clean up SMTP debug output, remove embedded HTML
-* Some small changes in header formatting to improve IETF msglint test results
-* Update test_script to use some recently changed features, rename to
code_generator
-* Generated code actually works!
-* Update SyntaxHighlighter
-* Major overhaul and cleanup of example code
-* New PHPMailer graphic
-* msgHTML now uses RFC2392-compliant content ids
-* Add line break normalization function and use it in msgHTML
-* Don't set unnecessary reply-to addresses
-* Make fakesendmail.sh a bit cleaner and safer
-* Set a content-transfer-encoding on multiparts (fixes msglint error)
-* Fix cid generation in msgHTML (Thanks to @digitalthought)
-* Fix handling of multiple SMTP servers (Thanks to @NanoCaiordo)
-* SMTP->connect() now supports stream context options (Thanks to
@stanislavdavid)
-* Add support for iCal event alternatives (Thanks to @reblutus)
-* Update to Polish language file (Thanks to Krzysztof Kowalewski)
-* Update to Norwegian language file (Thanks to @datagutten)
-* Update to Hungarian language file (Thanks to @dominicus-75)
-* Add Persian/Farsi translation from @jaii
-* Make SMTPDebug property type match type in SMTP class
-* Add unit tests for DKIM
-* Major refactor of SMTP class
-* Reformat to PSR-2 coding standard
-* Introduce autoloader
-* Allow overriding of SMTP class
-* Overhaul of PHPDocs
-* Fix broken Q-encoding
-* Czech language update (Thanks to @nemelu)
-* Removal of excess blank lines in messages
-* Added fake POP server and unit tests for POP-before-SMTP
-
-## Version 5.2.6 (April 11th 2013)
-* Reflect move to PHPMailer GitHub organisation at
https://github.com/PHPMailer/PHPMailer
-* Fix unbumped version numbers
-* Update packagist.org with new location
-* Clean up Changelog
-
-## Version 5.2.5 (April 6th 2013)
-* First official release after move from Google Code
-* Fixes for qmail when sending via mail()
-* Merge in changes from Google code 5.2.4 release
-* Minor coding standards cleanup in SMTP class
-* Improved unit tests, now tests S/MIME signing
-* Travis-CI support on GitHub, runs tests with fake SMTP server
-
-## Version 5.2.4 (February 19, 2013)
-* Fix tag and version bug.
-* un-deprecate isSMTP(), isMail(), IsSendmail() and isQmail().
-* Numerous translation updates
-
-## Version 5.2.3 (February 8, 2013)
-* Fix issue with older PCREs and ValidateAddress() (Bugz: 124)
-* Add CRAM-MD5 authentication, thanks to Elijah madden,
https://github.com/okonomiyaki3000
-* Replacement of obsolete Quoted-Printable encoder with a much better
implementation
-* Composer package definition
-* New language added: Hebrew
-
-## Version 5.2.2 (December 3, 2012)
-* Some fixes and syncs from https://github.com/Synchro/PHPMailer
-* Add Slovak translation, thanks to Michal Tinka
-
-## Version 5.2.2-rc2 (November 6, 2012)
-* Fix SMTP server rotation (Bugz: 118)
-* Allow override of autogen'ed 'Date' header (for Drupal's
- og_mailinglist module)
-* No whitespace after '-f' option (Bugz: 116)
-* Work around potential warning (Bugz: 114)
-
-## Version 5.2.2-rc1 (September 28, 2012)
-* Header encoding works with long lines (Bugz: 93)
-* Turkish language update (Bugz: 94)
-* undefined $pattern in EncodeQ bug squashed (Bugz: 98)
-* use of mail() in safe_mode now works (Bugz: 96)
-* ValidateAddress() now 'public static' so people can override the
- default and use their own validation scheme.
-* ValidateAddress() no longer uses broken FILTER_VALIDATE_EMAIL
-* Added in AUTH PLAIN SMTP authentication
-
-## Version 5.2.2-beta2 (August 17, 2012)
-* Fixed Postfix VERP support (Bugz: 92)
-* Allow action_function callbacks to pass/use
- the From address (passed as final param)
-* Prevent inf look for get_lines() (Bugz: 77)
-* New public var ($UseSendmailOptions). Only pass sendmail()
- options iff we really are using sendmail or something sendmail
- compatible. (Bugz: 75)
-* default setting for LE returned to "\n" due to popular demand.
-
-## Version 5.2.2-beta1 (July 13, 2012)
-* Expose PreSend() and PostSend() as public methods to allow
- for more control if serializing message sending.
-* GetSentMIMEMessage() only constructs the message copy when
- needed. Save memory.
-* Only pass params to mail() if the underlying MTA is
- "sendmail" (as defined as "having the string sendmail
- in its pathname") [#69]
-* Attachments now work with Amazon SES and others [Bugz#70]
-* Debug output now sent to stdout (via echo) or error_log [Bugz#5]
-* New var: Debugoutput (for above) [Bugz#5]
-* SMTP reads now Timeout aware (new var: Timeout=15) [Bugz#71]
-* SMTP reads now can have a Timelimit associated with them
- (new var: Timelimit=30)[Bugz#71]
-* Fix quoting issue associated with charsets
-* default setting for LE is now RFC compliant: "\r\n"
-* Return-Path can now be user defined (new var: ReturnPath)
- (the default is "" which implies no change from previous
- behavior, which was to use either From or Sender) [Bugz#46]
-* X-Mailer header can now be disabled (by setting to a
- whitespace string, eg " ") [Bugz#66]
-* Bugz closed: #68, #60, #42, #43, #59, #55, #66, #48, #49,
- #52, #31, #41, #5. #70, #69
-
-## Version 5.2.1 (January 16, 2012)
-* Closed several bugs #5
-* 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('address@hidden','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)
-* 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
-
-## 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 = Etc/UTC (or your own zone)
- 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('Etc/UTC');`
- - 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()
-
-## 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.
-* fixed warning message in SMTP get_lines method
-* added TLS/SSL SMTP support.
-* 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 written 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)
-* Initial public release
Deleted: trunk/phpgwapi/inc/phpmailer/class.phpmailer.php
===================================================================
--- trunk/phpgwapi/inc/phpmailer/class.phpmailer.php 2017-12-24 12:58:44 UTC
(rev 17465)
+++ trunk/phpgwapi/inc/phpmailer/class.phpmailer.php 2017-12-25 17:36:09 UTC
(rev 17466)
@@ -1,4039 +0,0 @@
-<?php
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <address@hidden>
- * @author Jim Jagielski (jimjag) <address@hidden>
- * @author Andy Prevost (codeworxtech) <address@hidden>
- * @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 - PHP email creation and transport class.
- * @package PHPMailer
- * @author Marcus Bointon (Synchro/coolbru) <address@hidden>
- * @author Jim Jagielski (jimjag) <address@hidden>
- * @author Andy Prevost (codeworxtech) <address@hidden>
- * @author Brent R. Matzelle (original founder)
- */
-class PHPMailer
-{
- /**
- * The PHPMailer Version number.
- * @var string
- */
- public $Version = '5.2.23';
-
- /**
- * 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;
-
- /**
- * The character set of the message.
- * @var string
- */
- public $CharSet = 'iso-8859-1';
-
- /**
- * The MIME Content-type of the message.
- * @var string
- */
- public $ContentType = 'text/plain';
-
- /**
- * 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 = '';
-
- /**
- * The From email address for the message.
- * @var string
- */
- public $From = 'address@hidden';
-
- /**
- * The From name of the message.
- * @var string
- */
- public $FromName = 'Root User';
-
- /**
- * 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 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 = '';
-
- /**
- * The Subject of the message.
- * @var string
- */
- public $Subject = '';
-
- /**
- * An HTML or plain text message body.
- * If HTML then call isHTML(true).
- * @var string
- */
- public $Body = '';
-
- /**
- * 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 = '';
-
- /**
- * 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 = '';
-
- /**
- * The complete compiled MIME message body.
- * @access protected
- * @var string
- */
- protected $MIMEBody = '';
-
- /**
- * The complete compiled MIME message headers.
- * @var string
- * @access protected
- */
- protected $MIMEHeader = '';
-
- /**
- * Extra headers that createHeader() doesn't fold in.
- * @var string
- * @access protected
- */
- protected $mailHeader = '';
-
- /**
- * 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;
-
- /**
- * Which method to use to send mail.
- * Options: "mail", "sendmail", or "smtp".
- * @var string
- */
- public $Mailer = 'mail';
-
- /**
- * The path to the sendmail program.
- * @var string
- */
- public $Sendmail = '/usr/sbin/sendmail';
-
- /**
- * Whether mail() uses a fully sendmail-compatible MTA.
- * One which supports sendmail's "-oi -f" options.
- * @var boolean
- */
- public $UseSendmailOptions = true;
-
- /**
- * 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 = '';
-
- /**
- * The email address that a reading confirmation should be sent to, also
known as read receipt.
- * @var string
- */
- public $ConfirmReadingTo = '';
-
- /**
- * 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 = '';
-
- /**
- * 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 "<address@hidden>",
- * 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 = '';
-
- /**
- * The message Date to be used in the Date header.
- * If empty, the current date will be added.
- * @var string
- */
- public $MessageDate = '';
-
- /**
- * 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';
-
- /**
- * The default SMTP server port.
- * @var integer
- * @TODO Why is this needed when the SMTP class takes care of it?
- */
- public $Port = 25;
-
- /**
- * 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 = '';
-
- /**
- * What kind of encryption to use on the SMTP connection.
- * Options: '', 'ssl' or 'tls'
- * @var string
- */
- public $SMTPSecure = '';
-
- /**
- * 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;
-
- /**
- * Whether to use SMTP authentication.
- * Uses the Username and Password properties.
- * @var boolean
- * @see PHPMailer::$Username
- * @see PHPMailer::$Password
- */
- public $SMTPAuth = false;
-
- /**
- * Options array passed to stream_context_create when connecting via SMTP.
- * @var array
- */
- public $SMTPOptions = array();
-
- /**
- * SMTP username.
- * @var string
- */
- public $Username = '';
-
- /**
- * SMTP password.
- * @var string
- */
- public $Password = '';
-
- /**
- * SMTP auth type.
- * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that
order if not specified
- * @var string
- */
- public $AuthType = '';
-
- /**
- * SMTP realm.
- * Used for NTLM auth
- * @var string
- */
- public $Realm = '';
-
- /**
- * SMTP workstation.
- * Used for NTLM auth
- * @var string
- */
- public $Workstation = '';
-
- /**
- * The SMTP server timeout in seconds.
- * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
- * @var integer
- */
- public $Timeout = 300;
-
- /**
- * 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;
-
- /**
- * 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';
-
- /**
- * 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;
-
- /**
- * 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;
-
- /**
- * Storage for addresses when SingleTo is enabled.
- * @var array
- * @TODO This should really not be public
- */
- public $SingleToArray = array();
-
- /**
- * 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;
-
- /**
- * Whether to allow sending messages with an empty body.
- * @var boolean
- */
- public $AllowEmpty = false;
-
- /**
- * 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";
-
- /**
- * DKIM selector.
- * @var string
- */
- public $DKIM_selector = '';
-
- /**
- * DKIM Identity.
- * Usually the email address used as the source of the email.
- * @var string
- */
- public $DKIM_identity = '';
-
- /**
- * DKIM passphrase.
- * Used if your key is encrypted.
- * @var string
- */
- public $DKIM_passphrase = '';
-
- /**
- * DKIM signing domain name.
- * @example 'example.com'
- * @var string
- */
- public $DKIM_domain = '';
-
- /**
- * DKIM private key file path.
- * @var string
- */
- public $DKIM_private = '';
-
- /**
- * DKIM private key string.
- * If set, takes precedence over `$DKIM_private`.
- * @var string
- */
- public $DKIM_private_string = '';
-
- /**
- * Callback Action function name.
- *
- * The function that handles the result of the send email action.
- * It is called out by send() for each email sent.
- *
- * Value can be any php callable: http://www.php.net/is_callable
- *
- * Parameters:
- * boolean $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
- * string $from email address of sender
- * @var string
- */
- public $action_function = '';
-
- /**
- * What to put in the X-Mailer header.
- * Options: An empty string for PHPMailer default, whitespace for none, or
a string to use
- * @var string
- */
- public $XMailer = '';
-
- /**
- * Which validator to use by default when validating email addresses.
- * May be a callable to inject your own validator, but there are several
built-in validators.
- * @see PHPMailer::validateAddress()
- * @var string|callable
- * @static
- */
- public static $validator = 'auto';
-
- /**
- * An instance of the SMTP sender class.
- * @var SMTP
- * @access protected
- */
- protected $smtp = null;
-
- /**
- * The array of 'to' names and addresses.
- * @var array
- * @access protected
- */
- protected $to = array();
-
- /**
- * The array of 'cc' names and addresses.
- * @var array
- * @access protected
- */
- protected $cc = array();
-
- /**
- * The array of 'bcc' names and addresses.
- * @var array
- * @access protected
- */
- protected $bcc = array();
-
- /**
- * The array of reply-to names and addresses.
- * @var array
- * @access protected
- */
- protected $ReplyTo = array();
-
- /**
- * An array of all kinds of addresses.
- * Includes all of $to, $cc, $bcc
- * @var array
- * @access protected
- * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
- */
- protected $all_recipients = array();
-
- /**
- * An array of names and addresses queued for validation.
- * In send(), valid and non duplicate entries are moved to $all_recipients
- * and one of $to, $cc, or $bcc.
- * This array is used only for addresses with IDN.
- * @var array
- * @access protected
- * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
- * @see PHPMailer::$all_recipients
- */
- protected $RecipientsQueue = array();
-
- /**
- * An array of reply-to names and addresses queued for validation.
- * In send(), valid and non duplicate entries are moved to $ReplyTo.
- * This array is used only for addresses with IDN.
- * @var array
- * @access protected
- * @see PHPMailer::$ReplyTo
- */
- protected $ReplyToQueue = array();
-
- /**
- * The array of attachments.
- * @var array
- * @access protected
- */
- protected $attachment = array();
-
- /**
- * The array of custom headers.
- * @var array
- * @access protected
- */
- protected $CustomHeader = array();
-
- /**
- * The most recent Message-ID (including angular brackets).
- * @var string
- * @access protected
- */
- protected $lastMessageID = '';
-
- /**
- * The message's MIME type.
- * @var string
- * @access protected
- */
- protected $message_type = '';
-
- /**
- * The array of MIME boundary strings.
- * @var array
- * @access protected
- */
- protected $boundary = array();
-
- /**
- * The array of available languages.
- * @var array
- * @access protected
- */
- protected $language = array();
-
- /**
- * The number of errors encountered.
- * @var integer
- * @access protected
- */
- protected $error_count = 0;
-
- /**
- * The S/MIME certificate file path.
- * @var string
- * @access protected
- */
- protected $sign_cert_file = '';
-
- /**
- * The S/MIME key file path.
- * @var string
- * @access protected
- */
- protected $sign_key_file = '';
-
- /**
- * The optional S/MIME extra certificates ("CA Chain") file path.
- * @var string
- * @access protected
- */
- protected $sign_extracerts_file = '';
-
- /**
- * The S/MIME password for the key.
- * Used only if the key is encrypted.
- * @var string
- * @access protected
- */
- protected $sign_key_pass = '';
-
- /**
- * Whether to throw exceptions for errors.
- * @var boolean
- * @access protected
- */
- protected $exceptions = false;
-
- /**
- * Unique ID used for message ID and boundaries.
- * @var string
- * @access protected
- */
- protected $uniqueid = '';
-
- /**
- * Error severity: message only, continue processing.
- */
- const STOP_MESSAGE = 0;
-
- /**
- * Error severity: message, likely ok to continue processing.
- */
- const STOP_CONTINUE = 1;
-
- /**
- * Error severity: message, plus full stop, critical error reached.
- */
- const STOP_CRITICAL = 2;
-
- /**
- * SMTP RFC standard line ending.
- */
- const CRLF = "\r\n";
-
- /**
- * The maximum line length allowed by RFC 2822 section 2.1.1
- * @var integer
- */
- const MAX_LINE_LENGTH = 998;
-
- /**
- * Constructor.
- * @param boolean $exceptions Should we throw external exceptions?
- */
- public function __construct($exceptions = null)
- {
- if ($exceptions !== null) {
- $this->exceptions = (boolean)$exceptions;
- }
- }
-
- /**
- * Destructor.
- */
- public function __destruct()
- {
- //Close any open SMTP connection nicely
- $this->smtpClose();
- }
-
- /**
- * Call mail() in a safe_mode-aware fashion.
- * Also, unless sendmail_path points to sendmail (or something that
- * claims to be sendmail), don't pass params (not a perfect fix,
- * but it will do)
- * @param string $to To
- * @param string $subject Subject
- * @param string $body Message Body
- * @param string $header Additional Header(s)
- * @param string $params Params
- * @access private
- * @return boolean
- */
- private function mailPassthru($to, $subject, $body, $header, $params)
- {
- //Check overloading of mail function to avoid double-encoding
- if (ini_get('mbstring.func_overload') & 1) {
- $subject = $this->secureHeader($subject);
- } else {
- $subject = $this->encodeHeader($this->secureHeader($subject));
- }
-
- //Can't use additional_parameters in safe_mode, calling mail() with
null params breaks
- //@link http://php.net/manual/en/function.mail.php
- if (ini_get('safe_mode') or !$this->UseSendmailOptions or
is_null($params)) {
- $result = @mail($to, $subject, $body, $header);
- } else {
- $result = @mail($to, $subject, $body, $header, $params);
- }
- return $result;
- }
- /**
- * Output debugging info via user-defined method.
- * Only generates output if SMTP debug output is enabled (@see
SMTP::$do_debug).
- * @see PHPMailer::$Debugoutput
- * @see PHPMailer::$SMTPDebug
- * @param string $str
- */
- protected function edebug($str)
- {
- if ($this->SMTPDebug <= 0) {
- return;
- }
- //Avoid clash with built-in function names
- if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo'))
and is_callable($this->Debugoutput)) {
- call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
- return;
- }
- switch ($this->Debugoutput) {
- case 'error_log':
- //Don't output, just log
- error_log($str);
- break;
- case 'html':
- //Cleans up output a bit for a better looking, HTML-safe output
- echo htmlentities(
- preg_replace('/[\r\n]+/', '', $str),
- ENT_QUOTES,
- 'UTF-8'
- )
- . "<br>\n";
- break;
- case 'echo':
- default:
- //Normalize line breaks
- $str = preg_replace('/\r\n?/ms', "\n", $str);
- echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
- "\n",
- "\n \t ",
- trim($str)
- ) . "\n";
- }
- }
-
- /**
- * Sets message type to HTML or plain.
- * @param boolean $isHtml True for HTML mode.
- * @return void
- */
- public function isHTML($isHtml = true)
- {
- if ($isHtml) {
- $this->ContentType = 'text/html';
- } else {
- $this->ContentType = 'text/plain';
- }
- }
-
- /**
- * Send messages using SMTP.
- * @return void
- */
- public function isSMTP()
- {
- $this->Mailer = 'smtp';
- }
-
- /**
- * Send messages using PHP's mail() function.
- * @return void
- */
- public function isMail()
- {
- $this->Mailer = 'mail';
- }
-
- /**
- * Send messages using $Sendmail.
- * @return void
- */
- public function isSendmail()
- {
- $ini_sendmail_path = ini_get('sendmail_path');
-
- if (!stristr($ini_sendmail_path, 'sendmail')) {
- $this->Sendmail = '/usr/sbin/sendmail';
- } else {
- $this->Sendmail = $ini_sendmail_path;
- }
- $this->Mailer = 'sendmail';
- }
-
- /**
- * Send messages using qmail.
- * @return void
- */
- public function isQmail()
- {
- $ini_sendmail_path = ini_get('sendmail_path');
-
- if (!stristr($ini_sendmail_path, 'qmail')) {
- $this->Sendmail = '/var/qmail/bin/qmail-inject';
- } else {
- $this->Sendmail = $ini_sendmail_path;
- }
- $this->Mailer = 'qmail';
- }
-
- /**
- * Add a "To" address.
- * @param string $address The email address to send to
- * @param string $name
- * @return boolean true on success, false if address already used or
invalid in some way
- */
- public function addAddress($address, $name = '')
- {
- return $this->addOrEnqueueAnAddress('to', $address, $name);
- }
-
- /**
- * Add a "CC" address.
- * @note: This function works with the SMTP mailer on win32, not with the
"mail" mailer.
- * @param string $address The email address to send to
- * @param string $name
- * @return boolean true on success, false if address already used or
invalid in some way
- */
- public function addCC($address, $name = '')
- {
- return $this->addOrEnqueueAnAddress('cc', $address, $name);
- }
-
- /**
- * Add a "BCC" address.
- * @note: This function works with the SMTP mailer on win32, not with the
"mail" mailer.
- * @param string $address The email address to send to
- * @param string $name
- * @return boolean true on success, false if address already used or
invalid in some way
- */
- public function addBCC($address, $name = '')
- {
- return $this->addOrEnqueueAnAddress('bcc', $address, $name);
- }
-
- /**
- * Add a "Reply-To" address.
- * @param string $address The email address to reply to
- * @param string $name
- * @return boolean true on success, false if address already used or
invalid in some way
- */
- public function addReplyTo($address, $name = '')
- {
- return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
- }
-
- /**
- * Add an address to one of the recipient arrays or to the ReplyTo array.
Because PHPMailer
- * can't validate addresses with an IDN without knowing the
PHPMailer::$CharSet (that can still
- * be modified after calling this function), addition of such addresses is
delayed until send().
- * Addresses that have been added already return false, but do not throw
exceptions.
- * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
- * @param string $address The email address to send, resp. to reply to
- * @param string $name
- * @throws phpmailerException
- * @return boolean true on success, false if address already used or
invalid in some way
- * @access protected
- */
- protected function addOrEnqueueAnAddress($kind, $address, $name)
- {
- $address = trim($address);
- $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and
trim
- if (($pos = strrpos($address, '@')) === false) {
- // At-sign is misssing.
- $error_message = $this->lang('invalid_address') . " (addAnAddress
$kind): $address";
- $this->setError($error_message);
- $this->edebug($error_message);
- if ($this->exceptions) {
- throw new phpmailerException($error_message);
- }
- return false;
- }
- $params = array($kind, $address, $name);
- // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
- if ($this->has8bitChars(substr($address, ++$pos)) and
$this->idnSupported()) {
- if ($kind != 'Reply-To') {
- if (!array_key_exists($address, $this->RecipientsQueue)) {
- $this->RecipientsQueue[$address] = $params;
- return true;
- }
- } else {
- if (!array_key_exists($address, $this->ReplyToQueue)) {
- $this->ReplyToQueue[$address] = $params;
- return true;
- }
- }
- return false;
- }
- // Immediately add standard addresses without IDN.
- return call_user_func_array(array($this, 'addAnAddress'), $params);
- }
-
- /**
- * Add an address to one of the recipient arrays or to the ReplyTo array.
- * Addresses that have been added already return false, but do not throw
exceptions.
- * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
- * @param string $address The email address to send, resp. to reply to
- * @param string $name
- * @throws phpmailerException
- * @return boolean true on success, false if address already used or
invalid in some way
- * @access protected
- */
- protected function addAnAddress($kind, $address, $name = '')
- {
- if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
- $error_message = $this->lang('Invalid recipient kind: ') . $kind;
- $this->setError($error_message);
- $this->edebug($error_message);
- if ($this->exceptions) {
- throw new phpmailerException($error_message);
- }
- return false;
- }
- if (!$this->validateAddress($address)) {
- $error_message = $this->lang('invalid_address') . " (addAnAddress
$kind): $address";
- $this->setError($error_message);
- $this->edebug($error_message);
- if ($this->exceptions) {
- throw new phpmailerException($error_message);
- }
- return false;
- }
- if ($kind != 'Reply-To') {
- if (!array_key_exists(strtolower($address),
$this->all_recipients)) {
- array_push($this->$kind, array($address, $name));
- $this->all_recipients[strtolower($address)] = true;
- return true;
- }
- } else {
- if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
- $this->ReplyTo[strtolower($address)] = array($address, $name);
- return true;
- }
- }
- return false;
- }
-
- /**
- * Parse and validate a string containing one or more RFC822-style
comma-separated email addresses
- * of the form "display name <address>" into an array of name/address
pairs.
- * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is
available.
- * Note that quotes in the name part are removed.
- * @param string $addrstr The address list string
- * @param bool $useimap Whether to use the IMAP extension to parse the list
- * @return array
- * @link
http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more
careful implementation
- */
- public function parseAddresses($addrstr, $useimap = true)
- {
- $addresses = array();
- if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
- //Use this built-in parser if it's available
- $list = imap_rfc822_parse_adrlist($addrstr, '');
- foreach ($list as $address) {
- if ($address->host != '.SYNTAX-ERROR.') {
- if ($this->validateAddress($address->mailbox . '@' .
$address->host)) {
- $addresses[] = array(
- 'name' => (property_exists($address, 'personal') ?
$address->personal : ''),
- 'address' => $address->mailbox . '@' .
$address->host
- );
- }
- }
- }
- } else {
- //Use this simpler parser
- $list = explode(',', $addrstr);
- foreach ($list as $address) {
- $address = trim($address);
- //Is there a separate name part?
- if (strpos($address, '<') === false) {
- //No separate name, just use the whole thing
- if ($this->validateAddress($address)) {
- $addresses[] = array(
- 'name' => '',
- 'address' => $address
- );
- }
- } else {
- list($name, $email) = explode('<', $address);
- $email = trim(str_replace('>', '', $email));
- if ($this->validateAddress($email)) {
- $addresses[] = array(
- 'name' => trim(str_replace(array('"', "'"), '',
$name)),
- 'address' => $email
- );
- }
- }
- }
- }
- return $addresses;
- }
-
- /**
- * Set the From and FromName properties.
- * @param string $address
- * @param string $name
- * @param boolean $auto Whether to also set the Sender address, defaults
to true
- * @throws phpmailerException
- * @return boolean
- */
- public function setFrom($address, $name = '', $auto = true)
- {
- $address = trim($address);
- $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and
trim
- // Don't validate now addresses with IDN. Will be done in send().
- if (($pos = strrpos($address, '@')) === false or
- (!$this->has8bitChars(substr($address, ++$pos)) or
!$this->idnSupported()) and
- !$this->validateAddress($address)) {
- $error_message = $this->lang('invalid_address') . " (setFrom)
$address";
- $this->setError($error_message);
- $this->edebug($error_message);
- if ($this->exceptions) {
- throw new phpmailerException($error_message);
- }
- return false;
- }
- $this->From = $address;
- $this->FromName = $name;
- if ($auto) {
- if (empty($this->Sender)) {
- $this->Sender = $address;
- }
- }
- return true;
- }
-
- /**
- * Return the Message-ID header of the last email.
- * Technically this is the value from the last time the headers were
created,
- * but it's also the message ID of the last sent message except in
- * pathological cases.
- * @return string
- */
- public function getLastMessageID()
- {
- return $this->lastMessageID;
- }
-
- /**
- * Check that a string looks like an email address.
- * @param string $address The email address to check
- * @param string|callable $patternselect A selector for the validation
pattern to use :
- * * `auto` Pick best pattern automatically;
- * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >=
5.3.2, 5.2.14;
- * * `pcre` Use old PCRE implementation;
- * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
- * * `html5` Use the pattern given by the HTML5 spec for 'email' type form
input elements.
- * * `noregex` Don't use a regex: super fast, really dumb.
- * Alternatively you may pass in a callable to inject your own validator,
for example:
- * PHPMailer::validateAddress('address@hidden', function($address) {
- * return (strpos($address, '@') !== false);
- * });
- * You can also set the PHPMailer::$validator static to a callable,
allowing built-in methods to use your validator.
- * @return boolean
- * @static
- * @access public
- */
- public static function validateAddress($address, $patternselect = null)
- {
- if (is_null($patternselect)) {
- $patternselect = self::$validator;
- }
- if (is_callable($patternselect)) {
- return call_user_func($patternselect, $address);
- }
- //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
- if (strpos($address, "\n") !== false or strpos($address, "\r") !==
false) {
- return false;
- }
- if (!$patternselect or $patternselect == 'auto') {
- //Check this constant first so it works when extension_loaded() is
disabled by safe mode
- //Constant was added in PHP 5.2.4
- if (defined('PCRE_VERSION')) {
- //This pattern can get stuck in a recursive loop in PCRE <=
8.0.2
- if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
- $patternselect = 'pcre8';
- } else {
- $patternselect = 'pcre';
- }
- } elseif (function_exists('extension_loaded') and
extension_loaded('pcre')) {
- //Fall back to older PCRE
- $patternselect = 'pcre';
- } else {
- //Filter_var appeared in PHP 5.2.0 and does not require the
PCRE extension
- if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
- $patternselect = 'php';
- } else {
- $patternselect = 'noregex';
- }
- }
- }
- switch ($patternselect) {
- case 'pcre8':
- /**
- * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL
is based, but allows dotless domains.
- * @link
http://squiloople.com/2009/12/20/email-address-validation/
- * @copyright 2009-2010 Michael Rushton
- * Feel free to use and redistribute this code. But please
keep this copyright notice.
- */
- return (boolean)preg_match(
- '/^(?!(?>(?1)"?(?>\\\[
-~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
- '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t
]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-
'(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)'
.
-
'([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*'
.
-
'(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)'
.
-
'(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}'
.
-
'|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:'
.
-
'|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}'
.
- '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
- $address
- );
- case 'pcre':
- //An older regex that doesn't need a recent PCRE
- return (boolean)preg_match(
- '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[
-~]|[^"])"?){65,}@)(?>' .
-
'[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")'
.
-
'(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*'
.
-
'@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})'
.
-
'(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:'
.
-
'[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?'
.
-
'::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:'
.
-
'[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?'
.
-
'::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}'
.
-
'|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
- $address
- );
- case 'html5':
- /**
- * This is the pattern used in the HTML5 spec for validation
of 'email' type form input elements.
- * @link
http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
- */
- return (boolean)preg_match(
-
'/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|address@hidden(?:[a-zA-Z0-9-]{0,61}' .
-
'[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
- $address
- );
- case 'noregex':
- //No PCRE! Do something _very_ approximate!
- //Check the address is 3 chars or longer and contains an @
that's not the first or last char
- return (strlen($address) >= 3
- and strpos($address, '@') >= 1
- and strpos($address, '@') != strlen($address) - 1);
- case 'php':
- default:
- return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
- }
- }
-
- /**
- * Tells whether IDNs (Internationalized Domain Names) are supported or
not. This requires the
- * "intl" and "mbstring" PHP extensions.
- * @return bool "true" if required functions for IDN support are present
- */
- public function idnSupported()
- {
- // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
- return function_exists('idn_to_ascii') and
function_exists('mb_convert_encoding');
- }
-
- /**
- * Converts IDN in given email address to its ASCII form, also known as
punycode, if possible.
- * Important: Address must be passed in same encoding as currently set in
PHPMailer::$CharSet.
- * This function silently returns unmodified address if:
- * - No conversion is necessary (i.e. domain name is not an IDN, or is
already in ASCII form)
- * - Conversion to punycode is impossible (e.g. required PHP functions are
not available)
- * or fails for any reason (e.g. domain has characters not allowed in an
IDN)
- * @see PHPMailer::$CharSet
- * @param string $address The email address to convert
- * @return string The encoded address in ASCII form
- */
- public function punyencodeAddress($address)
- {
- // Verify we have required functions, CharSet, and at-sign.
- if ($this->idnSupported() and
- !empty($this->CharSet) and
- ($pos = strrpos($address, '@')) !== false) {
- $domain = substr($address, ++$pos);
- // Verify CharSet string is a valid one, and domain properly
encoded in this CharSet.
- if ($this->has8bitChars($domain) and @mb_check_encoding($domain,
$this->CharSet)) {
- $domain = mb_convert_encoding($domain, 'UTF-8',
$this->CharSet);
- if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
- idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
- idn_to_ascii($domain)) !== false) {
- return substr($address, 0, $pos) . $punycode;
- }
- }
- }
- return $address;
- }
-
- /**
- * Create a message and send it.
- * Uses the sending method specified by $Mailer.
- * @throws phpmailerException
- * @return boolean false on error - See the ErrorInfo property for details
of the error.
- */
- public function send()
- {
- try {
- if (!$this->preSend()) {
- return false;
- }
- return $this->postSend();
- } catch (phpmailerException $exc) {
- $this->mailHeader = '';
- $this->setError($exc->getMessage());
- if ($this->exceptions) {
- throw $exc;
- }
- return false;
- }
- }
-
- /**
- * Prepare a message for sending.
- * @throws phpmailerException
- * @return boolean
- */
- public function preSend()
- {
- try {
- $this->error_count = 0; // Reset errors
- $this->mailHeader = '';
-
- // Dequeue recipient and Reply-To addresses with IDN
- foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue)
as $params) {
- $params[1] = $this->punyencodeAddress($params[1]);
- call_user_func_array(array($this, 'addAnAddress'), $params);
- }
- if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1)
{
- throw new phpmailerException($this->lang('provide_address'),
self::STOP_CRITICAL);
- }
-
- // Validate From, Sender, and ConfirmReadingTo addresses
- foreach (array('From', 'Sender', 'ConfirmReadingTo') as
$address_kind) {
- $this->$address_kind = trim($this->$address_kind);
- if (empty($this->$address_kind)) {
- continue;
- }
- $this->$address_kind =
$this->punyencodeAddress($this->$address_kind);
- if (!$this->validateAddress($this->$address_kind)) {
- $error_message = $this->lang('invalid_address') . '
(punyEncode) ' . $this->$address_kind;
- $this->setError($error_message);
- $this->edebug($error_message);
- if ($this->exceptions) {
- throw new phpmailerException($error_message);
- }
- return false;
- }
- }
-
- // Set whether the message is multipart/alternative
- if ($this->alternativeExists()) {
- $this->ContentType = 'multipart/alternative';
- }
-
- $this->setMessageType();
- // Refuse to send an empty message unless we are specifically
allowing it
- if (!$this->AllowEmpty and empty($this->Body)) {
- throw new phpmailerException($this->lang('empty_message'),
self::STOP_CRITICAL);
- }
-
- // Create body before headers in case body makes changes to
headers (e.g. altering transfer encoding)
- $this->MIMEHeader = '';
- $this->MIMEBody = $this->createBody();
- // createBody may have added some headers, so retain them
- $tempheaders = $this->MIMEHeader;
- $this->MIMEHeader = $this->createHeader();
- $this->MIMEHeader .= $tempheaders;
-
- // To capture the complete message when using mail(), create
- // an extra header list which createHeader() doesn't fold in
- if ($this->Mailer == 'mail') {
- if (count($this->to) > 0) {
- $this->mailHeader .= $this->addrAppend('To', $this->to);
- } else {
- $this->mailHeader .= $this->headerLine('To',
'undisclosed-recipients:;');
- }
- $this->mailHeader .= $this->headerLine(
- 'Subject',
-
$this->encodeHeader($this->secureHeader(trim($this->Subject)))
- );
- }
-
- // Sign with DKIM if enabled
- if (!empty($this->DKIM_domain)
- && !empty($this->DKIM_selector)
- && (!empty($this->DKIM_private_string)
- || (!empty($this->DKIM_private) &&
file_exists($this->DKIM_private))
- )
- ) {
- $header_dkim = $this->DKIM_Add(
- $this->MIMEHeader . $this->mailHeader,
- $this->encodeHeader($this->secureHeader($this->Subject)),
- $this->MIMEBody
- );
- $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") .
self::CRLF .
- str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
- }
- return true;
- } catch (phpmailerException $exc) {
- $this->setError($exc->getMessage());
- if ($this->exceptions) {
- throw $exc;
- }
- return false;
- }
- }
-
- /**
- * Actually send a message.
- * Send the email via the selected mechanism
- * @throws phpmailerException
- * @return boolean
- */
- public function postSend()
- {
- try {
- // Choose the mailer and send through it
- switch ($this->Mailer) {
- case 'sendmail':
- case 'qmail':
- return $this->sendmailSend($this->MIMEHeader,
$this->MIMEBody);
- case 'smtp':
- return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
- case 'mail':
- return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
- default:
- $sendMethod = $this->Mailer.'Send';
- if (method_exists($this, $sendMethod)) {
- return $this->$sendMethod($this->MIMEHeader,
$this->MIMEBody);
- }
-
- return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
- }
- } catch (phpmailerException $exc) {
- $this->setError($exc->getMessage());
- $this->edebug($exc->getMessage());
- if ($this->exceptions) {
- throw $exc;
- }
- }
- return false;
- }
-
- /**
- * Send mail using the $Sendmail program.
- * @param string $header The message headers
- * @param string $body The message body
- * @see PHPMailer::$Sendmail
- * @throws phpmailerException
- * @access protected
- * @return boolean
- */
- protected function sendmailSend($header, $body)
- {
- // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be
escaped.
- if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
- if ($this->Mailer == 'qmail') {
- $sendmailFmt = '%s -f%s';
- } else {
- $sendmailFmt = '%s -oi -f%s -t';
- }
- } else {
- if ($this->Mailer == 'qmail') {
- $sendmailFmt = '%s';
- } else {
- $sendmailFmt = '%s -oi -t';
- }
- }
-
- // TODO: If possible, this should be changed to escapeshellarg. Needs
thorough testing.
- $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail),
$this->Sender);
-
- if ($this->SingleTo) {
- foreach ($this->SingleToArray as $toAddr) {
- if (address@hidden = popen($sendmail, 'w')) {
- throw new phpmailerException($this->lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
- }
- fputs($mail, 'To: ' . $toAddr . "\n");
- fputs($mail, $header);
- fputs($mail, $body);
- $result = pclose($mail);
- $this->doCallback(
- ($result == 0),
- array($toAddr),
- $this->cc,
- $this->bcc,
- $this->Subject,
- $body,
- $this->From
- );
- if ($result != 0) {
- throw new phpmailerException($this->lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
- }
- }
- } else {
- if (address@hidden = popen($sendmail, 'w')) {
- throw new phpmailerException($this->lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
- }
- fputs($mail, $header);
- fputs($mail, $body);
- $result = pclose($mail);
- $this->doCallback(
- ($result == 0),
- $this->to,
- $this->cc,
- $this->bcc,
- $this->Subject,
- $body,
- $this->From
- );
- if ($result != 0) {
- throw new phpmailerException($this->lang('execute') .
$this->Sendmail, self::STOP_CRITICAL);
- }
- }
- return true;
- }
-
- /**
- * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe
shell characters.
- *
- * Note that escapeshellarg and escapeshellcmd are inadequate for our
purposes, especially on Windows.
- * @param string $string The string to be validated
- * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045
bug report
- * @access protected
- * @return boolean
- */
- protected static function isShellSafe($string)
- {
- // Future-proof
- if (escapeshellcmd($string) !== $string
- or !in_array(escapeshellarg($string), array("'$string'",
"\"$string\""))
- ) {
- return false;
- }
-
- $length = strlen($string);
-
- for ($i = 0; $i < $length; $i++) {
- $c = $string[$i];
-
- // All other characters have a special meaning in at least one
common shell, including = and +.
- // Full stop (.) has a special meaning in cmd.exe, but its impact
should be negligible here.
- // Note that this does permit non-Latin alphanumeric characters
based on the current locale.
- if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Send mail using the PHP mail() function.
- * @param string $header The message headers
- * @param string $body The message body
- * @link http://www.php.net/manual/en/book.mail.php
- * @throws phpmailerException
- * @access protected
- * @return boolean
- */
- protected function mailSend($header, $body)
- {
- $toArr = array();
- foreach ($this->to as $toaddr) {
- $toArr[] = $this->addrFormat($toaddr);
- }
- $to = implode(', ', $toArr);
-
- $params = null;
- //This sets the SMTP envelope sender which gets turned into a
return-path header by the receiver
- if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
- // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters
will be escaped.
- if (self::isShellSafe($this->Sender)) {
- $params = sprintf('-f%s', $this->Sender);
- }
- }
- if (!empty($this->Sender) and !ini_get('safe_mode') and
$this->validateAddress($this->Sender)) {
- $old_from = ini_get('sendmail_from');
- ini_set('sendmail_from', $this->Sender);
- }
- $result = false;
- if ($this->SingleTo and count($toArr) > 1) {
- foreach ($toArr as $toAddr) {
- $result = $this->mailPassthru($toAddr, $this->Subject, $body,
$header, $params);
- $this->doCallback($result, array($toAddr), $this->cc,
$this->bcc, $this->Subject, $body, $this->From);
- }
- } else {
- $result = $this->mailPassthru($to, $this->Subject, $body, $header,
$params);
- $this->doCallback($result, $this->to, $this->cc, $this->bcc,
$this->Subject, $body, $this->From);
- }
- if (isset($old_from)) {
- ini_set('sendmail_from', $old_from);
- }
- if (!$result) {
- throw new phpmailerException($this->lang('instantiate'),
self::STOP_CRITICAL);
- }
- return true;
- }
-
- /**
- * Get an instance to use for SMTP operations.
- * Override this function to load your own SMTP implementation
- * @return SMTP
- */
- public function getSMTPInstance()
- {
- if (!is_object($this->smtp)) {
- $this->smtp = new SMTP;
- }
- return $this->smtp;
- }
-
- /**
- * Send mail via SMTP.
- * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
- * Uses the PHPMailerSMTP class by default.
- * @see PHPMailer::getSMTPInstance() to use a different class.
- * @param string $header The message headers
- * @param string $body The message body
- * @throws phpmailerException
- * @uses SMTP
- * @access protected
- * @return boolean
- */
- protected function smtpSend($header, $body)
- {
- $bad_rcpt = array();
- if (!$this->smtpConnect($this->SMTPOptions)) {
- throw new phpmailerException($this->lang('smtp_connect_failed'),
self::STOP_CRITICAL);
- }
- if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
- $smtp_from = $this->Sender;
- } else {
- $smtp_from = $this->From;
- }
- if (!$this->smtp->mail($smtp_from)) {
- $this->setError($this->lang('from_failed') . $smtp_from . ' : ' .
implode(',', $this->smtp->getError()));
- throw new phpmailerException($this->ErrorInfo,
self::STOP_CRITICAL);
- }
-
- // Attempt to send to all recipients
- foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
- foreach ($togroup as $to) {
- if (!$this->smtp->recipient($to[0])) {
- $error = $this->smtp->getError();
- $bad_rcpt[] = array('to' => $to[0], 'error' =>
$error['detail']);
- $isSent = false;
- } else {
- $isSent = true;
- }
- $this->doCallback($isSent, array($to[0]), array(), array(),
$this->Subject, $body, $this->From);
- }
- }
-
- // Only send the DATA command if we have viable recipients
- if ((count($this->all_recipients) > count($bad_rcpt)) and
!$this->smtp->data($header . $body)) {
- throw new phpmailerException($this->lang('data_not_accepted'),
self::STOP_CRITICAL);
- }
- if ($this->SMTPKeepAlive) {
- $this->smtp->reset();
- } else {
- $this->smtp->quit();
- $this->smtp->close();
- }
- //Create error message for any bad addresses
- if (count($bad_rcpt) > 0) {
- $errstr = '';
- foreach ($bad_rcpt as $bad) {
- $errstr .= $bad['to'] . ': ' . $bad['error'];
- }
- throw new phpmailerException(
- $this->lang('recipients_failed') . $errstr,
- self::STOP_CONTINUE
- );
- }
- return true;
- }
-
- /**
- * Initiate a connection to an SMTP server.
- * Returns false if the operation failed.
- * @param array $options An array of options compatible with
stream_context_create()
- * @uses SMTP
- * @access public
- * @throws phpmailerException
- * @return boolean
- */
- public function smtpConnect($options = null)
- {
- if (is_null($this->smtp)) {
- $this->smtp = $this->getSMTPInstance();
- }
-
- //If no options are provided, use whatever is set in the instance
- if (is_null($options)) {
- $options = $this->SMTPOptions;
- }
-
- // Already connected?
- if ($this->smtp->connected()) {
- return true;
- }
-
- $this->smtp->setTimeout($this->Timeout);
- $this->smtp->setDebugLevel($this->SMTPDebug);
- $this->smtp->setDebugOutput($this->Debugoutput);
- $this->smtp->setVerp($this->do_verp);
- $hosts = explode(';', $this->Host);
- $lastexception = null;
-
- foreach ($hosts as $hostentry) {
- $hostinfo = array();
- if
(!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/',
trim($hostentry), $hostinfo)) {
- // Not a valid host entry
- continue;
- }
- // $hostinfo[2]: optional ssl or tls prefix
- // $hostinfo[3]: the hostname
- // $hostinfo[4]: optional port number
- // The host string prefix can temporarily override the current
setting for SMTPSecure
- // If it's not specified, the default value is used
- $prefix = '';
- $secure = $this->SMTPSecure;
- $tls = ($this->SMTPSecure == 'tls');
- if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' ==
$this->SMTPSecure)) {
- $prefix = 'ssl://';
- $tls = false; // Can't have SSL and TLS at the same time
- $secure = 'ssl';
- } elseif ($hostinfo[2] == 'tls') {
- $tls = true;
- // tls doesn't use a prefix
- $secure = 'tls';
- }
- //Do we need the OpenSSL extension?
- $sslext = defined('OPENSSL_ALGO_SHA1');
- if ('tls' === $secure or 'ssl' === $secure) {
- //Check for an OpenSSL constant rather than using
extension_loaded, which is sometimes disabled
- if (!$sslext) {
- throw new
phpmailerException($this->lang('extension_missing').'openssl',
self::STOP_CRITICAL);
- }
- }
- $host = $hostinfo[3];
- $port = $this->Port;
- $tport = (integer)$hostinfo[4];
- if ($tport > 0 and $tport < 65536) {
- $port = $tport;
- }
- if ($this->smtp->connect($prefix . $host, $port, $this->Timeout,
$options)) {
- try {
- if ($this->Helo) {
- $hello = $this->Helo;
- } else {
- $hello = $this->serverHostname();
- }
- $this->smtp->hello($hello);
- //Automatically enable TLS encryption if:
- // * it's not disabled
- // * we have openssl extension
- // * we are not already using SSL
- // * the server offers STARTTLS
- if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl'
and $this->smtp->getServerExt('STARTTLS')) {
- $tls = true;
- }
- if ($tls) {
- if (!$this->smtp->startTLS()) {
- throw new
phpmailerException($this->lang('connect_host'));
- }
- // We must resend EHLO after TLS negotiation
- $this->smtp->hello($hello);
- }
- if ($this->SMTPAuth) {
- if (!$this->smtp->authenticate(
- $this->Username,
- $this->Password,
- $this->AuthType,
- $this->Realm,
- $this->Workstation
- )
- ) {
- throw new
phpmailerException($this->lang('authenticate'));
- }
- }
- return true;
- } catch (phpmailerException $exc) {
- $lastexception = $exc;
- $this->edebug($exc->getMessage());
- // We must have connected, but then failed TLS or Auth, so
close connection nicely
- $this->smtp->quit();
- }
- }
- }
- // If we get here, all connection attempts have failed, so close
connection hard
- $this->smtp->close();
- // As we've caught all exceptions, just report whatever the last one
was
- if ($this->exceptions and !is_null($lastexception)) {
- throw $lastexception;
- }
- return false;
- }
-
- /**
- * Close the active SMTP session if one exists.
- * @return void
- */
- public function smtpClose()
- {
- if (is_a($this->smtp, 'SMTP')) {
- if ($this->smtp->connected()) {
- $this->smtp->quit();
- $this->smtp->close();
- }
- }
- }
-
- /**
- * Set the language for error messages.
- * Returns false if it cannot load the language file.
- * The default language is English.
- * @param string $langcode ISO 639-1 2-character language code (e.g.
French is "fr")
- * @param string $lang_path Path to the language file directory, with
trailing separator (slash)
- * @return boolean
- * @access public
- */
- public function setLanguage($langcode = 'en', $lang_path = '')
- {
- // Backwards compatibility for renamed language codes
- $renamed_langcodes = array(
- 'br' => 'pt_br',
- 'cz' => 'cs',
- 'dk' => 'da',
- 'no' => 'nb',
- 'se' => 'sv',
- );
-
- if (isset($renamed_langcodes[$langcode])) {
- $langcode = $renamed_langcodes[$langcode];
- }
-
- // Define full set of translatable strings in English
- $PHPMAILER_LANG = array(
- 'authenticate' => 'SMTP Error: Could not authenticate.',
- 'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
- 'data_not_accepted' => 'SMTP Error: data not accepted.',
- 'empty_message' => 'Message body empty',
- 'encoding' => 'Unknown encoding: ',
- 'execute' => 'Could not execute: ',
- 'file_access' => 'Could not access file: ',
- 'file_open' => 'File Error: Could not open file: ',
- 'from_failed' => 'The following From address failed: ',
- 'instantiate' => 'Could not instantiate mail function.',
- 'invalid_address' => 'Invalid address: ',
- 'mailer_not_supported' => ' mailer is not supported.',
- 'provide_address' => 'You must provide at least one recipient
email address.',
- 'recipients_failed' => 'SMTP Error: The following recipients
failed: ',
- 'signing' => 'Signing Error: ',
- 'smtp_connect_failed' => 'SMTP connect() failed.',
- 'smtp_error' => 'SMTP server error: ',
- 'variable_set' => 'Cannot set or reset variable: ',
- 'extension_missing' => 'Extension missing: '
- );
- if (empty($lang_path)) {
- // Calculate an absolute path so it can work if CWD is not here
- $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'.
DIRECTORY_SEPARATOR;
- }
- //Validate $langcode
- if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
- $langcode = 'en';
- }
- $foundlang = true;
- $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
- // There is no English translation file
- if ($langcode != 'en') {
- // Make sure language file path is readable
- if (!is_readable($lang_file)) {
- $foundlang = false;
- } else {
- // Overwrite language-specific strings.
- // This way we'll never have missing translation keys.
- $foundlang = include $lang_file;
- }
- }
- $this->language = $PHPMAILER_LANG;
- return (boolean)$foundlang; // Returns false if language not found
- }
-
- /**
- * Get the array of strings for the current language.
- * @return array
- */
- public function getTranslations()
- {
- return $this->language;
- }
-
- /**
- * Create recipient headers.
- * @access public
- * @param string $type
- * @param array $addr An array of recipient,
- * where each recipient is a 2-element indexed array with element 0
containing an address
- * and element 1 containing a name, like:
- * array(array('address@hidden', 'Joe User'), array('address@hidden', 'Zoe
User'))
- * @return string
- */
- public function addrAppend($type, $addr)
- {
- $addresses = array();
- foreach ($addr as $address) {
- $addresses[] = $this->addrFormat($address);
- }
- return $type . ': ' . implode(', ', $addresses) . $this->LE;
- }
-
- /**
- * Format an address for use in a message header.
- * @access public
- * @param array $addr A 2-element indexed array, element 0 containing an
address, element 1 containing a name
- * like array('address@hidden', 'Joe User')
- * @return string
- */
- public function addrFormat($addr)
- {
- if (empty($addr[1])) { // No name provided
- return $this->secureHeader($addr[0]);
- } else {
- return $this->encodeHeader($this->secureHeader($addr[1]),
'phrase') . ' <' . $this->secureHeader(
- $addr[0]
- ) . '>';
- }
- }
-
- /**
- * Word-wrap message.
- * For use with mailers that do not automatically perform wrapping
- * and for quoted-printable encoded messages.
- * Original written by philippe.
- * @param string $message The message to wrap
- * @param integer $length The line length to wrap to
- * @param boolean $qp_mode Whether to run in Quoted-Printable mode
- * @access public
- * @return string
- */
- public function wrapText($message, $length, $qp_mode = false)
- {
- if ($qp_mode) {
- $soft_break = sprintf(' =%s', $this->LE);
- } else {
- $soft_break = $this->LE;
- }
- // If utf-8 encoding is used, we will need to make sure we don't
- // split multibyte characters when we wrap
- $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
- $lelen = strlen($this->LE);
- $crlflen = strlen(self::CRLF);
-
- $message = $this->fixEOL($message);
- //Remove a trailing line break
- if (substr($message, -$lelen) == $this->LE) {
- $message = substr($message, 0, -$lelen);
- }
-
- //Split message into lines
- $lines = explode($this->LE, $message);
- //Message will be rebuilt in here
- $message = '';
- foreach ($lines as $line) {
- $words = explode(' ', $line);
- $buf = '';
- $firstword = true;
- foreach ($words as $word) {
- if ($qp_mode and (strlen($word) > $length)) {
- $space_left = $length - strlen($buf) - $crlflen;
- if (!$firstword) {
- if ($space_left > 20) {
- $len = $space_left;
- if ($is_utf8) {
- $len = $this->utf8CharBoundary($word, $len);
- } elseif (substr($word, $len - 1, 1) == '=') {
- $len--;
- } elseif (substr($word, $len - 2, 1) == '=') {
- $len -= 2;
- }
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
- $buf .= ' ' . $part;
- $message .= $buf . sprintf('=%s', self::CRLF);
- } else {
- $message .= $buf . $soft_break;
- }
- $buf = '';
- }
- while (strlen($word) > 0) {
- if ($length <= 0) {
- break;
- }
- $len = $length;
- if ($is_utf8) {
- $len = $this->utf8CharBoundary($word, $len);
- } elseif (substr($word, $len - 1, 1) == '=') {
- $len--;
- } elseif (substr($word, $len - 2, 1) == '=') {
- $len -= 2;
- }
- $part = substr($word, 0, $len);
- $word = substr($word, $len);
-
- if (strlen($word) > 0) {
- $message .= $part . sprintf('=%s', self::CRLF);
- } else {
- $buf = $part;
- }
- }
- } else {
- $buf_o = $buf;
- if (!$firstword) {
- $buf .= ' ';
- }
- $buf .= $word;
-
- if (strlen($buf) > $length and $buf_o != '') {
- $message .= $buf_o . $soft_break;
- $buf = $word;
- }
- }
- $firstword = false;
- }
- $message .= $buf . self::CRLF;
- }
-
- return $message;
- }
-
- /**
- * Find the last character boundary prior to $maxLength in a utf-8
- * quoted-printable encoded string.
- * Original written by Colin Brown.
- * @access public
- * @param string $encodedText utf-8 QP text
- * @param integer $maxLength Find the last character boundary prior to
this length
- * @return integer
- */
- public function utf8CharBoundary($encodedText, $maxLength)
- {
- $foundSplitPos = false;
- $lookBack = 3;
- while (!$foundSplitPos) {
- $lastChunk = substr($encodedText, $maxLength - $lookBack,
$lookBack);
- $encodedCharPos = strpos($lastChunk, '=');
- if (false !== $encodedCharPos) {
- // Found start of encoded character byte within $lookBack
block.
- // Check the encoded byte value (the 2 chars after the '=')
- $hex = substr($encodedText, $maxLength - $lookBack +
$encodedCharPos + 1, 2);
- $dec = hexdec($hex);
- if ($dec < 128) {
- // Single byte character.
- // If the encoded char was found at pos 0, it will fit
- // otherwise reduce maxLength to start of the encoded char
- if ($encodedCharPos > 0) {
- $maxLength = $maxLength - ($lookBack -
$encodedCharPos);
- }
- $foundSplitPos = true;
- } elseif ($dec >= 192) {
- // First byte of a multi byte character
- // Reduce maxLength to split at start of character
- $maxLength = $maxLength - ($lookBack - $encodedCharPos);
- $foundSplitPos = true;
- } elseif ($dec < 192) {
- // Middle byte of a multi byte character, look further back
- $lookBack += 3;
- }
- } else {
- // No encoded character found
- $foundSplitPos = true;
- }
- }
- return $maxLength;
- }
-
- /**
- * Apply word wrapping to the message body.
- * Wraps the message body to the number of chars set in the WordWrap
property.
- * You should only do this to plain-text bodies as wrapping HTML tags may
break them.
- * This is called automatically by createBody(), so you don't need to call
it yourself.
- * @access public
- * @return void
- */
- public function setWordWrap()
- {
- if ($this->WordWrap < 1) {
- return;
- }
-
- switch ($this->message_type) {
- case 'alt':
- case 'alt_inline':
- case 'alt_attach':
- case 'alt_inline_attach':
- $this->AltBody = $this->wrapText($this->AltBody,
$this->WordWrap);
- break;
- default:
- $this->Body = $this->wrapText($this->Body, $this->WordWrap);
- break;
- }
- }
-
- /**
- * Assemble message headers.
- * @access public
- * @return string The assembled headers
- */
- public function createHeader()
- {
- $result = '';
-
- if ($this->MessageDate == '') {
- $this->MessageDate = self::rfcDate();
- }
- $result .= $this->headerLine('Date', $this->MessageDate);
-
- // To be created automatically by mail()
- if ($this->SingleTo) {
- if ($this->Mailer != 'mail') {
- foreach ($this->to as $toaddr) {
- $this->SingleToArray[] = $this->addrFormat($toaddr);
- }
- }
- } else {
- if (count($this->to) > 0) {
- if ($this->Mailer != 'mail') {
- $result .= $this->addrAppend('To', $this->to);
- }
- } elseif (count($this->cc) == 0) {
- $result .= $this->headerLine('To', 'undisclosed-recipients:;');
- }
- }
-
- $result .= $this->addrAppend('From', array(array(trim($this->From),
$this->FromName)));
-
- // sendmail and mail() extract Cc from the header before sending
- if (count($this->cc) > 0) {
- $result .= $this->addrAppend('Cc', $this->cc);
- }
-
- // sendmail and mail() extract Bcc from the header before sending
- if ((
- $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or
$this->Mailer == 'mail'
- )
- and count($this->bcc) > 0
- ) {
- $result .= $this->addrAppend('Bcc', $this->bcc);
- }
-
- if (count($this->ReplyTo) > 0) {
- $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
- }
-
- // mail() sets the subject itself
- if ($this->Mailer != 'mail') {
- $result .= $this->headerLine('Subject',
$this->encodeHeader($this->secureHeader($this->Subject)));
- }
-
- // Only allow a custom message ID if it conforms to RFC 5322 section
3.6.4
- // https://tools.ietf.org/html/rfc5322#section-3.6.4
- if ('' != $this->MessageID and preg_match('/^<address@hidden>$/',
$this->MessageID)) {
- $this->lastMessageID = $this->MessageID;
- } else {
- $this->lastMessageID = sprintf('<address@hidden>',
$this->uniqueid, $this->serverHostname());
- }
- $result .= $this->headerLine('Message-ID', $this->lastMessageID);
- if (!is_null($this->Priority)) {
- $result .= $this->headerLine('X-Priority', $this->Priority);
- }
- if ($this->XMailer == '') {
- $result .= $this->headerLine(
- 'X-Mailer',
- 'PHPMailer ' . $this->Version . '
(https://github.com/PHPMailer/PHPMailer)'
- );
- } else {
- $myXmailer = trim($this->XMailer);
- if ($myXmailer) {
- $result .= $this->headerLine('X-Mailer', $myXmailer);
- }
- }
-
- if ($this->ConfirmReadingTo != '') {
- $result .= $this->headerLine('Disposition-Notification-To', '<' .
$this->ConfirmReadingTo . '>');
- }
-
- // Add custom headers
- foreach ($this->CustomHeader as $header) {
- $result .= $this->headerLine(
- trim($header[0]),
- $this->encodeHeader(trim($header[1]))
- );
- }
- if (!$this->sign_key_file) {
- $result .= $this->headerLine('MIME-Version', '1.0');
- $result .= $this->getMailMIME();
- }
-
- return $result;
- }
-
- /**
- * Get the message MIME type headers.
- * @access public
- * @return string
- */
- public function getMailMIME()
- {
- $result = '';
- $ismultipart = true;
- switch ($this->message_type) {
- case 'inline':
- $result .= $this->headerLine('Content-Type',
'multipart/related;');
- $result .= $this->textLine("\tboundary=\"" .
$this->boundary[1] . '"');
- break;
- case 'attach':
- case 'inline_attach':
- case 'alt_attach':
- case 'alt_inline_attach':
- $result .= $this->headerLine('Content-Type',
'multipart/mixed;');
- $result .= $this->textLine("\tboundary=\"" .
$this->boundary[1] . '"');
- break;
- case 'alt':
- case 'alt_inline':
- $result .= $this->headerLine('Content-Type',
'multipart/alternative;');
- $result .= $this->textLine("\tboundary=\"" .
$this->boundary[1] . '"');
- break;
- default:
- // Catches case 'plain': and case '':
- $result .= $this->textLine('Content-Type: ' .
$this->ContentType . '; charset=' . $this->CharSet);
- $ismultipart = false;
- break;
- }
- // RFC1341 part 5 says 7bit is assumed if not specified
- if ($this->Encoding != '7bit') {
- // RFC 2045 section 6.4 says multipart MIME parts may only use
7bit, 8bit or binary CTE
- if ($ismultipart) {
- if ($this->Encoding == '8bit') {
- $result .= $this->headerLine('Content-Transfer-Encoding',
'8bit');
- }
- // The only remaining alternatives are quoted-printable and
base64, which are both 7bit compatible
- } else {
- $result .= $this->headerLine('Content-Transfer-Encoding',
$this->Encoding);
- }
- }
-
- if ($this->Mailer != 'mail') {
- $result .= $this->LE;
- }
-
- return $result;
- }
-
- /**
- * Returns the whole MIME message.
- * Includes complete headers and body.
- * Only valid post preSend().
- * @see PHPMailer::preSend()
- * @access public
- * @return string
- */
- public function getSentMIMEMessage()
- {
- return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") .
self::CRLF . self::CRLF . $this->MIMEBody;
- }
-
- /**
- * Create unique ID
- * @return string
- */
- protected function generateId() {
- return md5(uniqid(time()));
- }
-
- /**
- * Assemble the message body.
- * Returns an empty string on failure.
- * @access public
- * @throws phpmailerException
- * @return string The assembled message body
- */
- public function createBody()
- {
- $body = '';
- //Create unique IDs and preset boundaries
- $this->uniqueid = $this->generateId();
- $this->boundary[1] = 'b1_' . $this->uniqueid;
- $this->boundary[2] = 'b2_' . $this->uniqueid;
- $this->boundary[3] = 'b3_' . $this->uniqueid;
-
- if ($this->sign_key_file) {
- $body .= $this->getMailMIME() . $this->LE;
- }
-
- $this->setWordWrap();
-
- $bodyEncoding = $this->Encoding;
- $bodyCharSet = $this->CharSet;
- //Can we do a 7-bit downgrade?
- if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
- $bodyEncoding = '7bit';
- //All ISO 8859, Windows codepage and UTF-8 charsets are ascii
compatible up to 7-bit
- $bodyCharSet = 'us-ascii';
- }
- //If lines are too long, and we're not already using an encoding that
will shorten them,
- //change to quoted-printable transfer encoding for the body part only
- if ('base64' != $this->Encoding and
self::hasLineLongerThanMax($this->Body)) {
- $bodyEncoding = 'quoted-printable';
- }
-
- $altBodyEncoding = $this->Encoding;
- $altBodyCharSet = $this->CharSet;
- //Can we do a 7-bit downgrade?
- if ($altBodyEncoding == '8bit' and
!$this->has8bitChars($this->AltBody)) {
- $altBodyEncoding = '7bit';
- //All ISO 8859, Windows codepage and UTF-8 charsets are ascii
compatible up to 7-bit
- $altBodyCharSet = 'us-ascii';
- }
- //If lines are too long, and we're not already using an encoding that
will shorten them,
- //change to quoted-printable transfer encoding for the alt body part
only
- if ('base64' != $altBodyEncoding and
self::hasLineLongerThanMax($this->AltBody)) {
- $altBodyEncoding = 'quoted-printable';
- }
- //Use this as a preamble in all multipart message types
- $mimepre = "This is a multi-part message in MIME format." . $this->LE
. $this->LE;
- switch ($this->message_type) {
- case 'inline':
- $body .= $mimepre;
- $body .= $this->getBoundary($this->boundary[1], $bodyCharSet,
'', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->attachAll('inline', $this->boundary[1]);
- break;
- case 'attach':
- $body .= $mimepre;
- $body .= $this->getBoundary($this->boundary[1], $bodyCharSet,
'', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->attachAll('attachment', $this->boundary[1]);
- break;
- case 'inline_attach':
- $body .= $mimepre;
- $body .= $this->textLine('--' . $this->boundary[1]);
- $body .= $this->headerLine('Content-Type',
'multipart/related;');
- $body .= $this->textLine("\tboundary=\"" . $this->boundary[2]
. '"');
- $body .= $this->LE;
- $body .= $this->getBoundary($this->boundary[2], $bodyCharSet,
'', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->attachAll('inline', $this->boundary[2]);
- $body .= $this->LE;
- $body .= $this->attachAll('attachment', $this->boundary[1]);
- break;
- case 'alt':
- $body .= $mimepre;
- $body .= $this->getBoundary($this->boundary[1],
$altBodyCharSet, 'text/plain', $altBodyEncoding);
- $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->getBoundary($this->boundary[1], $bodyCharSet,
'text/html', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- if (!empty($this->Ical)) {
- $body .= $this->getBoundary($this->boundary[1], '',
'text/calendar; method=REQUEST', '');
- $body .= $this->encodeString($this->Ical, $this->Encoding);
- $body .= $this->LE . $this->LE;
- }
- $body .= $this->endBoundary($this->boundary[1]);
- break;
- case 'alt_inline':
- $body .= $mimepre;
- $body .= $this->getBoundary($this->boundary[1],
$altBodyCharSet, 'text/plain', $altBodyEncoding);
- $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->textLine('--' . $this->boundary[1]);
- $body .= $this->headerLine('Content-Type',
'multipart/related;');
- $body .= $this->textLine("\tboundary=\"" . $this->boundary[2]
. '"');
- $body .= $this->LE;
- $body .= $this->getBoundary($this->boundary[2], $bodyCharSet,
'text/html', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->attachAll('inline', $this->boundary[2]);
- $body .= $this->LE;
- $body .= $this->endBoundary($this->boundary[1]);
- break;
- case 'alt_attach':
- $body .= $mimepre;
- $body .= $this->textLine('--' . $this->boundary[1]);
- $body .= $this->headerLine('Content-Type',
'multipart/alternative;');
- $body .= $this->textLine("\tboundary=\"" . $this->boundary[2]
. '"');
- $body .= $this->LE;
- $body .= $this->getBoundary($this->boundary[2],
$altBodyCharSet, 'text/plain', $altBodyEncoding);
- $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->getBoundary($this->boundary[2], $bodyCharSet,
'text/html', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->endBoundary($this->boundary[2]);
- $body .= $this->LE;
- $body .= $this->attachAll('attachment', $this->boundary[1]);
- break;
- case 'alt_inline_attach':
- $body .= $mimepre;
- $body .= $this->textLine('--' . $this->boundary[1]);
- $body .= $this->headerLine('Content-Type',
'multipart/alternative;');
- $body .= $this->textLine("\tboundary=\"" . $this->boundary[2]
. '"');
- $body .= $this->LE;
- $body .= $this->getBoundary($this->boundary[2],
$altBodyCharSet, 'text/plain', $altBodyEncoding);
- $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->textLine('--' . $this->boundary[2]);
- $body .= $this->headerLine('Content-Type',
'multipart/related;');
- $body .= $this->textLine("\tboundary=\"" . $this->boundary[3]
. '"');
- $body .= $this->LE;
- $body .= $this->getBoundary($this->boundary[3], $bodyCharSet,
'text/html', $bodyEncoding);
- $body .= $this->encodeString($this->Body, $bodyEncoding);
- $body .= $this->LE . $this->LE;
- $body .= $this->attachAll('inline', $this->boundary[3]);
- $body .= $this->LE;
- $body .= $this->endBoundary($this->boundary[2]);
- $body .= $this->LE;
- $body .= $this->attachAll('attachment', $this->boundary[1]);
- break;
- default:
- // Catch case 'plain' and case '', applies to simple
`text/plain` and `text/html` body content types
- //Reset the `Encoding` property in case we changed it for line
length reasons
- $this->Encoding = $bodyEncoding;
- $body .= $this->encodeString($this->Body, $this->Encoding);
- break;
- }
-
- if ($this->isError()) {
- $body = '';
- } elseif ($this->sign_key_file) {
- try {
- if (!defined('PKCS7_TEXT')) {
- throw new
phpmailerException($this->lang('extension_missing') . 'openssl');
- }
- // @TODO would be nice to use php://temp streams here, but
need to wrap for PHP < 5.1
- $file = tempnam(sys_get_temp_dir(), 'mail');
- if (false === file_put_contents($file, $body)) {
- throw new phpmailerException($this->lang('signing') . '
Could not write temp file');
- }
- $signed = tempnam(sys_get_temp_dir(), 'signed');
- //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
- if (empty($this->sign_extracerts_file)) {
- $sign = @openssl_pkcs7_sign(
- $file,
- $signed,
- 'file://' . realpath($this->sign_cert_file),
- array('file://' . realpath($this->sign_key_file),
$this->sign_key_pass),
- null
- );
- } else {
- $sign = @openssl_pkcs7_sign(
- $file,
- $signed,
- 'file://' . realpath($this->sign_cert_file),
- array('file://' . realpath($this->sign_key_file),
$this->sign_key_pass),
- null,
- PKCS7_DETACHED,
- $this->sign_extracerts_file
- );
- }
- if ($sign) {
- @unlink($file);
- $body = file_get_contents($signed);
- @unlink($signed);
- //The message returned by openssl contains both headers
and body, so need to split them up
- $parts = explode("\n\n", $body, 2);
- $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
- $body = $parts[1];
- } else {
- @unlink($file);
- @unlink($signed);
- throw new phpmailerException($this->lang('signing') .
openssl_error_string());
- }
- } catch (phpmailerException $exc) {
- $body = '';
- if ($this->exceptions) {
- throw $exc;
- }
- }
- }
- return $body;
- }
-
- /**
- * Return the start of a message boundary.
- * @access protected
- * @param string $boundary
- * @param string $charSet
- * @param string $contentType
- * @param string $encoding
- * @return string
- */
- protected 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->LE;
- // RFC1341 part 5 says 7bit is assumed if not specified
- if ($encoding != '7bit') {
- $result .= $this->headerLine('Content-Transfer-Encoding',
$encoding);
- }
- $result .= $this->LE;
-
- return $result;
- }
-
- /**
- * Return the end of a message boundary.
- * @access protected
- * @param string $boundary
- * @return string
- */
- protected function endBoundary($boundary)
- {
- return $this->LE . '--' . $boundary . '--' . $this->LE;
- }
-
- /**
- * Set the message type.
- * PHPMailer only supports some preset message types, not arbitrary MIME
structures.
- * @access protected
- * @return void
- */
- protected function setMessageType()
- {
- $type = array();
- if ($this->alternativeExists()) {
- $type[] = 'alt';
- }
- if ($this->inlineImageExists()) {
- $type[] = 'inline';
- }
- if ($this->attachmentExists()) {
- $type[] = 'attach';
- }
- $this->message_type = implode('_', $type);
- if ($this->message_type == '') {
- //The 'plain' message_type refers to the message having a single
body element, not that it is plain-text
- $this->message_type = 'plain';
- }
- }
-
- /**
- * Format a header line.
- * @access public
- * @param string $name
- * @param string $value
- * @return string
- */
- public function headerLine($name, $value)
- {
- return $name . ': ' . $value . $this->LE;
- }
-
- /**
- * Return a formatted mail line.
- * @access public
- * @param string $value
- * @return string
- */
- public function textLine($value)
- {
- return $value . $this->LE;
- }
-
- /**
- * Add an attachment from a path on the filesystem.
- * Never use a user-supplied path to a file!
- * Returns false if the file could not be found or read.
- * @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 (MIME) type.
- * @param string $disposition Disposition to use
- * @throws phpmailerException
- * @return boolean
- */
- public function addAttachment($path, $name = '', $encoding = 'base64',
$type = '', $disposition = 'attachment')
- {
- try {
- if (address@hidden($path)) {
- throw new phpmailerException($this->lang('file_access') .
$path, self::STOP_CONTINUE);
- }
-
- // If a MIME type is not specified, try to work it out from the
file name
- if ($type == '') {
- $type = self::filenameToType($path);
- }
-
- $filename = basename($path);
- if ($name == '') {
- $name = $filename;
- }
-
- $this->attachment[] = array(
- 0 => $path,
- 1 => $filename,
- 2 => $name,
- 3 => $encoding,
- 4 => $type,
- 5 => false, // isStringAttachment
- 6 => $disposition,
- 7 => 0
- );
-
- } catch (phpmailerException $exc) {
- $this->setError($exc->getMessage());
- $this->edebug($exc->getMessage());
- if ($this->exceptions) {
- throw $exc;
- }
- return false;
- }
- return true;
- }
-
- /**
- * Return the array of attachments.
- * @return array
- */
- public function getAttachments()
- {
- return $this->attachment;
- }
-
- /**
- * Attach all file, string, and binary attachments to the message.
- * Returns an empty string on failure.
- * @access protected
- * @param string $disposition_type
- * @param string $boundary
- * @return string
- */
- protected function attachAll($disposition_type, $boundary)
- {
- // Return text of body
- $mime = array();
- $cidUniq = array();
- $incl = array();
-
- // Add all attachments
- foreach ($this->attachment as $attachment) {
- // Check if it is a valid disposition_filter
- if ($attachment[6] == $disposition_type) {
- // Check for string attachment
- $string = '';
- $path = '';
- $bString = $attachment[5];
- if ($bString) {
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17466] upgrade phpmailer from upstream,
sigurdne <=