added a return path for undeliverable messages
This commit is contained in:
parent
e6d08227fd
commit
30fefe9e68
3 changed files with 22 additions and 0 deletions
|
|
@ -213,6 +213,8 @@ sub create {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
my $returnPath = $session->setting->get("mailReturnPath");
|
||||||
|
$returnPath = "<".$returnPath.">" if $returnPath;
|
||||||
my $message = MIME::Entity->build(
|
my $message = MIME::Entity->build(
|
||||||
Type=>$headers->{contentType} || "multipart/mixed",
|
Type=>$headers->{contentType} || "multipart/mixed",
|
||||||
From=>$headers->{from} || $session->setting->get("companyEmail"),
|
From=>$headers->{from} || $session->setting->get("companyEmail"),
|
||||||
|
|
@ -221,6 +223,7 @@ sub create {
|
||||||
Bcc=>$headers->{bcc},
|
Bcc=>$headers->{bcc},
|
||||||
"Reply-To"=>$headers->{replyTo},
|
"Reply-To"=>$headers->{replyTo},
|
||||||
"In-Reply-To"=>$headers->{inReplyTo},
|
"In-Reply-To"=>$headers->{inReplyTo},
|
||||||
|
"Return-Path"=>$returnPath,
|
||||||
Subject=>$headers->{subject},
|
Subject=>$headers->{subject},
|
||||||
"Message-Id"=>$headers->{messageId} || "WebGUI-".$session->id->generate,
|
"Message-Id"=>$headers->{messageId} || "WebGUI-".$session->id->generate,
|
||||||
Date=>$session->datetime->epochToHuman("","%W, %d %C %y %j:%n:%s %O"),
|
Date=>$session->datetime->epochToHuman("","%W, %d %C %y %j:%n:%s %O"),
|
||||||
|
|
|
||||||
|
|
@ -180,6 +180,13 @@ sub www_editSettings {
|
||||||
-hoverHelp=>$i18n->get('824 description'),
|
-hoverHelp=>$i18n->get('824 description'),
|
||||||
-value=>$session->setting->get("mailFooter")
|
-value=>$session->setting->get("mailFooter")
|
||||||
);
|
);
|
||||||
|
$tabform->getTab("messaging")->textarea(
|
||||||
|
-name=>"mailReturnPath",
|
||||||
|
-label=>$i18n->get("mail return path"),
|
||||||
|
-hoverHelp=>$i18n->get('mail return path help'),
|
||||||
|
-value=>$session->setting->get("mailReturnPath")
|
||||||
|
);
|
||||||
|
# misc
|
||||||
$tabform->getTab("misc")->yesNo(
|
$tabform->getTab("misc")->yesNo(
|
||||||
-name=>"preventProxyCache",
|
-name=>"preventProxyCache",
|
||||||
-label=>$i18n->get(400),
|
-label=>$i18n->get(400),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,18 @@
|
||||||
package WebGUI::i18n::English::WebGUI;
|
package WebGUI::i18n::English::WebGUI;
|
||||||
|
|
||||||
our $I18N = {
|
our $I18N = {
|
||||||
|
'mail return path help' => {
|
||||||
|
message => q|To what email address should undeliverable messages be sent?|,
|
||||||
|
lastUpdated => 0,
|
||||||
|
context=>"Settings hover help"
|
||||||
|
},
|
||||||
|
|
||||||
|
'mail return path' => {
|
||||||
|
message => q|Return Path|,
|
||||||
|
lastUpdated => 0,
|
||||||
|
context=>"Settings"
|
||||||
|
},
|
||||||
|
|
||||||
'default version tag workflow help' => {
|
'default version tag workflow help' => {
|
||||||
message => q|Which workflow should be used by default when user's create their own version tags.|,
|
message => q|Which workflow should be used by default when user's create their own version tags.|,
|
||||||
lastUpdated => 0,
|
lastUpdated => 0,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue