--- rat/lonuserstate.pm 2003/10/23 21:01:54 1.63
+++ rat/lonuserstate.pm 2005/01/19 20:18:44 1.78.2.1
@@ -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.63 2003/10/23 21:01:54 albertel Exp $
+# $Id: lonuserstate.pm,v 1.78.2.1 2005/01/19 20:18:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,22 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Server for RAT Maps
-#
-# (Edit Handler for RAT Maps
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30 Gerd Kortemeyer)
-# 7/1 Gerd Kortemeyer)
-# 7/1,7/3,7/4,7/7,7/8,7/10 Gerd Kortemeyer)
-#
-# 7/15,7/17,7/18,8/1,8/2,8/4,8/5,8/21,8/22,8/23,8/30,
-# 9/2,9/4,9/29,9/30,10/2,10/11,10/30,10/31,
-# 11/1,11/2,11/14,11/16,11/22,12/28,
-# YEAR=2001
-# 07/05/01,08/30,08/31 Gerd Kortemeyer
-#
###
package Apache::lonuserstate;
@@ -57,6 +41,7 @@ use Apache::lonmsg;
use Safe;
use Safe::Hole;
use Opcode;
+use Apache::lonenc;
# ---------------------------------------------------- Globals for this package
@@ -68,6 +53,8 @@ my $errtext; # variable with all errors
my $retfurl; # variable with the very first URL in the course
my %randompick; # randomly picked resources
my %randompickseed; # optional seed for randomly picking resources
+my %encurl; # URLs in this folder are supposed to be encrypted
+my %hiddenurl; # this URL (or complete folder) is supposed to be hidden
# ----------------------------------- Remove version from URL and store in hash
@@ -89,7 +76,10 @@ sub putinversion {
my $uri=shift;
if ($hash{'version_'.$uri}) {
my $version=$hash{'version_'.$uri};
- if ($version eq 'current') { return $uri; }
+ if ($version eq 'mostrecent') { return $uri; }
+ if ($version eq &Apache::lonnet::getversion(
+ &Apache::lonnet::filelocation('',$uri)))
+ { return $uri; }
$uri=~s/\.(\w+)$/\.$version\.$1/;
}
return $uri;
@@ -98,7 +88,7 @@ sub putinversion {
# ----------------------------------------- Processing versions file for course
sub processversionfile {
- my %cenv=shift;
+ my %cenv=@_;
my %versions=&Apache::lonnet::dump('resourceversions',
$cenv{'domain'},
$cenv{'num'});
@@ -170,23 +160,29 @@ sub loadmap {
if ($token->[2]->{'external'} eq 'true') { # external
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
} elsif ($turi=~/^\/*uploaded\//) { # uploaded
- if (($embstyle eq 'img') || ($embstyle eq 'emb')
- || ($embstyle eq 'ssi')) {
+ if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
$turi='/adm/wrapper'.$turi;
- } elsif ($turi!~/\.(sequence|page)$/) {
+ } elsif ($embstyle eq 'ssi') {
+ #do nothing with these
+ } elsif ($turi!~/\.(sequence|page)$/) {
$turi='/adm/coursedocs/showdoc'.$turi;
}
- } else { # normal internal resource
- if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
- $turi='/adm/wrapper'.$turi;
- }
+ } elsif ($turi=~/\S/) { # normal non-empty internal resource
+ my $mapdir=$uri;
+ $mapdir=~s/[^\/]+$//;
+ $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
+ if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+ $turi='/adm/wrapper'.$turi;
+ }
}
}
-
- if (defined($hash{'ids_'.$turi})) {
- $hash{'ids_'.$turi}.=','.$rid;
+# Store reverse lookup, remove query string
+ my $idsuri=$turi;
+ $idsuri=~s/\?.+$//;
+ if (defined($hash{'ids_'.$idsuri})) {
+ $hash{'ids_'.$idsuri}.=','.$rid;
} else {
- $hash{'ids_'.$turi}=''.$rid;
+ $hash{'ids_'.$idsuri}=''.$rid;
}
if
@@ -282,15 +278,25 @@ sub loadmap {
} else {
$hash{'param_'.$referid}=''.$newparam;
}
- if ($token->[2]->{'name'} eq 'parameter_mapalias') {
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) {
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
}
- if ($token->[2]->{'name'} eq 'parameter_randompick') {
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
$randompick{$referid}=$token->[2]->{'value'};
}
- if ($token->[2]->{'name'} eq 'parameter_randompickseed') {
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
$randompick{$referid}=$token->[2]->{'value'};
}
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
+ if ($token->[2]->{'value'}=~/^yes$/i) {
+ $hiddenurl{$referid}=1;
+ }
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) {
+ if ($token->[2]->{'value'}=~/^yes$/i) {
+ $hiddenurl{$referid}=1;
+ }
+ }
}
}
@@ -325,10 +331,16 @@ sub simplify {
# -------------------------------------------------------- Build condition hash
sub traceroute {
- my ($sofar,$rid,$beenhere)=@_;
+ my ($sofar,$rid,$beenhere,$encflag,$hdnflag)=@_;
$sofar=simplify($sofar);
unless ($beenhere=~/\&$rid\&/) {
$beenhere.=$rid.'&';
+ if ($hdnflag) {
+ $hiddenurl{$rid}=1;
+ }
+ if ($encflag) {
+ $encurl{$rid}=1;
+ }
if (($retfurl eq '') && ($hash{'src_'.$rid})
&& ($hash{'src_'.$rid}!~/\.sequence$/)) {
my ($mapid,$resid)=split(/\./,$rid);
@@ -347,7 +359,9 @@ sub traceroute {
}
if (defined($hash{'is_map_'.$rid})) {
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
- &traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&');
+ &traceroute($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},'&',
+ $encflag || $encurl{$rid},
+ $hdnflag || $hiddenurl{$rid});
if (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) {
$sofar=
$hash{'conditions_'.$hash{'map_finish_'.$hash{'src_'.$rid}}};
@@ -366,7 +380,7 @@ sub traceroute {
.$hash{'undercond_'.$_}.'. ';
}
}
- &traceroute($further,$hash{'goesto_'.$_},$beenhere);
+ &traceroute($further,$hash{'goesto_'.$_},$beenhere,$encflag,$hdnflag);
}
}
}
@@ -435,9 +449,9 @@ sub accinit {
/(\&\Q$urifile\E\:[^\&]*)/) {
my $replace=$1;
my $regexp=$replace;
- $regexp=~s/\|/\\\|/g;
+ #$regexp=~s/\|/\\\|/g;
$acchash{'acc.res.'.$short.'.'.$uripath}
- =~s/$regexp/$replace\|$uricond/;
+ =~s/\Q$regexp\E/$replace\|$uricond/;
} else {
$acchash{'acc.res.'.$short.'.'.$uripath}.=
$urifile.':'.$uricond.'&';
@@ -460,9 +474,9 @@ sub accinit {
"request.course.uri" => $courseuri);
}
-# ------------------------------------- Selectively delete from randompick maps
+# ---------------- Selectively delete from randompick maps and hidden url parms
-sub pickrandom {
+sub hiddenurls {
my $randomoutentry='';
foreach my $rid (keys %randompick) {
my $rndpick=$randompick{$rid};
@@ -504,6 +518,18 @@ sub pickrandom {
}
}
}
+# ------------------------------ take care of explicitly hidden urls or folders
+ foreach my $rid (keys %hiddenurl) {
+ $hash{'randomout_'.$rid}=1;
+ my ($mapid,$resid)=split(/\./,$rid);
+ $randomoutentry.='&'.
+ &Apache::lonnet::symbclean(
+ &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
+ '___'.$resid.'___'.
+ &Apache::lonnet::declutter($hash{'src_'.$rid})
+ ).'&';
+ }
+# --------------------------------------- append randomout entry to environment
if ($randomoutentry) {
&Apache::lonnet::appenv('acc.randomout' => $randomoutentry);
}
@@ -529,6 +555,8 @@ sub readmap {
unlink($fn.'.state');
unlink($fn.'parms.db');
undef %randompick;
+ undef %hiddenurl;
+ undef %encurl;
$retfurl='';
if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT(),0640)) &&
(tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT(),0640))) {
@@ -546,7 +574,7 @@ sub readmap {
if (defined($hash{'map_start_'.$uri})) {
&traceroute('0',$hash{'map_start_'.$uri},'&');
&accinit($uri,$short,$fn);
- &pickrandom();
+ &hiddenurls();
}
# ------------------------------------------------------- Put versions into src
foreach (keys %hash) {
@@ -554,10 +582,17 @@ sub readmap {
$hash{$_}=&putinversion($hash{$_});
}
}
+# ---------------------------------------------------------------- Encrypt URLs
+ foreach (keys %encurl) {
+ $hash{'src_'.$_}=&Apache::lonenc::encrypted($hash{'src_'.$_});
+ }
+# ----------------------------------------------- Close hashes to finally store
+# --------------------------------- Routine must pass this point, no early outs
unless ((untie(%hash)) && (untie(%parmhash))) {
&Apache::lonnet::logthis("WARNING: ".
"Could not untie coursemap $fn for $uri.");
}
+# ---------------------------------------------------- Store away initial state
{
my $cfh;
if ($cfh=Apache::File->new(">$fn.state")) {
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.