--- loncom/interface/lonsupportreq.pm	2024/07/15 17:13:06	1.79.2.12
+++ loncom/interface/lonsupportreq.pm	2025/02/25 05:35:26	1.108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.12 2024/07/15 17:13:06 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.108 2025/02/25 05:35:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,6 @@
 package Apache::lonsupportreq;
 
 use strict;
-use MIME::Types;
-use MIME::Lite;
 use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -332,11 +330,17 @@ ENDJS
                        onload   => "initialize_codes();",
                       );
 
-    
-    $r->print(&Apache::loncommon::start_page('Support Request',$js,
-				       { 'function'    => $function,
-					 'add_entries' => \%add_entries,
-					 'only_body'   => 1,}));
+    my $args = { 'function'    => $function,
+                 'add_entries' => \%add_entries,
+                 'only_body'   => 1,};
+    unless (($knownuser) || ($public)) {
+        (undef,undef,undef,my $clientmathml,my $clientunicode) =
+            &Apache::loncommon::decode_user_agent();
+        if ($clientunicode && !$clientmathml) {
+            $args->{'browser.unicode'} = 1;
+        }
+    }
+    $r->print(&Apache::loncommon::start_page('Support Request',$js,$args));
     if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$origurl);
     }
@@ -349,30 +353,34 @@ ENDJS
     }
     my $topsubmit = '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$html_lt{'subm'}.'" onclick="validate()" />&nbsp;';
     my $shownsubmit;
-    $r->print('<form method="post" action="" name="logproblem"'.$formtype.'>'."\n");
+    $r->print('<div class="LC_landmark" role="main">'."\n".
+              '<form method="post" action="" name="logproblem"'.$formtype.'>'."\n");
     my $output = &Apache::lonhtmlcommon::start_pick_box().
                  &Apache::lonhtmlcommon::row_headline().
                  '<span class="LC_info">'.
-                 &mt('(All fields marked with * are required.)').
+                 &mt('(All fields marked with [_1]*[_2] are required.)',
+                     '<span class="LC_parm_part">','</span>').
                  '</span>'.
                  &Apache::lonhtmlcommon::row_closure();
     unless ($helpform{'username'} eq 'no') {
-        my ($reqd,$namefield,$fullname);
+        my ($reqd,$aria_reqd,$namefield,$fullname);
         if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
             $fullname = "$firstname $lastname";
-            $namefield = $fullname.'<input type="hidden" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
+            $namefield = $fullname.'<input type="hidden" name="username" id="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
         } else {
             if (defined($firstname) && $firstname ne '') {
                 $fullname = $firstname;
             } elsif (defined($lastname) && $lastname ne '') {
                 $fullname = " $lastname";
             }
-            $namefield = '<input type="text" size="20" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
             if ($helpform{'username'} eq 'req') {
-                $reqd = '<span class="LC_info">*</span>';
+                $reqd = '<span class="LC_parm_part">*</span>';
+                $aria_reqd = 'aria-required="true" ';
             }
+            $namefield = '<input type="text" size="20" name="username" id="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" '.$aria_reqd.'/>'."\n";
         }
-        $output .= &Apache::lonhtmlcommon::row_title($html_lt{'name'}.$reqd,undef,$css[$num])."\n".$namefield.
+        my $title = '<label for="username">'.$html_lt{'name'}.'</label>';
+        $output .= &Apache::lonhtmlcommon::row_title($title.$reqd,undef,$css[$num])."\n".$namefield.
                    $topsubmit.
                    &Apache::lonhtmlcommon::row_closure()."\n";
         $shownsubmit = 1;
@@ -381,10 +389,11 @@ ENDJS
     }
     $output .= &Apache::lonhtmlcommon::row_title(
                    '<span title="'.&mt('required').'">'.
-                   $html_lt{'emad'}.' <span class="LC_info">*</span></span>'
+                   '<label for="email">'.$html_lt{'emad'}.
+                   '</label><span class="LC_parm_part">*</span></span>'
                   ,undef,$css[$i]).
