Changeset:
6a68e2e11d49
https://sourceforge.net/p/mrbs/hg-code/ci/6a68e2e11d49bb1134be66cf58bd0bd93d5315ec
Author:
Campbell Morrison <[email protected]>
Date:
Fri Feb 19 14:15:11 2016 +0000
Log message:
Tweaked last change (changeset 2a31d5467ac8)
diffstat:
web/functions.inc | 9 ++++++++-
web/functions_mail.inc | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diffs (38 lines):
diff -r 2a31d5467ac8 -r 6a68e2e11d49 web/functions.inc
--- a/web/functions.inc Fri Feb 19 13:28:48 2016 +0000
+++ b/web/functions.inc Fri Feb 19 14:15:11 2016 +0000
@@ -2030,6 +2030,13 @@
return $string;
}
+
+function validate_email($email)
+{
+ return (FALSE !== filter_var(trim($email), FILTER_VALIDATE_EMAIL));
+}
+
+
// validates a comma separated list of email addresses
// returns FALSE if any one of them is invalid, otherwise TRUE
function validate_email_list($list)
@@ -2039,7 +2046,7 @@
$emails = explode(',', $list);
foreach ($emails as $email)
{
- if (FALSE === filter_var(trim($email), FILTER_VALIDATE_EMAIL))
+ if (!validate_email)
{
return FALSE;
}
diff -r 2a31d5467ac8 -r 6a68e2e11d49 web/functions_mail.inc
--- a/web/functions_mail.inc Fri Feb 19 13:28:48 2016 +0000
+++ b/web/functions_mail.inc Fri Feb 19 14:15:11 2016 +0000
@@ -185,7 +185,7 @@
$array[$i] = trim($array[$i]);
if ($array[$i] !== '')
{
- if (!validate_email_list($array[$i]))
+ if (!validate_email($array[$i]))
{
$message = 'Invalid email address "' . $array[$i] . '"';
mail_debug($message);
------------------------------------------------------------------------------
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
