--- rat/lonuserstate.pm 2024/07/03 02:16:44 1.149.2.6
+++ rat/lonuserstate.pm 2018/11/13 03:59:17 1.157
@@ -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.6 2024/07/03 02:16:44 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.157 2018/11/13 03:59:17 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -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
@@ -198,10 +199,6 @@ sub loadmap {
$errtext.= '
'
.&mt('Map not loaded: The file [_1] does not exist.',
"$fn");
- $hash{'map_type_'.$lpc}='none';
- if (&is_advanced($courseid)) {
- $errtext .= &error_detail($parent_rid,$courseid,$ispage,$uri);
- }
return;
}
@@ -259,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) {
@@ -296,7 +293,15 @@ sub loadmap {
# Handle randomization and random selection
if ($randomize) {
- unless (&is_advanced($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'} = '';
+ }
+ unless ($advanced) {
# Order of resources is not randomized if user has and advanced role in the course.
my $seed;
@@ -379,232 +384,6 @@ 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;
-}
-
-sub error_detail {
- my ($parent_rid,$courseid,$ispage,$uri) = @_;
- my $errinfo;
- if ($courseid) {
- my $courseurl = &Apache::lonnet::courseid_to_courseurl($courseid);
- if ($parent_rid =~ /^(\d+)\.(\d+)$/) {
- my ($parent_pc,$parent_id) = ($1,$2);
- my ($parent_type,$published,$uploaded,$canedit,$role,$switchserver,$audom,$auname,
- $editfile,$filerole,$fileswitch,$audomfile,$aunamefile);
- if (($parent_pc eq '0') && ($hash{'map_id_1'} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$})) {
- ($audomfile,$aunamefile) = ($1,$2);
- ($editfile,$filerole,$fileswitch) = &canedit_published($audomfile,$aunamefile);
- $errinfo = &mt('Top level published sequence file is missing.');
- } else {
- if ($parent_pc eq '1') {
- if ($hash{'map_id_1'} eq "/uploaded$courseurl/default.sequence") {
- $uploaded = 1;
- if (&Apache::lonnet::allowed('mdc',$courseid)) {
- $canedit = 1;
- }
- $errinfo = &mt('Map is referenced in the top level ([_1]Main Content[_2]) folder.',
- '','');
- } elsif ($hash{'map_id_1'} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) {
- ($audom,$auname) = ($1,$2);
- ($canedit,$role,$switchserver) = &canedit_published($audom,$auname);
- $published = 1;
- $errinfo = &mt('Map is referenced in the top level published sequence file.');
- }
- } else {
- if ($hash{'map_id_'.$parent_pc} =~ m{^\Q/uploaded$courseurl/default_\E\d+\.(sequence|page)$}) {
- $uploaded = 1;
- if (&Apache::lonnet::allowed('mdc',$courseid)) {
- $canedit = 1;
- }
- } elsif ($hash{'map_id_'.$parent_pc} =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) {
- ($audom,$auname) = ($1,$2);
- ($canedit,$role,$switchserver) = &canedit_published($audom,$auname);
- $published = 1;
- }
- if (exists($hash{'ids_'.$hash{'map_id_'.$parent_pc}})) {
- $parent_type = $hash{'map_type_'.$parent_pc};
- if ($published) {
- $errinfo = &mt("Map is referenced in the published $parent_type file: [_1].",
- ''.$hash{'map_id_'.$parent_pc}.'');
- } else {
- my $title = $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$parent_pc}}};
- if ($title ne '') {
- my $mapdesc;
- if ($parent_type eq 'sequence') {
- $mapdesc = 'folder';
- } else {
- $mapdesc = 'composite page';
- }
- $errinfo = &mt("Map is referenced in the $mapdesc named: [_1].",
- ''.$title.'');
- }
- my @containers = split(/,/,$hash{'map_hierarchy_'.$parent_pc});
- shift(@containers);
- my $folderpath;
- foreach my $id (@containers) {
- my $name;
- if ($id == 1) {
- $name = &mt('Main Content');
- } elsif ($hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$id}}} ne '') {
- $name = $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$id}}};
- }
- if ($name ne '') {
- $folderpath .= $name.' » ';
- }
- }
- if ($title eq '') {
- $folderpath =~ s/\Q » \E$//;
- } else {
- $folderpath .= $title;
- }
- if ($folderpath) {
- $errinfo .= '
'.&mt('Hierarchy is: [_1]',
- ''.$folderpath.'');
- }
- }
- }
- }
- if ($uri =~ m{^/res/($match_domain)/($match_username)/.+\.(sequence|page)$}) {
- ($audomfile,$aunamefile) = ($1,$2);
- ($editfile,$filerole,$fileswitch) = &canedit_published($audomfile,$aunamefile);
- }
- }
- if ($errinfo) {
- $errinfo = '
'.$errinfo.'
';
- }
- if ($editfile) {
- if ($errinfo ne '') {
- $errinfo .= '
';
- }
- if ($canedit) {
- $errinfo .= &mt('One way to rectify this problem is to create and publish the missing file');
- } else {
- $errinfo .= &mt('To rectify this problem, create and publish the missing file');
- }
- my $fileurl = $uri;
- $fileurl =~s{^/res/}{/priv/};
- if ($fileswitch) {
- my $rolename = &Apache::lonnet::plaintext($filerole);
- my $rolecode;
- if ($filerole eq 'au') {
- $rolecode = 'au./'.$audomfile.'/';
- } else {
- $rolecode = $filerole.'./'.$audomfile.'/'.$aunamefile;
- }
- $errinfo .= '.
'.&mt('You will need to [_1]switch server[_2].',
- '','');
- } else {
- &js_escape(\$fileurl);
- $errinfo .= ': '.&mt('Create the missing file').'';
- }
- }
- if ($canedit) {
- if ($errinfo ne '') {
- $errinfo .= '
';
- }
- if ($published) {
- my $rolename = &Apache::lonnet::plaintext($role);
- my $rolecode;
- if ($role eq 'au') {
- $rolecode = 'au./'.$audom.'/';
- } else {
- $rolecode = $role.'./'.$audom.'/'.$auname;
- }
- if ($editfile) {
- $errinfo .= &mt('Another way is to edit the parent map to remove the reference to the missing file');
- } else {
- $errinfo .= &mt('To rectify this problem edit the parent map to remove the reference to the missing file');
- }
- my $mapurl = $hash{'map_id_'.$parent_pc};
- $mapurl =~s{^/res/}{/priv/};
- if ($switchserver) {
- $errinfo .= '.
'.
- &mt('You will need to [_1]switch server[_2].',
- '','');
- } else {
- &js_escape(\$mapurl);
- $errinfo .= ': '.&mt('Edit the map').'';
- }
- } elsif ($uploaded && $courseid) {
- my ($dest,$linktext);
- my $crstype = &Apache::loncommon::course_type($courseid);
- if ($parent_pc eq '1') {
- $dest = '/adm/coursedocs?folderpath='.&escape('default&Main%20Content:::::');
- $linktext = &mt('Edit Folder');
- } elsif ($hash{'ids_'.$hash{'map_id_'.$parent_pc}} =~ /^(\d+)\.(\d+)$/) {
- my ($editmap,$editidx) = ($1,$2);
- my $symb = &Apache::lonnet::encode_symb($hash{'map_id_'.$editmap},
- $editidx,$hash{'map_id_'.$parent_pc});
- $dest = '/adm/coursedocs?command=directnav&symb='.&escape($symb);
- if ($parent_type eq 'sequence') {
- $linktext = &mt('Edit Folder');
- } else {
- $linktext = &mt('Edit Composite Page');
- }
- } else {
- $dest = '/adm/coursedocs?folderpath='.&escape('default&Main%20Content:::::');
- $linktext = &mt("Edit $crstype");
- }
- if ($editfile) {
- $errinfo .= &mt("Another way is to use the $crstype Editor to delete the reference to the missing file");
- } else {
- $errinfo .= &mt("To rectify this problem use the $crstype Editor to delete the reference to the missing file");
- }
- $errinfo .= ': '.$linktext.'';
- }
- $errinfo .= '
';
- }
- }
- }
- return $errinfo;
-}
-
-sub canedit_published {
- my ($audom,$auname) = @_;
- my ($canedit,$role,$switchserver);
- my $now = time;
- if (($auname eq $env{'user.name'}) && ($audom eq $env{'user.domain'})) {
- if (exists($env{"user.role.au./$audom/"})) {
- my ($start,$end) = split(/\./,$env{"user.role.au./$audom/"});
- unless (($end && $end < $now) || ($start && $start > $now)) {
- $canedit = 1;
- $role = 'au';
- }
- }
- }
- unless ($canedit) {
- foreach my $possrole ('ca','aa') {
- if (exists($env{"user.role.$possrole./$audom/$auname"})) {
- my ($end,$start) = split(/\./,$env{"user.role.$possrole./$audom/$auname"});
- unless (($end && $end < time) || ($start && $start > time)) {
- $canedit = 1;
- $role = $possrole;
- last;
- }
- }
- }
- }
- if ($canedit) {
- my $auhome = &Apache::lonnet::homeserver($auname,$audom);
- my @ids=&Apache::lonnet::current_machine_ids();
- if (($auhome ne 'no_host') && (!grep(/^\Q$auhome\E$/,@ids))) {
- $switchserver = $auhome;
- }
- }
- return ($canedit,$role,$switchserver);
-}
# -------------------------------------------------------------------- Resource
#
@@ -691,11 +470,7 @@ sub parse_resource {
# is not a page. If the resource is a page then it must be
# assembled (at fetch time?).
- if ($ispage) {
- if ($token->[2]->{'external'} eq 'true') { # external
- $turi=~s{^http\://}{/ext/};
- }
- } else {
+ unless ($ispage) {
$turi=~/\.(\w+)$/;
my $embstyle=&Apache::loncommon::fileembstyle($1);
if ($token->[2]->{'external'} eq 'true') { # external
@@ -710,6 +485,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/[^\/]+$//;
@@ -785,9 +562,7 @@ sub parse_resource {
if (($turi=~/\.sequence$/) ||
($turi=~/\.page$/)) {
$hash{'is_map_'.$rid}=1;
- if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) {
- &loadmap($turi,$rid,$courseid);
- }
+ &loadmap($turi,$rid,$courseid);
}
return $token->[2]->{'id'};
}
@@ -1143,6 +918,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(
@@ -1418,7 +1201,7 @@ sub mapcrumbs {
# ---------------------------------------------------- Read map and all submaps
sub readmap {
- my ($short,$critmsg_check) = @_;
+ my $short=shift;
$short=~s/^\///;
# TODO: Hidden dependency on current user:
@@ -1458,6 +1241,7 @@ sub readmap {
undef %randomizationcode;
undef %hiddenurl;
undef %encurl;
+ undef %deeplinkonly;
undef %rescount;
undef %mapcount;
$retfrid='';
@@ -1606,6 +1390,7 @@ sub readmap {
undef %randomizationcode;
undef %hiddenurl;
undef %encurl;
+ undef %deeplinkonly;
undef %rescount;
undef %mapcount;
$errtext='';
@@ -1655,18 +1440,14 @@ 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, which suppresses
-# critical message checking (users without evb priv).
-#
- if ($critmsg_check) {
- my ($redirect,$url) = &Apache::loncommon::critical_redirect();
- if ($redirect) {
- $retfurl = $url;
+ 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';
}
- }
+ }
return ($retfurl,$errtext);
}
@@ -1748,6 +1529,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;