--- rat/lonuserstate.pm	2019/02/07 01:51:34	1.149.2.2
+++ rat/lonuserstate.pm	2021/04/19 21:12:53	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.149.2.2 2019/02/07 01:51:34 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.162 2021/04/19 21:12:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use Safe::Hole;
 use Opcode;
 use Apache::lonenc;
 use Fcntl qw(:flock);
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 use File::Basename;
 
  
@@ -62,6 +62,7 @@ my %randomorder; # maps to order content
 my %randomizationcode; # code used to grade folder for bubblesheet exam 
 my %encurl; # URLs in this folder are supposed to be encrypted
 my %hiddenurl; # this URL (or complete folder) is supposed to be hidden
+my %deeplinkonly; # this URL (or complete folder) is deep-link only
 my %rescount; # count of unhidden items in each map
 my %mapcount; # count of unhidden maps in each map
 
@@ -255,9 +256,9 @@ sub loadmap {
 		push(@map_ids, $resource_id);
                 if ($hash{'src_'.$lpc.'.'.$resource_id}) {
                     $rescount{$lpc} ++;
-                    if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) ||
+                    if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) || 
                         ($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) {
-                        $mapcount{$lpc} ++;
+                        $mapcount{$lpc} ++; 
                     }
                 }
                 unless ($codechecked) {
@@ -292,15 +293,7 @@ sub loadmap {
     # Handle randomization and random selection
 
     if ($randomize) {
-        my $advanced;
-        if ($env{'request.course.id'}) {
-            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
-        } else {
-            $env{'request.course.id'} = $courseid;
-            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
-            $env{'request.course.id'} = '';
-        }
-        unless ($advanced) {
+        unless (&is_advanced($courseid)) {
             # Order of resources is not randomized if user has and advanced role in the course.
 	    my $seed;
 
@@ -383,6 +376,18 @@ sub loadmap {
     }
 }
 
+sub is_advanced {
+    my ($courseid) = @_;
+    my $advanced;
+    if ($env{'request.course.id'}) {
+        $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+    } else {
+        $env{'request.course.id'} = $courseid;
+        $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+        $env{'request.course.id'} = '';
+    }
+    return $advanced;
+}
 
 # -------------------------------------------------------------------- Resource
 #
@@ -469,7 +474,11 @@ sub parse_resource {
     # is not a page.  If the resource is a page then it must be
     # assembled (at fetch time?).
 
-    unless ($ispage) {
+    if ($ispage) {
+        if ($token->[2]->{'external'} eq 'true') { # external
+            $turi=~s{^http\://}{/ext/};
+        }
+    } else {
 	$turi=~/\.(\w+)$/;
 	my $embstyle=&Apache::loncommon::fileembstyle($1);
 	if ($token->[2]->{'external'} eq 'true') { # external
@@ -484,6 +493,8 @@ sub parse_resource {
 	    } elsif ($turi!~/\.(sequence|page)$/) {
 		$turi='/adm/coursedocs/showdoc'.$turi;
 	    }
+        } elsif ($turi=~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
+            $turi='/adm/wrapper'.$turi;
 	} elsif ($turi=~/\S/) { # normal non-empty internal resource
 	    my $mapdir=$uri;
 	    $mapdir=~s/[^\/]+$//;
@@ -559,7 +570,9 @@ sub parse_resource {
     if (($turi=~/\.sequence$/) ||
 	($turi=~/\.page$/)) {
 	$hash{'is_map_'.$rid}=1;
-	&loadmap($turi,$rid,$courseid);
+	if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) {
+	    &loadmap($turi,$rid,$courseid);
+	}
     } 
     return $token->[2]->{'id'};
 }
@@ -915,6 +928,14 @@ sub traceroute {
 	    && ($hash{'src_'.$rid}!~/\.sequence$/)) {
 	    $retfrid=$rid;
 	}
+        my @deeplink=&Apache::lonnet::EXT('resource.0.deeplink',$symb);
+        unless ((@deeplink == 0) || ($deeplink[0] eq 'full')) {
+            $deeplinkonly{$rid}=join(':',@deeplink);
+            if ($deeplink[1] eq 'map') {
+                my $parent = (split(/\,/,$hash{'map_hierarchy_'.$mapid}))[-1];
+                $deeplinkonly{"$parent.$mapid"}=$deeplinkonly{$rid};
+            }
+        }
 
 	if (defined($hash{'conditions_'.$rid})) {
 	    $hash{'conditions_'.$rid}=simplify(
@@ -1190,7 +1211,7 @@ sub mapcrumbs {
 # ---------------------------------------------------- Read map and all submaps
 
 sub readmap {
-    my $short=shift;
+    my ($short,$critmsg_check) = @_;
     $short=~s/^\///;
 
     # TODO:  Hidden dependency on current user:
@@ -1230,6 +1251,7 @@ sub readmap {
     undef %randomizationcode;
     undef %hiddenurl;
     undef %encurl;
+    undef %deeplinkonly;
     undef %rescount;
     undef %mapcount;
     $retfrid='';
@@ -1378,6 +1400,7 @@ sub readmap {
         undef %randomizationcode;
         undef %hiddenurl;
         undef %encurl;
+        undef %deeplinkonly;
         undef %rescount;
         undef %mapcount;
         $errtext='';
@@ -1427,12 +1450,16 @@ sub readmap {
 
 #  Depends on user must parameterize this as well..or separate as this is:
 #  more part of determining what someone sees on entering a course?
+#  When lonuserstate::readmap() is called from lonroles.pm, i.e.,
+#  after selecting a role in a course, critical_redirect will be called,
+#  unless the course has a blocking event in effect, when suppresses
+#  critical message checking (users without evb priv).
+#
 
-    my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},
-				   $env{'user.name'});
-    if ($what[0]) {
-	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
-	    $retfurl='/adm/email?critical=display';
+    if ($critmsg_check) {
+        my ($redirect,$url) = &Apache::loncommon::critical_redirect();
+        if ($redirect) {
+            $retfurl = $url;
         }
     }
     return ($retfurl,$errtext);
@@ -1516,6 +1543,10 @@ sub build_tmp_hashes {
 #           $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id});
         $hash{'encrypted_'.$id}=1;
     }
+# ------------------------------------------------------------ Deep-linked URLs
+    foreach my $id (keys(%deeplinkonly)) {
+        $hash{'deeplinkonly_'.$id}=$deeplinkonly{$id};
+    }
 # ----------------------------------------------- Close hashes to finally store
 # --------------------------------- Routine must pass this point, no early outs
     $hash{'first_rid'}=$retfrid;