From 9cbc85e20c9c4187317bd429c27d2ad2ebfd133d Mon Sep 17 00:00:00 2001 From: Victor Boctor Date: Sun, 28 May 2017 15:36:14 -0700 Subject: [PATCH] Update PHPMailer to 5.2.23 via Composer Fixes #22940 --- composer.json | 1 + composer.lock | 78 +++++++++++++++++++++++++++++++++++++++++++++- core/email_api.php | 2 -- library/README.md | 2 -- library/phpmailer | 1 - 5 files changed, 78 insertions(+), 6 deletions(-) delete mode 160000 library/phpmailer diff --git a/composer.json b/composer.json index 5653037fc1..6bb1b3972f 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "guzzlehttp/guzzle": "^6.2", "vboctor/disposable_email_checker": "^3.0", "adodb/adodb-php": "^5.20", + "phpmailer/phpmailer": "^5.2", "erusev/parsedown": "^1.6" }, "license": "GPL v2", diff --git a/composer.lock b/composer.lock index 6c8943496a..668ba1533f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ae0495b540a4514816fa6a2cfd7201bc", + "content-hash": "992e2d7ba9fb33a42f216ecfda3d7727", "packages": [ { "name": "adodb/adodb-php", @@ -354,6 +354,82 @@ ], "time": "2017-01-19T11:35:12+00:00" }, + { + "name": "phpmailer/phpmailer", + "version": "v5.2.23", + "source": { + "type": "git", + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "7115df4a6f76281109ebe352900c42403b728bb4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/7115df4a6f76281109ebe352900c42403b728bb4", + "reference": "7115df4a6f76281109ebe352900c42403b728bb4", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "require-dev": { + "doctrine/annotations": "1.2.*", + "jms/serializer": "0.16.*", + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "4.8.*", + "symfony/debug": "2.8.*", + "symfony/filesystem": "2.8.*", + "symfony/translation": "2.8.*", + "symfony/yaml": "2.8.*", + "zendframework/zend-cache": "2.5.1", + "zendframework/zend-config": "2.5.1", + "zendframework/zend-eventmanager": "2.5.1", + "zendframework/zend-filter": "2.5.1", + "zendframework/zend-i18n": "2.5.1", + "zendframework/zend-json": "2.5.1", + "zendframework/zend-math": "2.5.1", + "zendframework/zend-serializer": "2.5.*", + "zendframework/zend-servicemanager": "2.5.*", + "zendframework/zend-stdlib": "2.5.1" + }, + "suggest": { + "league/oauth2-google": "Needed for Google XOAUTH2 authentication" + }, + "type": "library", + "autoload": { + "classmap": [ + "class.phpmailer.php", + "class.phpmaileroauth.php", + "class.phpmaileroauthgoogle.php", + "class.smtp.php", + "class.pop3.php", + "extras/EasyPeasyICS.php", + "extras/ntlm_sasl_client.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" + }, + { + "name": "Marcus Bointon", + "email": "phpmailer@synchromedia.co.uk" + }, + { + "name": "Andy Prevost", + "email": "codeworxtech@users.sourceforge.net" + }, + { + "name": "Brent R. Matzelle" + } + ], + "description": "PHPMailer is a full-featured email creation and transfer class for PHP", + "time": "2017-03-15T19:32:56+00:00" + }, { "name": "pimple/pimple", "version": "v3.0.2", diff --git a/core/email_api.php b/core/email_api.php index 121684ba9f..e1c7d1ba01 100644 --- a/core/email_api.php +++ b/core/email_api.php @@ -74,8 +74,6 @@ require_api( 'user_pref_api.php' ); require_api( 'utility_api.php' ); -require_lib( 'phpmailer/PHPMailerAutoload.php' ); - # reusable object of class SMTP $g_phpMailer = null; diff --git a/library/README.md b/library/README.md index bfc57cc442..a8735b53d5 100644 --- a/library/README.md +++ b/library/README.md @@ -9,7 +9,6 @@ The version and status of each is summarized below: directory | project | version | status ----------------|-----------------|-----------|--------------- -phpmailer | PHPMailer | 5.2.22 | unpatched [1] rssbuilder | RSSBuilder | 2.2.1 | patched [2] utf8 | phputf8 | 0.5 | unpatched securimage | PHP Captcha | 3.6.5 | patched [1] @@ -43,7 +42,6 @@ Upstream projects project | URL ----------------|-------------------------------------------------------------------- -phpmailer | https://github.com/PHPMailer/PHPMailer rssbuilder | http://code.google.com/p/flaimo-php/ utf8 | http://sourceforge.net/projects/phputf8 secureimage | http://www.phpcaptcha.org/ - https://github.com/mantisbt/securimage diff --git a/library/phpmailer b/library/phpmailer deleted file mode 160000 index e066a6277a..0000000000 --- a/library/phpmailer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e066a6277ad41fcfdb8d3b8536aaa55ec9b6399b