--- loncom/interface/lonsupportreq.pm	2009/06/05 12:49:50	1.53
+++ loncom/interface/lonsupportreq.pm	2009/10/01 19:08:29	1.54
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.53 2009/06/05 12:49:50 bisitz Exp $
+# $Id: lonsupportreq.pm,v 1.54 2009/10/01 19:08:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -566,13 +566,15 @@ END
         if ($env{'form.'.$item} ne '') {
             if ($item eq 'description') {
                 my $descrip = $env{'form.description'};
-                $descrip =~ s|\n|<br />|g;
+                $descrip =  &cleanup_html($descrip);
+                $descrip =~ s|[\n\r\f]|<br />|g;
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $descrip<br />\n";
             } elsif ($item eq 'sourceurl') {
                 my $showurl = $env{'form.sourceurl'};
                 $showurl =~ s/\?.*$//;
+                $showurl =  &cleanup_html($showurl);
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showurl<br />\n";
@@ -581,9 +583,11 @@ END
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $okcclist<br />\n";
             } else {
+                my $showitem = $env{'form.'.$item};
+                $showitem = &cleanup_html($showitem);
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
-                    "$lt{$item}</span>: $env{'form.'.$item}<br />\n";
+                    "$lt{$item}</span>: $showitem<br />\n";
             }
         }
     }
@@ -846,9 +850,27 @@ sub get_domain {
     } elsif ($env{'request.role.domain'}) {
         $codedom = $env{'request.role.domain'};
     } else {
-        $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
+        $codedom = &Apache::lonnet::default_login_domain();
     }
     return $codedom;
 }
 
+sub cleanup_html {
+    my ($incoming) = @_;
+    my $outgoing;
+    if ($incoming ne '') {
+        $outgoing = $incoming;
+        $outgoing =~ s/\#/&#035;/g;
+        $outgoing =~ s/\&/&#038;/g;
+        $outgoing =~ s/</&#060;/g;
+        $outgoing =~ s/>/&#062;/g;
+        $outgoing =~ s/\(/&#040/g;
+        $outgoing =~ s/\)/&#041;/g;
+        $outgoing =~ s/"/&#034;/g;
+        $outgoing =~ s/'/&#039;/g;
+        $outgoing =~ s/\$/&#036;/g;
+    }
+    return $outgoing;
+}
+
 1;