--- loncom/interface/lonblockingstatus.pm	2020/09/28 00:27:48	1.14.2.3
+++ loncom/interface/lonblockingstatus.pm	2020/09/22 12:19:15	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # displays the blocking status table
 #
-# $Id: lonblockingstatus.pm,v 1.14.2.3 2020/09/28 00:27:48 raeburn Exp $
+# $Id: lonblockingstatus.pm,v 1.16 2020/09/22 12:19:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,32 +43,30 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my (%activities,$activity,$origurl,$origsymb);
-    map { $activities{$_} = 1; } ('boards','chat','com','blogs','groups','port','printout','docs','passwd');
+    my (%activities,$activity,$origurl);
+    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']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']);
     $activity = $env{'form.activity'};
 
     my $title = 'Communication Blocking Status Information';
 
     if (($activity eq 'docs') || ($activity eq 'printout') ||
-        ($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('<p class="LC_error">'.&mt('Error: unknown activity type blocked').'</p>');
-    } elsif (($activity eq 'docs') && ($origurl eq '') && ($origsymb eq '')) {
-        $r->print('<p class="LC_error">'.&mt('Error: could not determine what content was blocked from access').'</p>');
+        $r->print('<span class="LC_error">'.&mt('Error: unknown activity type blocked').'</span>');
     } else {
-        $r->print(&blockpage($activity,$origurl,$origsymb));
+        $r->print(&blockpage($activity,$origurl));
     }
     
     $r->print(&Apache::loncommon::end_page());
@@ -78,7 +76,7 @@ sub handler {
 
 
 sub blockpage {
-    my ($activity,$origurl,$origsymb) = @_;
+    my ($activity,$origurl) = @_;
 
     # 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.
@@ -105,44 +103,14 @@ sub blockpage {
         }
     }
 
-    # retrieve start/end of possible active blocking
-    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 '<p class="LC_info">'.&mt('Could not determine why access is blocked.').'</p>';
-        }
-    } else {
-        ($startblock,$endblock,$triggerblock) = 
-            &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl,undef,$origsymb,'blockingstatus');
-    }
+    # retrieve start/end of possible active blocking
+    my %setters;
+    my ($startblock,$endblock,$triggerblock) = 
+        &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl);
 
     # nothing to do if there's no active blocking
-    unless ($startblock && $endblock) {
-        if ($activity eq 'docs') {
-            return '<p class="LC_info">'.&mt('Content no longer blocked from access').'</p>';
-        }
-        return '<p class="LC_info">'.&mt('Access no longer blocked for this activity').'</p>';
-    }
+    unless ($startblock && $endblock) { return ''; }
 
     # lookup $activity -> description
                    #possible activity          #corresponding description
@@ -155,13 +123,16 @@ sub blockpage {
                    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{'docs'} = 'Community Content';
+            $descs{'grades'} = 'Community Gradebook';
         }
     }
 
@@ -177,7 +148,7 @@ 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') {
@@ -185,7 +156,8 @@ sub blockpage {
                          . ' 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')) {
+        } 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.'