--- loncom/interface/lonsupportreq.pm 2007/12/04 04:43:21 1.45 +++ loncom/interface/lonsupportreq.pm 2010/11/29 13:36:43 1.55.6.1 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.45 2007/12/04 04:43:21 raeburn Exp $ +# $Id: lonsupportreq.pm,v 1.55.6.1 2010/11/29 13:36:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -99,7 +99,8 @@ sub print_request_form { rdes => 'You must include a description', name => 'Name', subm => 'Submit Request', - emad => 'E-mail address', + emad => 'Your e-mail address', + emac => 'Cc', unme => 'username', doma => 'domain', entu => 'Enter the username you use to log-in to LON-CAPA', @@ -237,9 +238,12 @@ function initialize_codes() { if ($r->uri eq '/adm/helpdesk') { &print_header($r,$origurl); } + my @css = ('LC_evenrow_value','LC_oddrow_value'); + my $num = 1; + my $i = $num%2; $r->print('
'."\n"); my $output = &Apache::lonhtmlcommon::start_pick_box(). - &Apache::lonhtmlcommon::row_title($lt{'name'},undef,'LC_oddrow_value')."\n"; + &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n"; my $fullname = ''; if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) { $fullname = "$firstname $lastname"; @@ -253,12 +257,23 @@ function initialize_codes() { $output .= '&').'" />'; } $output .= '      '. - &Apache::lonhtmlcommon::row_closure()."\n". - &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,'LC_evenrow_value'). - '&').'" />
'."\n". - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,'LC_oddrow_value'); + &Apache::lonhtmlcommon::row_closure()."\n"; + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title($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; + } + $output .= &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,$css[$i]); my $udom_input = '&').'" />'; my $uname_input = '  '; + $unameform= ''.$lt{'unme'}.':   '; } $output .= $unameform.$udomform; } - $output .= &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,'LC_evenrow_value'). + $output .= &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]). $showserver.'&').'" />'. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_oddrow_value'). - '
'. - &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,'LC_evenrow_value'); - if ($cnum) { - if ($coursecodes{$cnum}) { - foreach my $item (@codetitles) { - $output .= ''.$item.': '.$codes{$cnum}{$item}.'; '; + &Apache::lonhtmlcommon::row_closure(); + if (&Apache::loncommon::check_for_gci_dc()) { + $output .= &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef, + 'LC_evenrow_value'). + '
'. + &Apache::lonhtmlcommon::row_closure(); + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]); + if ($cnum) { + if ($coursecodes{$cnum}) { + foreach my $item (@codetitles) { + $output .= ''.$item.': '.$codes{$cnum}{$item}.'; '; + } + $output .= ' &').'" />'; + } else { + $output .= $lt{'enin'}.':  + '; } - $output .= ' &').'" />'; } else { - $output .= $lt{'enin'}.':  - '; - } - } else { - if ($totcodes > 0) { - my $numtitles = @codetitles; - if ($numtitles == 0) { - $output .= $lt{'enin'}.':  - '; - } else { - my $lasttitle = $numtitles; - if ($numtitles > 4) { - $lasttitle = 4; - } - $output .= ''; - for (my $i=1; $i<$numtitles; $i++) { - $output .= ''."\n"; - } - $output .= '
'.$codetitles[0].'
'."\n". - ''; } else { - $items[0] = $idlist{$codetitles[0]}; - } - if (defined($idlist_titles{$codetitles[0]})) { - if ($idlist_titles{$codetitles[0]} =~ /","/) { - @longitems = split(/","/,$idlist_titles{$codetitles[0]}); + my $lasttitle = $numtitles; + if ($numtitles > 4) { + $lasttitle = 4; + } + $output .= ''; + for (my $i=1; $i<$numtitles; $i++) { + $output .= ''."\n"; + } + $output .= '
'.$codetitles[0].'
'."\n". + '		'.$codetitles[$i].'
'."\n". + ''."\n". + '
'; + if ($numtitles > 4) { + $output .= '

