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

clean up sent messages some

Browse source
This commit is contained in:
Graham Knop 2008-09-18 19:51:14 +00:00
parent baa228737d
commit 7aa9c59af8
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Inbox/Message.pm
View file

@ -118,7 +118,7 @@ sub create {
$pref .= $session->db->quickScalar("SELECT username FROM users WHERE userid = ?",[$properties->{sentBy}]). ".";
my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
if ($msg =~ m/\<.*\>/) {
$mail->addHtml("<p>$pref</p><br>".$msg);
$mail->addHtml("<p>$pref</p><br />".$msg);
} else {
$mail->addText($pref."\n\n".$msg);
}

2
lib/WebGUI/Mail/Send.pm
View file

@ -286,7 +286,7 @@ sub create {
}
}
}
my $from = $headers->{from} || $session->user->username." <".$session->setting->get("companyEmail").">";
my $from = $headers->{from} || $session->setting->get('comanyName') . " <".$session->setting->get("companyEmail").">";
my $type = $headers->{contentType} || "multipart/mixed";
my $replyTo = $headers->{replyTo} || $session->setting->get("mailReturnPath");