--- rat/lonuserstate.pm 2004/04/26 19:16:45 1.77 +++ 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.77 2004/04/26 19:16:45 www Exp $ +# $Id: lonuserstate.pm,v 1.78.2.1 2005/01/19 20:18:44 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -162,7 +162,9 @@ sub loadmap { } elsif ($turi=~/^\/*uploaded\//) { # uploaded 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; } } elsif ($turi=~/\S/) { # normal non-empty internal resource @@ -287,7 +289,7 @@ sub loadmap { } if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) { if ($token->[2]->{'value'}=~/^yes$/i) { - $encurl{$referid}=1; + $hiddenurl{$referid}=1; } } if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) { @@ -447,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.'&';