Changeset:
4bb13f52e4b8
https://sourceforge.net/p/mrbs/hg-code/ci/4bb13f52e4b802149b5faaf884a7d1eabb27e45f
Author:
Campbell Morrison <[email protected]>
Date:
Fri Feb 19 16:26:29 2016 +0000
Log message:
Restructured code and fixed bug introduced in recent changes
diffstat:
web/defaultincludes.inc | 1 +
web/functions.inc | 2 --
web/functions_mail.inc | 6 +++---
3 files changed, 4 insertions(+), 5 deletions(-)
diffs (52 lines):
diff -r 949a2b8e55aa -r 4bb13f52e4b8 web/defaultincludes.inc
--- a/web/defaultincludes.inc Fri Feb 19 16:08:50 2016 +0000
+++ b/web/defaultincludes.inc Fri Feb 19 16:26:29 2016 +0000
@@ -16,6 +16,7 @@
// is called.
require_once "lib/autoload.inc";
+require_once 'lib/PHPMailer/PHPMailerAutoload.php';
require "grab_globals.inc.php";
require_once "systemdefaults.inc.php";
require_once "areadefaults.inc.php";
diff -r 949a2b8e55aa -r 4bb13f52e4b8 web/functions.inc
--- a/web/functions.inc Fri Feb 19 16:08:50 2016 +0000
+++ b/web/functions.inc Fri Feb 19 16:26:29 2016 +0000
@@ -2033,8 +2033,6 @@
function validate_email($email)
{
- require_once 'lib/PHPMailer/PHPMailerAutoload.php';
-
return PHPMailer::validateAddress($email);
}
diff -r 949a2b8e55aa -r 4bb13f52e4b8 web/functions_mail.inc
--- a/web/functions_mail.inc Fri Feb 19 16:08:50 2016 +0000
+++ b/web/functions_mail.inc Fri Feb 19 16:26:29 2016 +0000
@@ -201,14 +201,15 @@
return $string;
}
+
// Take a string of email addresses separated by commas or newlines
// and return a comma separated list with duplicates removed.
function clean_address_list($string)
{
$string = str_replace(array("\r\n", "\n", "\r"), ',', $string);
$array = explode(',', $string);
- $string = get_address_list($array);
- return $string;
+ array_walk($array, 'trim');
+ return implode(',', array_unique($array));
}
@@ -1120,7 +1121,6 @@
function sendMail($addresses, $subject, $text_body, $html_body, $attachment,
$charset = 'us-ascii')
{
require_once 'Mail/mimePart.php';
- require_once 'lib/PHPMailer/PHPMailerAutoload.php';
// We use the PHPMailer class to handle the sending of mail. However
PHPMailer does not
// provide the versatility we need to be able to construct the MIME parts
necessary for
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