-               '<input type="text" size="20" name="email" value="'.
-               &HTML::Entities::encode($email,'"<>&').'" />'."\n";
+               '<input type="text" size="20" name="email" id="email" value="'.
+               &HTML::Entities::encode($email,'"<>&').'" aria-required="true" />'."\n";
     unless ($shownsubmit) {
         $output .= $topsubmit;
     }
@@ -398,22 +407,25 @@ ENDJS
             my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
                 &Apache::loncommon::blockcheck(\%setters,'com',$ip);
             unless (($helpform{'cc'} eq 'no') || ($by_ip)) {
-                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'emac'},undef,$css[$i]).
-                           '<input type="text" size="50" name="cc" value="" /><br />'."\n".
+                $output .= &Apache::lonhtmlcommon::row_title('<label for="cc">'.$html_lt{'emac'}.'</label>',
+                                                             undef,$css[$i]).
+                           '<input type="text" size="50" name="cc" id="cc" value="" /><br />'."\n".
                            &Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
             }
         }
     }
-    unless ($helpform{'user'} eq 'no') {
+    unless (($helpform{'user'} eq 'no') || ($env{'request.lti.login'})) {
         $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'unme'}/$html_lt{'doma'}",undef,$css[$i]);
         my $udom_input = '<input type="hidden" name="udom" value="'.
                          &HTML::Entities::encode($udom,'"<>&').'" />'."\n";
         my $uname_input = '<input type="hidden" name="uname" value="'.
                          &HTML::Entities::encode($uname,'"<>&').'" />'."\n";
         if ($knownuser) {
-            $output .= '<i>'.$html_lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$html_lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
+            $output .= '<span class="LC_nobreak"><span class="LC_cusr_emph">'.$html_lt{'unme'}
+                      .'</span>:&nbsp;'.$uname.'&nbsp;&nbsp;<span class="LC_cusr_emph">'
+                      .$html_lt{'doma'}.'</span>:&nbsp;'.$udom.$udom_input.$uname_input.'</span>';
         } else {
             my $udomform = '';
             my $unameform = '';
@@ -427,46 +439,53 @@ ENDJS
             $output .= '<br />'."\n";
             if (!$public) {
                 if ($env{'user.domain'} =~ /^$match_domain$/) {
-                    $udomform = '<i>'.$html_lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
+                    $udomform = '<span class="LC_cusr_emph">'.$html_lt{'doma'}.'</span>:&nbsp;'.$udom.$udom_input;
                 } elsif ($env{'user.name'} =~ /^$match_username$/) {
-                    $unameform = '<i>'.$html_lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+                    $unameform = '<span class="LC_cusr_emph">'.$html_lt{'unme'}.'</span>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
                 }
             }
             if ($udomform eq '') {
-                $udomform = '<i>'.$html_lt{'doma'}.'</i>:&nbsp;';
-                $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom')."\n";
+                $udomform = '<span class="LC_nobreak"><span class="LC_cusr_emph"><label for="udom">'
+                           .$html_lt{'doma'}.'</label></span>:&nbsp;'
+                           .&Apache::loncommon::select_dom_form($codedom,'udom','','','','','','','udom')."</span>\n";
             }
             if ($unameform eq '') {
-                $unameform= '<i>'.$html_lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
+                $unameform= '<span class="LC_nobreak"><span class="LC_cusr_emph"><label for="uname">'
+                           .$html_lt{'unme'}.'</label></span>:&nbsp;'
+                           .'<input type="text" size="20" name="uname" id="uname" value="'.$uname.'" />'
+                           .'&nbsp;&nbsp;</span>';
             }
             $output .= $unameform.$udomform;
         }
         $output .= &Apache::lonhtmlcommon::row_closure();
         $num ++;
+        $i = $num%2;
+    }
+    unless ($env{'request.lti.login'}) {
+        $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'urlp'}",undef,$css[$i]).
+                   $server."\n".'<input type="hidden" name="sourceurl" value="'.
+                   &HTML::Entities::encode($sourceurl,'"<>&').'" />'."\n".
+                   &Apache::lonhtmlcommon::row_closure();
     }
