--- rat/lonuserstate.pm 2022/05/29 12:35:02 1.149.2.5.2.2 +++ rat/lonuserstate.pm 2021/04/29 14:54:36 1.163 @@ -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.5.2.2 2022/05/29 12:35:02 raeburn Exp $ +# $Id: lonuserstate.pm,v 1.163 2021/04/29 14:54:36 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 qw(:DEFAULT :match); +use LONCAPA qw(:DEFAULT :match); use File::Basename; @@ -62,7 +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 %deeplinkout; # this URL (or complete folder) unavailable in deep-link session +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 @@ -256,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) { @@ -905,7 +905,7 @@ sub simplify { # new value indicating how far the map has been traversed (the sofar). # sub traceroute { - my ($sofar,$rid,$beenhere,$encflag,$hdnflag,$cid)=@_; + my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_; my $newsofar=$sofar=simplify($sofar); unless ($beenhere=~/\&\Q$rid\E\&/) { @@ -928,29 +928,13 @@ sub traceroute { && ($hash{'src_'.$rid}!~/\.sequence$/)) { $retfrid=$rid; } - - my (@deeplink,@recurseup); - if ($hash{'is_map_'.$rid}) { - my ($cdom,$cnum) = split(/_/,$cid); - my $mapsrc = $hash{'src_'.$rid}; - my $map_pc = $hash{'map_pc_'.$mapsrc}; - my @pcs = split(/,/,$hash{'map_hierarchy_'.$map_pc}); - shift(@pcs); - @recurseup = map { &Apache::lonnet::declutter($hash{'map_id_'.$_}) } reverse(@pcs); - my $mapname = &Apache::lonnet::declutter(&Apache::lonnet::deversion($mapsrc)); - my $deeplinkval = &get_mapparam($env{'user.name'},$env{'user.domain'},$cnum,$cdom, - $rid,$mapname,'0.deeplink',\@recurseup); - if ($deeplinkval ne '') { - @deeplink = ($deeplinkval,'map'); + 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}; } - } else { - my @pcs = split(/,/,$hash{'map_hierarchy_'.$mapid}); - shift(@pcs); - @recurseup = map { &Apache::lonnet::declutter($hash{'map_id_'.$_}) } reverse(@pcs); - @deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb,'','','','',$cid,\@recurseup); - } - unless (@deeplink < 2) { - $hash{'deeplinkonly_'.$rid}=join(':',map { &escape($_); } @deeplink); } if (defined($hash{'conditions_'.$rid})) { @@ -974,8 +958,7 @@ sub traceroute { $hash{'map_start_'.$hash{'src_'.$rid}}, $beenhere, $encflag || $encurl{$rid}, - $hdnflag || $hiddenurl{$rid}, - $cid); + $hdnflag || $hiddenurl{$rid}); } } @@ -1002,7 +985,7 @@ sub traceroute { } # Recurse to resoruces that have to's to us. $newsofar=&traceroute($further,$hash{'goesto_'.$id},$beenhere, - $encflag,$hdnflag,$cid); + $encflag,$hdnflag); } } } @@ -1199,34 +1182,17 @@ sub hiddenurls { } } -sub deeplinkouts { - my $deeplinkoutentry; - foreach my $rid (keys(%deeplinkout)) { - $hash{'deeplinkout_'.$rid}=1; - my ($mapid,$resid)=split(/\./,$rid); - $deeplinkoutentry.='&'. - &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid, - $hash{'src_'.$rid}).'&'; - } -# --------------------------------------- append deeplinkout entry to environment - if ($deeplinkoutentry) { - &Apache::lonnet::appenv({'acc.deeplinkout' => $deeplinkoutentry}); - } -} - # -------------------------------------- populate big hash with map breadcrumbs # Create map_breadcrumbs_$pc from map_hierarchy_$pc by omitting intermediate # maps not shown in Course Contents table. sub mapcrumbs { - my ($cid) = @_; foreach my $key (keys(%rescount)) { if ($hash{'map_hierarchy_'.$key}) { my $skipnext = 0; foreach my $id (split(/,/,$hash{'map_hierarchy_'.$key}),$key) { - my $rid = $hash{'ids_'.$hash{'map_id_'.$id}}; - unless (($skipnext) || (!&is_advanced($cid) && $hash{'deeplinkout_'.$rid})) { + unless ($skipnext) { $hash{'map_breadcrumbs_'.$key} .= "$id,"; } unless (($id == 0) || ($id == 1)) { @@ -1285,7 +1251,7 @@ sub readmap { undef %randomizationcode; undef %hiddenurl; undef %encurl; - undef %deeplinkout; + undef %deeplinkonly; undef %rescount; undef %mapcount; $retfrid=''; @@ -1434,7 +1400,7 @@ sub readmap { undef %randomizationcode; undef %hiddenurl; undef %encurl; - undef %deeplinkout; + undef %deeplinkonly; undef %rescount; undef %mapcount; $errtext=''; @@ -1495,7 +1461,7 @@ sub readmap { if ($redirect) { $retfurl = $url; } - } + } return ($retfurl,$errtext); } @@ -1543,6 +1509,7 @@ sub build_tmp_hashes { # Load the map.. note that loadmap may implicitly recurse if the map contains # sub-maps. + &loadmap($uri,'0.0',$short); # The code below only executes if there is a starting point for the map> @@ -1555,9 +1522,10 @@ sub build_tmp_hashes { "request.course.uri" => $uri, "request.course.tied" => time}); $env{'request.course.id'}=$short; - &traceroute('0',$hash{'map_start_'.$uri},'&','','',$short); + &traceroute('0',$hash{'map_start_'.$uri},'&'); &accinit($uri,$short,$fn); &hiddenurls(); + &mapcrumbs(); } $errtext .= &get_mapalias_errors(); # ------------------------------------------------------- Put versions into src @@ -1575,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; @@ -1597,92 +1569,6 @@ sub build_tmp_hashes { "Could not write statemap $fn for $uri."); } } - - # Was initial access via a deep-link? - my ($cdom,$cnum) = split(/_/,$short); - if (($cdom ne '') && ($env{'request.deeplink.login'} ne '')) { - my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); - if ($deeplink_symb) { - my ($loginrid,$deeplink_login_pc,$login_hierarchy); - my ($map,$resid,$url) = &Apache::lonnet::decode_symb($deeplink_symb); - $loginrid = $hash{'map_pc_'.&Apache::lonnet::clutter($map)}.'.'.$resid; - if ($deeplink_symb =~ /\.(page|sequence)$/) { - $deeplink_login_pc = $hash{'map_pc_'.&Apache::lonnet::clutter($url)}; - } else { - $deeplink_login_pc = $hash{'map_pc_'.&Apache::lonnet::clutter($map)}; - } - my $deeplink; - if ($hash{'deeplinkonly_'.$loginrid} ne '') { - my @deeplinkinfo = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$loginrid}); - unless (@deeplinkinfo < 2) { - $deeplink = $deeplinkinfo[0]; - } - } - if ($deeplink) { - my $disallow; - my ($state,$others,$listed,$scope,$protect) = split(/,/,$deeplink); - if (($protect ne 'none') && ($protect ne '')) { - my ($acctype,$item) = split(/:/,$protect); - if ($acctype =~ /lti(c|d)$/) { - unless ($env{'request.linkprot'} eq $item.$1.':'.$env{'request.deeplink.login'}) { - $disallow = 1; - } - } elsif ($acctype eq 'key') { - unless ($env{'request.linkkey'} eq $item) { - $disallow = 1; - } - } - } - if ($disallow) { - &Apache::lonnet::delenv('request.deeplink.login'); - if ($env{'request.deeplink.target'} ne '') { - &Apache::lonnet::delenv('request.deeplink.target'); - } - } else { - if ($others eq 'hide') { - my @recfolders; - if ($scope eq 'rec') { - foreach my $key (keys(%hash)) { - if ($key=~/^map_hierarchy_(\d+)$/) { - my $mpc = $1; - my @ids = split(/,/,$hash{$key}); - if (grep(/^$deeplink_login_pc$/,@ids)) { - my $idx; - foreach my $mapid (@ids) { - if ($idx) { - push(@recfolders,$mapid); - } elsif ($mapid == $deeplink_login_pc) { - push(@recfolders,$mapid); - $idx = $mapid; - } - } - push(@recfolders,$mpc); - } - } - } - } - foreach my $key (keys(%hash)) { - if ($key=~/^src_(.+)$/) { - my $rid = $1; - next if ($rid eq '0.0'); - next if ($rid eq $loginrid); - if ($scope ne 'res') { - my $mapid = (split(/\./,$rid))[0]; - next if ($mapid eq $deeplink_login_pc); - if ($scope eq 'rec') { - next if (grep(/^$mapid$/,@recfolders)); - } - } - $deeplinkout{$rid} = 1; - } - } - } - } - &deeplinkouts(); - } - } - } - &mapcrumbs(); return $gotstate; } @@ -1744,165 +1630,6 @@ sub evalstate { return $state; } -sub get_mapparam { - my ($uname,$udom,$cnum,$cdom,$rid,$mapname,$what,$recurseupref) = @_; - unless ($mapname) { return; } - -# ------------------------------------------------- Get coursedata (if present) - my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom); - if (!ref($courseopt)) { - undef($courseopt); - } - -# --------------------------------------------------- Get userdata (if present) - my $useropt=&Apache::lonnet::get_userresdata($uname,$udom); - if (!ref($useropt)) { - undef($useropt); - } - - my @recurseup; - if (ref($recurseupref) eq 'ARRAY') { - @recurseup = @{$recurseupref}; - } - - # Get the section if there is one. - - my $cid = $cdom.'_'.$cnum; - my $csec=$env{'request.course.sec'}; - my $cgroup=''; - my @cgrps=split(/:/,$env{'request.course.groups'}); - if (@cgrps > 0) { - @cgrps = sort(@cgrps); - $cgroup = $cgrps[0]; - } - - my $rwhat=$what; - $what=~s/^parameter\_//; - $what=~s/\_/\./; - - # Build the hash keys for the lookup: - - my $mapparm=$mapname.'___(all).'.$what; - my $recurseparm=$mapname.'___(rec).'.$what; - my $usercourseprefix=$cid; - - my $grplevelm = "$usercourseprefix.[$cgroup].$mapparm"; - my $seclevelm = "$usercourseprefix.[$csec].$mapparm"; - my $courselevelm = "$usercourseprefix.$mapparm"; - - my $grpleveli = "$usercourseprefix.[$cgroup].$recurseparm"; - my $secleveli = "$usercourseprefix.[$csec].$recurseparm"; - my $courseleveli = "$usercourseprefix.$recurseparm"; - - # Check per user - - if ($uname and defined($useropt)) { - if (defined($$useropt{$courselevelm})) { - return $$useropt{$courselevelm}; - } - if (defined($$useropt{$courseleveli})) { - return $$useropt{$courseleveli}; - } - foreach my $item (@recurseup) { - my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; - if (defined($$useropt{$norecursechk})) { - if ($what =~ /\.(encrypturl|hiddenresource)$/) { - return $$useropt{$norecursechk}; - } else { - last; - } - } - } - } - - # Check course -- group - - if ($cgroup ne '' and defined ($courseopt)) { - if (defined($$courseopt{$grplevelm})) { - return $$courseopt{$grplevelm}; - } - if (defined($$courseopt{$grpleveli})) { - return $$courseopt{$grpleveli}; - } - foreach my $item (@recurseup) { - my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what; - if (defined($$courseopt{$norecursechk})) { - if ($what =~ /\.(encrypturl|hiddenresource)$/) { - return $$courseopt{$norecursechk}; - } else { - last; - } - } - } - } - - # Check course -- section - - if ($csec ne '' and defined($courseopt)) { - if (defined($$courseopt{$seclevelm})) { - return $$courseopt{$seclevelm}; - } - if (defined($$courseopt{$secleveli})) { - return $$courseopt{$secleveli}; - } - foreach my $item (@recurseup) { - my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what; - if (defined($$courseopt{$norecursechk})) { - if ($what =~ /\.(encrypturl|hiddenresource)$/) { - return $$courseopt{$norecursechk}; - } else { - last; - } - } - } - } - - # Check the map parameters themselves: - - if ($hash{'param_'.$rid}) { - my @items = split(/\&/,$hash{'param_'.$rid}); - my $thisparm; - foreach my $item (@items) { - my ($esctype,$escname,$escvalue) = ($item =~ /^([^:]+):([^=]+)=(.*)$/); - my $name = &unescape($escname); - my $value = &unescape($escvalue); - if ($name eq $what) { - $thisparm = $value; - last; - } - } - if (defined($thisparm)) { - return $thisparm; - } - } - - # Additional course parameters: - - if (defined($courseopt)) { - if (defined($$courseopt{$courselevelm})) { - return $$courseopt{$courselevelm}; - } - - if (defined($$courseopt{$courseleveli})) { - return $$courseopt{$courseleveli}; - } - - if (@recurseup) { - foreach my $item (@recurseup) { - my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; - if (defined($$courseopt{$norecursechk})) { - if ($what =~ /\.(encrypturl|hiddenresource)$/) { - return $$courseopt{$norecursechk}; - } else { - last; - } - } - } - } - } - return undef; -} - # This block seems to have code to manage/detect doubly defined # aliases in maps.