--- loncom/interface/lonblockingstatus.pm 2020/09/08 04:04:31 1.14.2.2.2.1 +++ loncom/interface/lonblockingstatus.pm 2020/09/29 20:17:30 1.14.2.2.2.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the blocking status table # -# $Id: lonblockingstatus.pm,v 1.14.2.2.2.1 2020/09/08 04:04:31 raeburn Exp $ +# $Id: lonblockingstatus.pm,v 1.14.2.2.2.2 2020/09/29 20:17:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,45 +43,48 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - my (%activities,$activity,$origurl); - map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','grades','passwd'); + my (%activities,$activity,$origurl,$origsymb); + map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','grades','passwd','search'); # determine what kind of blocking we want details for - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']); + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url','symb']); $activity = $env{'form.activity'}; my $title = 'Communication Blocking Status Information'; if (($activity eq 'docs') || ($activity eq 'printout') || - ($activity eq 'grades') || ($activity eq 'passwd')) { + ($activity eq 'grades') || ($activity eq 'passwd') || + ($activity eq 'search')) { $title = 'Blocking Status Information'; if ($activity eq 'docs') { $origurl = $env{'form.url'}; + $origsymb = $env{'form.symb'}; } } $r->print(&Apache::loncommon::start_page($title,undef, {'only_body' => 1})); if (($activity eq '') || (!$activities{$activity})) { - $r->print(''.&mt('Error: unknown activity type blocked').''); + $r->print('

'.&mt('Error: unknown activity type blocked').'

'); + } elsif (($activity eq 'docs') && ($origurl eq '') && ($origsymb eq '')) { + $r->print('

'.&mt('Error: could not determine what content was blocked from access').'

'); } else { - $r->print(&blockpage($activity,$origurl)); + $r->print(&blockpage($activity,$origurl,$origsymb)); } - + $r->print(&Apache::loncommon::end_page()); return OK; } - sub blockpage { - my ($activity,$origurl) = @_; + my ($activity,$origurl,$origsymb) = @_; # in case of a portfolio block we need to determine the owner of the files # we're trying to look at. This information is passed via query string. my ($uname, $udom); - if (($activity eq 'port') || + if (($activity eq 'port') || (($activity eq 'passwd') && ($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))) { &Apache::loncommon::get_unprocessed_cgi( $ENV{'QUERY_STRING'}, ['udom', 'uname'] ); @@ -92,7 +95,7 @@ sub blockpage { return ''. &mt('Information about the owner of the portfolio files you were trying to view was missing or invalid.'). '
'. - &mt('Without valid owner information, the reason why access is blocked can not be determined'); + &mt('Without valid owner information, the reason why access is blocked can not be determined'); } else { return ''. &mt('Information about the username and/or domain for which you were trying to reset a password was missing or invalid.'). @@ -102,14 +105,44 @@ sub blockpage { } } - # retrieve start/end of possible active blocking - my %setters; - my ($startblock,$endblock,$triggerblock) = - &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl); + my (%setters,$startblock,$endblock,$triggerblock); + + if ($activity eq 'docs') { + my ($cdom,$cnum); + if ($env{'request.course.id'}) { + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + } + my $cancheck; + if (($cdom ne '') && ($cnum ne '')) { + if ($origsymb =~ m{^uploaded/($match_domain)/($match_courseid)/}) { + my ($crsdom,$crsnum) = ($1,$2); + if (($cdom eq $crsdom) && ($cnum eq $crsnum)) { + $cancheck = 1; + } + } else { + $cancheck = 1; + } + } + if ($cancheck) { + ($startblock,$endblock,$triggerblock) = + &Apache::loncommon::blockcheck(\%setters,$activity,$cnum,$cdom,$origurl,1,$origsymb,'blockingstatus'); + } else { + return '

'.&mt('Could not determine why access is blocked.').'

'; + } + } else { + ($startblock,$endblock,$triggerblock) = + &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus'); + } # nothing to do if there's no active blocking - unless ($startblock && $endblock) { return ''; } + unless ($startblock && $endblock) { + if ($activity eq 'docs') { + return '

'.&mt('Content no longer blocked from access').'

'; + } + return '

'.&mt('Access no longer blocked for this activity').'

'; + } # lookup $activity -> description #possible activity #corresponding description @@ -119,10 +152,11 @@ sub blockpage { com => 'This message', blogs => 'Blogs', groups => 'Groups in this course', - printout => 'Printout generation', + printout => 'Printout generation', docs => 'Course Content', passwd => 'Changing of passwords', grades => 'Course Gradebook', + search => 'Content Search', ); if ($activity eq 'groups' || $activity eq 'boards') { @@ -146,15 +180,16 @@ sub blockpage { my $showend = Apache::lonlocal::locallocaltime($endblock); my $output; - + if ( ref($description) ne 'ARRAY' ) { #default: $description is one of the above descriptions if ($activity eq 'docs') { - $output=&mt( 'Access to the content page you are attempting to' + $output=&mt( 'Access to the content page you are attempting to' . ' view will be unavailable between [_1] and [_2] because' . ' access to selected '.$description.' is being blocked.' ,$showstart, $showend); - } elsif (($activity eq 'printout') || ($activity eq 'passwd') || ($activity eq 'grades')) { + } elsif (($activity eq 'printout') || ($activity eq 'passwd') || + ($activity eq 'grades') || ($activity eq 'search')) { $output = mt( $description . ' will be unavailable between [_1] and [_2] because' . ' this functionality is being blocked.' @@ -163,7 +198,7 @@ sub blockpage { $output = mt( $description . ' will be inaccessible between [_1] and [_2] because' . ' communication is being blocked.' - ,$showstart, $showend); + ,$showstart, $showend); } } else { # @$description is is the array returned from get_portfolio_category() @@ -172,12 +207,12 @@ sub blockpage { $output = mt( $$description[0] . ' will be inaccessible between [_2] and [_3] because' . ' communication is being blocked.' - ,$$description[1], $showstart, $showend) + ,$$description[1], $showstart, $showend); } $output = "

$output

"; - # show a table containing details, except if user is trying to look + # show a table containing details, except if user is trying to look # at a different user's portfolio files if ( $activity ne 'port' # no portfolio || ( $uname eq $env{'user.name'} # or own portfolio @@ -218,7 +253,7 @@ sub build_block_table { } my $triggertype = $$setters{$course}{triggers}[$i]; if ($triggertype) { - $fullname .= &mt(' (triggered by you when starting timer)'); + $fullname .= &mt(' (triggered by you when starting timer)'); } my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]}; $openblock = &Apache::lonlocal::locallocaltime($openblock);