-    $i = $num%2;
-    $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'urlp'}",undef,$css[$i]).
-               $server."\n".'<input type="hidden" name="sourceurl" value="'.
-               &HTML::Entities::encode($sourceurl,'"<>&').'" />'."\n".
-               &Apache::lonhtmlcommon::row_closure();
     unless ($helpform{'phone'} eq 'no') {
-        my $reqd;
+        my ($reqd,$aria_reqd);
         if ($helpform{'phone'} eq 'req') {
-            $reqd = '<span class="LC_info">*</span>';
+            $reqd = '<span class="LC_parm_part">*</span>';
+            $aria_reqd = 'aria-required="true" ';
         }
-        $output .= &Apache::lonhtmlcommon::row_title($html_lt{'phon'}.$reqd,undef,'LC_evenrow_value').
-                   '<input type="text" size="15" name="phone" /><br />'."\n".
+        $output .= &Apache::lonhtmlcommon::row_title('<label for="phone">'.$html_lt{'phon'}.'</label>'.$reqd,undef,'LC_evenrow_value').
+                   '<input type="text" size="15" name="phone" id="phone" '.$aria_reqd.'/><br />'."\n".
                    &Apache::lonhtmlcommon::row_closure();
         $num ++;
         $i = $num%2;
     }
-    unless ($helpform{'course'} eq 'no') {
+    unless (($helpform{'course'} eq 'no') || ($env{'request.lti.login'})) {
         $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'crsd'}$details_title",undef,$css[$i]);
         if ($totcodes > 0) {
             my $numtitles = @codetitles;
             if ($numtitles == 0) {
-                $output .= $html_lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="'.&HTML::Entities::encode($ccode,'\'"&<>').'" />'."\n";
+                $output .= '<label>'.$html_lt{'enin'}.':&nbsp;
+                  <input type="text" name="coursecode" size="15" value="'.&HTML::Entities::encode($ccode,'\'"&<>').'" /></label>'."\n";
             } else {
                 my @standardnames = &Apache::loncommon::get_standard_codeitems();
                 my $lasttitle = $numtitles;
@@ -477,8 +496,13 @@ ENDJS
                 if ($sectionlist) {
                     $onchange = 'toggleSecVis()';
                 }
-                $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
-                      '<select name="'.$standardnames[0].'" onchange="courseSet('."'$codetitles[0]'".');'.$onchange.'">'."\n".
+                $output .= '<table><tr>';
+                for (my $i=0; $i<$lasttitle; $i++) {
+                    $output .= '<th><label for="'.$standardnames[$i].'_'.$i.'">'.$codetitles[0].'</label></th>';
+                }
+                $output .= '</tr>';
+                $output .= '<tr><td>'.
+                      '<select name="'.$standardnames[0].'" id="'.$standardnames[0].'_0" onchange="courseSet('."'$codetitles[0]'".');'.$onchange.'">'."\n".
                       ' <option value="-1">'.$html_lt{'sele'}."</option>\n";
                 my @items = ();
                 my @longitems = ();
@@ -505,40 +529,43 @@ ENDJS
                     $output .= ' <option value="'.$items[$i].'">'.$longitems[$i].'</option>'."\n";
                 }
                 $output .= '</select></td>';
-                for (my $i=1; $i<$numtitles; $i++) {
-                    $output .= '<td>'.$codetitles[$i].'<br />'."\n".
-                     '<select name="'.$standardnames[$i].'" onchange="courseSet('."'$codetitles[$i]'".');'.$onchange.'">'."\n".
+                for (my $i=1; $i<$lasttitle; $i++) {
+                    $output .= '<td>'."\n".
+                     '<select name="'.$standardnames[$i].'" id="'.$standardnames[$i].'_'.$i.'" onchange="courseSet('."'$codetitles[$i]'".');'.$onchange.'">'."\n".
                      '<option value="-1">&lt;-'.$html_lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
                      '</select>'."\n".
                      '</td>'."\n";
                 }
                 $output .= '</tr></table>';
                 if ($numtitles > 4) {
-                    $output .= '<br /><br />'.$codetitles[$numtitles].'<br />'."\n".
+                    $output .= '<br /><br /><label>'.$codetitles[$numtitles].'<br />'."\n".
                           '<select name="'.$standardnames[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".');'.$onchange.'">'."\n".
                           '<option value="-1">&lt;-'.$html_lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
-                          '</select>'."\n";
+                          '</select></label>'."\n";
                 }
             }
         } else {
-            $output .= $html_lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="" />'."\n";
+            $output .= '<label>'.$html_lt{'enin'}.':&nbsp;
+                  <input type="text" name="coursecode" size="15" value="" /></label>'."\n";
         }
-        my $reqd;
+        my ($reqd,$aria_reqd);
         if ($helpform{'course'} eq 'req') {
-             $reqd = '<span class="LC_info">*</span>';
+             $reqd = '<span class="LC_parm_part">*</span>';
+             $aria_reqd = 'aria-required="true" ';
         }
-        $output .= '<br />'.$html_lt{'enct'}.$reqd.':&nbsp;
+        $output .= '<br /><div><label>'.$html_lt{'enct'}.$reqd.':&nbsp;
                    <input type="text" name="title" size="25" value="'.
-                   &HTML::Entities::encode($ctitle,'"<>&').'" />'."\n";
+                   &HTML::Entities::encode($ctitle,'"<>&').'" '.$aria_reqd.'/></label></div>'."\n";
         $output .= &Apache::lonhtmlcommon::row_closure();
         $num ++;
         $i = $num%2;
     }
-    unless ($helpform{'section'} eq 'no') {
-        $output .= &Apache::lonhtmlcommon::row_title($html_lt{'secn'},undef,$css[$i]);
+    unless (($helpform{'section'} eq 'no') || ($env{'request.lti.login'})) {
+        $output .= &Apache::lonhtmlcommon::row_title('<label for="section">'.$html_lt{'secn'}.'</label>',
+                                                     undef,$css[$i]);
         if ($sectionlist) {
-            $output .= "<div id=\"LC_helpdesk_sectionlist\"><select name=\"sectionsel\">\n".
+            $output .= "<div id=\"LC_helpdesk_sectionlist\">\n".
+                       "<select name=\"sectionsel\" id=\"section\">\n".
                        "  <option value=\"\" selected=\"selected\">$html_lt{'sele'}</option>\n";
             foreach my $id (sort(keys(%groupid))) {
                 if ($id eq $groupid{$id} || $groupid{$id} eq '') {
@@ -553,9 +580,9 @@ ENDJS
             }
             $output .= '</select></div>'."\n".
                        '<div id="LC_helpdesk_section" style="display:none">'.
-                       '<input type="text" name="sectiontxt" size="10" /></div>'."\n";
+                       '<input type="text" name="sectiontxt" id="notinuse" size="10" /></div>'."\n";
         } else {
-            $output .= '<input type="text" name="section" size="10" />'."\n";
+            $output .= '<input type="text" name="section" id="section" size="10" />'."\n";
         }
         $output .= &Apache::lonhtmlcommon::row_closure();
         $num ++;
@@ -563,15 +590,17 @@ ENDJS
     }
     $output .= &Apache::lonhtmlcommon::row_title(
                    '<span title="'.&mt('required').'">'.
-                   $html_lt{'subj'}.' <span class="LC_info">*</span></span>'
+                   '<label for="subject">'.$html_lt{'subj'}.'</label>'.
+                   '<span class="LC_parm_part">*</span></span>'
                   ,undef,'LC_oddrow_value').
-               '<input type="text" size="40" name="subject" />'."\n".
+               '<input type="text" size="40" name="subject" id="subject" aria-required="true" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
                &Apache::lonhtmlcommon::row_title(
                    '<span title="'.&mt('required').'">'.
-                   $html_lt{'detd'}.' <span class="LC_info">*</span></span>'
+                   '<label for="description">'.$html_lt{'detd'}.'</label>'.
+                   '<span class="LC_parm_part">*</span></span>'
                   ,undef,'LC_evenrow_value').
-               '<textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
+               '<textarea rows="10" cols="45" name="description" id="description" style="word-wrap:normal;" aria-required="true">'.
                '</textarea>'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
@@ -587,9 +616,9 @@ ENDJS
                 }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
                 $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
-                    .' <input type="file" name="screenshot" class="LC_flUpload" size="20" />'
+                    .'<input type="file" name="screenshot" id="screenshot" class="LC_flUpload" size="20" />'
                     .'<input type="hidden" id="LC_free_space" value="'.$max.'" />'
-                    .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
+                    .'<br />'."\n".'<label for="screenshot">'.$html_lt{'uplf'}.'</label>'.$showmax."\n"
                     .&Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
@@ -600,7 +629,7 @@ ENDJS
             $output .= &Apache::lonhtmlcommon::row_title(
                            '<span title="'.&mt('required').'">'.
                            &mt('Validation').
-                           ' <span class="LC_info">*</span></span>'
+                           '<span class="LC_parm_part">*</span></span>'
                       ,undef,$css[$i]).
                        $captcha_form."\n".
                        &Apache::lonhtmlcommon::row_closure();
@@ -610,18 +639,16 @@ ENDJS
     }
     $output .= &Apache::lonhtmlcommon::row_title($html_lt{'fini'},undef,$css[$i]);
     $output .= <<END;
-             <table border="0" cellpadding="8" cellspacing="0">
-              <tr>
-               <td>
+             <div>
+               <div class="LC_floatleft" style="padding-top:0, padding-left:8px; padding-right:8px; padding-bottom:0; margin:0">
                 <input type="hidden" name="command" value="process" />
                 <input type="button" value="$html_lt{'subm'}" onclick="validate()" /> &nbsp;
-               </td>
-               <td>&nbsp;</td>
-               <td>
+               </div>
+               <div class="LC_floatleft" style="padding-top:0, padding-left:8px; padding-right:8px; padding-bottom:0; margin:0">
                 <input type="reset" value="$html_lt{'clfm'}" />
-               </td>
-              </tr>
-             </table>
+               </div>
+             </div>
+             <div style="padding:0;clear:both;margin:0;border:0"></div>
 END
     $output .= &Apache::lonhtmlcommon::row_closure(1);
     $output .= &Apache::lonhtmlcommon::end_pick_box();
@@ -629,6 +656,7 @@ END
 $output
 </form>
 <br />
+</div>
 END
     $r->print(&Apache::loncommon::end_page());
     return;
@@ -637,6 +665,7 @@ END
 sub print_request_receipt {
     my ($r,$url,$function) = @_;
     my $public;
+    my $args;
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;
     }
@@ -645,25 +674,33 @@ sub print_request_receipt {
         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,}));
