--- loncom/interface/lonblockingstatus.pm 2020/09/28 00:10:28 1.17 +++ loncom/interface/lonblockingstatus.pm 2020/09/29 19:29:51 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the blocking status table # -# $Id: lonblockingstatus.pm,v 1.17 2020/09/28 00:10:28 raeburn Exp $ +# $Id: lonblockingstatus.pm,v 1.18 2020/09/29 19:29:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,13 +71,12 @@ sub handler { } else { $r->print(&blockpage($activity,$origurl,$origsymb)); } - + $r->print(&Apache::loncommon::end_page()); return OK; } - sub blockpage { my ($activity,$origurl,$origsymb) = @_; @@ -85,7 +84,7 @@ sub blockpage { # 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'] ); @@ -96,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.'). @@ -133,12 +132,12 @@ sub blockpage { return '

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

'; } } else { - ($startblock,$endblock,$triggerblock) = + ($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) { + unless ($startblock && $endblock) { if ($activity eq 'docs') { return '

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

'; } @@ -153,7 +152,7 @@ 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', @@ -185,7 +184,7 @@ sub blockpage { 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); @@ -199,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() @@ -208,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 @@ -254,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);