--- loncom/interface/lonblockingstatus.pm 2021/01/04 17:26:22 1.14.2.2.2.3 +++ loncom/interface/lonblockingstatus.pm 2020/09/28 00:27:48 1.14.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the blocking status table # -# $Id: lonblockingstatus.pm,v 1.14.2.2.2.3 2021/01/04 17:26:22 raeburn Exp $ +# $Id: lonblockingstatus.pm,v 1.14.2.3 2020/09/28 00:27:48 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -44,7 +44,7 @@ sub handler { return OK if $r->header_only; my (%activities,$activity,$origurl,$origsymb); - map { $activities{$_} = 1; } ('boards','chat','com','blogs','about','groups','port','printout','docs','grades','passwd','search'); + map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','passwd'); # determine what kind of blocking we want details for &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url','symb']); @@ -53,8 +53,7 @@ sub handler { my $title = 'Communication Blocking Status Information'; if (($activity eq 'docs') || ($activity eq 'printout') || - ($activity eq 'grades') || ($activity eq 'passwd') || - ($activity eq 'search')) { + ($activity eq 'passwd')) { $title = 'Blocking Status Information'; if ($activity eq 'docs') { $origurl = $env{'form.url'}; @@ -71,12 +70,13 @@ sub handler { } else { $r->print(&blockpage($activity,$origurl,$origsymb)); } - + $r->print(&Apache::loncommon::end_page()); return OK; } + sub blockpage { my ($activity,$origurl,$origsymb) = @_; @@ -84,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') || ($activity eq 'about') || + 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'] ); @@ -95,12 +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'); - } elsif ($activity eq 'about') { - return ''. - &mt('The username and/or domain for the User Information page you were trying to view was missing or invalid.'). - '
'. - &mt('Without valid 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.'). @@ -137,7 +132,7 @@ 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'); } @@ -156,21 +151,17 @@ sub blockpage { chat => 'Chat Room', com => 'This message', blogs => 'Blogs', - about => 'User information pages', 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') { if (&Apache::loncommon::course_type() eq 'Community') { $descs{'boards'} = 'Discussion posts in this community'; $descs{'groups'} = 'Groups in this community'; - $descs{'docs'} = 'Community Content'; - $descs{'grades'} = 'Community Gradebook'; + $descs{'docs'} = 'Community Content'; } } @@ -186,17 +177,15 @@ 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') || ($activity eq 'search') || - ($activity eq 'about')) { + } elsif (($activity eq 'printout') || ($activity eq 'passwd')) { $output = mt( $description . ' will be unavailable between [_1] and [_2] because' . ' this functionality is being blocked.' @@ -205,7 +194,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() @@ -214,12 +203,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 @@ -260,7 +249,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);