+            $args = {
+                     'function'    => $function,
+                     'add_entries' => {
+                                         topmargin    => "0",
+                                         marginheight => "0",
+                                      },
+                     'only_body'   => 1,};
+            (undef,undef,undef,my $clientmathml,my $clientunicode) =
+                &Apache::loncommon::decode_user_agent();
+            if ($clientunicode && !$clientmathml) {
+                $args->{'browser.unicode' => 1};
+            }
+            $r->print(&Apache::loncommon::start_page('Support request failed',undef,$args));
             if ($r->uri eq '/adm/helpdesk') {
                 &print_header($r,$url,'process');
             }
             $r->print(
-                '<h2>'.&mt('Support request failed').'</h2>'.
+                '<div class="LC_landmark" role="main">'.
+                '<h2 class="LC_heading_2">'.&mt('Support request failed').'</h2>'.
                       &Apache::lonhtmlcommon::confirm_success(
                         &mt('Validation of the code you entered failed.'),1).
                 '<br /><br />'.
                 &Apache::lonhtmlcommon::actionbox([
                     &mt('[_1]Go back[_2] and try again',
                         '<a href="javascript:history.go(-1)">','</a>')]).
-                      &Apache::loncommon::end_page());
+                '</div>'.
+                &Apache::loncommon::end_page());
             return;
         }
     }
