--- loncom/interface/lonsupportreq.pm 2024/07/15 17:12:40 1.106 +++ loncom/interface/lonsupportreq.pm 2025/02/17 18:48:06 1.107 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Helpdesk request form # -# $Id: lonsupportreq.pm,v 1.106 2024/07/15 17:12:40 raeburn Exp $ +# $Id: lonsupportreq.pm,v 1.107 2025/02/17 18:48:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -330,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); } @@ -347,30 +353,33 @@ ENDJS } my $topsubmit = '      '; my $shownsubmit; - $r->print('
'."\n"); + $r->print('
'."\n". + ''."\n"); my $output = &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_headline(). ''. - &mt('(All fields marked with * are required.)'). + &mt('(All fields marked with [_1]*[_2] are required.)', + '',''). ''. &Apache::lonhtmlcommon::row_closure(); unless ($helpform{'username'} eq 'no') { my ($reqd,$namefield,$fullname); if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) { $fullname = "$firstname $lastname"; - $namefield = $fullname.'&').'" />'."\n"; + $namefield = $fullname.'&').'" />'."\n"; } else { if (defined($firstname) && $firstname ne '') { $fullname = $firstname; } elsif (defined($lastname) && $lastname ne '') { $fullname = " $lastname"; } - $namefield = '&').'" />'."\n"; + $namefield = '&').'" />'."\n"; if ($helpform{'username'} eq 'req') { - $reqd = '*'; + $reqd = '*'; } } - $output .= &Apache::lonhtmlcommon::row_title($html_lt{'name'}.$reqd,undef,$css[$num])."\n".$namefield. + my $title = ''; + $output .= &Apache::lonhtmlcommon::row_title($title.$reqd,undef,$css[$num])."\n".$namefield. $topsubmit. &Apache::lonhtmlcommon::row_closure()."\n"; $shownsubmit = 1; @@ -379,9 +388,10 @@ ENDJS } $output .= &Apache::lonhtmlcommon::row_title( ''. - $html_lt{'emad'}.' *' + '*' ,undef,$css[$i]). - '&').'" />'."\n"; unless ($shownsubmit) { $output .= $topsubmit; @@ -396,8 +406,9 @@ 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]). - '
'."\n". + $output .= &Apache::lonhtmlcommon::row_title('', + undef,$css[$i]). + '
'."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; @@ -411,7 +422,9 @@ ENDJS my $uname_input = '&').'" />'."\n"; if ($knownuser) { - $output .= ''.$html_lt{'unme'}.': '.$uname.'  '.$html_lt{'doma'}.': '.$udom.$udom_input.$uname_input; + $output .= ''.$html_lt{'unme'} + .': '.$uname.'  ' + .$html_lt{'doma'}.': '.$udom.$udom_input.$uname_input.''; } else { my $udomform = ''; my $unameform = ''; @@ -425,17 +438,21 @@ ENDJS $output .= '
'."\n"; if (!$public) { if ($env{'user.domain'} =~ /^$match_domain$/) { - $udomform = ''.$html_lt{'doma'}.': '.$udom.$udom_input; + $udomform = ''.$html_lt{'doma'}.': '.$udom.$udom_input; } elsif ($env{'user.name'} =~ /^$match_username$/) { - $unameform = ''.$html_lt{'unme'}.': '.$uname.'  '.$uname_input; + $unameform = ''.$html_lt{'unme'}.': '.$uname.'  '.$uname_input; } } if ($udomform eq '') { - $udomform = ''.$html_lt{'doma'}.': '; - $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom')."\n"; + $udomform = ': ' + .&Apache::loncommon::select_dom_form($codedom,'udom','','','','','','','udom')."\n"; } if ($unameform eq '') { - $unameform= ''.$html_lt{'unme'}.':   '; + $unameform= ': ' + .'' + .'  '; } $output .= $unameform.$udomform; } @@ -452,10 +469,10 @@ ENDJS unless ($helpform{'phone'} eq 'no') { my $reqd; if ($helpform{'phone'} eq 'req') { - $reqd = '*'; + $reqd = '*'; } - $output .= &Apache::lonhtmlcommon::row_title($html_lt{'phon'}.$reqd,undef,'LC_evenrow_value'). - '
'."\n". + $output .= &Apache::lonhtmlcommon::row_title(''.$reqd,undef,'LC_evenrow_value'). + '
'."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; @@ -465,8 +482,8 @@ ENDJS if ($totcodes > 0) { my $numtitles = @codetitles; if ($numtitles == 0) { - $output .= $html_lt{'enin'}.':  - ').'" />'."\n"; + $output .= ''."\n"; } else { my @standardnames = &Apache::loncommon::get_standard_codeitems(); my $lasttitle = $numtitles; @@ -477,8 +494,13 @@ ENDJS if ($sectionlist) { $onchange = 'toggleSecVis()'; } - $output .= ' - - - - -
'.$codetitles[0].'
'."\n". - ''; + for (my $i=0; $i<$lasttitle; $i++) { + $output .= ''; + } + $output .= ''; + $output .= ''; - for (my $i=1; $i<$numtitles; $i++) { - $output .= ''."\n"; } $output .= '
'. + ''.$codetitles[$i].'
'."\n". - '		'."\n". + ''."\n". '
'; if ($numtitles > 4) { - $output .= '

'.$codetitles[$numtitles].'
'."\n". + $output .= '

'."\n"; } } } else { - $output .= $html_lt{'enin'}.':  - '."\n"; + $output .= ''."\n"; } my $reqd; if ($helpform{'course'} eq 'req') { - $reqd = '*'; + $reqd = '*'; } - $output .= '
'.$html_lt{'enct'}.$reqd.':  + $output .= '
'."\n"; $output .= &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; } unless (($helpform{'section'} eq 'no') || ($env{'request.lti.login'})) { - $output .= &Apache::lonhtmlcommon::row_title($html_lt{'secn'},undef,$css[$i]); + $output .= &Apache::lonhtmlcommon::row_title('', + undef,$css[$i]); if ($sectionlist) { - $output .= "
\n". " \n"; foreach my $id (sort(keys(%groupid))) { if ($id eq $groupid{$id} || $groupid{$id} eq '') { @@ -553,9 +577,9 @@ ENDJS } $output .= '
'."\n". ''."\n"; + ''."\n"; } else { - $output .= ''."\n"; + $output .= ''."\n"; } $output .= &Apache::lonhtmlcommon::row_closure(); $num ++; @@ -563,15 +587,17 @@ ENDJS } $output .= &Apache::lonhtmlcommon::row_title( ''. - $html_lt{'subj'}.' *' + ''. + '*' ,undef,'LC_oddrow_value'). - ''."\n". + ''."\n". &Apache::lonhtmlcommon::row_closure(). &Apache::lonhtmlcommon::row_title( ''. - $html_lt{'detd'}.' *' + ''. + '*' ,undef,'LC_evenrow_value'). - ''."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; @@ -587,9 +613,9 @@ ENDJS } $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')'; $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]) - .' ' + .'' .'' - .'
'."\n".$html_lt{'uplf'}.$showmax."\n" + .'
'."\n".''.$showmax."\n" .&Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; @@ -600,7 +626,7 @@ ENDJS $output .= &Apache::lonhtmlcommon::row_title( ''. &mt('Validation'). - ' *' + '*' ,undef,$css[$i]). $captcha_form."\n". &Apache::lonhtmlcommon::row_closure(); @@ -610,18 +636,16 @@ ENDJS } $output .= &Apache::lonhtmlcommon::row_title($html_lt{'fini'},undef,$css[$i]); $output .= < -
+
+
  -
  + +
