--- loncom/interface/groupsort.pm 2011/07/04 09:24:58 1.68 +++ loncom/interface/groupsort.pm 2016/11/22 15:55:40 1.68.6.8 @@ -2,7 +2,7 @@ # The LON-CAPA group sort handler # Allows for sorting prior to import into RAT. # -# $Id: groupsort.pm,v 1.68 2011/07/04 09:24:58 foxr Exp $ +# $Id: groupsort.pm,v 1.68.6.8 2016/11/22 15:55:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,12 +32,12 @@ package Apache::groupsort; use strict; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common :http); use GDBM_File; use Apache::loncommon; use Apache::lonlocal; use Apache::lonnet; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); my $iconpath; # variable to be accessible to multiple subroutines my %hash; # variable to tie to user specific database @@ -59,7 +59,7 @@ sub update_actions_hash { $ac++; } # sorting through the actions and changing the global database hash - foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) { + foreach my $key (sort {$achash{$a}<=>$achash{$b}} (keys(%ahash))) { if ($ahash{$key} eq '1') { $hash->{'store_'.$hash->{'pre_'.$key.'_link'}}= $hash->{'pre_'.$key.'_title'}; @@ -152,12 +152,23 @@ sub readfromfile { &Apache::lonnet::filelocation('',$env{'form.readfile'})); } else { my $parser = HTML::TokeParser->new(\$cont); - my $token; + my ($token,$donechk,$allmaps); + $allmaps = {}; while ($token = $parser->get_token) { if ($token->[0] eq 'S') { if ($token->[1] eq 'resource') { if ($env{'form.recover'}) { if ($token->[2]->{'type'} ne 'zombie') { next; } + if ($token->[2]->{'src'} =~ /\.(page|sequence)$/) { + if (($env{'request.course.id'}) && + ($env{'form.readfile'} =~ m{/default(|_\d+)\.(page|sequence)$})) { + unless ($donechk) { + $allmaps = &Apache::loncommon::allmaps_incourse(); + $donechk = 1; + } + } + if ($allmaps->{$token->[2]->{'src'}}) { next; } + } } else { if ($token->[2]->{'type'} eq 'zombie') { next; } } @@ -181,7 +192,6 @@ sub readfromfile { } } - # ---------------------------------------------------------------- Main Handler sub handler { my $r = shift; @@ -193,16 +203,79 @@ sub handler { $r->send_http_header; return OK if $r->header_only; +# permissions checking + my ($allowed,$canedit,$context,$cid); + if ($env{'form.readfile'} =~ m{^/uploaded/($match_domain)/($match_courseid)/}) { + my ($cdom,$cnum) = ($1,$2); + $cid = $cdom.'_'.$cnum; + $context = 'course'; + if ((&Apache::lonnet::allowed('mdc',$cid)) || + (&Apache::lonnet::allowed('cev',$cid))) { + $allowed = 1; + } + } elsif ($env{'form.readfile'} =~ m{^/res/}) { + $context = 'res'; + if ((&Apache::lonnet::allowed('bre',$env{'form.readfile'})) || + (&Apache::lonnet::allowed('bro',$env{'form.readfile'}))) { + $allowed = 1; + } + } elsif (($env{'form.readfile'} eq '') && ($env{'form.acts'} ne '')) { + $allowed = 1; + } + if ($allowed) { + if ($env{'form.mode'} eq 'rat') { + if (&Apache::lonnet::allowed('are',$env{'request.role.domain'})) { + $canedit = 1; + } + } elsif (($env{'form.mode'} eq 'simple') || ($env{'form.mode'} eq '')) { + if ($context eq 'course') { + if (&Apache::lonnet::allowed('mdc',$cid)) { + $canedit = 1; + } + } elsif (($env{'request.course.id'}) && + (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { + $canedit = 1; + } elsif (&Apache::lonnet::allowed('are',$env{'request.role.domain'})) { + $canedit = 1; + } + } + } + + unless ($allowed) { + if ($context eq 'course') { + if ($env{'request.course.id'} eq $cid) { + $env{'user.error.msg'}= + "/adm/groupsort::0:1:Course environment gone, reinitialize the course"; + } else { + $env{'user.error.msg'}= + "/adm/groupsort:bre:0:0:Cannot view folder contents"; + } + } else { + $env{'user.error.msg'}= + "/adm/groupsort:bre:0:0:Cannot view map contents"; + } + return HTTP_NOT_ACCEPTABLE; + } + # finish_import looks different for graphical or "simple" RAT my $finishimport=''; my $begincondition=''; my $endcondition=''; + my $noedit; + unless ($canedit) { + if ($context eq 'course') { + $noedit = &js_escape(&mt('You do not have rights to edit the course.')); + } else { + $noedit = &js_escape(&mt('You do not have rights to edit map contents.')); + } + } if (($env{'form.readfile'})) { $begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {'; $endcondition='}'; } if ($env{'form.mode'} eq 'simple' || $env{'form.mode'} eq '') { - $finishimport=(< 1) || ($env{'form.readfile'})) { my %lt=&Apache::lonlocal::texthash( 'fin'=> 'Finalize order of resources', @@ -329,8 +421,8 @@ END if ($env{'form.recover'}) { $r->print(<  - + onclick="finish_import()"$disabled />  + END } else { # --- Continue Buttons @@ -340,12 +432,12 @@ END

$lt{'fin'}

  + onclick="window.location='$resurl?inhibitmenu=yes&catalogmode=import'" />    + onclick="window.location='/adm/searchcat?inhibitmenu=yes&catalogmode=import'" />    - + onclick="finish_import()"$disabled />  +

END @@ -394,7 +486,7 @@ END $r->print(&Apache::loncommon::start_data_table_row() .""); if (($env{'form.readfile'})) { - $r->print(&checkbox($ctr-1)); + $r->print(&checkbox($ctr-1,$disabled)); } else { $r->print(&movers($clen,$ctr)); } @@ -405,13 +497,20 @@ END $r->print(""); unless (($env{'form.readfile'})) { $r->print("". - &select_box($clen,$ctr). + &select_box($clen,$ctr,$disabled). ""); } $r->print(""); $r->print(""); $r->print(""); - $r->print($resource->{'title'}.$resource->{'notes'}."\n"); + if (($env{'form.recover'}) && + ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) { + my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'}); + $r->print($title); + } else { + $r->print($resource->{'title'}); + } + $r->print($resource->{'notes'}."\n"); $r->print($resource->{'url'}."" .&Apache::loncommon::end_data_table_row() ."\n"); @@ -468,10 +567,10 @@ END # ------------------------------------------ Select box (returns scalar string) sub select_box { - my ($total,$sel) = @_; + my ($total,$sel,$disabled) = @_; my $string; $string = ''.&mt('Include').''; + $disabled.' />'.&mt('Include').''; } 1;