--- loncom/interface/lonsupportreq.pm 2009/06/05 12:49:50 1.53 +++ loncom/interface/lonsupportreq.pm 2015/06/18 20:19:06 1.80 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.53 2009/06/05 12:49:50 bisitz Exp $ +# $Id: lonsupportreq.pm,v 1.80 2015/06/18 20:19:06 musolffc 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; - +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 $origurl = &unescape($env{'form.origurl'}); + 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') { @@ -70,33 +82,47 @@ sub handler { 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); + my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid, + $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server, + $formname,$public,$homeserver); $function = &Apache::loncommon::get_users_function() if (!$function); $ccode = ''; $os = $env{'browser.os'}; $browser = $env{'browser.type'}; $bversion = $env{'browser.version'}; $uhost = $env{'request.host'}; - $uname = $env{'user.name'}; - $udom = $env{'user.domain'}; - $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; + if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) { + $public = 1; } else { - $server = $machine.$origurl; + 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'}; + } + } } - my $showserver = $server; - $showserver =~ s/\?.*$//; - my %lt = &Apache::lonlocal::texthash ( + if ($homeserver) { + $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(); + my $sourceurl = $machine.$origurl; + $server = $machine.&Apache::loncommon::cleanup_html($origurl); + $server =~ s/\?.*$//; + my %js_lt = &Apache::lonlocal::texthash ( email => 'The e-mail address you entered', notv => 'is not a valid e-mail address', rsub => 'You must include a subject', rdes => 'You must include a description', + ); + my %html_lt = &Apache::lonlocal::texthash ( name => 'Name', subm => 'Submit Request', emad => 'Your e-mail address', @@ -119,22 +145,24 @@ sub print_request_form { subj => 'Subject', detd => 'Detailed Description', opfi => 'Optional file upload', - uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (128 KB max.)', + uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (1 MB max.)', fini => 'Finish', clfm => 'Clear Form', ); + &js_escape(\%js_lt); + &html_escape(\%html_lt); my $scripttag = (<<"END"); function validate() { if (validmail(document.logproblem.email) == false) { - alert("$lt{'email'}: "+document.logproblem.email.value+" $lt{'notv'}."); + alert("$js_lt{'email'}: "+document.logproblem.email.value+" $js_lt{'notv'}."); return; } if (document.logproblem.subject.value == '') { - alert("$lt{'rsub'}."); + alert("$js_lt{'rsub'}."); return; } if (document.logproblem.description.value == '') { - alert("$lt{'rdes'}."); + alert("$js_lt{'rdes'}."); return; } document.logproblem.submit(); @@ -153,18 +181,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; @@ -172,7 +202,20 @@ END my ($sec,$grp) = split(/:/,$section); $groupid{$sec} = $grp; } - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom', + 'useremail','useraccount']); + if ($env{'form.origurl'} eq '/adm/createaccount') { + if ($email eq '') { + if ($env{'form.useremail'} =~ /^[^\@]+\@[^\@]+$/) { + $email = &HTML::Entities::encode($env{'form.useremail'},'"<>&'); + } + } + if ($uname eq '') { + if ($env{'form.useraccount'} =~ /^$match_username$/) { + $uname = &HTML::Entities::encode($env{'form.useraccount'},'"<>&'); + } + } + } my $codedom = &get_domain(); my $details_title; if ($codedom) { @@ -224,11 +267,20 @@ function initialize_codes() { } } - my $js = ''; - my %add_entries = (topmargin => "0", - marginheight => "0", - onLoad =>"initialize_codes()",); + my $js = <<"ENDJS"; + + +ENDJS + my %add_entries = ( + style => "margin-top:0px;margin-bottom:0px;", + onload => "initialize_codes();", + ); $r->print(&Apache::loncommon::start_page('Support Request',$js, @@ -241,107 +293,125 @@ function initialize_codes() { my @css = ('LC_evenrow_value','LC_oddrow_value'); my $num = 1; my $i = $num%2; - $r->print('
'."\n"); + my $formtype; + if ($homeserver) { + $formtype = ' enctype="multipart/form-data"'; + } + $r->print(''."\n"); my $output = &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n"; + &Apache::lonhtmlcommon::row_headline(). + ''. + &mt('(All fields marked with * are required.)'). + ''. + &Apache::lonhtmlcommon::row_closure(). + &Apache::lonhtmlcommon::row_title($html_lt{'name'},undef,$css[$num])."\n"; my $fullname = ''; if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) { $fullname = "$firstname $lastname"; - $output .= $fullname.'&').'" />'; + $output .= $fullname.'&').'" />'."\n"; } else { if (defined($firstname) && $firstname ne '') { $fullname = $firstname; } elsif (defined($lastname) && $lastname ne '') { $fullname = " $lastname"; } - $output .= '&').'" />'; + $output .= '&').'" />'."\n"; } - $output .= '      '. + $output .= '      '. &Apache::lonhtmlcommon::row_closure()."\n"; $num ++; $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,$css[$i]). + $output .= &Apache::lonhtmlcommon::row_title( + ''. + $html_lt{'emad'}.' *' + ,undef,$css[$i]). '&').'" />
'."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - if (defined($env{'user.name'})) { - $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]). - '
'."\n". - &Apache::lonhtmlcommon::row_closure(); - $num ++; - $i = $num%2; + if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { + if ($homeserver) { + $output .= &Apache::lonhtmlcommon::row_title($html_lt{'emac'},undef,$css[$i]). + '
'."\n". + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + } } - $output .= &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,$css[$i]); + $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'unme'}/$html_lt{'doma'}",undef,$css[$i]); my $udom_input = '&').'" />'; + &HTML::Entities::encode($udom,'"<>&').'" />'."\n"; my $uname_input = '&').'" />'; - if (defined($uname) && defined($udom)) { - $output .= ''.$lt{'unme'}.': '.$uname.'  '.$lt{'doma'}.': '.$udom.$udom_input.$uname_input; + &HTML::Entities::encode($uname,'"<>&').'" />'."\n"; + if (($env{'user.name'} =~ /^$match_username$/) && + ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { + $output .= ''.$html_lt{'unme'}.': '.$uname.'  '.$html_lt{'doma'}.': '.$udom.$udom_input.$uname_input; } else { my $udomform = ''; my $unameform = ''; - if (defined($udom)) { - $output .= $lt{'entu'}; - } elsif (defined($uname)) { - $output .= $lt{'chdo'}; + if (($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { + $output .= $html_lt{'entu'}; + } elsif (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { + $output .= $html_lt{'chdo'}; } else { - $output .= $lt{'entr'}; + $output .= $html_lt{'entr'}; } - $output .= '
'; - if (defined($udom)) { - $udomform = ''.$lt{'doma'}.': '.$udom.$udom_input; - } elsif (defined($uname)) { - $unameform = ''.$lt{'unme'}.': '.$uname.'  '.$uname_input; + $output .= '
'."\n"; + if (!$public) { + if ($env{'user.domain'} =~ /^$match_domain$/) { + $udomform = ''.$html_lt{'doma'}.': '.$udom.$udom_input; + } elsif ($env{'user.name'} =~ /^$match_username$/) { + $unameform = ''.$html_lt{'unme'}.': '.$uname.'  '.$uname_input; + } } if ($udomform eq '') { - $udomform = ''.$lt{'doma'}.': '; - $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom'); + $udomform = ''.$html_lt{'doma'}.': '; + $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom')."\n"; } if ($unameform eq '') { - $unameform= ''.$lt{'unme'}.':   '; + $unameform= ''.$html_lt{'unme'}.':   '; } $output .= $unameform.$udomform; } $output .= &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]). - $showserver.'&').'" />'. + $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'urlp'}",undef,$css[$i]). + $server."\n".'&').'" />'."\n". &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value'). - '
'. + &Apache::lonhtmlcommon::row_title("$html_lt{'phon'}",undef,'LC_evenrow_value'). + '
'."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]); + $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'crsd'}$details_title",undef,$css[$i]); if ($cnum) { if ($coursecodes{$cnum}) { foreach my $item (@codetitles) { $output .= ''.$item.': '.$codes{$cnum}{$item}.'; '; } - $output .= ' &').'" />'; + $output .= ' &').'" />'."\n"; } else { - $output .= $lt{'enin'}.':  - '; + $output .= $html_lt{'enin'}.':  + '."\n"; } } else { if ($totcodes > 0) { my $numtitles = @codetitles; if ($numtitles == 0) { - $output .= $lt{'enin'}.':  - '; + $output .= $html_lt{'enin'}.':  + '."\n"; } else { + my @standardnames = &Apache::loncommon::get_standard_codeitems(); my $lasttitle = $numtitles; if ($numtitles > 4) { $lasttitle = 4; } $output .= ''; for (my $i=1; $i<$numtitles; $i++) { $output .= ''."\n"; } $output .= '
'.$codetitles[0].'
'."\n". - ''."\n". + ' \n"; my @items = (); my @longitems = (); if ($idlist{$codetitles[0]} =~ /","/) { @@ -369,39 +439,39 @@ function initialize_codes() { $output .= '		'.$codetitles[$i].'
'."\n". - ''."\n". + ''."\n". ''."\n". '
'; if ($numtitles > 4) { $output .= '

