From 27d6d99c51cec136171a2cdd051882d504c75fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?RitterNorbert=C2=9D?= Date: Thu, 14 Apr 2016 15:14:09 +0200 Subject: [PATCH] Added setting to set email return path to From user or Support email --- lib/moodlelib.php | 3 ++- message/output/email/lang/en/message_email.php | 2 ++ message/output/email/settings.php | 2 ++ message/output/email/version.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index a326558..5d1d597 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -5525,7 +5525,8 @@ function email_to_user($user, $from, $subject, $messagetext, $messagehtml = '', $modargs = 'B'.base64_encode(pack('V', $user->id)).substr(md5($user->email), 0, 16); $mail->Sender = generate_email_processing_address(0, $modargs); } else { - $mail->Sender = $supportuser->email; + $returnpath = $CFG->returnpath; + $mail->Sender = $$returnpath; } if (!empty($CFG->emailonlyfromnoreplyaddress)) { diff --git a/message/output/email/lang/en/message_email.php b/message/output/email/lang/en/message_email.php index a276f2e..f4331c3 100644 --- a/message/output/email/lang/en/message_email.php +++ b/message/output/email/lang/en/message_email.php @@ -34,6 +34,7 @@ $string['configsmtphosts'] = 'Give the full name of one or more local SMTP serve $string['configsmtpmaxbulk'] = 'Maximum number of messages sent per SMTP session. Grouping messages may speed up the sending of emails. Values lower than 2 force creation of new SMTP session for each email.'; $string['configsmtpsecure'] = 'If SMTP server requires secure connection, specify the correct protocol type.'; $string['configsmtpuser'] = 'If you have specified an SMTP server above, and the server requires authentication, then enter the username and password here.'; +$string['returnpath'] = 'Set Email Return-Path if bounce handling is disabled'; $string['email'] = 'Send email notifications to'; $string['emailonlyfromnoreplyaddress'] = 'Always send email from the no-reply address?'; $string['ifemailleftempty'] = 'Leave empty to send notifications to {$a}'; @@ -47,3 +48,4 @@ $string['smtpmaxbulk'] = 'SMTP session limit'; $string['smtppass'] = 'SMTP password'; $string['smtpsecure'] = 'SMTP security'; $string['smtpuser'] = 'SMTP username'; +$string['returnpath'] = 'Email Return-Path'; diff --git a/message/output/email/settings.php b/message/output/email/settings.php index 242fcf8..e223afd 100644 --- a/message/output/email/settings.php +++ b/message/output/email/settings.php @@ -46,4 +46,6 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('allowattachments', get_string('allowattachments', 'message_email'), get_string('configallowattachments', 'message_email'), 1)); $options = array('LF'=>'LF', 'CRLF'=>'CRLF'); $settings->add(new admin_setting_configselect('mailnewline', get_string('mailnewline', 'message_email'), get_string('configmailnewline','message_email'), 'LF', $options)); + $options = array('$supportuser->email' => 'Support email', '$from->email' => 'Sender email adress'); + $settings->add(new admin_setting_configselect('returnpath', get_string('returnpath', 'message_email'), get_string('configreturnpath','message_email'), 'Support email', $options)); } diff --git a/message/output/email/version.php b/message/output/email/version.php index 9673c2a..c283864 100644 --- a/message/output/email/version.php +++ b/message/output/email/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2015051100; // The current plugin version (Date: YYYYMMDDXX) +$plugin->version = 2015051101; // The current plugin version (Date: YYYYMMDDXX) $plugin->requires = 2015050500; // Requires this Moodle version $plugin->component = 'message_email'; // Full name of the plugin (used for diagnostics) -- 2.4.3