version 1.149.2.5, 2021/12/14 22:52:33
|
version 1.153, 2017/09/03 18:52:23
|
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 255 sub loadmap {
|
Line 255 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 292 sub loadmap {
|
# Handle randomization and random selection |
# Handle randomization and random selection |
|
|
if ($randomize) { |
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. |
# Order of resources is not randomized if user has and advanced role in the course. |
my $seed; |
my $seed; |
|
|
Line 375 sub loadmap {
|
Line 383 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 473 sub parse_resource {
|
Line 469 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?). |
|
|
if ($ispage) { |
unless ($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 492 sub parse_resource {
|
Line 484 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 567 sub parse_resource {
|
Line 561 sub parse_resource {
|
if (($turi=~/\.sequence$/) || |
if (($turi=~/\.sequence$/) || |
($turi=~/\.page$/)) { |
($turi=~/\.page$/)) { |
$hash{'is_map_'.$rid}=1; |
$hash{'is_map_'.$rid}=1; |
if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) { |
&loadmap($turi,$rid,$courseid); |
&loadmap($turi,$rid,$courseid); |
|
} |
|
} |
} |
return $token->[2]->{'id'}; |
return $token->[2]->{'id'}; |
} |
} |
Line 1200 sub mapcrumbs {
|
Line 1192 sub mapcrumbs {
|
# ---------------------------------------------------- Read map and all submaps |
# ---------------------------------------------------- Read map and all submaps |
|
|
sub readmap { |
sub readmap { |
my ($short,$critmsg_check) = @_; |
my $short=shift; |
$short=~s/^\///; |
$short=~s/^\///; |
|
|
# TODO: Hidden dependency on current user: |
# TODO: Hidden dependency on current user: |
Line 1217 sub readmap {
|
Line 1209 sub readmap {
|
} |
} |
@cond=('true:normal'); |
@cond=('true:normal'); |
|
|
unless (open(LOCKFILE,">","$fn.db.lock")) { |
unless (open(LOCKFILE,">$fn.db.lock")) { |
# |
# |
# Most likely a permissions problem on the lockfile or its directory. |
# Most likely a permissions problem on the lockfile or its directory. |
# |
# |
Line 1235 sub readmap {
|
Line 1227 sub readmap {
|
&unlink_tmpfiles($fn); |
&unlink_tmpfiles($fn); |
} |
} |
undef %randompick; |
undef %randompick; |
undef %randompickseed; |
|
undef %randomorder; |
|
undef %randomizationcode; |
|
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
undef %rescount; |
|
undef %mapcount; |
|
$retfrid=''; |
$retfrid=''; |
$errtext=''; |
$errtext=''; |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags. |
Line 1383 sub readmap {
|
Line 1370 sub readmap {
|
$lock=1; |
$lock=1; |
} |
} |
undef %randompick; |
undef %randompick; |
undef %randompickseed; |
|
undef %randomorder; |
|
undef %randomizationcode; |
|
undef %hiddenurl; |
undef %hiddenurl; |
undef %encurl; |
undef %encurl; |
undef %rescount; |
|
undef %mapcount; |
|
$errtext=''; |
$errtext=''; |
$retfrid=''; |
$retfrid=''; |
# |
# |
Line 1437 sub readmap {
|
Line 1419 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, which suppresses |
|
# critical message checking (users without evb priv). |
|
# |
|
|
|
if ($critmsg_check) { |
my @what=&Apache::lonnet::dump('critical',$env{'user.domain'}, |
my ($redirect,$url) = &Apache::loncommon::critical_redirect(); |
$env{'user.name'}); |
if ($redirect) { |
if ($what[0]) { |
$retfurl = $url; |
if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) { |
|
$retfurl='/adm/email?critical=display'; |
} |
} |
} |
} |
return ($retfurl,$errtext); |
return ($retfurl,$errtext); |
} |
} |
|
|
Line 1544 sub build_tmp_hashes {
|
Line 1522 sub build_tmp_hashes {
|
# ---------------------------------------------------- Store away initial state |
# ---------------------------------------------------- Store away initial state |
{ |
{ |
my $cfh; |
my $cfh; |
if (open($cfh,">","$fn.state")) { |
if (open($cfh,">$fn.state")) { |
print $cfh join("\n",@cond); |
print $cfh join("\n",@cond); |
$gotstate = 1; |
$gotstate = 1; |
} else { |
} else { |
Line 1581 sub evalstate {
|
Line 1559 sub evalstate {
|
if (-e $fn) { |
if (-e $fn) { |
my @conditions=(); |
my @conditions=(); |
{ |
{ |
open(my $fh,"<",$fn); |
open(my $fh,"<$fn"); |
@conditions=<$fh>; |
@conditions=<$fh>; |
close($fh); |
close($fh); |
} |
} |