--- loncom/interface/lonmsgdisplay.pm	2022/09/17 23:38:51	1.198
+++ loncom/interface/lonmsgdisplay.pm	2025/01/28 21:57:52	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.198 2022/09/17 23:38:51 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.201 2025/01/28 21:57:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,6 +111,7 @@ use Apache::loncommunicate;
 use Apache::lonfeedback;
 use Apache::lonrss();
 use Apache::lonselstudent();
+use Apache::lonenc();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA qw(:DEFAULT :match);
 
@@ -261,8 +262,7 @@ function folder_choice(targetform,caller
    </fieldset></div>
 '."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
-    '<input type="hidden" name="renamed" value="" />'.
-        ($folder=~/^critical/?'</form>':'');
+    '<input type="hidden" name="renamed" value="" />';
     return $output;
 }
 
@@ -1134,6 +1134,7 @@ ENDDISHEADER
             $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,$by_ip,$clientip,$blockdom,
                                          \%setters));
         }
+        $r->print('</form>');
         return;
     }
     my $interdis = $env{'form.interdis'};
@@ -2503,12 +2504,16 @@ sub displaymessage {
                               $showsymb,$env{'user.domain'},$env{'user.name'});
                 if ($symb) {
                     if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                        $showsymb = &Apache::lonenc::check_encrypt($symb);
+                        unless ($showsymb =~ m{^/enc/}) {
+                            $showsymb = &Apache::lonenc::encrypted($showsymb);
+                        }
                     }
                     $symblink = '?symb='.$showsymb;
                 }
                 if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
-                    $showurl = $baseurl;
+                    unless ($showurl =~ m{^/enc/}) {
+                        $showurl = &Apache::lonenc::encrypted($showurl);
+                    }
                 }
                 $r->print(&Apache::lonhtmlcommon::row_title(&mt('Refers to'))
                          .'<a href="'.$showurl.$symblink.'">'.$restitle.'</a>'
@@ -2702,9 +2707,10 @@ sub displayresource {
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
         my $symb;
         if (defined($content{'symb'})) {
-            $symb = $content{'symb'};
-        } else { 
-	    $symb=&Apache::lonnet::symbread($content{'baseurl'});
+            $symb = &Apache::lonenc::check_decrypt($content{'symb'});
+        } elsif (defined($content{'baseurl'})) {
+            $symb =
+                &Apache::lonnet::symbread(&Apache::lonenc::check_decrypt($content{'baseurl'}));
         }
 # Could not get a symb, give up
 	unless ($symb) { return $content{'citation'}; }