Reinstate PHPMailerAutoload

Loading classes directly caused conflicts with other software

qa-include/app/emails.php

@@ -132,8 +132,7 @@ function qa_send_email($params)
 
 	// @error_log(print_r($params, true));
 
-	require_once QA_INCLUDE_DIR . 'vendor/PHPMailer/class.phpmailer.php';
-	require_once QA_INCLUDE_DIR . 'vendor/PHPMailer/class.smtp.php';
+	require_once QA_INCLUDE_DIR . 'vendor/PHPMailer/PHPMailerAutoload.php';
 
 	$mailer = new PHPMailer();
 	$mailer->CharSet = 'utf-8';

qa-include/vendor/PHPMailer/PHPMailerAutoload.php

 <?php
 /**
- * @deprecated This file is deprecated; please use Q2A built-in functions for sending emails.
+ * 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.
  */
 
-if (defined('QA_DEBUG_PERFORMANCE') && QA_DEBUG_PERFORMANCE) {
-	trigger_error('Included file ' . basename(__FILE__) . ' is deprecated');
+/**
+ * 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.3.0', '>=')) {
+	spl_autoload_register('PHPMailerAutoload', true, true);
+} else {
+	spl_autoload_register('PHPMailerAutoload');
 }
 
-require_once QA_INCLUDE_DIR . 'vendor/PHPMailer/class.phpmailer.php';
-require_once QA_INCLUDE_DIR . 'vendor/PHPMailer/class.smtp.php';
+// old __autoload fallback removed as it causes problems in PHP 7.2