--- loncom/interface/loncommon.pm	2022/09/08 01:41:13	1.1387
+++ loncom/interface/loncommon.pm	2022/09/28 15:13:50	1.1389
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1387 2022/09/08 01:41:13 raeburn Exp $
+# $Id: loncommon.pm,v 1.1389 2022/09/28 15:13:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8881,6 +8881,7 @@ Inputs: $title - optional title for the
                                       window (side effect of setting
                                       $env{'internal.head.to_opener'} to
                                       1, if true.
+                                   5- whether encrypt check should be skipped
             domain         -> force to color decorate a page for a specific
                                domain
             function       -> force usage of a specific rolish color scheme
@@ -8943,8 +8944,10 @@ sub headtag {
         }
     }
     if (ref($args->{'redirect'})) {
-	my ($time,$url,$inhibit_continue,$to_opener) = @{$args->{'redirect'}};
-	$url = &Apache::lonenc::check_encrypt($url);
+	my ($time,$url,$inhibit_continue,$to_opener,$skip_enc_check) = @{$args->{'redirect'}};
+        if (!$skip_enc_check) {
+            $url = &Apache::lonenc::check_encrypt($url);
+        }
 	if (!$inhibit_continue) {
 	    $env{'internal.head.redirect'} = $url;
 	}
@@ -18474,9 +18477,11 @@ sub recurse_supplemental {
         if ($fatal) {
             $errors ++;
         } else {
-            if ($#LONCAPA::map::resources > 0) {
-                foreach my $res (@LONCAPA::map::resources) {
-                    my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
+            my @order = @LONCAPA::map::order;
+            if (@order > 0) {
+                my @resources = @LONCAPA::map::resources;
+                foreach my $idx (@order) {
+                    my ($title,$src,$ext,$type,$status)=split(/\:/,$resources[$idx]);
                     if (($src ne '') && ($status eq 'res')) {
                         if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
                             ($numfiles,$numexttools,$errors) = &recurse_supplemental($cnum,$cdom,$1,