--- rat/lonuserstate.pm	2000/11/21 20:46:42	1.20
+++ rat/lonuserstate.pm	2001/08/30 21:56:55	1.23
@@ -12,7 +12,8 @@
 #
 # 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 Gerd Kortemeyer
+# 11/1,11/2,11/14,11/16,11/22,12/28,
+# 07/05/01,08/30 Gerd Kortemeyer
 
 package Apache::lonuserstate;
 
@@ -24,6 +25,7 @@ use Apache::lonnet();
 use GDBM_File;
 use Apache::lonmsg;
 use Safe;
+use Safe::Hole;
 use Opcode;
 
 # ---------------------------------------------------- Globals for this package
@@ -33,6 +35,7 @@ my %hash;    # The big tied hash
 my %parmhash;# The hash with the parameters
 my @cond;    # Array with all of the conditions
 my $errtext; # variable with all errors
+my $retfurl; # variable with the very first URL in the course
 
 # --------------------------------------------------------- Loads map from disk
 
@@ -53,6 +56,8 @@ sub loadmap {
        return OK; 
     }
 
+    my $ispage=($fn=~/\.page$/);
+
     unless (-e $fn) {
 	my $returned=Apache::lonnet::repcopy($fn);
         unless ($returned eq OK) {
@@ -96,6 +101,18 @@ sub loadmap {
                     $hash{'kind_'.$rid}='res';
                     $hash{'title_'.$rid}=$token->[2]->{'title'};
                     my $turi=$token->[2]->{'src'};
+                    unless ($ispage) {
+                        $turi=~/\.(\w+)$/;
+                        my $embstyle=&Apache::lonnet::fileembstyle($1);
+                        if ($token->[2]->{'external'} eq 'true') {
+                            $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
+                        } else {
+                           my $embstyle=&Apache::lonnet::fileembstyle($1);
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+			       $turi='/adm/wrapper'.$turi;
+                           }
+                        }
+		    }
                     $hash{'src_'.$rid}=$turi;
 
                     if (defined($hash{'ids_'.$turi})) {
@@ -104,7 +121,7 @@ sub loadmap {
                         $hash{'ids_'.$turi}=''.$rid;
                     }
 
-                    if ($token->[2]->{'src'}=~/\/\//) {
+                    if ($token->[2]->{'external'} eq 'true') {
                         $hash{'ext_'.$rid}='true:';
                     } else {
                         $hash{'ext_'.$rid}='false:';
@@ -224,6 +241,9 @@ sub traceroute {
     $sofar=simplify($sofar);
     unless ($beenhere=~/\&$rid\&/) {
        $beenhere.=$rid.'&';  
+       if ($retfurl eq '') {
+           $retfurl=$hash{'src_'.$rid};
+       }
        if (defined($hash{'conditions_'.$rid})) {
 	   $hash{'conditions_'.$rid}=simplify(
            '('.$hash{'conditions_'.$rid}.')|('.$sofar.')');
@@ -304,11 +324,13 @@ sub accinit {
 	  map {
 	    my $resid=$_;
             my $uri=$hash{'src_'.$resid};
+            $uri=~s/^\/adm\/wrapper//;
             my @uriparts=split(/\//,$uri);
             my $urifile=$uriparts[$#uriparts];
             $#uriparts--;
             my $uripath=join('/',@uriparts);
             $uripath=~s/^\/res\///;
+           if ($uripath) {
             my $uricond='0';
             if (defined($hash{'conditions_'.$resid})) {
  		$uricond=$captured{$hash{'conditions_'.$resid}};
@@ -326,7 +348,8 @@ sub accinit {
             } else {
                 $acchash{'acc.res.'.$short.'.'.$uripath}=
                  '&'.$urifile.':'.$uricond.'&';
-            } 
+            }
+           } 
          } split(/\,/,$hash{$_});
       }
     } keys %hash;
@@ -358,6 +381,7 @@ sub readmap {
    unlink($fn.'_symb.db');
    unlink($fn.'.state');
    unlink($fn.'parms.db');
+   $retfurl='';
    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_WRCREAT,0640)) &&
        (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_WRCREAT,0640))) {
     %hash=();
@@ -387,13 +411,13 @@ sub readmap {
                        "Could not tie coursemap $fn for $uri.</font>"); 
    }
    &Apache::lonmsg::author_res_msg($ENV{'request.course.uri'},$errtext);
-   return $errtext;
+   return ($retfurl,$errtext);
 }
 
 # ------------------------------------------------------- Evaluate state string
 
 sub evalstate {
-    my $safeeval = new Safe;
+
     my $fn=$ENV{'request.course.fn'}.'.state';
     my $state='2';
     if (-e $fn) {
@@ -402,10 +426,12 @@ sub evalstate {
         my $fh=Apache::File->new($fn);
         @conditions=<$fh>;
        }  
+       my $safeeval = new Safe;
+       my $safehole = new Safe::Hole;
        $safeeval->permit("entereval");
        $safeeval->permit(":base_math");
        $safeeval->deny(":base_io");
-       $safeeval->share_from('Apache::lonnet',['&EXT']);
+       $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
        map {
 	   my $line=$_;
            chomp($line);