Changeset:
6f081b05c0c2
https://sourceforge.net/p/mrbs/hg-code/ci/6f081b05c0c214b91f62a6f1bf0a567e1cabd8a7
Author:
Campbell Morrison <[email protected]>
Date:
Tue Sep 22 14:54:38 2015 +0100
Log message:
Created the phpmailer branch to switch from using the PEAR Mail package to
PHPMailer. PEAR Mail is no longer supported and breaks under PHP7.
diffstat:
web/functions_mail.inc | 94 +-
web/lib/PHPMailer/LICENSE | 504 ++
web/lib/PHPMailer/PHPMailerAutoload.php | 49 +
web/lib/PHPMailer/VERSION | 1 +
web/lib/PHPMailer/class.phpmailer.php | 3722 +++++++++++++++++++
web/lib/PHPMailer/class.phpmaileroauth.php | 197 +
web/lib/PHPMailer/class.phpmaileroauthgoogle.php | 70 +
web/lib/PHPMailer/class.pop3.php | 397 ++
web/lib/PHPMailer/class.smtp.php | 1176 ++++++
web/lib/PHPMailer/get_oauth_token.php | 64 +
web/lib/PHPMailer/language/phpmailer.lang-am.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ar.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-az.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-be.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-bg.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-br.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ca.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ch.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-cz.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-de.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-dk.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-el.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-eo.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-es.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-et.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fa.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fi.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-fo.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-fr.php | 29 +
web/lib/PHPMailer/language/phpmailer.lang-gl.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-he.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-hr.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-hu.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-id.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-it.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ja.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-ka.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ko.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-lt.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-lv.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ms.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-nl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-no.php | 25 +
web/lib/PHPMailer/language/phpmailer.lang-pl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-pt.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ro.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-ru.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-se.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sk.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sl.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-sr.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-tr.php | 29 +
web/lib/PHPMailer/language/phpmailer.lang-uk.php | 27 +
web/lib/PHPMailer/language/phpmailer.lang-vi.php | 26 +
web/lib/PHPMailer/language/phpmailer.lang-zh.php | 28 +
web/lib/PHPMailer/language/phpmailer.lang-zh_cn.php | 27 +
web/systemdefaults.inc.php | 1 +
57 files changed, 7480 insertions(+), 3 deletions(-)
diffs (truncated from 7766 to 300 lines):
diff -r 2b29bee9844d -r 6f081b05c0c2 web/functions_mail.inc
--- a/web/functions_mail.inc Fri Sep 18 20:25:34 2015 +0100
+++ b/web/functions_mail.inc Tue Sep 22 14:54:38 2015 +0100
@@ -1083,7 +1083,7 @@
* @param array $text_body text part of body, an array consisting of
* 'content' the content itself
* 'cid' the content id
- * @param array $text_html HTML part of body, an array consisting of
+ * @param array $html_body HTML part of body, an array consisting of
* 'content' the content itself
* 'cid' the content id
* @param array $attachment file to attach. An array consisting of
@@ -1098,6 +1098,8 @@
require_once "Mail.php";
require_once "Mail/mime.php";
require_once "Mail/mimePart.php";
+
+ require_once 'lib/PHPMailer/PHPMailerAutoload.php';
global $mail_settings, $sendmail_settings, $smtp_settings, $enable_periods;
@@ -1108,6 +1110,8 @@
return;
}
+ $mail = new PHPMailer;
+
if ($mail_settings['debug'])
{
echo "[DEBUG] Preparing to send email ... <br>";
@@ -1141,6 +1145,83 @@
return FALSE;
}
+ switch ($mail_settings['admin_backend'])
+ {
+ case 'mail':
+ $mail->isMail();
+ break;
+ case 'smtp':
+ $mail->isSMTP();
+ $mail->Host = $smtp_settings['host'];
+ $mail->Port = $smtp_settings['port'];
+ $mail->SMTPAuth = $smtp_settings['auth'];
+ $mail->SMTPSecure = $smtp_settings['secure'];
+ $mail->Username = $smtp_settings['username'];
+ $mail->Password = $smtp_settings['password'];
+ break;
+ case 'sendmail':
+ $mail->isSendmail();
+ $mail->Sendmail = $sendmail_settings['path'];
+ if (isset($sendmail_settings['args']) && ($sendmail_settings['args'] !==
''))
+ {
+ $mail->Sendmail .= ' ' . $sendmail_settings['args'];
+ }
+ break;
+ default:
+ trigger_error("Unknown mail backend '" . $mail_settings['admin_backend']
. "'", E_USER_WARNING);
+ break;
+ }
+
+ $mail->CharSet = get_mail_charset(); // PHPMailer defaults to 'iso-8859-1'
+ $mail->AllowEmpty = true; // remove this for production
+ $mail->addCustomHeader('Auto-Submitted', 'auto-generated');
+
+ $from_addresses = $mail->parseAddresses($addresses['from']);
+ $mail->setFrom($from_addresses[0]['address'], $from_addresses[0]['name']);
+
+ $to_addresses = $mail->parseAddresses($addresses['to']);
+ foreach ($to_addresses as $to_address)
+ {
+ $mail->addAddress($to_address['address'], $to_address['name']);
+ }
+
+ if (isset($addresses['cc']))
+ {
+ $cc_addresses = $mail->parseAddresses($addresses['cc']);
+ foreach ($cc_addresses as $cc_address)
+ {
+ $mail->addCC($cc_address['address'], $cc_address['name']);
+ }
+ }
+
+ if (isset($addresses['bcc']))
+ {
+ $bcc_addresses = $mail->parseAddresses($addresses['bcc']);
+ foreach ($bcc_addresses as $bcc_address)
+ {
+ $mail->addBCC($bcc_address['address'], $bcc_address['name']);
+ }
+ }
+
+ $mail->Subject = $subject;
+
+ if (empty($html_body))
+ {
+ $mail->isHTML(false);
+ $mail->Body = $text_body['content'];;
+ }
+ else
+ {
+ $mail->isHTML(true);
+ $mail->Body = $html_body['content'];
+ $mail->AltBody = $text_body['content'];
+ }
+
+ if ($mail_settings['icalendar'] && !$enable_periods)
+ {
+ $mail->Ical = $attachment['content'];
+ }
+
// Set up configuration settings
$backend = $mail_settings['admin_backend'];
@@ -1176,7 +1257,7 @@
// ...communicate the charset and encode it correctly
$subject = "=?".get_mail_charset()."?B?".base64_encode($subject)."?=";
}
- $headers['Subject'] = $subject;
+ $headers['Subject'] = $subject . ' [PEAR]';
$headers['Mime-Version'] = '1.0';
// Build the email. We're going to use the "alternative" subtype which
means
@@ -1273,6 +1354,12 @@
echo "[DEBUG] Recipients: '" . htmlspecialchars($recipients) . "'<br>";
}
+ if (!$mail->send())
+ {
+ trigger_error("Error sending email: " . $mail->ErrorInfo, E_USER_WARNING);
+ return false;
+ }
+
// Call to the PEAR::Mail class
$mail_object =& Mail::factory($backend, $params);
$result = $mail_object->send($recipients, $mime['headers'], $mime['body']);
@@ -1295,7 +1382,8 @@
}
}
- return $result;
+ return $result; // PEAR
+ return true;
}
// }}}
diff -r 2b29bee9844d -r 6f081b05c0c2 web/lib/PHPMailer/LICENSE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/lib/PHPMailer/LICENSE Tue Sep 22 14:54:38 2015 +0100
@@ -0,0 +1,504 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+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
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+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
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
