Changeset:
891da51bdd07
https://sourceforge.net/p/mrbs/hg-code/ci/891da51bdd07a40c6fb315fdbb95fc11683d9aec
Author:
Campbell Morrison <[email protected]>
Date:
Fri Dec 09 17:08:46 2016 +0000
Log message:
Improved error reporting when $mail_settings['from'] not set.
diffstat:
web/functions_mail.inc | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 32dcfd1f1928 -r 891da51bdd07 web/functions_mail.inc
--- a/web/functions_mail.inc Fri Dec 09 16:26:45 2016 +0000
+++ b/web/functions_mail.inc Fri Dec 09 17:08:46 2016 +0000
@@ -777,7 +777,7 @@
}
else
{
- $from = $mail_settings['from'];
+ $from = (isset($mail_settings['from'])) ? $mail_settings['from'] : null;
}
// if we're requiring bookings to be approved and this user needs approval
@@ -1148,7 +1148,14 @@
}
if (empty($addresses['from']))
{
- $addresses['from'] = $mail_settings['from'];
+ if (isset($mail_settings['from']))
+ {
+ $addresses['from'] = $mail_settings['from'];
+ }
+ else
+ {
+ trigger_error('$mail_settings["from"] has not been set in the config
file.', E_USER_NOTICE);
+ }
}
// Need to put all the addresses into $recipients
@@ -1203,8 +1210,11 @@
$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']);
+ if (isset($addresses['from']))
+ {
+ $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)
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