'.$codetitles[$numtitles].'
'."\n". + ''."\n"; } - } else { - @longitems = @items; - } - for (my $i=0; $i<@items; $i++) { - $output .= ' '."\n"; - } - $output .= '		'.$codetitles[$i].'
'."\n". - ''."\n". - '
'; - if ($numtitles > 4) { - $output .= '

'.$codetitles[$numtitles].'
'."\n". - ''."\n"; } + } else { + $output .= $lt{'enin'}.':  + '; } + } + $output .= '
'; + if ($ctitle) { + $output .= ''.$lt{'titl'}.': '.$ctitle. + '&').'" />'."\n"; } else { - $output .= $lt{'enin'}.':  - '; + $output .= $lt{'enct'}.':  + '."\n"; } - } - if ($ctitle) { - $output .= '
'.$lt{'titl'}.': '.$ctitle. - '&').'" />'."\n"; - } else { - $output .= '
'.$lt{'enct'}.':  - '."\n"; - } - $output .= &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,'LC_oddrow_value'); - if ($sectionlist) { - $output .= "". + " \n"; + foreach my $id (sort(keys(%groupid))) { + if ($id eq $groupid{$id} || $groupid{$id} eq '') { + $output .= " \n"; + } else { + $output .= " \n"; + } } + $output .= ""; + } else { + $output .= ''; } - $output .= ""; - } else { - $output .= ''; + $output .= &Apache::lonhtmlcommon::row_closure(); } - $output .= &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_evenrow_value'). + $num ++; + $i = $num%2; + $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value'). ' '."\n". &Apache::lonhtmlcommon::row_closure(). - &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_oddrow_value'). + &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value'). ' '. &Apache::lonhtmlcommon::row_closure(); - my $lastrow = 'LC_evenrow_value'; + $num ++; + $i = $num%2; if (defined($env{'user.name'})) { - $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,'LC_evenrow_value'). + $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]). '
'.$lt{'uplf'}."\n". &Apache::lonhtmlcommon::row_closure(); - $lastrow = 'LC_oddrow_value'; + $num ++; + $i = $num%2; } - $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$lastrow); + $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]); $output .= < @@ -450,27 +479,33 @@ sub print_request_receipt { $defdom,$origmail); my $from = $admin; my $reporttime = &Apache::lonlocal::locallocaltime(time); - my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot'); - + my @formvars = ('username','email','uname','udom','sourceurl'); + if (&Apache::loncommon::check_for_gci_dc()) { + push(@formvars,('phone','section','coursecode','title')); + } + push(@formvars,('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'}; + if (&Apache::loncommon::check_for_gci_dc()) { + 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 %lt = &Apache::lonlocal::texthash ( username => 'Name', - email => 'Email', + email => 'E-mail', + cc => 'Cc', user => 'Username/domain', phone => 'Phone', crsi => 'Course Information', @@ -486,15 +521,57 @@ sub print_request_receipt { info => 'Information supplied', adin => 'Additional information recorded', ); - + + my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist); + if ((defined($env{'user.name'})) && (defined($env{'form.cc'}))) { + my @ccs; + if ($env{'form.cc'} =~ /,/) { + @ccs = split(/,/,$env{'form.cc'}); + } else { + $env{'form.cc'} =~ s/^\s+//; + $env{'form.cc'} =~ s/\s+$//; + @ccs = $env{'form.cc'}; + } + foreach my $cc (@ccs) { + $cc =~ s/^\s+//g; + $cc =~ s/\s+$//g; + if ($cc =~ m/^[^\@]+\@[^\@]+$/) { + if (!(grep(/^\Q$cc\E$/,@ok_ccs))) { + push(@ok_ccs,$cc); + } + } else { + if (!(grep(/^\Q$cc\E$/,@bad_ccs))) { + push(@bad_ccs,$cc); + } + } + } + if (@ok_ccs > 0) { + $okcclist = join(', ',@ok_ccs); + } + if (@bad_ccs == 1) { + $badccmsg .= '
'.&mt('The following Cc e-mail address is invalid: ').$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; + } + } $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'"; - $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'}; + if (&Apache::loncommon::check_for_gci_dc()) { + $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'}; + } my $supportmsg = <|g; + $descrip = &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 = &cleanup_html($showurl); $displaymsg .= ''. "$lt{$item}: $showurl
\n"; + } elsif ($item eq 'cc') { + $displaymsg .= + ''. + "$lt{$item}: $okcclist
\n"; } else { + my $showitem = $env{'form.'.$item}; + $showitem = &cleanup_html($showitem); $displaymsg .= ''. - "$lt{$item}: $env{'form.'.$item}
\n"; + "$lt{$item}: $showitem
\n"; } } } @@ -549,7 +639,9 @@ END my @ok_email; foreach my $email (split(/,/,$to)) { if ($email =~ m/^[^\@]+\@[^\@]+$/) { - push(@ok_email,$email); + if (!grep(/^\Q$email\E$/,@ok_email)) { + push(@ok_email,$email); + } } } if (@ok_email > 0) { @@ -575,11 +667,19 @@ END $r->print('

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

'); } if (defined($env{'form.email'})) { + $env{'form.email'} =~ s/^\s+//; + $env{'form.email'} =~ s/\s+$//; if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) { $from = $env{'form.email'}; } } + if (defined($env{'form.cc'})) { + if ($badccmsg) { + $displaymsg .= $badccmsg; + } + } + my $subject = $env{'form.subject'}; $subject =~ s/(`)/'/g; $subject =~ s/\$/\(\$\)/g; @@ -610,7 +710,12 @@ END if ($attachmentpath =~ m-/([^/]+)$-) { $fname = $1; - $displaymsg .= '
'.&mt('An uploaded screenshot file \'[_1]\' ([_2] bytes) was included in the request sent by [_3].',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'}); + $displaymsg .= '
' + .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].' + ,''.$fname.'' + ,$attachmentsize + ,$env{'user.name'}.':'.$env{'user.domain'} + ); $supportmsg .= "\n"; foreach my $var (@cookievars) { $supportmsg .= "$var: $cookies{$var}\n"; @@ -630,6 +735,10 @@ END Type =>'TEXT', Data => $supportmsg, ); + if (@ok_ccs > 0) { + my $cc_string = join(', ',@ok_ccs); + $msg->add("Cc" => $cc_string); + } if ($attachmentpath) { my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath); @@ -663,7 +772,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')); @@ -689,7 +799,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()); } @@ -705,20 +816,27 @@ sub print_header { login => 'Log-in help', ask => 'Ask helpdesk', getst => 'Getting started guide', - back => 'Back to last location' + back => 'Back to last location', + headline => 'help/support', ); - my ($getstartlink,$getstarttext); + my ($getstartlink,$reviewtext); if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') { $getstartlink = qq| $lt{'getst'}|; - $getstarttext = ' '.&mt('and the "Getting started" guide').' '; + $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.'); } $r->print(<   -
  LON-CAPA help/support +
+ + + LON-CAPA $lt{'headline'} + - + $getstartlink @@ -734,8 +852,11 @@ END if ($command ne 'process') { $r->print(' - '); } @@ -753,9 +874,27 @@ sub get_domain { } elsif ($env{'request.role.domain'}) { $codedom = $env{'request.role.domain'}; } else { - $codedom = $Apache::lonnet::perlvar{'lonDefDomain'}; + $codedom = &Apache::lonnet::default_login_domain(); } return $codedom; } +sub cleanup_html { + my ($incoming) = @_; + my $outgoing; + if ($incoming ne '') { + $outgoing = $incoming; + $outgoing =~ s/\#/#/g; + $outgoing =~ s/\&/&/g; + $outgoing =~ s//>/g; + $outgoing =~ s/\(/(/g; + $outgoing =~ s/\)/)/g; + $outgoing =~ s/"/"/g; + $outgoing =~ s/'/'/g; + $outgoing =~ s/\$/$/g; + } + return $outgoing; +} + 1;