--- loncom/interface/lonsupportreq.pm	2011/03/03 00:06:38	1.64
+++ loncom/interface/lonsupportreq.pm	2013/01/04 16:57:38	1.70
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.64 2011/03/03 00:06:38 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.70 2013/01/04 16:57:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,9 +36,10 @@ use Apache::lonhtmlcommon;
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
+use Apache::lonauth();
 use Apache::courseclassifier;
 use LONCAPA qw(:DEFAULT :match);
- 
+use HTML::Entities;
 
 sub handler {
     my ($r) = @_;
@@ -56,8 +57,19 @@ sub handler {
     if ($r->uri eq '/adm/helpdesk') {
         &Apache::lonacc::get_posted_cgi($r);
     }
-    my $function = $env{'form.function'};
+    my $function;
+    if ($env{'form.function'}) {
+        if (($env{'form.function'} eq 'norole')  ||
+            ($env{'form.function'} eq 'student') ||
+            ($env{'form.function'} eq 'admin')   ||
+            ($env{'form.function'} eq 'author')) {
+            $function = $env{'form.function'};
+        }
+    }
     my $origurl = $env{'form.origurl'};
+    $origurl =~ s{^https?://}{};
+    $origurl =~ s/(`)//g;
+    $origurl =~ s/\$/\(\$\)/g;
     my $command = $env{'form.command'};
 
     if ($command eq 'process') {
@@ -72,7 +84,7 @@ sub print_request_form {
     my ($r,$origurl,$function) = @_;
     my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
         $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,
-        $formname,$public);
+        $formname,$public,$homeserver);
     $function = &Apache::loncommon::get_users_function() if (!$function);
     $ccode = '';
     $os = $env{'browser.os'};
@@ -82,22 +94,28 @@ sub print_request_form {
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;
     } else {
-        $uname = $env{'user.name'};
-        $udom = $env{'user.domain'};
+        if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+            $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
+                                                      $env{'user.domain'});
+            if ($homeserver eq 'no_host') {
+                undef($homeserver); 
+            } else {
+                $uname = $env{'user.name'};
+                $udom = $env{'user.domain'};
+            }
+        }
+    }
+    if ($homeserver) {
+        $uhome = $env{'user.home'};
+        $urole = $env{'request.role'};
+        $usec = $env{'request.course.sec'};
+        $cid = $env{'request.course.id'};
     }
-    $uhome = $env{'user.home'};
-    $urole = $env{'request.role'};
-    $usec = $env{'request.course.sec'};
-    $cid = $env{'request.course.id'};
     $formname = 'logproblem';
     my $machine = &Apache::lonnet::absolute_url();
-    if ($origurl =~ m-^https?://-) {
-        $server = $origurl;
-    } else {
-        $server = $machine.$origurl;
-    }
-    my $showserver = $server;
-    $showserver =~ s/\?.*$//;
+    my $sourceurl = $machine.$origurl;
+    $server = $machine.&cleanup_html($origurl);
+    $server =~ s/\?.*$//;
     my %lt = &Apache::lonlocal::texthash (
                   email => 'The e-mail address you entered',
                   notv => 'is not a valid e-mail address',
@@ -159,18 +177,20 @@ END
         $sectionlist = $csettings{'internal.sectionnums'};
     }
 
-    if ($env{'environment.permanentemail'}) {
-        $email = $env{'environment.permanentemail'};
-    } elsif ($env{'environment.critnotification'}) {
-        $email = $env{'environment.critnotification'};
-    } elsif ($env{'environment.notification'}) {
-        $email = $env{'environment.notification'};
-    }
-    if ($env{'environment.lastname'}) {
-        $lastname = $env{'environment.lastname'};
-    }
-    if ($env{'environment.firstname'}) {
-        $firstname = $env{'environment.firstname'};
+    if ($homeserver) {
+        if ($env{'environment.permanentemail'}) {
+            $email = $env{'environment.permanentemail'};
+        } elsif ($env{'environment.critnotification'}) {
+            $email = $env{'environment.critnotification'};
+        } elsif ($env{'environment.notification'}) {
+            $email = $env{'environment.notification'};
+        }
+        if ($env{'environment.lastname'}) {
+            $lastname = $env{'environment.lastname'};
+        }
+        if ($env{'environment.firstname'}) {
+            $firstname = $env{'environment.firstname'};
+        }
     }
     my @sections = split(/,/,$sectionlist);
     my %groupid;
@@ -243,11 +263,19 @@ function initialize_codes() {
         }
     }
 	
-    my $js = '<script type="text/javascript">'."\n$scripttag\n$jscript\n".
-	     $loaditems.'</script>';
-    my %add_entries = (topmargin    => "0",
-		       marginheight => "0",
-		       onLoad       =>"initialize_codes()",);
+    my $js = <<"ENDJS";
+<script type="text/javascript">
+// <![CDATA[
+$scripttag
+$jscript
+$loaditems
+// ]]>
+</script>
+ENDJS
+    my %add_entries = (
+                       style    => "margin-top:0px;margin-bottom:0px;",
+                       onload   => "initialize_codes();",
+                      );
 
     
     $r->print(&Apache::loncommon::start_page('Support Request',$js,
@@ -260,20 +288,24 @@ function initialize_codes() {
     my @css = ('LC_evenrow_value','LC_oddrow_value');
     my $num = 1;
     my $i = $num%2;
-    $r->print('<form method="post" name="logproblem" enctype="multipart/form-data">'."\n");
+    my $formtype;
+    if ($homeserver) {
+        $formtype = ' enctype="multipart/form-data"';
+    }
+    $r->print('<form method="post" action="" name="logproblem"'.$formtype.'>'."\n");
     my $output = &Apache::lonhtmlcommon::start_pick_box().
                  &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n";
     my $fullname = '';
     if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
         $fullname = "$firstname $lastname"; 
-        $output .= $fullname.'<input type="hidden" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />';
+        $output .= $fullname.'<input type="hidden" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
     } else {
         if (defined($firstname) && $firstname ne '') {
             $fullname = $firstname;
         } elsif (defined($lastname) && $lastname ne '') {
             $fullname = " $lastname";
         }
-        $output .= '<input type="text" size="20" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />';
+        $output .= '<input type="text" size="20" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
     }
     $output .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$lt{'subm'}.'" onclick="validate()" />&nbsp;'.
                 &Apache::lonhtmlcommon::row_closure()."\n";
@@ -286,17 +318,19 @@ function initialize_codes() {
     $num ++;
     $i = $num%2;
     if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
-                   '<input type="text" size="50" name="cc" value="" /><br />'."\n".
-                   &Apache::lonhtmlcommon::row_closure();
-        $num ++;
-        $i = $num%2;
+        if ($homeserver) { 
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
+                       '<input type="text" size="50" name="cc" value="" /><br />'."\n".
+                       &Apache::lonhtmlcommon::row_closure();
+            $num ++;
+            $i = $num%2;
+        }
     }
     $output .= &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,$css[$i]);
     my $udom_input = '<input type="hidden" name="udom" value="'.
-                     &HTML::Entities::encode($udom,'"<>&').'" />';
+                     &HTML::Entities::encode($udom,'"<>&').'" />'."\n";
     my $uname_input = '<input type="hidden" name="uname" value="'.
-                      &HTML::Entities::encode($uname,'"<>&').'" />'; 
+                      &HTML::Entities::encode($uname,'"<>&').'" />'."\n"; 
     if (($env{'user.name'} =~ /^$match_username$/) && 
         ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
         $output .= '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
@@ -310,7 +344,7 @@ function initialize_codes() {
         } else {
             $output .= $lt{'entr'};
         }
-        $output .= '<br />';
+        $output .= '<br />'."\n";
         if (!$public) {
             if ($env{'user.domain'} =~ /^$match_domain$/) {
                 $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
@@ -320,7 +354,7 @@ function initialize_codes() {
         }
         if ($udomform eq '') {
             $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;';
-            $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom');
+            $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom')."\n";
         }
         if ($unameform eq '') {
             $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
@@ -331,11 +365,11 @@ function initialize_codes() {
     $num ++;
     $i = $num%2;
     $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]).
-               $showserver.'<input type="hidden" name="sourceurl" value="'.
-               &HTML::Entities::encode($server,'"<>&').'" />'.
+               $server."\n".'<input type="hidden" name="sourceurl" value="'.
+               &HTML::Entities::encode($sourceurl,'"<>&').'" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
-               '<input type="text" size="15" name="phone" /><br />'.
+               '<input type="text" size="15" name="phone" /><br />'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
@@ -345,17 +379,17 @@ function initialize_codes() {
             foreach my $item (@codetitles) {
                 $output .= '<i>'.$item.'</i>:&nbsp;'.$codes{$cnum}{$item}.';&nbsp;';
             }
-            $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />';
+            $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />'."\n";
         } else {
             $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
+                  <input type="text" name="coursecode" size="15" value="" />'."\n";
         }
     } else {
         if ($totcodes > 0) {
             my $numtitles = @codetitles;
             if ($numtitles == 0) {
                 $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
+                  <input type="text" name="coursecode" size="15" value="" />'."\n";
             } else {
                 my @standardnames = &Apache::loncommon::get_standard_codeitems();
                 my $lasttitle = $numtitles;
@@ -364,7 +398,7 @@ function initialize_codes() {
                 } 
                 $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
                       '<select name="'.$standardnames[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
-                      ' <option value="-1" />'.$lt{'sele'}."\n";
+                      ' <option value="-1">'.$lt{'sele'}."</option>\n";
                 my @items = ();
                 my @longitems = ();
                 if ($idlist{$codetitles[0]} =~ /","/) {
@@ -407,7 +441,7 @@ function initialize_codes() {
             }
         } else {
             $output .= $lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />';
+                  <input type="text" name="coursecode" size="15" value="" />'."\n";
         }
     }
     if ($ctitle) {
@@ -438,7 +472,7 @@ function initialize_codes() {
         }
         $output .= "</select>";
     } else {
-        $output .= '<input type="text" name="section" size="10" />';
+        $output .= '<input type="text" name="section" size="10" />'."\n";
     }
     $output .= &Apache::lonhtmlcommon::row_closure();
     $num ++;
@@ -447,16 +481,32 @@ function initialize_codes() {
                '  <input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value').
-               '  <textarea rows="10" cols="45" name="description" wrap="virtual"></textarea>'.
+               '  <textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
+               '</textarea>'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
     if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
-                   ' <input type="file" name="screenshot" size="20" /><br />'.$lt{'uplf'}."\n".
-        &Apache::lonhtmlcommon::row_closure();
-        $num ++;
-        $i = $num%2; 
+        if ($homeserver) {
+            $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
+                       ' <input type="file" name="screenshot" size="20" /><br />'.
+                       "\n".$lt{'uplf'}."\n".
+                       &Apache::lonhtmlcommon::row_closure();
+            $num ++;
+            $i = $num%2;
+        }
+    } else {
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($captchaform,$error) = 
+            &Apache::loncommon::captcha_display('login',$lonhost);
+        if ($captchaform) {
+            $output .= &Apache::lonhtmlcommon::row_title(&mt('Validation'),undef,
+                                                         $css[$i])."\n".
+                       $captchaform."\n".
+                       &Apache::lonhtmlcommon::row_closure();
+            $num ++;
+            $i = $num%2;
+        }
     }
     $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]);
     $output .= <<END;
@@ -486,6 +536,32 @@ END
 
 sub print_request_receipt {
     my ($r,$url,$function) = @_;
+    my $public;
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $public = 1;
+    }
+    unless (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
+        my $lonhost = $r->dir_config('lonHostID');
+        my ($captcha_chk,$captcha_error) = 
+            &Apache::loncommon::captcha_response('login',$lonhost);
+        if ($captcha_chk != 1) {
+            $r->print(&Apache::loncommon::start_page('Support request failed',undef,
+                                       {'function'    => $function,
+                                        'add_entries' => {
+                                            topmargin    => "0",
+                                            marginheight => "0",
+                                        },
+                                        'only_body'   => 1,}));
+            if ($r->uri eq '/adm/helpdesk') {
+                &print_header($r,$url,'process');
+            }
+            $r->print('<h3>'.&mt('Support request failed').'</h3>'.
+                      '<span class="LC_error">'.
+                      &mt('Validation of the code you entered failed.').
+                      &Apache::loncommon::end_page());
+            return;
+        }
+    }
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
     my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
@@ -558,7 +634,6 @@ sub print_request_receipt {
                  sourceurl   => 'URL',
                  date        => 'Date/Time',
                  secn        => 'Section',
-                 asup        => 'A support request has been sent to',
                  warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',
                  sect        => 'section',
@@ -566,8 +641,17 @@ sub print_request_receipt {
                  adin        => 'Additional information recorded',
     );
 
-    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist);
-    if ((defined($env{'user.name'})) && (defined($env{'form.cc'}))) {
+    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist,$public,$homeserver);
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $public = 1;
+    } else {
+        if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+            $homeserver = &Apache::lonnet::homeserver($env{'user.name'},
+                                                      $env{'user.domain'});
+        }
+    }
+
+    if (($homeserver) && (defined($env{'form.cc'}))) {
         my @ccs;
         if ($env{'form.cc'} =~ /,/) {
             @ccs = split(/,/,$env{'form.cc'});
@@ -689,14 +773,20 @@ END
             $bad_email = 1;
         }
     }
-    if ($bad_email) {
-        $r->print('
- <h3>'.$lt{'warn'}.'</h3>'.
-&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.')); 
-            $to = 'helpdesk@lon-capa.org';
+
+    my $message;
+    if (!$bad_email) {
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));
     } else {
-        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            $lt{'warn'}.'<br />'
+           .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>')
+           .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1); 
+        $to = 'helpdesk@lon-capa.org';
     }
+    $r->print(&Apache::loncommon::confirmwrapper($message));
+
     if (defined($env{'form.email'})) {
         $env{'form.email'} =~ s/^\s+//;
         $env{'form.email'} =~ s/\s+$//;
@@ -724,7 +814,7 @@ END
     my $attachmentsize = '';
     if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
         && ($env{'user.domain'} ne 'public')) {
-        if ($env{'form.screenshot.filename'}) {
+        if ($homeserver && $env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {
                 $displaymsg .= '<br />'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize);
@@ -744,7 +834,7 @@ END
         $fname = $1;
         $displaymsg .= '<br />'
                       .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
-                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,'<span class="LC_filename">'.$fname.'</span>'
                           ,$attachmentsize
                           ,$env{'user.name'}.':'.$env{'user.domain'}
                        );
@@ -767,16 +857,19 @@ END
                  Type    =>'TEXT',
                  Data    => $supportmsg,
                  );
-    if (@ok_ccs > 0) {
-        my $cc_string = join(', ',@ok_ccs);
-        $msg->add("Cc" => $cc_string);
+    if ($homeserver) {
+        if (@ok_ccs > 0) {
+            my $cc_string = join(', ',@ok_ccs);
+            $msg->add("Cc" => $cc_string);
+        }
     }
     if ($bcc ne '') {
         $msg->add("Bcc" => $bcc);
     }
-    $msg->add('Content-type','text/plain; charset=UTF-8');
+    $msg->attr("content-type"         => "text/plain");
+    $msg->attr("content-type.charset" => "UTF-8");
 
-    if ($attachmentpath) {
+    if ($homeserver && $attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
         $msg->attach(Type     => $type,
                      Path     => $attachmentpath,
@@ -849,11 +942,14 @@ sub print_header {
         $helpdesk_link = '<a href="/adm/helpdesk">';
     }
     my %lt = &Apache::lonlocal::texthash (
-                                           login => 'Log-in help',
-                                           ask   => 'Ask helpdesk',
-                                           getst => 'Getting started guide',
-                                           back =>  'Back to last location',
+                                           login    => 'Log-in help',
+                                           ask      => 'Ask helpdesk',
+                                           getst    => 'Getting started guide',
+                                           back     =>  'Back to last location',
                                            headline => 'help/support',
+                                           stud     => 'Students',
+                                           ifyo     => 'If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.',
+                                           cont     => 'Contact your instructor instead.',
                                          );
     my ($getstartlink,$reviewtext);
     if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
@@ -862,42 +958,54 @@ sub print_header {
     } else {
         $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
     }
+    my $linkback;
     if ($origurl eq '') {
-        $origurl = 'javascript:history.go(-1)';
+        $linkback = 'javascript:history.go(-1)';
+    } else {
+        $linkback = &HTML::Entities::encode($origurl,'"<>&');
     }
-    $r->print(<<END);
-<table width="620" border="0" cellspacing="0" cellpadding="0" height="55">   <tr height="50">    <td width='5'>&nbsp;</td>
-   <td>
+    my $loginhelp = &Apache::lonauth::loginhelpdisplay();
+    if ($loginhelp eq '') {
+        $loginhelp = '/adm/loginproblems.html';
+    }
+    $r->print(<<"END");
+<table width="620" border="0" cellspacing="0" cellpadding="0" style="height: 55px;">
+ <tr>
+   <td width="5" height="50">&nbsp;</td>
+   <td height="50">
     <fieldset>
       <legend>
-        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />
+        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" alt="logo" style="vertical-align: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>
-    <td align="center"><span class="LC_nobreak">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" valign="middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</span></td>$getstartlink
-    <td align="center"><span class="LC_nobreak">&nbsp;<b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" valign="middle" />&nbsp;$lt{'back'}</a></b>&nbsp;</span></td>
+    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" />&nbsp;<b><a href="$loginhelp">$lt{'login'}</a></b>&nbsp;</span></td>
+    <td align="center"><span class="LC_nobreak">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" style="vertical-align:middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</span></td>$getstartlink
+    <td align="center"><span class="LC_nobreak">&nbsp;<b><a href="$linkback" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" style="vertical-align:middle" />&nbsp;$lt{'back'}</a></b>&nbsp;</span></td>
    </tr>
  </table>
 </fieldset>
   </td>
-  <td width='5'>&nbsp;</td>
+  <td width="5">&nbsp;</td>
  </tr>
- <tr height='5'>
-  <td colspan='3' height='5'>&nbsp;</td>
+ <tr>
+  <td colspan="3" height="5">&nbsp;</td>
  </tr>
 END
     if  ($command ne 'process') {
-        $r->print('
+        my $stuwarn = &mt('Do [_1]not[_2] use this form to ask about course content.',
+                          '<b>','</b>');
+        $r->print(<<"END");
  <tr>
-  <td colspan="3">'.$reviewtext.' '
-.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.').'<br />'
-.'<font size="-1"><b>'.&mt('Students').'</b>: '.&mt('Do <b>not</b> use this form to ask questions about course content.').' '
-.&mt('Contact your instructor instead.')
-.'</font><br /><br />
+  <td colspan="3">$reviewtext 
+  $lt{'ifyo'}<br />
+<span style="font-size:90%;"><b>$lt{'stud'}</b>: 
+$stuwarn $lt{'cont'}</span>
+<br /><br />
   </td>
- </tr>');
+ </tr>
+END
     }
     $r->print('
 </table>');
@@ -907,8 +1015,11 @@ END
 sub get_domain {
     my $codedom;
     if (exists($env{'form.codedom'})) {
-        $codedom = $env{'form.codedom'};
-    } elsif ($env{'request.course.id'}) {
+        if (&Apache::lonnet::domain($env{'form.codedom'}) ne '') {
+            return $env{'form.codedom'};
+        }
+    }
+    if ($env{'request.course.id'}) {
         $codedom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     } elsif ($env{'request.role.domain'}) {
         $codedom = $env{'request.role.domain'};
@@ -923,6 +1034,7 @@ sub cleanup_html {
     my $outgoing;
     if ($incoming ne '') {
         $outgoing = $incoming;
+        $outgoing =~ s/;/&#059;/g;
         $outgoing =~ s/\#/&#035;/g;
         $outgoing =~ s/\&/&#038;/g;
         $outgoing =~ s/</&#060;/g;
@@ -932,6 +1044,9 @@ sub cleanup_html {
         $outgoing =~ s/"/&#034;/g;
         $outgoing =~ s/'/&#039;/g;
         $outgoing =~ s/\$/&#036;/g;
+        $outgoing =~ s{/}{&#047;}g;
+        $outgoing =~ s/=/&#061;/g;
+        $outgoing =~ s/\\/&#092;/g
     }
     return $outgoing;
 }