oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed emailed form submissions so that textareas retain their formatting in the email

Browse source
This commit is contained in:
Wes Morgan 2007-05-02 20:56:37 +00:00
parent b3ebabb5fc
commit b5fbbef649
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -526,6 +526,7 @@ sub getRecordTemplateVars {
"tab.field.isDisplayed" => ($data{status} eq "visible" && !$hidden), "tab.field.isDisplayed" => ($data{status} eq "visible" && !$hidden),
"tab.field.isRequired" => ($data{status} eq "required" && !$hidden), "tab.field.isRequired" => ($data{status} eq "required" && !$hidden),
"tab.field.subtext" => $subtext, "tab.field.subtext" => $subtext,
"tab.field.type" => $data{type},
"tab.field.controls" => $self->_fieldAdminIcons($data{DataForm_fieldId},$data{DataForm_tabId},$data{isMailField}) "tab.field.controls" => $self->_fieldAdminIcons($data{DataForm_fieldId},$data{DataForm_tabId},$data{isMailField})
}); });
} }
@ -574,6 +575,7 @@ sub getRecordTemplateVars {
"isDisplayed" => ($data{status} eq "visible" && !$hidden), "isDisplayed" => ($data{status} eq "visible" && !$hidden),
"isRequired" => ($data{status} eq "required" && !$hidden), "isRequired" => ($data{status} eq "required" && !$hidden),
"subtext" => $subtext, "subtext" => $subtext,
"type" => $data{type},
"controls" => $self->_fieldAdminIcons($data{DataForm_fieldId},$data{DataForm_tabId},$data{isMailField}) "controls" => $self->_fieldAdminIcons($data{DataForm_fieldId},$data{DataForm_tabId},$data{isMailField})
); );
push(@fields, { map {("field.".$_ => $fieldProperties{$_})} keys(%fieldProperties) }); push(@fields, { map {("field.".$_ => $fieldProperties{$_})} keys(%fieldProperties) });
@ -712,8 +714,6 @@ sub purge {
sub sendEmail { sub sendEmail {
my $self = shift; my $self = shift;
my $var = shift; my $var = shift;
my $message = $self->processTemplate($var,$self->get("emailTemplateId"));
WebGUI::Macro::process($self->session,\$message);
my ($to, $subject, $from, $bcc, $cc); my ($to, $subject, $from, $bcc, $cc);
foreach my $row (@{$var->{field_loop}}) { foreach my $row (@{$var->{field_loop}}) {
if ($row->{"field.name"} eq "to") { if ($row->{"field.name"} eq "to") {
@ -726,8 +726,14 @@ sub sendEmail {
$bcc = $row->{"field.value"}; $bcc = $row->{"field.value"};
} elsif ($row->{"field.name"} eq "subject") { } elsif ($row->{"field.name"} eq "subject") {
$subject = $row->{"field.value"}; $subject = $row->{"field.value"};
} elsif ($row->{"field.type"} eq "textArea") {
$row->{"field.value"} =~ s/\n/<br\/>/;
} elsif ($row->{"field.type"} eq "textarea") {
$row->{"field.value"} = WebGUI::HTML::format($row->{"field.value"},'mixed');
} }
} }
my $message = $self->processTemplate($var,$self->get("emailTemplateId"));
WebGUI::Macro::process($self->session,\$message);
my @attachments = $self->get('mailAttachments')? my @attachments = $self->get('mailAttachments')?
@{$self->getAttachedFiles({returnType=>'attachments',entryId=>$var->{entryId}})} @{$self->getAttachedFiles({returnType=>'attachments',entryId=>$var->{entryId}})}
: (); : ();