version 1.96, 2005/09/23 21:39:09
|
version 1.100, 2006/02/10 22:33:42
|
Line 31 package Apache::lonuserstate;
|
Line 31 package Apache::lonuserstate;
|
|
|
# ------------------------------------------------- modules used by this module |
# ------------------------------------------------- modules used by this module |
use strict; |
use strict; |
use Apache::Constants qw(:common :http); |
|
use HTML::TokeParser; |
use HTML::TokeParser; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
Line 104 sub processversionfile {
|
Line 103 sub processversionfile {
|
|
|
sub loadmap { |
sub loadmap { |
my $uri=shift; |
my $uri=shift; |
if ($hash{'map_pc_'.$uri}) { return OK; } |
if ($hash{'map_pc_'.$uri}) { return; } |
|
|
$pc++; |
$pc++; |
my $lpc=$pc; |
my $lpc=$pc; |
Line 119 sub loadmap {
|
Line 118 sub loadmap {
|
unless (($fn=~/\.sequence$/) || |
unless (($fn=~/\.sequence$/) || |
($fn=~/\.page$/)) { |
($fn=~/\.page$/)) { |
$errtext.="Invalid map: $fn\n"; |
$errtext.="Invalid map: $fn\n"; |
return OK; |
return; |
} |
} |
|
|
my $instr=&Apache::lonnet::getfile($fn); |
my $instr=&Apache::lonnet::getfile($fn); |
Line 165 sub loadmap {
|
Line 164 sub loadmap {
|
if ($token->[2]->{'external'} eq 'true') { # external |
if ($token->[2]->{'external'} eq 'true') { # external |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
$turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//; |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
if (($embstyle eq 'img') |
|
|| ($embstyle eq 'emb') |
|
|| ($embstyle eq 'wrp')) { |
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} elsif ($embstyle eq 'ssi') { |
} elsif ($embstyle eq 'ssi') { |
#do nothing with these |
#do nothing with these |
Line 176 sub loadmap {
|
Line 177 sub loadmap {
|
my $mapdir=$uri; |
my $mapdir=$uri; |
$mapdir=~s/[^\/]+$//; |
$mapdir=~s/[^\/]+$//; |
$turi=&Apache::lonnet::hreflocation($mapdir,$turi); |
$turi=&Apache::lonnet::hreflocation($mapdir,$turi); |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
if (($embstyle eq 'img') |
|
|| ($embstyle eq 'emb') |
|
|| ($embstyle eq 'wrp')) { |
$turi='/adm/wrapper'.$turi; |
$turi='/adm/wrapper'.$turi; |
} |
} |
} |
} |
Line 440 sub accinit {
|
Line 443 sub accinit {
|
foreach (split(/\,/,$hash{$_})) { |
foreach (split(/\,/,$hash{$_})) { |
my $resid=$_; |
my $resid=$_; |
my $uri=$hash{'src_'.$resid}; |
my $uri=$hash{'src_'.$resid}; |
$uri=~s/^\/adm\/wrapper//; |
my ($uripath,$urifile) = |
$uri=&Apache::lonnet::declutter($uri); |
&Apache::lonnet::split_uri_for_cond($uri); |
my @uriparts=split(/\//,$uri); |
|
my $urifile=$uriparts[$#uriparts]; |
|
$#uriparts--; |
|
my $uripath=join('/',@uriparts); |
|
if ($uripath) { |
if ($uripath) { |
my $uricond='0'; |
my $uricond='0'; |
if (defined($hash{'conditions_'.$resid})) { |
if (defined($hash{'conditions_'.$resid})) { |