@@ -710,10 +747,10 @@ sub print_request_receipt {
     unless ($helpform{'phone'} eq 'no') {
         $formvars{'phone'} = 1;
     }
-    unless ($helpform{'section'} eq 'no') {
+    unless (($helpform{'section'} eq 'no') || ($env{'request.lti.login'})) {
         $formvars{'section'} = 1;
     }
-    unless ($helpform{'course'} eq 'no') {
+    unless (($helpform{'course'} eq 'no') || ($env{'request.lti.login'})) {
         $formvars{'course'} = 1;
     }
     unless (($helpform{'cc'} eq 'no') || ($by_ip)) {
@@ -722,7 +759,7 @@ sub print_request_receipt {
     unless ($helpform{'screenshot'} eq 'no') {
         $formvars{'screenshot'} = 1;
     }
-    my $coursecode;
+    my ($coursecode,$sourceurl);
     if ($formvars{'course'}) {
         $coursecode = $env{'form.coursecode'};
         if ($coursecode eq '') {
@@ -822,7 +859,15 @@ sub print_request_receipt {
             $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: '). &Apache::loncommon::cleanup_html(join(', ',@bad_ccs));
         }
     }
-    $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
+    if ($env{'request.lti.login'}) {
+        if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+            $env{'form.user'} = "'".$env{'user.name'}.':'.$env{'user.domain'}."'";
+        }
+        $sourceurl = &Apache::lonnet::absolute_url().$url;
+    } else {
+        $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
+        $sourceurl = $env{'form.sourceurl'};
+    }
     if ($formvars{'course'}) {
         $env{'form.crsi'} = $env{'form.title'};
         if ($coursecode ne '') {
@@ -861,7 +906,7 @@ sub print_request_receipt {
     }
     $supportmsg .= "$lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
-$lt{'sourceurl'}: $env{'form.sourceurl'}
+$lt{'sourceurl'}: $sourceurl
 $lt{'date'}: $reporttime
 ";
 
@@ -895,6 +940,7 @@ $lt{'date'}: $reporttime
                     next if ($helpform{$item} eq 'no');
                 }
                 next if (($item eq 'crsi') && ($helpform{'course'} eq 'no'));
+                next if (($item eq 'user') && ($env{'request.lti.login'}));
                 my $showitem = $env{'form.'.$item};
                 $showitem = &Apache::loncommon::cleanup_html($showitem);
                 $displaymsg .= 
@@ -932,18 +978,19 @@ $lt{'date'}: $reporttime
 
     $displaymsg .= '<span class="LC_helpform_receipt_cat">'.
                    $lt{'date'}.'</span>: '.$reporttime.'<br />'."\n";
-
-    my $start_page = 
-	&Apache::loncommon::start_page('Support request recorded',undef,
-				       {'function'    => $function,
-					'add_entries' => {
-					    topmargin    => "0",
-					    marginheight => "0",
-					},
-					'only_body'   => 1,});
-
+    my $args = {'function'    => $function,
+                'add_entries' => {
+                                    topmargin    => "0",
+                                    marginheight => "0",
+                                 },
+                'only_body'   => 1,};
+    (undef,undef,undef,my $clientmathml,my $clientunicode) =
+        &Apache::loncommon::decode_user_agent();
+    if ($clientunicode && !$clientmathml) {
+        $args->{'browser.unicode'} = 1;
+    }
+    $r->print(&Apache::loncommon::start_page('Support request recorded',undef,$args));
     $r->print(<<"END");
-$start_page
 <form name="logproblem" action="">
 <input type="hidden" name="command" value="result" />
 </form>
@@ -992,8 +1039,10 @@ END
             $message .= &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>');
         }
     }
-    $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)));
-
+    $r->print('<div class="LC_landmark" role="main">');
+    if ($bad_email) {
+        $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)).'<br />');
+    }
     if ($reqemail ne '') {
         $from = $reqemail;
     }