'.$codetitles[$numtitles].'
'."\n". - ''."\n". + ''."\n". ''."\n"; } } } else { - $output .= $lt{'enin'}.':  - '; + $output .= $html_lt{'enin'}.':  + '."\n"; } } if ($ctitle) { - $output .= '
'.$lt{'titl'}.': '.$ctitle. + $output .= '
'.$html_lt{'titl'}.': '.$ctitle. '&').'" />'."\n"; } else { - $output .= '
'.$lt{'enct'}.':  + $output .= '
'.$html_lt{'enct'}.':  '."\n"; } $output .= &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]); + $output .= &Apache::lonhtmlcommon::row_title($html_lt{'secn'},undef,$css[$i]); if ($sectionlist) { $output .= ""; } else { - $output .= ''; + $output .= ''."\n"; } $output .= &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value'). - ' '."\n". + $output .= &Apache::lonhtmlcommon::row_title( + ''. + $html_lt{'subj'}.' *' + ,undef,'LC_oddrow_value'). + ''."\n". &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value'). - ' '. + &Apache::lonhtmlcommon::row_title( + ''. + $html_lt{'detd'}.' *' + ,undef,'LC_evenrow_value'). + ''."\n". &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - if (defined($env{'user.name'})) { - $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]). - '
'.$lt{'uplf'}."\n". - &Apache::lonhtmlcommon::row_closure(); - $num ++; - $i = $num%2; + if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { + if ($homeserver) { + $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]) + .' ' + .'' + .'
'."\n".$html_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]). + $captchaform."\n". + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + } } - $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]); + $output .= &Apache::lonhtmlcommon::row_title($html_lt{'fini'},undef,$css[$i]); $output .= < -   +     - + @@ -463,6 +559,37 @@ 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( + '

