--- rat/lonuserstate.pm	2013/06/26 21:22:55	1.146
+++ rat/lonuserstate.pm	2017/09/03 18:19:09	1.152
@@ -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.146 2013/06/26 21:22:55 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.152 2017/09/03 18:19:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use Safe::Hole;
 use Opcode;
 use Apache::lonenc;
 use Fcntl qw(:flock);
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 use File::Basename;
 
  
@@ -184,7 +184,7 @@ sub loadmap {
     # We can only nest sequences or pages.  Anything else is an illegal nest.
 
     unless (($fn=~/\.sequence$/) || $ispage) { 
-	$errtext.=&mt("<br />Invalid map: <tt>[_1]</tt>",$fn);
+	$errtext.='<br />'.&mt('Invalid map: [_1]',"<tt>$fn</tt>");
 	return; 
     }
 
@@ -193,7 +193,9 @@ sub loadmap {
     my $instr=&Apache::lonnet::getfile($fn);
 
     if ($instr eq -1) {
-        $errtext.=&mt('<br />Map not loaded: The file <tt>[_1]</tt> does not exist.',$fn);
+        $errtext.= '<br />'
+                  .&mt('Map not loaded: The file [_1] does not exist.',
+                       "<tt>$fn</tt>");
 	return;
     }
 
@@ -276,16 +278,23 @@ sub loadmap {
     }
     undef($codechecked);
 
-
     # Handle randomization and random selection
 
     if ($randomize) {
-	if (!$env{'request.role.adv'}) {
+        my $advanced;
+        if ($env{'request.course.id'}) {
+            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+        } else {
+            $env{'request.course.id'} = $courseid;
+            $advanced = (&Apache::lonnet::allowed('adv') eq 'F');
+            $env{'request.course.id'} = '';
+        }
+        unless ($advanced) {
+            # Order of resources is not randomized if user has and advanced role in the course.
 	    my $seed;
 
-	    # In the advanced role, the map's random seed
-	    # parameter is used as the basis for computing the
-	    # seed ... if it has been specified:
+            # If the map's random seed parameter has been specified
+            # it is used as the basis for computing the seed ...
 
 	    if (defined($randompickseed{$parent_rid})) {
 		$seed = $randompickseed{$parent_rid};
@@ -325,10 +334,9 @@ sub loadmap {
 	    # processing the randomorder parameter if it is set, not
 	    # randompick.
 
-	    @map_ids=&Math::Random::random_permutation(@map_ids); 
+	    @map_ids=&Math::Random::random_permutation(@map_ids);
 	}
 
-
 	my $from = shift(@map_ids);
 	my $from_rid = $lpc.'.'.$from;
 	$hash{'map_start_'.$uri} = $from_rid;
@@ -353,7 +361,7 @@ sub loadmap {
     $parser = HTML::TokeParser->new(\$instr);
     $parser->attr_encoded(1);
 
-    # last parse out the mapalias params.  Thes provide mnemonic
+    # last parse out the mapalias params.  These provide mnemonic
     # tags to resources that can be used in conditions
 
     while (my $token = $parser->get_token) {
@@ -465,6 +473,8 @@ sub parse_resource {
 	    } elsif ($turi!~/\.(sequence|page)$/) {
 		$turi='/adm/coursedocs/showdoc'.$turi;
 	    }
+        } elsif ($turi=~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
+            $turi='/adm/wrapper'.$turi;
 	} elsif ($turi=~/\S/) { # normal non-empty internal resource
 	    my $mapdir=$uri;
 	    $mapdir=~s/[^\/]+$//;
@@ -696,7 +706,7 @@ sub parse_condition {
 #  Typical attributes:
 #     to=n      - Number of the resource the parameter applies to.
 #     type=xx   - Type of parameter value (e.g. string_yesno or int_pos).
-#     name=xxx  - Name ofr parameter (e.g. parameter_randompick or parameter_randomorder).
+#     name=xxx  - Name of parameter (e.g. parameter_randompick or parameter_randomorder).
 #     value=xxx - value of the parameter.
 
 sub parse_param {
@@ -938,7 +948,9 @@ sub traceroute {
 			$further=simplify('('.'_'.$rid.')&('.
 					  $hash{'condid_'.$hash{'undercond_'.$id}}.')');
 		    } else {
-			$errtext.=&mt('<br />Undefined condition ID: [_1]',$hash{'undercond_'.$id});
+			$errtext.= '<br />'.
+                                   &mt('Undefined condition ID: [_1]',
+                                       $hash{'undercond_'.$id});
 		    }
                 }
 		#  Recurse to resoruces that have to's to us.
@@ -1060,7 +1072,7 @@ sub accinit {
 
 sub hiddenurls {
     my $randomoutentry='';
-    foreach my $rid (keys %randompick) {
+    foreach my $rid (keys(%randompick)) {
         my $rndpick=$randompick{$rid};
         my $mpc=$hash{'map_pc_'.$hash{'src_'.$rid}};
 # ------------------------------------------- put existing resources into array
@@ -1111,7 +1123,7 @@ sub hiddenurls {
         }
     }
 # ------------------------------ take care of explicitly hidden urls or folders
-    foreach my $rid (keys %hiddenurl) {
+    foreach my $rid (keys(%hiddenurl)) {
 	$hash{'randomout_'.$rid}=1;
 	my ($mapid,$resid)=split(/\./,$rid);
 	$randomoutentry.='&'.
@@ -1548,8 +1560,8 @@ sub evalstate {
 			     $count++;
 			 }
 			 my ($mapid) = split(/\./,$id);
-                         &mt('Resource "[_1]" <br /> in Map "[_2]"',
-			     $hash{'title_'.$id},
+                         &mt('Resource [_1][_2]in Map [_3]',
+			     $hash{'title_'.$id},'<br />',
 			     $hash{'title_'.$hash{'ids_'.$hash{'map_id_'.$mapid}}});
 		     } (@{ $mapalias_cache{$mapalias} }));
 	    next if ($count < 2);