version 1.78, 2004/05/11 06:28:23
|
version 1.79, 2004/10/26 15:10:42
|
Line 335 sub traceroute {
|
Line 335 sub traceroute {
|
$sofar=simplify($sofar); |
$sofar=simplify($sofar); |
unless ($beenhere=~/\&$rid\&/) { |
unless ($beenhere=~/\&$rid\&/) { |
$beenhere.=$rid.'&'; |
$beenhere.=$rid.'&'; |
if ($hdnflag) { |
my ($mapid,$resid)=split(/\./,$rid); |
$hiddenurl{$rid}=1; |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
} |
my $encrypt=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
if ($encflag) { |
if ($hdnflag || lc($encrypt) eq 'yes') { $hiddenurl{$rid}=1; } |
$encurl{$rid}=1; |
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
} |
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
&& ($hash{'src_'.$rid}!~/\.sequence$/)) { |
my ($mapid,$resid)=split(/\./,$rid); |
$retfurl=$hash{'src_'.$rid}.(($hash{'src_'.$rid}=~/\?/)?'&':'?'). |
$retfurl=$hash{'src_'.$rid}. |
'symb='.$symb; |
(($hash{'src_'.$rid}=~/\?/)?'&':'?').'symb='. |
|
&Apache::lonnet::symbclean( |
|
&Apache::lonnet::declutter($hash{'map_id_'.$mapid}). |
|
'___'.$resid.'___'. |
|
&Apache::lonnet::declutter($hash{'src_'.$rid})); |
|
} |
} |
if (defined($hash{'conditions_'.$rid})) { |
if (defined($hash{'conditions_'.$rid})) { |
$hash{'conditions_'.$rid}=simplify( |
$hash{'conditions_'.$rid}=simplify( |
Line 468 sub accinit {
|
Line 463 sub accinit {
|
my $courseuri=$uri; |
my $courseuri=$uri; |
$courseuri=~s/^\/res\///; |
$courseuri=~s/^\/res\///; |
&Apache::lonnet::delenv('(acc\.|httpref\.)'); |
&Apache::lonnet::delenv('(acc\.|httpref\.)'); |
&Apache::lonnet::appenv(%acchash, |
&Apache::lonnet::appenv(%acchash); |
"request.course.id" => $short, |
|
"request.course.fn" => $fn, |
|
"request.course.uri" => $courseuri); |
|
} |
} |
|
|
# ---------------- Selectively delete from randompick maps and hidden url parms |
# ---------------- Selectively delete from randompick maps and hidden url parms |
Line 572 sub readmap {
|
Line 564 sub readmap {
|
$hash{'is_map_0.0'}=1; |
$hash{'is_map_0.0'}=1; |
loadmap($uri); |
loadmap($uri); |
if (defined($hash{'map_start_'.$uri})) { |
if (defined($hash{'map_start_'.$uri})) { |
|
&Apache::lonnet::appenv("request.course.id" => $short, |
|
"request.course.fn" => $fn, |
|
"request.course.uri" => $uri); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&traceroute('0',$hash{'map_start_'.$uri},'&'); |
&accinit($uri,$short,$fn); |
&accinit($uri,$short,$fn); |
&hiddenurls(); |
&hiddenurls(); |