--- loncom/interface/lonsupportreq.pm 2009/01/27 15:59:30 1.52 +++ loncom/interface/lonsupportreq.pm 2010/12/03 04:56:56 1.55.6.4 @@ -1,5 +1,5 @@ # -# $Id: lonsupportreq.pm,v 1.52 2009/01/27 15:59:30 schafran Exp $ +# $Id: lonsupportreq.pm,v 1.55.6.4 2010/12/03 04:56:56 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,8 +37,7 @@ use Apache::lonnet; use Apache::lonlocal; use Apache::lonacc(); use Apache::courseclassifier; -use LONCAPA; - +use LONCAPA qw(:DEFAULT :match); sub handler { my ($r) = @_; @@ -57,7 +56,7 @@ sub handler { &Apache::lonacc::get_posted_cgi($r); } my $function = $env{'form.function'}; - my $origurl = &unescape($env{'form.origurl'}); + my $origurl = $env{'form.origurl'}; my $command = $env{'form.command'}; if ($command eq 'process') { @@ -70,15 +69,21 @@ 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); $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'}; + if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) { + $public = 1; + } else { + $uname = $env{'user.name'}; + $udom = $env{'user.domain'}; + } $uhome = $env{'user.home'}; $urole = $env{'request.role'}; $usec = $env{'request.course.sec'}; @@ -172,7 +177,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) { @@ -225,7 +243,7 @@ function initialize_codes() { } my $js = ''; + $loaditems.''; my %add_entries = (topmargin => "0", marginheight => "0", onLoad =>"initialize_codes()",); @@ -266,7 +284,7 @@ function initialize_codes() { &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - if (defined($env{'user.name'})) { + if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]). '
'."\n". &Apache::lonhtmlcommon::row_closure(); @@ -278,30 +296,33 @@ function initialize_codes() { &HTML::Entities::encode($udom,'"<>&').'" />'; my $uname_input = '&').'" />'; - if (defined($uname) && defined($udom)) { + if (($env{'user.name'} =~ /^$match_username$/) && + ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { $output .= ''.$lt{'unme'}.': '.$uname.'  '.$lt{'doma'}.': '.$udom.$udom_input.$uname_input; } else { my $udomform = ''; my $unameform = ''; - if (defined($udom)) { + if (($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) { $output .= $lt{'entu'}; - } elsif (defined($uname)) { + } elsif (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { $output .= $lt{'chdo'}; } else { $output .= $lt{'entr'}; } $output .= '
'; - if (defined($udom)) { - $udomform = ''.$lt{'doma'}.': '.$udom.$udom_input; - } elsif (defined($uname)) { - $unameform = ''.$lt{'unme'}.': '.$uname.'  '.$uname_input; + if (!$public) { + if ($env{'user.domain'} =~ /^$match_domain$/) { + $udomform = ''.$lt{'doma'}.': '.$udom.$udom_input; + } elsif ($env{'user.name'} =~ /^$match_username$/) { + $unameform = ''.$lt{'unme'}.': '.$uname.'  '.$uname_input; + } } if ($udomform eq '') { $udomform = ''.$lt{'doma'}.': '; $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom'); } if ($unameform eq '') { - $unameform= ''.$lt{'unme'}.':   '; + $unameform= ''.$lt{'unme'}.':   '; } $output .= $unameform.$udomform; } @@ -311,115 +332,119 @@ function initialize_codes() { $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]). $showserver.'&').'" />'. - &Apache::lonhtmlcommon::row_closure(). - &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}.'; '; + 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(); - $num ++; - $i = $num%2; - $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]); - 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(); $num ++; - $i = $num%2; + $i = $num%2; $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value'). ' '."\n". &Apache::lonhtmlcommon::row_closure(). @@ -428,7 +453,7 @@ function initialize_codes() { &Apache::lonhtmlcommon::row_closure(); $num ++; $i = $num%2; - if (defined($env{'user.name'})) { + if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]). '
'.$lt{'uplf'}."\n". &Apache::lonhtmlcommon::row_closure(); @@ -475,22 +500,27 @@ 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 ( @@ -547,14 +577,22 @@ sub print_request_receipt { } } $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"; @@ -581,9 +626,11 @@ END ''. "$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"; } } } @@ -746,7 +793,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 +820,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()); } @@ -798,10 +847,17 @@ sub print_header { } else { $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.'); } + if ($origurl eq '') { + $origurl = 'javascript:history.go(-1)'; + } $r->print(<   -
  LON-CAPA $lt{'headline'} +
+ + + LON-CAPA $lt{'headline'} + @@ -842,9 +898,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;