--- loncom/interface/lonblockingstatus.pm 2021/12/24 21:32:03 1.14.2.6 +++ loncom/interface/lonblockingstatus.pm 2020/09/28 00:10:28 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the blocking status table # -# $Id: lonblockingstatus.pm,v 1.14.2.6 2021/12/24 21:32:03 raeburn Exp $ +# $Id: lonblockingstatus.pm,v 1.17 2020/09/28 00:10:28 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','wishlist','annotate'); + 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','symb']); @@ -54,8 +54,7 @@ sub handler { if (($activity eq 'docs') || ($activity eq 'printout') || ($activity eq 'grades') || ($activity eq 'passwd') || - ($activity eq 'search') || ($activity eq 'wishlist') || - ($activity eq 'annotate')) { + ($activity eq 'search')) { $title = 'Blocking Status Information'; if ($activity eq 'docs') { $origurl = $env{'form.url'}; @@ -70,23 +69,23 @@ sub handler { } elsif (($activity eq 'docs') && ($origurl eq '') && ($origsymb eq '')) { $r->print('

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

'); } else { - my $clientip = &Apache::lonnet::get_requestor_ip($r); - $r->print(&blockpage($activity,$origurl,$origsymb,$clientip)); + $r->print(&blockpage($activity,$origurl,$origsymb)); } - + $r->print(&Apache::loncommon::end_page()); return OK; } + sub blockpage { - my ($activity,$origurl,$origsymb,$clientip) = @_; + 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') || ($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'] ); @@ -97,12 +96,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.'). @@ -113,7 +107,7 @@ sub blockpage { } # retrieve start/end of possible active blocking - my (%setters,$startblock,$endblock,$triggerblock,$by_ip,$blockdom); + my (%setters,$startblock,$endblock,$triggerblock); if ($activity eq 'docs') { my ($cdom,$cnum); @@ -134,17 +128,17 @@ sub blockpage { } if ($cancheck) { ($startblock,$endblock,$triggerblock) = - &Apache::loncommon::blockcheck(\%setters,$activity,$clientip,$cnum,$cdom,$origurl,1,$origsymb,'blockingstatus'); + &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,$by_ip,$blockdom) = - &Apache::loncommon::blockcheck(\%setters,$activity,$clientip,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus'); + ($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) || ($by_ip)) { + unless ($startblock && $endblock) { if ($activity eq 'docs') { return '

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

'; } @@ -158,15 +152,12 @@ 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', - wishlist => 'Stored Links', - annotate => 'Annotations', ); if ($activity eq 'groups' || $activity eq 'boards') { @@ -180,90 +171,56 @@ sub blockpage { my $description = $descs{$activity}; if ($activity eq 'port') { - $description = &get_portfolio_category($uname,$udom,$by_ip,\%setters); + $description = &get_portfolio_category($uname,$udom,\%setters); } if ($description eq '') { $description = 'Communication'; } - my ($showstart,$showend,$output); - unless ($by_ip) { - $showstart = Apache::lonlocal::locallocaltime($startblock); - $showend = Apache::lonlocal::locallocaltime($endblock); - } + my $showstart = Apache::lonlocal::locallocaltime($startblock); + 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') || ($activity eq 'wishlist') || - ($activity eq 'annotate')) { - if ($by_ip) { - $output = mt( $description - . ' unavailable from your current IP address: [_1] ' - . 'because this functionality is being blocked for certain IP address(es).' - ,$clientip); - } else { - $output = mt( $description - . ' will be unavailable between [_1] and [_2] because' - . ' this functionality is being blocked.' - ,$showstart, $showend); - } + ($activity eq 'grades') || ($activity eq 'search')) { + $output = mt( $description + . ' will be unavailable between [_1] and [_2] because' + . ' this functionality is being blocked.' + ,$showstart, $showend); } else { - if ($by_ip) { - $output = mt( $description - . ' unavailable from your current IP address: [_1] ' - . 'because communication is being blocked for certain IP address(es).' - ,$clientip); - } else { - $output = mt( $description - . ' will be inaccessible between [_1] and [_2] because' - . ' communication is being blocked.' - ,$showstart, $showend); - } + $output = mt( $description + . ' will be inaccessible between [_1] and [_2] because' + . ' communication is being blocked.' + ,$showstart, $showend); } } else { # @$description is is the array returned from get_portfolio_category() # and contains the description (e.g. "Portfolio files belonging to [_1]" # and the value for [_1] - if ($by_ip) { - $output = mt( $$description[0] - . ' are inaccessible from your current IP address: [_2] ' - . 'because communication is being blocked for certain IP address(es).' - , $$description[1], $clientip); - } else { - $output = mt( $$description[0] - . ' will be inaccessible between [_2] and [_3] because' - . ' communication is being blocked.' - ,$$description[1], $showstart, $showend); - } + $output = mt( $$description[0] + . ' will be inaccessible between [_2] and [_3] because' + . ' communication is being blocked.' + ,$$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 && $udom eq $env{'user.domain'} ) || Apache::lonnet::is_course($udom, $uname) ) # or portfolio of a course { - if ($by_ip) { - my $showdom = &Apache::lonnet::domain($blockdom); - if ($showdom eq '') { - $showdom = $blockdom; - } - $output .= '
'. - &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.' - ,$showdom); - } else { - $output .= &build_block_table(\%setters); - } + $output .= &build_block_table(\%setters); } return $output; @@ -297,7 +254,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); @@ -314,7 +271,7 @@ sub build_block_table { } sub get_portfolio_category { - my ($uname, $udom, $by_ip, $setters) = @_; + my ($uname, $udom, $setters) = @_; if ($uname eq $env{'user.name'} && $udom eq $env{'user.domain'}) { # user's portolfio files @@ -326,17 +283,12 @@ sub get_portfolio_category { my $coursedesc; - if ($by_ip) { - my %courseinfo = Apache::lonnet::coursedescription($udom.'_'.$uname); + foreach my $course (keys(%{$setters})) { + my %courseinfo = Apache::lonnet::coursedescription($course); $coursedesc = $courseinfo{'description'}; - } else { - foreach my $course (keys(%{$setters})) { - my %courseinfo = Apache::lonnet::coursedescription($course); - $coursedesc = $courseinfo{'description'}; - } } - return ["Group portfolio files in the course '[_1]'", $coursedesc]; + return ["Group portfolio in the course '[_1]'", $coursedesc]; } else { # different user's portfolio files