--- loncom/interface/lonsupportreq.pm	2008/10/01 17:47:06	1.50
+++ loncom/interface/lonsupportreq.pm	2009/10/22 13:41:41	1.55
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.50 2008/10/01 17:47:06 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.55 2009/10/22 13:41:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -495,7 +495,7 @@ sub print_request_receipt {
     }
     my %lt = &Apache::lonlocal::texthash (
                  username    => 'Name',
-                 email       => 'Email',
+                 email       => 'E-mail',
                  cc          => 'Cc',
                  user        => 'Username/domain',
                  phone       => 'Phone',
@@ -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";
             }
         }
     }
@@ -684,7 +688,12 @@ END
 
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
-        $displaymsg .= '<br />'.&mt('An uploaded screenshot file \'[_1]\' ([_2] bytes) was included in the request sent by [_3].',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'});
+        $displaymsg .= '<br />'
+                      .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
+                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,$attachmentsize
+                          ,$env{'user.name'}.':'.$env{'user.domain'}
+                       );
         $supportmsg .= "\n";
         foreach my $var (@cookievars) {
             $supportmsg .= "$var: $cookies{$var}\n";
@@ -741,7 +750,8 @@ END
         unlink($attachmentpath);
     }
     $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
-    $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_helpform_receipt').
+    $r->print('<div style="width:620px;">'.
+              &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".
               &Apache::lonhtmlcommon::row_closure().
               &Apache::lonhtmlcommon::row_title($lt{'adin'},undef,'LC_evenrow_value'));
@@ -767,7 +777,8 @@ END
     $envmsg =~ s/, $//;
     $r->print($envmsg."\n".
               &Apache::lonhtmlcommon::row_closure(1)."\n".
-              &Apache::lonhtmlcommon::end_pick_box()."\n".
+              &Apache::lonhtmlcommon::end_pick_box().
+              "</div>\n".
               &Apache::loncommon::end_page());
 }
 
@@ -796,7 +807,11 @@ sub print_header {
     $r->print(<<END);
 <table width="620" border="0" cellspacing="0" cellpadding="0" height="55">   <tr height="50">    <td width='5'>&nbsp;</td>
    <td>
-    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA $lt{'headline'}</font></b></legend>
+    <fieldset>
+      <legend>
+        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />
+        LON-CAPA $lt{'headline'}
+      </legend>
  <table id="LC_helpmenu_links">
    <tr>
     <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" valign="middle" />&nbsp;<b><a href="/adm/loginproblems.html">$lt{'login'}</a></b>&nbsp;</span></td>
@@ -837,9 +852,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;