[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonblockingstatus.pm

[raeburn]

raeburn		Fri Dec 24 21:32:03 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonblockingstatus.pm 
  Log:
  - For 2.11
    Backport 1.22 
  
  
Index: loncom/interface/lonblockingstatus.pm
diff -u loncom/interface/lonblockingstatus.pm:1.14.2.5 loncom/interface/lonblockingstatus.pm:1.14.2.6
--- loncom/interface/lonblockingstatus.pm:1.14.2.5	Mon Dec 13 04:05:24 2021
+++ loncom/interface/lonblockingstatus.pm	Fri Dec 24 21:32:03 2021
@@ -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.14.2.6 2021/12/24 21:32:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,7 +44,7 @@
     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','about','groups','port','printout','docs','grades','passwd','search','wishlist','annotate');
 
     # determine what kind of blocking we want details for
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url','symb']);
@@ -54,7 +54,8 @@
 
     if (($activity eq 'docs') || ($activity eq 'printout') ||
         ($activity eq 'grades') || ($activity eq 'passwd') ||
-        ($activity eq 'search')) {
+        ($activity eq 'search') || ($activity eq 'wishlist') ||
+        ($activity eq 'annotate')) {
         $title = 'Blocking Status Information';
         if ($activity eq 'docs') {
             $origurl = $env{'form.url'};
@@ -164,6 +165,8 @@
                    passwd     => 'Changing of passwords',
                    grades     => 'Course Gradebook',
                    search     => 'Content Search',
+                   wishlist   => 'Stored Links',
+                   annotate   => 'Annotations',
                 );
 
     if ($activity eq 'groups' || $activity eq 'boards') {
@@ -171,7 +174,7 @@
             $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';
         }
     }
 
@@ -198,7 +201,8 @@
                          ,$showstart, $showend);
         } elsif (($activity eq 'printout') || ($activity eq 'passwd') ||
                  ($activity eq 'grades') || ($activity eq 'search') ||
-                 ($activity eq 'about')) {
+                 ($activity eq 'about') || ($activity eq 'wishlist') ||
+                 ($activity eq 'annotate')) {
             if ($by_ip) {
                 $output = mt( $description
                               . ' unavailable from your current IP address: [_1] '
@@ -252,7 +256,7 @@
         if ($by_ip) {
             my $showdom = &Apache::lonnet::domain($blockdom);
             if ($showdom eq '') {
-                $showdom = $blockdom
+                $showdom = $blockdom;
             }
             $output .= '<br />'.
                        &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.'