Bug 1811163: Upgrade phpmailer to 6.0.6 (a8e83954) · Commits · mahara / mahara

htdocs/lib/mahara.php

+1 −2

Original line number	Diff line number	Diff line
		@@ -4736,8 +4736,7 @@ function is_https() {
		}

		function sanitize_email($value) {
		require_once('phpmailer/class.phpmailer.php');
		if (!PHPMailer::validateAddress($value)) {
		if (!PHPMailer\PHPMailer\PHPMailer::validateAddress($value)) {
		return '';
		}
		return $value;

htdocs/lib/phpmailer/LICENSE

+20 −22

Original line number	Diff line number	Diff line
		@@ -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.

		@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know
		that what they have is not the original version, so that the original
		author's reputation will not be affected by problems that might be
		introduced by others.


		Finally, software patents pose a constant threat to the existence of
		any free program. We wish to make sure that a company cannot
		effectively restrict the users of a free program by obtaining a
		@@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a
		"work based on the library" and a "work that uses the library". The
		former contains code derived from the library, whereas the latter must
		be combined with the library in order to run.


		GNU LESSER GENERAL PUBLIC LICENSE
		TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

		@@ -158,7 +158,7 @@ Library.
		You may charge a fee for the physical act of transferring a copy,
		and you may at your option offer warranty protection in exchange for a
		fee.


		2. You may modify your copy or copies of the Library or any portion
		of it, thus forming a work based on the Library, and copy and
		distribute such modifications or work under the terms of Section 1
		@@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the
		ordinary GNU General Public License has appeared, then you can specify
		that version instead if you wish.) Do not make any other change in
		these notices.


		Once this change is made in a given copy, it is irreversible for
		that copy, so the ordinary GNU General Public License applies to all
		subsequent copies and derivative works made from that copy.
		@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
		distribute the object code for the work under the terms of Section 6.
		Any executables containing that work also fall under Section 6,
		whether or not they are linked directly with the Library itself.


		6. As an exception to the Sections above, you may also combine or
		link a "work that uses the Library" with the Library to produce a
		work containing portions of the Library, and distribute that work
		@@ -312,7 +312,7 @@ of these things:
		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
		@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally
		accompany the operating system. Such a contradiction means you cannot
		use both them and the Library together in an executable that you
		distribute.


		7. You may place library facilities that are a work based on the
		Library side-by-side in a single library together with other library
		facilities not covered by this License, and distribute such a combined
		@@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further
		restrictions on the recipients' exercise of the rights granted herein.
		You are not responsible for enforcing compliance by third parties with
		this License.


		11. If, as a consequence of a court judgment or allegation of patent
		infringement or for any other reason (not limited to patent issues),
		conditions are imposed on you (whether by court order, agreement or
		@@ -422,7 +422,7 @@ conditions either of that version or of any later version published by
		the Free Software Foundation. If the Library does not specify a
		license version number, you may choose any version ever published by
		the Free Software Foundation.


		14. If you wish to incorporate parts of the Library into other free
		programs whose distribution conditions are incompatible with these,
		write to the author to ask for permission. For software which is
		@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
		DAMAGES.

		END OF TERMS AND CONDITIONS


		How to Apply These Terms to Your New Libraries

		If you develop a new library, and you want it to be of the greatest
		@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the

		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 @@ necessary. Here is a sample; alter the names:
		Ty Coon, President of Vice

		That's all there is to it!
		No newline at end of file

htdocs/lib/phpmailer/PHPMailerAutoload.php

deleted100644 → 0

+0 −49

Original line number	Diff line number	Diff line
		<?php
		/**
		* PHPMailer SPL autoloader.
		* PHP Version 5
		* @package PHPMailer
		* @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
		* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
		* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
		* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
		* @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);
		}
		}

htdocs/lib/phpmailer/README.Mahara

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,11 +2,10 @@ phpmailer in Mahara
		======================

		Website: https://github.com/PHPMailer/PHPMailer
		Version: 5.2.22
		Version: 6.0.6

		This library is for the email_user() function in lib/user.php

		Changes:

		- None

htdocs/lib/phpmailer/VERSION

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		5.2.22