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

Fixed #8818: Visitor sends a welcome message

Browse source
This commit is contained in:
Frank Dillon 2008-10-28 21:41:56 +00:00
parent d7b5083b85
commit fec49433c3
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -30,6 +30,7 @@
- Fixed #8899: Calendar feeds somehow cause edit screen to fail
- Fixed #8891: Calendar still pulls feeds when in trash
- Fixed #8981: style template help -- Macro being replaced
- Fixed #8818: Visitor sends a welcome message
7.6.1
- changed: the list of extensions for the export system to pass through

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

@ -113,14 +113,20 @@ sub create {
subject=>$subject,
});
if (defined $mail) {
my $i18n = WebGUI::International->new($session, 'Inbox_Message');
my $pref = $i18n->get("from user preface");
$pref .= $session->db->quickScalar("SELECT username FROM users WHERE userId = ?",[$properties->{sentBy}]). ".";
my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
my $preface = "";
my $fromUser = WebGUI::User->new($session, $properties->{sentBy});
#Don't append prefaces to the visitor users or messages that don't specify a user (default case)
unless ($fromUser->isVisitor || $fromUser->userId eq 3) { #Can't use isAdmin because it will not send prefaces from normal users who in the admin group
my $i18n = WebGUI::International->new($session, 'Inbox_Message');
$preface = sprintf($i18n->get('from user preface'), $fromUser->username);
}
my $msg = (defined $properties->{emailMessage}) ? $properties->{emailMessage} : $self->{_properties}{message};
if ($msg =~ m/\<.*\>/) {
$mail->addHtml("<p>$pref</p><br />".$msg);
$msg = '<p>' . $preface . '</p><br />'.$msg if($preface ne "");
$mail->addHtml($msg);
} else {
$mail->addText($pref."\n\n".$msg);
$msg = $preface."\n\n".$msg if($preface ne "");
$mail->addText($msg);
}
$mail->addFooter;
$mail->queue;