--- loncom/interface/lonsupportreq.pm	2013/01/04 16:57:38	1.70
+++ loncom/interface/lonsupportreq.pm	2013/01/04 18:35:12	1.72
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.70 2013/01/04 16:57:38 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.72 2013/01/04 18:35:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -641,10 +641,8 @@ sub print_request_receipt {
                  adin        => 'Additional information recorded',
     );
 
-    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$public,$homeserver);
-    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
-        $public = 1;
-    } else {
+    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$homeserver);
+    unless ($public) {
         if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
             $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
                                                       $env{'user.domain'});
@@ -677,10 +675,11 @@ sub print_request_receipt {
            $okcclist = join(', ',@ok_ccs); 
         } 
         if (@bad_ccs == 1) {
-            $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+            if ($bad_ccs[0] ne '') {
+                $badccmsg .= '<br />'.&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 .= '<br />'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
+            $badccmsg .= '<br />'.&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 +715,12 @@ END
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showurl<br />\n";
             } elsif ($item eq 'cc') {
-                $displaymsg .=
-                    '<span class="LC_helpform_receipt_cat">'.
-                    "$lt{$item}</span>: $okcclist<br />\n";
+                if ($okcclist) {
+                    my $showcclist = &cleanup_html($okcclist);
+                    $displaymsg .=
+                        '<span class="LC_helpform_receipt_cat">'.
+                        "$lt{$item}</span>: $showcclist<br />\n";
+                }
             } else {
                 my $showitem = $env{'form.'.$item};
                 $showitem = &cleanup_html($showitem);
@@ -812,8 +814,7 @@ END
 
     my $attachmentpath = '';
     my $attachmentsize = '';
-    if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
-        && ($env{'user.domain'} ne 'public')) {
+    if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {