diff --git a/README.md b/README.md index e3e4ecff..df565d0e 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ you should look at before rolling your own. Try [SwiftMailer](https://swiftmaile , [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc. ## License -This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution. +This software is distributed under the [LGPL 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/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](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file: @@ -144,7 +144,7 @@ If you are re-using the instance (e.g. when sending to a mailing list), you may That's it. You should now be ready to use PHPMailer! ## Localization -PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many 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 many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](https://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 @@ -162,9 +162,9 @@ To reduce PHPMailer's deployed code footprint, examples are not included if you Complete generated API documentation is [available online](https://phpmailer.github.io/PHPMailer/). -You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `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/blob/master/test/PHPMailerTest.php) a good reference for 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 the `docs` folder, though you'll need to have [PHPDocumentor](https://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good reference for how to do various operations such as encryption. -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). +If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](https://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 [PHPMailer tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/) use PHPUnit 9, with [a polyfill](https://github.com/Yoast/PHPUnit-Polyfills) to let 9-style tests run on older PHPUnit and PHP versions. @@ -213,7 +213,7 @@ use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-php See [changelog](changelog.md). ## History -- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/). +- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](https://sourceforge.net/projects/phpmailer/). - [Marcus Bointon](https://github.com/Synchro) (`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) in 2008. diff --git a/SECURITY.md b/SECURITY.md index 035a87f7..4822273f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -19,7 +19,7 @@ PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file 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.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](https://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. diff --git a/UPGRADING.md b/UPGRADING.md index 31bca7aa..a08312fd 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -38,7 +38,7 @@ require 'src/Exception.php'; ``` ## Namespace -PHPMailer 6 uses a [namespace](http://php.net/manual/en/language.namespaces.rationale.php) of `PHPMailer\PHPMailer`, because it's the PHPMailer project within the PHPMailer organisation. You **must** import (with a `use` statement) classes you're using explicitly into your own namespace, or reference them absolutely in the global namespace - all the examples do this. This means the fully-qualified name of the main PHPMailer class is `PHPMailer\PHPMailer\PHPMailer`, which is a bit of a mouthful, but there's no harm in it! If you are using other PHPMailer classes explicitly (such as `SMTP` or `Exception`), you will need to import them into your namespace too. +PHPMailer 6 uses a [namespace](https://www.php.net/manual/en/language.namespaces.rationale.php) of `PHPMailer\PHPMailer`, because it's the PHPMailer project within the PHPMailer organisation. You **must** import (with a `use` statement) classes you're using explicitly into your own namespace, or reference them absolutely in the global namespace - all the examples do this. This means the fully-qualified name of the main PHPMailer class is `PHPMailer\PHPMailer\PHPMailer`, which is a bit of a mouthful, but there's no harm in it! If you are using other PHPMailer classes explicitly (such as `SMTP` or `Exception`), you will need to import them into your namespace too. For example you might create an instance like this: @@ -91,7 +91,7 @@ try { ``` ## OAuth2 Support -The OAuth2 implementation has been completely redesigned using the [OAuth2 packages](http://oauth2-client.thephpleague.com) from the [League of extraordinary packages](http://thephpleague.com), providing support for many more OAuth services, and you'll need to update your code if you were using OAuth in 5.2. See [the examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) and documentation in the [PHPMailer wiki](https://github.com/PHPMailer/PHPMailer/wiki). +The OAuth2 implementation has been completely redesigned using the [OAuth2 packages](https://oauth2-client.thephpleague.com) from the [League of extraordinary packages](https://thephpleague.com), providing support for many more OAuth services, and you'll need to update your code if you were using OAuth in 5.2. See [the examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) and documentation in the [PHPMailer wiki](https://github.com/PHPMailer/PHPMailer/wiki). ## Extras Additional classes previously bundled in the `Extras` folder (such as htmlfilter and EasyPeasyICS) have been removed - use equivalent packages from [packagist.org](https://packagist.org) instead. diff --git a/changelog.md b/changelog.md index bf930502..9303d5bb 100644 --- a/changelog.md +++ b/changelog.md @@ -886,7 +886,7 @@ 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 +* Fixed alt attachments bug: https://sourceforge.net/p/phpmailer/bugs/120/ ## Version 1.72 (Wed, May 25 2004) * Added Dutch, Swedish, Czech, Norwegian, and Turkish translations. @@ -1003,7 +1003,7 @@ NOTE: will NOT work with PHP5 in E_STRICT error mode ## 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) + (See PHP bug report: https://bugs.php.net/bug.php?id=11616 * mail() no longer passes a fifth parameter when not needed ## Version 1.15 (Fri, Jun 15 2001) diff --git a/examples/DKIM_sign.phps b/examples/DKIM_sign.phps index cebdd09f..216ba664 100644 --- a/examples/DKIM_sign.phps +++ b/examples/DKIM_sign.phps @@ -2,7 +2,7 @@ /** * This example shows sending a DKIM-signed message with PHPMailer. - * More info about DKIM can be found here: http://www.dkim.org/info/dkim-faq.html + * More info about DKIM can be found here: https://www.dkim.org/info/dkim-faq.html * There's more to using DKIM than just this code - check out this article: * @see https://yomotherboard.com/how-to-setup-email-server-dkim-keys/ * See also the DKIM_gen_keys example code in the examples folder, diff --git a/examples/README.md b/examples/README.md index 0fc5f1e0..98ad0465 100644 --- a/examples/README.md +++ b/examples/README.md @@ -8,15 +8,15 @@ This folder contains a collection of examples of using [PHPMailer](https://githu When working on email sending code you'll find yourself worrying about what might happen if all these test emails got sent to your mailing list. The solution is to use a fake mail server, one that acts just like the real thing, but just doesn't actually send anything out. Some offer web interfaces, feedback, logging, the ability to return specific error codes, all things that are useful for testing error handling, authentication etc. Here's a selection of mail testing tools you might like to try: * [FakeEmail](https://github.com/tomwardill/FakeEmail), a Python-based fake mail server with a web interface. -* [smtp-sink](http://www.postfix.org/smtp-sink.1.html), part of the Postfix mail server, so you may have this installed already. This is used in the GitHub actions configuration to run PHPMailer's unit tests. +* [smtp-sink](https://www.postfix.org/smtp-sink.1.html), part of the Postfix mail server, so you may have this installed already. This is used in the GitHub actions configuration to run PHPMailer's unit tests. * [smtp4dev](https://github.com/rnwood/smtp4dev), a dummy SMTP server for Windows and Linux. * [fakesendmail.sh](https://github.com/PHPMailer/PHPMailer/blob/master/test/fakesendmail.sh), part of PHPMailer's test setup, this is a shell script that emulates sendmail for testing 'mail' or 'sendmail' methods in PHPMailer. * [HELO](https://usehelo.com), a very nice (commercial) mail server desktop app from BeyondCode, and [how to set it up for local testing](https://usehelo.com/blog/how-to-use-helo-with-phps-mail-function). -* [msglint](http://tools.ietf.org/tools/msglint/), not a mail server, the IETF's MIME structure analyser checks the formatting of your messages. +* [msglint](https://www.splitbrain.org/_static/msglint/), not a mail server, the IETF's MIME structure analyser checks the formatting of your messages. * [MailHog](https://github.com/les-enovateurs/mailhog-examples), a Go-based email testing tool for developers with a web interface. You can use it with Docker and GitHub Actions to test your mails. The repository also contains a small part of PHPMailer's setup. * [aboutmy.email](https://aboutmy.email), a service for evaluating your email config – SPF, DKIM, DMARC, and compliance with list-unsubscribe, TLS, and many other settings. -Most of these examples use the `example.com` and `example.net` domains. These domains are reserved by IANA for illustrative purposes, as documented in [RFC 2606](http://tools.ietf.org/html/rfc2606). Don't use made-up domains like 'mydomain.com' or 'somedomain.com' in examples as someone, somewhere, probably owns them! +Most of these examples use the `example.com` and `example.net` domains. These domains are reserved by IANA for illustrative purposes, as documented in [RFC 2606](https://www.rfc-editor.org/rfc/rfc2606). Don't use made-up domains like 'mydomain.com' or 'somedomain.com' in examples as someone, somewhere, probably owns them! ## Security note Before running these examples in a web server, you'll need to rename them with '.php' extensions. They are supplied as '.phps' files which will usually be displayed with syntax highlighting by PHP instead of running them. This prevents potential security issues with running potential spam-gateway code if you happen to deploy these code examples on a live site - _please don't do that!_ diff --git a/examples/send_file_upload.phps b/examples/send_file_upload.phps index 36c74db0..31d22837 100644 --- a/examples/send_file_upload.phps +++ b/examples/send_file_upload.phps @@ -13,7 +13,7 @@ $msg = ''; if (array_key_exists('userfile', $_FILES)) { //First handle the upload //Don't trust provided filename - same goes for MIME types - //See http://php.net/manual/en/features.file-upload.php#114004 for more thorough upload validation + //See https://www.php.net/manual/en/features.file-upload.php#114004 for more thorough upload validation //Extract an extension from the provided filename $ext = PHPMailer::mb_pathinfo($_FILES['userfile']['name'], PATHINFO_EXTENSION); //Define a safe location to move the uploaded file to, preserving the extension @@ -57,4 +57,4 @@ if (array_key_exists('userfile', $_FILES)) { echo htmlspecialchars($msg); } ?> - \ No newline at end of file + diff --git a/examples/smime_signed_mail.phps b/examples/smime_signed_mail.phps index 7ddc2bef..23d035c5 100644 --- a/examples/smime_signed_mail.phps +++ b/examples/smime_signed_mail.phps @@ -9,7 +9,7 @@ * STEP 1 - Creating a certificate: * You can either use a self-signed certificate, pay for a signed one, * or use free alternatives such as StartSSL, Comodo etc. - * Check out this link for more providers: http://kb.mozillazine.org/Getting_an_SMIME_certificate + * Check out this link for more providers: https://kb.mozillazine.org/Getting_an_SMIME_certificate * In this example I am using Comodo. * The form is directly available via https://secure.comodo.com/products/frontpage?area=SecureEmailCertificate * Fill it out and you'll get an email with a link to download your certificate. diff --git a/get_oauth_token.php b/get_oauth_token.php index b8348444..0e54a00b 100644 --- a/get_oauth_token.php +++ b/get_oauth_token.php @@ -12,7 +12,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. @@ -36,7 +36,7 @@ namespace PHPMailer\PHPMailer; * Aliases for League Provider Classes * Make sure you have added these to your composer.json and run `composer install` * Plenty to choose from here: - * @see http://oauth2-client.thephpleague.com/providers/thirdparty/ + * @see https://oauth2-client.thephpleague.com/providers/thirdparty/ */ //@see https://github.com/thephpleague/oauth2-google use League\OAuth2\Client\Provider\Google; diff --git a/language/phpmailer.lang-fr.php b/language/phpmailer.lang-fr.php index 9d754505..a6d582d8 100644 --- a/language/phpmailer.lang-fr.php +++ b/language/phpmailer.lang-fr.php @@ -6,7 +6,6 @@ * Some French punctuation requires a thin non-breaking space (U+202F) character before it, * for example before a colon or exclamation mark. * There is one of these characters between these quotes: " " - * @see http://unicode.org/udhr/n/notes_fra.html */ $PHPMAILER_LANG['authenticate'] = 'Erreur SMTP : échec de l’authentification.'; diff --git a/language/phpmailer.lang-ja.php b/language/phpmailer.lang-ja.php index c76f5264..42367ace 100644 --- a/language/phpmailer.lang-ja.php +++ b/language/phpmailer.lang-ja.php @@ -3,7 +3,7 @@ /** * Japanese PHPMailer language file: refer to English translation for definitive list * @package PHPMailer - * @author Mitsuhiro Yoshida + * @author Mitsuhiro Yoshida * @author Yoshi Sakai * @author Arisophy */ diff --git a/src/DSNConfigurator.php b/src/DSNConfigurator.php index 566c9618..7058c1f0 100644 --- a/src/DSNConfigurator.php +++ b/src/DSNConfigurator.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2023 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. diff --git a/src/Exception.php b/src/Exception.php index 52eaf951..09c1a2cf 100644 --- a/src/Exception.php +++ b/src/Exception.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. diff --git a/src/OAuth.php b/src/OAuth.php index c1d5b776..a7e95886 100644 --- a/src/OAuth.php +++ b/src/OAuth.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. @@ -29,7 +29,7 @@ use League\OAuth2\Client\Token\AccessToken; * OAuth - OAuth2 authentication wrapper class. * Uses the oauth2-client package from the League of Extraordinary Packages. * - * @see http://oauth2-client.thephpleague.com + * @see https://oauth2-client.thephpleague.com * * @author Marcus Bointon (Synchro/coolbru) */ diff --git a/src/OAuthTokenProvider.php b/src/OAuthTokenProvider.php index 11555074..cbda1a12 100644 --- a/src/OAuthTokenProvider.php +++ b/src/OAuthTokenProvider.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. diff --git a/src/PHPMailer.php b/src/PHPMailer.php index ba4bcd47..dee46938 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. @@ -152,8 +152,7 @@ class PHPMailer * Only supported in simple alt or alt_inline message types * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator. * - * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/ - * @see http://kigkonsult.se/iCalcreator/ + * @see https://kigkonsult.se/iCalcreator/ * * @var string */ @@ -468,7 +467,7 @@ class PHPMailer * Only applicable when sending via SMTP. * * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path - * @see http://www.postfix.org/VERP_README.html Postfix VERP info + * @see https://www.postfix.org/VERP_README.html Postfix VERP info * * @var bool */ @@ -551,10 +550,10 @@ class PHPMailer * 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 + * Value can be any php callable: https://www.php.net/is_callable * * Parameters: - * bool $result result of the send action + * bool $result result of the send action * array $to email addresses of the recipients * array $cc cc email addresses * array $bcc bcc email addresses @@ -1212,7 +1211,7 @@ class PHPMailer * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available. * Note that quotes in the name part are removed. * - * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation + * @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation * * @param string $addrstr The address list string * @param bool $useimap Whether to use the IMAP extension to parse the list @@ -1407,7 +1406,6 @@ class PHPMailer * * IPv6 literals: 'first.last@[IPv6:a1::]' * Not all of these will necessarily work for sending! * - * @see 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. */ @@ -1734,9 +1732,8 @@ class PHPMailer //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver //A space after `-f` is optional, but there is a long history of its presence //causing problems, so we don't use one - //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html - //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html - //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html + //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html + //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html //Example problem: https://www.drupal.org/node/1057954 //PHP 5.6 workaround @@ -1901,7 +1898,7 @@ class PHPMailer /** * Send mail using the PHP mail() function. * - * @see http://www.php.net/manual/en/book.mail.php + * @see https://www.php.net/manual/en/book.mail.php * * @param string $header The message headers * @param string $body The message body @@ -1931,9 +1928,8 @@ class PHPMailer //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver //A space after `-f` is optional, but there is a long history of its presence //causing problems, so we don't use one - //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html - //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html - //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html + //Exim docs: https://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html + //Sendmail docs: https://www.sendmail.org/~ca/email/man/sendmail.html //Example problem: https://www.drupal.org/node/1057954 //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped. @@ -3634,7 +3630,7 @@ class PHPMailer * without breaking lines within a character. * Adapted from a function by paravoid. * - * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283 + * @see https://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283 * * @param string $str multi-byte text to wrap encode * @param string $linebreak string to use as linefeed/end-of-line @@ -3690,7 +3686,7 @@ class PHPMailer /** * Encode a string using Q encoding. * - * @see http://tools.ietf.org/html/rfc2047#section-4.2 + * @see https://www.rfc-editor.org/rfc/rfc2047#section-4.2 * * @param string $str the text to encode * @param string $position Where the text is going to be used, see the RFC for what that means @@ -4267,8 +4263,8 @@ class PHPMailer //Is it a valid IPv4 address? return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false; } - //Is it a syntactically valid hostname (when embeded in a URL)? - return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false; + //Is it a syntactically valid hostname (when embedded in a URL)? + return filter_var('https://' . $host, FILTER_VALIDATE_URL) !== false; } /** @@ -4679,7 +4675,7 @@ class PHPMailer * Multi-byte-safe pathinfo replacement. * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe. * - * @see http://www.php.net/manual/en/function.pathinfo.php#107461 + * @see https://www.php.net/manual/en/function.pathinfo.php#107461 * * @param string $path A filename or path, does not need to exist as a file * @param int|string $options Either a PATHINFO_* constant, diff --git a/src/POP3.php b/src/POP3.php index 7b25fdd7..c4d38a25 100644 --- a/src/POP3.php +++ b/src/POP3.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. diff --git a/src/SMTP.php b/src/SMTP.php index aa7ccfcb..7c8520a5 100644 --- a/src/SMTP.php +++ b/src/SMTP.php @@ -13,7 +13,7 @@ * @copyright 2012 - 2020 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 + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.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. @@ -152,8 +152,8 @@ class SMTP /** * Whether to use VERP. * - * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path - * @see http://www.postfix.org/VERP_README.html Info on VERP + * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path + * @see https://www.postfix.org/VERP_README.html Info on VERP * * @var bool */ @@ -164,7 +164,7 @@ class SMTP * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2. * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure. * - * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2 + * @see https://www.rfc-editor.org/rfc/rfc2821#section-4.5.3.2 * * @var int */ @@ -648,7 +648,7 @@ class SMTP } //The following borrowed from - //http://php.net/manual/en/function.mhash.php#27225 + //https://www.php.net/manual/en/function.mhash.php#27225 //RFC 2104 HMAC implementation for php. //Creates an md5 HMAC. diff --git a/test/DebugLogTestListener.php b/test/DebugLogTestListener.php index dcf6b5ed..957301db 100644 --- a/test/DebugLogTestListener.php +++ b/test/DebugLogTestListener.php @@ -11,7 +11,7 @@ * @copyright 2010 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost * @copyright 2020 Juliette Reinders Folmer - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test; diff --git a/test/Language/TranslationCompletenessTest.php b/test/Language/TranslationCompletenessTest.php index 41e9737c..527a5a7e 100644 --- a/test/Language/TranslationCompletenessTest.php +++ b/test/Language/TranslationCompletenessTest.php @@ -9,7 +9,7 @@ * @author Andy Prevost * @copyright 2010 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\Language; diff --git a/test/OAuth/OAuthTest.php b/test/OAuth/OAuthTest.php index 4e810764..4b640ced 100644 --- a/test/OAuth/OAuthTest.php +++ b/test/OAuth/OAuthTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\OAuth; diff --git a/test/PHPMailer/AddEmbeddedImageTest.php b/test/PHPMailer/AddEmbeddedImageTest.php index f3a9906c..8ba33ef5 100644 --- a/test/PHPMailer/AddEmbeddedImageTest.php +++ b/test/PHPMailer/AddEmbeddedImageTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/AddStringAttachmentTest.php b/test/PHPMailer/AddStringAttachmentTest.php index 0c58f3c6..70635143 100644 --- a/test/PHPMailer/AddStringAttachmentTest.php +++ b/test/PHPMailer/AddStringAttachmentTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/AddStringEmbeddedImageTest.php b/test/PHPMailer/AddStringEmbeddedImageTest.php index f0ba9d34..0ca44d21 100644 --- a/test/PHPMailer/AddStringEmbeddedImageTest.php +++ b/test/PHPMailer/AddStringEmbeddedImageTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/AddrFormatTest.php b/test/PHPMailer/AddrFormatTest.php index eeb2a0db..f2b899a4 100644 --- a/test/PHPMailer/AddrFormatTest.php +++ b/test/PHPMailer/AddrFormatTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/AuthCRAMMD5Test.php b/test/PHPMailer/AuthCRAMMD5Test.php index 1f0b61f2..9217edbc 100644 --- a/test/PHPMailer/AuthCRAMMD5Test.php +++ b/test/PHPMailer/AuthCRAMMD5Test.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/CustomHeaderTest.php b/test/PHPMailer/CustomHeaderTest.php index 0f416469..338633c8 100644 --- a/test/PHPMailer/CustomHeaderTest.php +++ b/test/PHPMailer/CustomHeaderTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/DKIMTest.php b/test/PHPMailer/DKIMTest.php index 1344737d..48080460 100644 --- a/test/PHPMailer/DKIMTest.php +++ b/test/PHPMailer/DKIMTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/DSNConfiguratorTest.php b/test/PHPMailer/DSNConfiguratorTest.php index 87ffa49e..a561d14d 100644 --- a/test/PHPMailer/DSNConfiguratorTest.php +++ b/test/PHPMailer/DSNConfiguratorTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/EncodeQTest.php b/test/PHPMailer/EncodeQTest.php index c03fbc78..32653113 100644 --- a/test/PHPMailer/EncodeQTest.php +++ b/test/PHPMailer/EncodeQTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/EncodeStringTest.php b/test/PHPMailer/EncodeStringTest.php index 33c14332..9a91b148 100644 --- a/test/PHPMailer/EncodeStringTest.php +++ b/test/PHPMailer/EncodeStringTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/FileIsAccessibleTest.php b/test/PHPMailer/FileIsAccessibleTest.php index e43f47ca..1dfa2e21 100644 --- a/test/PHPMailer/FileIsAccessibleTest.php +++ b/test/PHPMailer/FileIsAccessibleTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/FilenameToTypeTest.php b/test/PHPMailer/FilenameToTypeTest.php index fbdb9ba0..c84841aa 100644 --- a/test/PHPMailer/FilenameToTypeTest.php +++ b/test/PHPMailer/FilenameToTypeTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/GenerateIdTest.php b/test/PHPMailer/GenerateIdTest.php index c9dcf257..2a52f4df 100644 --- a/test/PHPMailer/GenerateIdTest.php +++ b/test/PHPMailer/GenerateIdTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/GetLastMessageIDTest.php b/test/PHPMailer/GetLastMessageIDTest.php index 0b5cd8ca..ce27ac42 100644 --- a/test/PHPMailer/GetLastMessageIDTest.php +++ b/test/PHPMailer/GetLastMessageIDTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/HasLineLongerThanMaxTest.php b/test/PHPMailer/HasLineLongerThanMaxTest.php index 24d4f51e..af6118d6 100644 --- a/test/PHPMailer/HasLineLongerThanMaxTest.php +++ b/test/PHPMailer/HasLineLongerThanMaxTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/Html2TextTest.php b/test/PHPMailer/Html2TextTest.php index 51f47009..34f5c4ea 100644 --- a/test/PHPMailer/Html2TextTest.php +++ b/test/PHPMailer/Html2TextTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; @@ -87,8 +87,8 @@ material is wood',

PHPMailer does HTML!

This is a test message written in HTML.
- Go to - http://code.google.com/a/apache-extras.org/p/phpmailer/ + Go to + https://github.com/PHPMailer/PHPMailer for new versions of PHPMailer.

Thank you!

@@ -100,8 +100,8 @@ EOT 'expected' => << [ 'input' => '

Complex ' . 'text <50% ' - . 'with ' + . 'with ' . 'tags

', 'expected' => 'Complex text', ], 'HTML with an encoded "less than" sign in the text' => [ 'input' => '

Complex ' . 'text <50% ' - . 'with ' + . 'with ' . 'tags

', 'expected' => 'Complex text <50% with tags', ], diff --git a/test/PHPMailer/ICalTest.php b/test/PHPMailer/ICalTest.php index 7b99b8de..34fbc4fa 100644 --- a/test/PHPMailer/ICalTest.php +++ b/test/PHPMailer/ICalTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/IsPermittedPathTest.php b/test/PHPMailer/IsPermittedPathTest.php index bdbbd52a..93823a44 100644 --- a/test/PHPMailer/IsPermittedPathTest.php +++ b/test/PHPMailer/IsPermittedPathTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/IsValidHostTest.php b/test/PHPMailer/IsValidHostTest.php index 41bdeb99..4d0b9239 100644 --- a/test/PHPMailer/IsValidHostTest.php +++ b/test/PHPMailer/IsValidHostTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/LocalizationTest.php b/test/PHPMailer/LocalizationTest.php index 9d02f10b..c67ce578 100644 --- a/test/PHPMailer/LocalizationTest.php +++ b/test/PHPMailer/LocalizationTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; @@ -262,7 +262,7 @@ final class LocalizationTest extends TestCase ], 'Custom path: not a local/permitted path' => [ 'langCode' => 'xx', // Unassigned lang code. - 'langPath' => 'http://example.com/files/', + 'langPath' => 'https://example.com/files/', ], 'Custom path: path traversal' => [ 'langCode' => 'xx', // Unassigned lang code. diff --git a/test/PHPMailer/MailTransportTest.php b/test/PHPMailer/MailTransportTest.php index e073c918..aecc2c09 100644 --- a/test/PHPMailer/MailTransportTest.php +++ b/test/PHPMailer/MailTransportTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/MbPathinfoTest.php b/test/PHPMailer/MbPathinfoTest.php index 72f74e8d..04c73b38 100644 --- a/test/PHPMailer/MbPathinfoTest.php +++ b/test/PHPMailer/MbPathinfoTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/MimeTypesTest.php b/test/PHPMailer/MimeTypesTest.php index 389ed6f0..9e3f0a36 100644 --- a/test/PHPMailer/MimeTypesTest.php +++ b/test/PHPMailer/MimeTypesTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/NormalizeBreaksTest.php b/test/PHPMailer/NormalizeBreaksTest.php index b3ddbe2d..cfa9009f 100644 --- a/test/PHPMailer/NormalizeBreaksTest.php +++ b/test/PHPMailer/NormalizeBreaksTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/PHPMailerTest.php b/test/PHPMailer/PHPMailerTest.php index bef452c1..0b82fe12 100644 --- a/test/PHPMailer/PHPMailerTest.php +++ b/test/PHPMailer/PHPMailerTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; @@ -472,7 +472,7 @@ EOT; //Make sure phar paths are rejected self::assertFalse($this->Mail->addAttachment('phar://pharfile.php', 'pharfile.php')); //Make sure any path that looks URLish is rejected - self::assertFalse($this->Mail->addAttachment('http://example.com/test.php', 'test.php')); + self::assertFalse($this->Mail->addAttachment('https://example.com/test.php', 'test.php')); self::assertFalse( $this->Mail->addAttachment( 'ssh2.sftp://user:pass@attacker-controlled.example.com:22/tmp/payload.phar', diff --git a/test/PHPMailer/ParseAddressesTest.php b/test/PHPMailer/ParseAddressesTest.php index 131d830a..9b20cb67 100644 --- a/test/PHPMailer/ParseAddressesTest.php +++ b/test/PHPMailer/ParseAddressesTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/PunyencodeAddressTest.php b/test/PHPMailer/PunyencodeAddressTest.php index daa10ca7..f1e43be4 100644 --- a/test/PHPMailer/PunyencodeAddressTest.php +++ b/test/PHPMailer/PunyencodeAddressTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/QuotedStringTest.php b/test/PHPMailer/QuotedStringTest.php index 52ad3376..bc11c8b6 100644 --- a/test/PHPMailer/QuotedStringTest.php +++ b/test/PHPMailer/QuotedStringTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/ReplyToGetSetClearTest.php b/test/PHPMailer/ReplyToGetSetClearTest.php index c690bff5..53df763e 100644 --- a/test/PHPMailer/ReplyToGetSetClearTest.php +++ b/test/PHPMailer/ReplyToGetSetClearTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/SetErrorTest.php b/test/PHPMailer/SetErrorTest.php index e26850a5..c18d01b5 100644 --- a/test/PHPMailer/SetErrorTest.php +++ b/test/PHPMailer/SetErrorTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/SetFromTest.php b/test/PHPMailer/SetFromTest.php index 12d4ba1c..8d46fb26 100644 --- a/test/PHPMailer/SetFromTest.php +++ b/test/PHPMailer/SetFromTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/SetTest.php b/test/PHPMailer/SetTest.php index a66ec551..6b9ce6ce 100644 --- a/test/PHPMailer/SetTest.php +++ b/test/PHPMailer/SetTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/SetWordWrapTest.php b/test/PHPMailer/SetWordWrapTest.php index 8a4f6f80..6ade60bc 100644 --- a/test/PHPMailer/SetWordWrapTest.php +++ b/test/PHPMailer/SetWordWrapTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/Utf8CharBoundaryTest.php b/test/PHPMailer/Utf8CharBoundaryTest.php index 463f785f..6d9cd777 100644 --- a/test/PHPMailer/Utf8CharBoundaryTest.php +++ b/test/PHPMailer/Utf8CharBoundaryTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/ValidateAddressCustomValidatorTest.php b/test/PHPMailer/ValidateAddressCustomValidatorTest.php index d9660c06..0f31502a 100644 --- a/test/PHPMailer/ValidateAddressCustomValidatorTest.php +++ b/test/PHPMailer/ValidateAddressCustomValidatorTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/ValidateAddressTest.php b/test/PHPMailer/ValidateAddressTest.php index f8400e9a..adfc7763 100644 --- a/test/PHPMailer/ValidateAddressTest.php +++ b/test/PHPMailer/ValidateAddressTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; @@ -19,8 +19,6 @@ use Yoast\PHPUnitPolyfills\TestCases\TestCase; /** * Test email address validation. * - * Test addresses obtained from {@link http://isemail.info}. - * * @todo Recommendation JRF: Rework the tests to actually test all test cases * against each type of build-in pattern. * As things stand, only the PHP validation is tested (while it shouldn't be as that's diff --git a/test/PHPMailer/WrapTextTest.php b/test/PHPMailer/WrapTextTest.php index aba35187..215fb9bd 100644 --- a/test/PHPMailer/WrapTextTest.php +++ b/test/PHPMailer/WrapTextTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/PHPMailer/XMailerTest.php b/test/PHPMailer/XMailerTest.php index a3b14358..934eedd1 100644 --- a/test/PHPMailer/XMailerTest.php +++ b/test/PHPMailer/XMailerTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\PHPMailer; diff --git a/test/POP3/PopBeforeSmtpTest.php b/test/POP3/PopBeforeSmtpTest.php index 88bd677a..3513ada9 100644 --- a/test/POP3/PopBeforeSmtpTest.php +++ b/test/POP3/PopBeforeSmtpTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\POP3; diff --git a/test/PreSendTestCase.php b/test/PreSendTestCase.php index 08a51858..d60de65f 100644 --- a/test/PreSendTestCase.php +++ b/test/PreSendTestCase.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test; diff --git a/test/Security/DenialOfServiceVectorsTest.php b/test/Security/DenialOfServiceVectorsTest.php index 31338250..3290afff 100644 --- a/test/Security/DenialOfServiceVectorsTest.php +++ b/test/Security/DenialOfServiceVectorsTest.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test\Security; @@ -24,8 +24,6 @@ final class DenialOfServiceVectorsTest extends SendTestCase { /** * Test this denial of service attack. - * - * @link http://www.cybsec.com/vuln/PHPMailer-DOS.pdf */ public function testDenialOfServiceAttack1() { diff --git a/test/SendTestCase.php b/test/SendTestCase.php index 24338eb5..dfa3118d 100644 --- a/test/SendTestCase.php +++ b/test/SendTestCase.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test; diff --git a/test/TestCase.php b/test/TestCase.php index 6e383064..40fbc8e5 100644 --- a/test/TestCase.php +++ b/test/TestCase.php @@ -8,7 +8,7 @@ * @author Andy Prevost * @copyright 2012 - 2020 Marcus Bointon * @copyright 2004 - 2009 Andy Prevost - * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License + * @license https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html GNU Lesser General Public License */ namespace PHPMailer\Test; diff --git a/test/fakepopserver.sh b/test/fakepopserver.sh index 3b8276f7..fef28cdf 100755 --- a/test/fakepopserver.sh +++ b/test/fakepopserver.sh @@ -3,13 +3,13 @@ # Fake POP3 server # By Marcus Bointon # Copyright 2010 - 2020 Marcus Bointon -# Based on code by 'Frater' found at http://www.linuxquestions.org/questions/programming-9/fake-pop3-server-to-capture-pop3-passwords-933733 +# Based on code by 'Frater' found at https://www.linuxquestions.org/questions/programming-9/fake-pop3-server-to-capture-pop3-passwords-933733/ # Does not actually serve any mail, but supports commands sufficient to test POP-before SMTP # Can be run directly from a shell like this: # mkfifo fifo; nc -l 1100 fifo; rm fifo # It will accept any user name and will return a positive response for the password 'test' -# Licensed under the GNU Lesser General Public License: http://www.gnu.org/copyleft/lesser.html +# Licensed under the GNU Lesser General Public License: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html # Enable debug output #set -xv diff --git a/test/runfakepopserver.sh b/test/runfakepopserver.sh index f07d2168..12270937 100755 --- a/test/runfakepopserver.sh +++ b/test/runfakepopserver.sh @@ -3,7 +3,6 @@ set -xv # Run the fake pop server from bash -# Idea from http://blog.ale-re.net/2007/09/ipersimple-remote-shell-with-netcat.html # Defaults to port 1100 so it can be run by unpriv users and not clash with a real server # Optionally, pass in a port number as the first arg