--- loncom/interface/lonsupportreq.pm 2013/01/04 16:57:38 1.70
+++ loncom/interface/lonsupportreq.pm 2013/01/04 17:46:00 1.71
@@ -1,5 +1,5 @@
#
-# $Id: lonsupportreq.pm,v 1.70 2013/01/04 16:57:38 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.71 2013/01/04 17:46:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -677,10 +677,11 @@ sub print_request_receipt {
$okcclist = join(', ',@ok_ccs);
}
if (@bad_ccs == 1) {
- $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+ if ($bad_ccs[0] ne '') {
+ $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').&cleanup_html($bad_ccs[0]);
+ }
} elsif (@bad_ccs > 1) {
- my $bad_cc_string = join(', ',@bad_ccs);
- $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
+ $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: '). &cleanup_html(join(', ',@bad_ccs));
}
}
$env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
@@ -716,9 +717,12 @@ END
''.
"$lt{$item}: $showurl
\n";
} elsif ($item eq 'cc') {
- $displaymsg .=
- ''.
- "$lt{$item}: $okcclist
\n";
+ if ($okcclist) {
+ my $showcclist = &cleanup_html($okcclist);
+ $displaymsg .=
+ ''.
+ "$lt{$item}: $showcclist
\n";
+ }
} else {
my $showitem = $env{'form.'.$item};
$showitem = &cleanup_html($showitem);