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

[raeburn]

raeburn		Sat Nov 26 01:47:05 2016 EDT

  Modified files:              
    /loncom/interface	lonnavmaps.pm 
  Log:
  - encrypturl and hiddenresource parameters are always recursive.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.525 loncom/interface/lonnavmaps.pm:1.526
--- loncom/interface/lonnavmaps.pm:1.525	Tue Nov 22 00:43:12 2016
+++ loncom/interface/lonnavmaps.pm	Sat Nov 26 01:47:04 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.525 2016/11/22 00:43:12 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.526 2016/11/26 01:47:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2688,7 +2688,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$useropt{$norecursechk}));
+            if (defined($$useropt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$useropt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; } 
         }
@@ -2706,7 +2712,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                   last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }      
         }
@@ -2723,7 +2735,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; }
         }
@@ -2757,7 +2775,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return [$$courseopt{$norecursechk},'map'];
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return [$$courseopt{$recursechk},'map'];
@@ -2896,7 +2920,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-            last if (defined($$useropt{$norecursechk}));
+            if (defined($$useropt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$useropt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
             if (defined($$useropt{$recursechk})) {
                 return $$useropt{$recursechk};
@@ -2921,7 +2951,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$courseopt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return $$courseopt{$recursechk};
@@ -2945,7 +2981,13 @@
         }
         foreach my $item (@recurseup) {
             my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
-            last if (defined($$courseopt{$norecursechk}));
+            if (defined($$courseopt{$norecursechk})) {
+                if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                    return $$courseopt{$norecursechk};
+                } else {
+                    last;
+                }
+            }
             my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what;
             if (defined($$courseopt{$recursechk})) {
                 return $$courseopt{$recursechk};
@@ -2976,7 +3018,13 @@
         if (@recurseup) {
             foreach my $item (@recurseup) {
                 my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-                last if (defined($$courseopt{$norecursechk}));
+                if (defined($$courseopt{$norecursechk})) {
+                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
+                        return $$courseopt{$norecursechk};
+                    } else {
+                        last;
+                    }
+                }
                 my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what;
                 if (defined($$courseopt{$recursechk})) {
                     return $$courseopt{$recursechk};