'.&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()); + 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'); @@ -474,23 +601,53 @@ sub print_request_receipt { my $to = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', $defdom,$origmail); my $from = $admin; + my $bcc; + my %domconfig = + &Apache::lonnet::get_dom('configuration',['contacts'],$defdom); + if (ref($domconfig{'contacts'}) eq 'HASH') { + if (exists($domconfig{'contacts'}{'helpdeskmail'})) { + if (ref($domconfig{'contacts'}{'helpdeskmail'}) eq 'HASH') { + my $bccmail = $domconfig{'contacts'}{'helpdeskmail'}{'bcc'}; + if ($bccmail ne '') { + my @bccs = split(/,/,$bccmail); + my @ok_bccs; + foreach my $bcc (@bccs) { + $bcc =~ s/^\s+//g; + $bcc =~ s/\s+$//g; + if ($bcc =~ m/^[^\@]+\@[^\@]+$/) { + if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) { + push(@ok_bccs,$bcc); + } + } + } + if (@ok_bccs > 0) { + $bcc = join(', ',@ok_bccs); + } + } + } + } + } my $reporttime = &Apache::lonlocal::locallocaltime(time); my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot'); &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars); my $coursecode = $env{'form.coursecode'}; if ($coursecode eq '') { - if (defined($env{'form.Year'})) { - $coursecode .= $env{'form.Year'}; - } - if (defined($env{'form.Semester'})) { - $coursecode .= $env{'form.Semester'}; - } - if (defined($env{'form.Department'})) { - $coursecode .= $env{'form.Department'}; - } - if (defined($env{'form.Number'})) { - $coursecode .= $env{'form.Number'}; + my $totcodes = 0; + my %coursecodes; + $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes); + my @standardnames = &Apache::loncommon::get_standard_codeitems(); + if ($totcodes > 0) { + my $noregexps = 1; + $coursecode = + &Apache::courseclassifier::instcode_from_selectors($defdom,$noregexps); + } + if ($coursecode eq '') { + foreach my $item (@standardnames) { + if ((defined($env{'form.'.$item})) && ($env{'form.'.$item} ne '-1')) { + $coursecode .= $env{'form.'.$item}; + } + } } } my %lt = &Apache::lonlocal::texthash ( @@ -505,7 +662,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', @@ -513,8 +669,15 @@ 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,$homeserver); + unless ($public) { + 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'}); @@ -530,7 +693,7 @@ sub print_request_receipt { if (!(grep(/^\Q$cc\E$/,@ok_ccs))) { push(@ok_ccs,$cc); } - } else { + } elsif ($cc ne '') { if (!(grep(/^\Q$cc\E$/,@bad_ccs))) { push(@bad_ccs,$cc); } @@ -540,21 +703,22 @@ sub print_request_receipt { $okcclist = join(', ',@ok_ccs); } if (@bad_ccs == 1) { - $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0]; + if ($bad_ccs[0] ne '') { + $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').&Apache::loncommon::cleanup_html($bad_ccs[0]); + } } elsif (@bad_ccs > 1) { - my $bad_cc_string = join(', ',@bad_ccs); - $badccmsg .= '
'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string; + $badccmsg .= '
'.&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'}."'"; - $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'}; + $env{'form.crsi'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'}; my $supportmsg = <|g; + $descrip = &Apache::loncommon::cleanup_html($descrip); + $descrip =~ s|[\n\r\f]|
|g; $displaymsg .= ''. "$lt{$item}: $descrip
\n"; } elsif ($item eq 'sourceurl') { my $showurl = $env{'form.sourceurl'}; $showurl =~ s/\?.*$//; + $showurl = &Apache::loncommon::cleanup_html($showurl); $displaymsg .= ''. "$lt{$item}: $showurl
\n"; } elsif ($item eq 'cc') { - $displaymsg .= - ''. - "$lt{$item}: $okcclist
\n"; + if ($okcclist) { + my $showcclist = &Apache::loncommon::cleanup_html($okcclist); + $displaymsg .= + ''. + "$lt{$item}: $showcclist
\n"; + } } else { + my $showitem = $env{'form.'.$item}; + $showitem = &Apache::loncommon::cleanup_html($showitem); $displaymsg .= ''. - "$lt{$item}: $env{'form.'.$item}
\n"; + "$lt{$item}: $showitem
\n"; } } } @@ -601,7 +772,7 @@ END $r->print(<<"END"); $start_page - + END @@ -632,14 +803,20 @@ END $bad_email = 1; } } - if ($bad_email) { - $r->print(' -