@@ -1047,6 +1096,18 @@ END
     if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) {
         $cookies{'lonLinkID'} = $1;
     }
+    my $lti_info;
+    if (($env{'request.lti.login'}) && ($env{'request.course.id'})) {
+        my $ltidom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($ltidom) {
+            my %lti = &Apache::lonnet::get_domain_lti($ltidom,'provider');
+            if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+                if ($lti{$env{'request.lti.login'}}{'consumer'}) {
+                    $lti_info = "LTI consumer: ".$lti{$env{'request.lti.login'}}{'consumer'}."\n";
+                }
+            }
+        }
+    }
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
         $displaymsg .= '<br />'
@@ -1065,6 +1126,9 @@ END
         foreach my $var (@envvars) {
             $supportmsg .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $supportmsg .= $lti_info;
+        }
     }
 
     my $cc_string;
@@ -1089,6 +1153,9 @@ END
         foreach my $var (@loncvars) {
             $attachment_text .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $attachment_text .= $lti_info;
+        }
     }
 
     if ($addtext) {
@@ -1101,50 +1168,17 @@ END
         }
     }
 
-    unless ($bad_email) {
-        my $msg = MIME::Lite->new(
-                     From    => $from,
-                     To      => $to,
-                     Subject => $subject,
-                     Type    =>'TEXT',
-                     Data    => $supportmsg,
-                     );
-        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->attr("content-type"         => "text/plain");
-        $msg->attr("content-type.charset" => "UTF-8");
-
-        if ($homeserver && $attachmentpath) {
-            my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
-            $msg->attach(Type     => $type,
-                         Path     => $attachmentpath,
-                         Filename => $fname
-                         );
-
-        } elsif ($attachment_text ne '') {
-            $msg->attach(Type => 'TEXT',
-                         Data => $attachment_text);
-        }
-
-        ### Send it:
-        $msg->send('sendmail');
-    }
-
-    if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
-        unlink($attachmentpath);
-    }
     if ($bad_email) {
         $r->print('<b>'.$lt{'belo'}.'</b><br />'.
-                  $lt{'ifyk'}.'<br /><br />'."\n");
+                  $lt{'ifyk'}."\n");
     } else {
-        $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
+        # Compose and send a MIME email
+        &Apache::loncommon::mime_email($from,'',$to,$subject,$supportmsg,$cc_string,
+                                       $bcc,$attachmentpath,$fname,$attachment_text);
+        $r->print('<b>'.$lt{'your'}.'</b>:'."\n");
+    }
+    if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
+        unlink($attachmentpath);
     }
     $r->print('<div style="width:620px;">'.
               &Apache::lonhtmlcommon::start_pick_box().
@@ -1178,7 +1212,11 @@ END
     $r->print($envmsg."\n".
               &Apache::lonhtmlcommon::row_closure(1)."\n".
               &Apache::lonhtmlcommon::end_pick_box().
-              "</div>\n".
+              '</div>');
+    unless ($bad_email) {
+        $r->print('<p><br />'.&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message)).'</p>');
+    }
+    $r->print("</div>\n".
               &Apache::loncommon::end_page());
 }
 