-
+
+ +
END $output .= &Apache::lonhtmlcommon::row_closure(1); $output .= &Apache::lonhtmlcommon::end_pick_box(); @@ -629,6 +653,7 @@ END $output

+ END $r->print(&Apache::loncommon::end_page()); return; @@ -637,6 +662,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 +671,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( - '

'.&mt('Support request failed').'

'. + '
'. + '

'.&mt('Support request failed').'

'. &Apache::lonhtmlcommon::confirm_success( &mt('Validation of the code you entered failed.'),1). '

'. &Apache::lonhtmlcommon::actionbox([ &mt('[_1]Go back[_2] and try again', '','')]). - &Apache::loncommon::end_page()); + '
'. + &Apache::loncommon::end_page()); return; } } @@ -941,18 +975,19 @@ $lt{'date'}: $reporttime $displaymsg .= ''. $lt{'date'}.': '.$reporttime.'
'."\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
@@ -1001,8 +1036,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.',''.$to.'','',''); } } - $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email))); - + $r->print('
'); + if ($bad_email) { + $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)).'
'); + } if ($reqemail ne '') { $from = $reqemail; } @@ -1130,12 +1167,12 @@ END if ($bad_email) { $r->print(''.$lt{'belo'}.'
'. - $lt{'ifyk'}.'

'."\n"); + $lt{'ifyk'}."\n"); } else { # Compose and send a MIME email &Apache::loncommon::mime_email($from,'',$to,$subject,$supportmsg,$cc_string, $bcc,$attachmentpath,$fname,$attachment_text); - $r->print(''.$lt{'your'}.':

'."\n"); + $r->print(''.$lt{'your'}.':'."\n"); } if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) { unlink($attachmentpath); @@ -1172,7 +1209,11 @@ END $r->print($envmsg."\n". &Apache::lonhtmlcommon::row_closure(1)."\n". &Apache::lonhtmlcommon::end_pick_box(). - "
\n". + ''); + unless ($bad_email) { + $r->print('


'.&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message)).'

'); + } + $r->print("\n". &Apache::loncommon::end_page()); } @@ -1180,7 +1221,11 @@ sub print_header { my ($r,$origurl,$command) = @_; my $location=&Apache::loncommon::lonhttpdurl("/adm"); my ($component_url); - my $helpdesk_link = ''; + my $helpicon_link = ''; + if ($command eq 'process') { + $helpicon_link = ''; + } + my $helpdesk_link = ''; if ($command eq 'process') { $helpdesk_link = ''; } @@ -1196,7 +1241,7 @@ sub print_header { ); my ($getstartlink,$reviewtext); if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') { - $getstartlink = qq| $lt{'getst'}|; + $getstartlink = qq|
$lt{'getst'} 
|; $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.'); @@ -1212,47 +1257,34 @@ sub print_header { $loginhelp = '/adm/loginproblems.html'; } $r->print(<<"END"); - - - - - - - - - + END if ($command ne 'process') { my $stuwarn = &mt('Do [_1]not[_2] use this form to ask about course content.', '',''); $r->print(<<"END"); - - - +

+ $lt{'stud'}: + $stuwarn $lt{'cont'} +

+ END } - $r->print(' -
  -
- - logo - LON-CAPA $lt{'headline'} - - - - - $getstartlink - - - -
- 		 
 
$reviewtext +
+ $reviewtext $lt{'ifyo'} -

-$lt{'stud'}: -$stuwarn $lt{'cont'} -


-
'); return; }