'.$lt{'warn'}.'

'. -&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 not 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]',''.$to.'')); } else { - $r->print('

'.$lt{'asup'}.' '.$to.'

'); + $message = &Apache::lonhtmlcommon::confirm_success( + $lt{'warn'}.'
' + .&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.'','','') + .' '.&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+$//; @@ -665,11 +842,12 @@ END my $attachmentpath = ''; my $attachmentsize = ''; - if (defined($env{'user.name'})) { - if ($env{'form.screenshot.filename'}) { + if ((defined($env{'user.name'})) && (!$public)) { + if ($homeserver && $env{'form.screenshot.filename'}) { $attachmentsize = length($env{'form.screenshot'}); - if ($attachmentsize > 131072) { - $displaymsg .= '
'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize); + if ($attachmentsize > 1048576) { + $displaymsg .= '
'. + &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 1 MB, and has therefore been discarded.',$attachmentsize).''; } else { $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests'); } @@ -686,7 +864,7 @@ END $fname = $1; $displaymsg .= '
' .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].' - ,''.$fname.'' + ,''.$fname.'' ,$attachmentsize ,$env{'user.name'}.':'.$env{'user.domain'} ); @@ -709,12 +887,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->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, @@ -746,7 +931,8 @@ END unlink($attachmentpath); } $r->print(''.$lt{'your'}.':

'."\n"); - $r->print(&Apache::lonhtmlcommon::start_pick_box('LC_helpform_receipt'). + $r->print('
'. + &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')); @@ -772,7 +958,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(). + "
\n". &Apache::loncommon::end_page()); } @@ -785,11 +972,14 @@ sub print_header { $helpdesk_link = ''; } 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') { @@ -798,39 +988,55 @@ sub print_header { } else { $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.'); } - $r->print(<   - + my $linkback; + if ($origurl eq '') { + $linkback = 'javascript:history.go(-1)'; + } else { + $linkback = &HTML::Entities::encode($origurl,'"<>&'); + } + my $loginhelp = &Apache::lonauth::loginhelpdisplay(); + if ($loginhelp eq '') { + $loginhelp = '/adm/loginproblems.html'; + } + $r->print(<<"END"); + + + + - + - - + + END if ($command ne 'process') { - $r->print(' + my $stuwarn = &mt('Do [_1]not[_2] use this form to ask about course content.', + '',''); + $r->print(<<"END"); - - '); + +END } $r->print('
 
- + logo LON-CAPA $lt{'headline'} - - $getstartlink - + + $getstartlink +
  
 
 
'.$reviewtext.' ' -.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.').'
' -.''.&mt('Students').': '.&mt('Do not use this form to ask questions about course content.').' ' -.&mt('Contact your instructor instead.') -.'

+ 		$reviewtext + $lt{'ifyo'} +

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


'); @@ -840,13 +1046,16 @@ 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'}; } else { - $codedom = $Apache::lonnet::perlvar{'lonDefDomain'}; + $codedom = &Apache::lonnet::default_login_domain(); } return $codedom; }