version 1.149.2.2, 2019/02/07 01:51:34
|
version 1.161, 2021/04/19 20:09:07
|
Line 42 use Safe::Hole;
|
Line 42 use Safe::Hole;
|
use Opcode; |
use Opcode; |
use Apache::lonenc; |
use Apache::lonenc; |
use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
use File::Basename; |
use File::Basename; |
|
|
|
|
Line 62 my %randomorder; # maps to order content
|
Line 62 my %randomorder; # maps to order content
|
my %randomizationcode; # code used to grade folder for bubblesheet exam |
my %randomizationcode; # code used to grade folder for bubblesheet exam |
my %encurl; # URLs in this folder are supposed to be encrypted |
my %encurl; # URLs in this folder are supposed to be encrypted |
my %hiddenurl; # this URL (or complete folder) is supposed to be hidden |
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 %rescount; # count of unhidden items in each map |
my %mapcount; # count of unhidden maps in each map |
my %mapcount; # count of unhidden maps in each map |
|
|
Line 255 sub loadmap {
|
Line 256 sub loadmap {
|
push(@map_ids, $resource_id); |
push(@map_ids, $resource_id); |
if ($hash{'src_'.$lpc.'.'.$resource_id}) { |
if ($hash{'src_'.$lpc.'.'.$resource_id}) { |
$rescount{$lpc} ++; |
$rescount{$lpc} ++; |
if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) || |
if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) || |
($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) { |
($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) { |
$mapcount{$lpc} ++; |
$mapcount{$lpc} ++; |
} |
} |
} |
} |
unless ($codechecked) { |
unless ($codechecked) { |
Line 292 sub loadmap {
|
Line 293 sub loadmap {
|
# Handle randomization and random selection |
# Handle randomization and random selection |
|
|
if ($randomize) { |
if ($randomize) { |
my $advanced; |
unless (&is_advanced($courseid)) { |
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. |
# Order of resources is not randomized if user has and advanced role in the course. |
my $seed; |
my $seed; |
|
|
Line 383 sub loadmap {
|
Line 376 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 |
# -------------------------------------------------------------------- Resource |
# |
# |
Line 469 sub parse_resource {
|
Line 474 sub parse_resource {
|
# is not a page. If the resource is a page then it must be |
# is not a page. If the resource is a page then it must be |
# assembled (at fetch time?). |
# assembled (at fetch time?). |
|
|
unless ($ispage) { |
if ($ispage) { |
|
if ($token->[2]->{'external'} eq 'true') { # external |
|
$turi=~s{^http\://}{/ext/}; |
|
} |
|
} else { |
$turi=~/\.(\w+)$/; |
$turi=~/\.(\w+)$/; |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
if ($token->[2]->{'external'} eq 'true') { # external |
if ($token->[2]->{'external'} eq 'true') { # external |
Line 484 sub parse_resource {
|
Line 493 sub parse_resource {
|
} elsif ($turi!~/\.(sequence|page)$/) { |
} elsif ($turi!~/\.(sequence|page)$/) { |
$turi='/adm/coursedocs/showdoc'.$turi; |
$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 |
} elsif ($turi=~/\S/) { # normal non-empty internal resource |
my $mapdir=$uri; |
my $mapdir=$uri; |
$mapdir=~s/[^\/]+$//; |
$mapdir=~s/[^\/]+$//; |
Line 559 sub parse_resource {
|
Line 570 sub parse_resource {
|
if (($turi=~/\.sequence$/) || |
if (($turi=~/\.sequence$/) || |
($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
$hash{'is_map_'.$rid}=1; |
$hash{'is_map_'.$rid}=1; |
&loadmap($turi,$rid,$courseid); |
if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) { |
|
&loadmap($turi,$rid,$courseid); |
|
} |
} |
} |
return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
} |
} |
Line 915 sub traceroute {
|
Line 928 sub traceroute {
|
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
$retfrid=$rid; |
$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})) { |
if (defined($hash{'conditions_'.$rid})) { |
$hash{'conditions_'.$rid}=simplify( |
$hash{'conditions_'.$rid}=simplify( |
Line 1190 sub mapcrumbs {
|
Line 1211 sub mapcrumbs {
|
# ---------------------------------------------------- Read map and all submaps |
# ---------------------------------------------------- Read map and all submaps |
|
|
sub readmap { |
sub readmap { |
my $short=shift; |
my ($short,$critmsg_check) = @_; |
$short=~s/^\///; |
$short=~s/^\///; |
|
|
# TODO: Hidden dependency on current user: |
# TODO: Hidden dependency on current user: |
Line 1230 sub readmap {
|
Line 1251 sub readmap {
|
undef %randomizationcode; |
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %deeplinkonly; |
undef %rescount; |
undef %rescount; |
undef %mapcount; |
undef %mapcount; |
$retfrid=''; |
$retfrid=''; |
Line 1378 sub readmap {
|
Line 1400 sub readmap {
|
undef %randomizationcode; |
undef %randomizationcode; |
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
|
undef %deeplinkonly; |
undef %rescount; |
undef %rescount; |
undef %mapcount; |
undef %mapcount; |
$errtext=''; |
$errtext=''; |
Line 1427 sub readmap {
|
Line 1450 sub readmap {
|
|
|
# Depends on user must parameterize this as well..or separate as this is: |
# Depends on user must parameterize this as well..or separate as this is: |
# more part of determining what someone sees on entering a course? |
# 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'}, |
if ($critmsg_check) { |
$env{'user.name'}); |
my ($redirect,$url) = &Apache::loncommon::critical_redirect(); |
if ($what[0]) { |
if ($redirect) { |
if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { |
$retfurl = $url; |
$retfurl='/adm/email?critical=display'; |
} |
} |
|
} |
} |
return ($retfurl,$errtext); |
return ($retfurl,$errtext); |
} |
} |
Line 1516 sub build_tmp_hashes {
|
Line 1543 sub build_tmp_hashes {
|
# $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id}); |
# $hash{'src_'.$id}=&Apache::lonenc::encrypted($hash{'src_'.$id}); |
$hash{'encrypted_'.$id}=1; |
$hash{'encrypted_'.$id}=1; |
} |
} |
|
# ------------------------------------------------------------ Deep-linked URLs |
|
foreach my $id (keys(%deeplinkonly)) { |
|
$hash{'deeplinkonly_'.$id}=$deeplinkonly{$id}; |
|
} |
# ----------------------------------------------- Close hashes to finally store |
# ----------------------------------------------- Close hashes to finally store |
# --------------------------------- Routine must pass this point, no early outs |
# --------------------------------- Routine must pass this point, no early outs |
$hash{'first_rid'}=$retfrid; |
$hash{'first_rid'}=$retfrid; |