[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

[raeburn]

raeburn		Wed Oct 20 16:15:04 2021 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  - Footer hiding options from menu collection also enforced when discussion   
    blocking is in effect.
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.385 loncom/interface/lonfeedback.pm:1.386
--- loncom/interface/lonfeedback.pm:1.385	Mon Oct 18 22:29:20 2021
+++ loncom/interface/lonfeedback.pm	Wed Oct 20 16:15:04 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.385 2021/10/18 22:29:20 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.386 2021/10/20 16:15:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -136,27 +136,29 @@
         }
     }
 
-    my ($blocked,$blocktext) = 
-        &Apache::loncommon::blocking_status('boards');
-    if ($blocked) {
-        $blocktext = '<br /><div class="LC_feedback_link"><span class="LC_feedback_link">'.$blocktext."</span>";
-        &Apache::lonenc::check_encrypt(\$ressymb);
-        if ($mode ne 'board') {
-            ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
-            unless ($nofooter || $nofdbklink) {
-                $blocktext.=&send_message_link($ressymb);
-            }
-            $blocktext.='</div>';
-        }else{
-            $blocktext.="</div>";
-        }
-        return $blocktext; 
-    }
-
     unless ($outputtarget eq 'export') {
         ($nofooter,$nodisclink,$nofdbklink) = &check_menucoll();
     }
 
+    unless ($nofooter) {
+        my ($blocked,$blocktext) = 
+            &Apache::loncommon::blocking_status('boards');
+        if ($blocked) {
+            my $footer = '<br /><div class="LC_feedback_link">';
+            unless ($nodisclink) {
+                $footer .= '<span class="LC_feedback_link">'.$blocktext.'</span>';
+            }
+            &Apache::lonenc::check_encrypt(\$ressymb);
+            if ($mode ne 'board') {
+                unless ($nofdbklink) {
+                    $footer.=&send_message_link($ressymb);
+                }
+            }
+            $footer.='</div>';
+            return $footer;
+        }
+    }
+
     my @bgcols = ("LC_disc_old_item","LC_disc_new_item");
     my $discussiononly=0;
     if ($mode eq 'board') { $discussiononly=1; }