@@ -1186,7 +1224,11 @@ sub print_header {
     my ($r,$origurl,$command) = @_;
     my $location=&Apache::loncommon::lonhttpdurl("/adm");
     my ($component_url);
-    my $helpdesk_link = '<a href="javascript:validate()">';
+    my $helpicon_link = '<a href="javascript:validate();" tabindex="-1">';
+    if ($command eq 'process') {
+        $helpicon_link = '<a href="/adm/helpdesk" tabindex="-1">';
+    }
+    my $helpdesk_link = '<a href="javascript:validate();">';
     if ($command eq 'process') {
         $helpdesk_link = '<a href="/adm/helpdesk">';
     }
@@ -1202,7 +1244,7 @@ sub print_header {
                                          );
     my ($getstartlink,$reviewtext);
     if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
-        $getstartlink = qq|<td align="center">&nbsp;<b><a href="/adm/gettingstarted.html">$lt{'getst'}</a></td>|;
+        $getstartlink = qq|<div class="LC_helpdesk_links LC_nobreak"><div class="LC_helpdesk_img" aria-hidden="true">&nbsp;</div><div class="LC_helpdesk_text"><a href="/adm/gettingstarted.html">$lt{'getst'}</a>&nbsp;</div></div>|;
         $reviewtext = &mt('Please review the information in "Log-in help" and the "Getting started" guide if you are unable to log-in.');
     } else {
         $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
@@ -1218,47 +1260,34 @@ sub print_header {
         $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" 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'})" 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>
- </tr>
- <tr>
-  <td colspan="3" height="5">&nbsp;</td>
- </tr>
+<div class="LC_landmark" style="display: inline-block;" role="navigation">
+  <div class="LC_helpdesk_headbox">
+    <h1 class="LC_helpdesk_legend">
+      <img src="$location/lonIcons/minilogo.gif" height="20" width="29" alt="LONCAPA logo" style="vertical-align: middle" />
+      LON-CAPA $lt{'headline'}
+    </h1>
+    <div style="border:0; padding:0; margin: 1em 0 0.5em;">
+      <div class="LC_helpdesk_links LC_nobreak"><div class="LC_helpdesk_img" aria-hidden="true">&nbsp;<a href="$loginhelp" tabindex="-1"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" />&nbsp;</a></div><div class="LC_helpdesk_text"><a href="$loginhelp">$lt{'login'}</a>&nbsp;</div></div>
+      <div class="LC_helpdesk_links LC_nobreak"><div class="LC_helpdesk_img" aria-hidden="true">&nbsp;$helpicon_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" style="vertical-align:top" />&nbsp;</a></div><div class="LC_helpdesk_text">$helpdesk_link$lt{'ask'}</a>&nbsp;</div></div>$getstartlink
+      <div class="LC_helpdesk_links LC_nobreak"><div class="LC_helpdesk_img" aria-hidden="true">&nbsp;<a href="$linkback" target="_top" tabindex="-1"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" style="vertical-align:middle" />&nbsp;</a></div><div class="LC_helpdesk_text"><a href="$linkback" target="_top">$lt{'back'}</a>&nbsp;</div></div>
+    </div>
+  </div>
+</div>
 END
     if  ($command ne 'process') {
         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 
+ <div style="border:0; padding:0; margin: 0; max-width: 600px;" role="complementary">
+  $reviewtext
   $lt{'ifyo'}
-<p class="LC_info">
-<b>$lt{'stud'}:</b> 
-$stuwarn $lt{'cont'}
-</p><br />
-  </td>
- </tr>
+  <p class="LC_info">
+    <b>$lt{'stud'}:</b> 
+    $stuwarn $lt{'cont'}
+  </p>
+ </div>
 END
     }
-    $r->print('
-</table>');
     return;
 }