--- loncom/interface/lonblockingstatus.pm 2021/12/13 04:05:24 1.14.2.5 +++ loncom/interface/lonblockingstatus.pm 2021/01/02 21:07:36 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the blocking status table # -# $Id: lonblockingstatus.pm,v 1.14.2.5 2021/12/13 04:05:24 raeburn Exp $ +# $Id: lonblockingstatus.pm,v 1.19 2021/01/02 21:07:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,8 +69,7 @@ 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()); @@ -79,7 +78,7 @@ sub handler { } 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. @@ -112,7 +111,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); @@ -133,17 +132,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').'

'; } @@ -171,23 +170,22 @@ sub blockpage { $descs{'boards'} = 'Discussion posts in this community'; $descs{'groups'} = 'Groups in this community'; $descs{'docs'} = 'Community Content'; - $descs{'grades'} = 'Community Gradebook'; + $descs{'grades'} = 'Community Gradebook'; } } 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 @@ -199,45 +197,24 @@ sub blockpage { } elsif (($activity eq 'printout') || ($activity eq 'passwd') || ($activity eq 'grades') || ($activity eq 'search') || ($activity eq 'about')) { - 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); - } + $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

"; @@ -249,17 +226,7 @@ sub blockpage { && $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; @@ -310,7 +277,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 @@ -322,17 +289,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