Skip to content

Commit

Permalink
updated PHPMailer
Browse files Browse the repository at this point in the history
  • Loading branch information
Guite committed Dec 29, 2016
1 parent c7401cb commit c5d3879
Show file tree
Hide file tree
Showing 59 changed files with 7,336 additions and 4,532 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG-1.3.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
CHANGELOG - ZIKULA 1.3.12
-------------------------

- Upgraded to PHPMailer 5.2.21

CHANGELOG - ZIKULA 1.3.11
-------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/system/Mailer/lib/Mailer/Api/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function sendmessage($args)
}

// include php mailer class file
require_once "system/Mailer/lib/vendor/class.phpmailer.php";
require_once 'system/Mailer/lib/vendor/PHPMailerAutoload.php';

// create new instance of mailer class
$mail = new PHPMailer();
Expand Down
49 changes: 49 additions & 0 deletions src/system/Mailer/lib/vendor/PHPMailerAutoload.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php
/**
* PHPMailer SPL autoloader.
* PHP Version 5
* @package PHPMailer
* @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
* @author Marcus Bointon (Synchro/coolbru) <[email protected]>
* @author Jim Jagielski (jimjag) <[email protected]>
* @author Andy Prevost (codeworxtech) <[email protected]>
* @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);
}
}
218 changes: 0 additions & 218 deletions src/system/Mailer/lib/vendor/README

This file was deleted.

Loading

0 comments on commit c5d3879

Please sign in to comment.