Diff for /rat/lonuserstate.pm between versions 1.149.2.5 and 1.150

version 1.149.2.5, 2021/12/14 22:52:33 version 1.150, 2016/01/26 14:30:40
Line 42  use Safe::Hole; Line 42  use Safe::Hole;
 use Opcode;  use Opcode;
 use Apache::lonenc;  use Apache::lonenc;
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use LONCAPA;  use LONCAPA qw(:DEFAULT :match);
 use File::Basename;  use File::Basename;
   
     
Line 62  my %randomorder; # maps to order content Line 62  my %randomorder; # maps to order content
 my %randomizationcode; # code used to grade folder for bubblesheet exam   my %randomizationcode; # code used to grade folder for bubblesheet exam 
 my %encurl; # URLs in this folder are supposed to be encrypted  my %encurl; # URLs in this folder are supposed to be encrypted
 my %hiddenurl; # this URL (or complete folder) is supposed to be hidden  my %hiddenurl; # this URL (or complete folder) is supposed to be hidden
 my %rescount; # count of unhidden items in each map  
 my %mapcount; # count of unhidden maps in each map  
   
 # ----------------------------------- Remove version from URL and store in hash  # ----------------------------------- Remove version from URL and store in hash
   
Line 242  sub loadmap { Line 240  sub loadmap {
   
     my @map_ids;      my @map_ids;
     my $codechecked;      my $codechecked;
     $rescount{$lpc} = 0;  
     $mapcount{$lpc} = 0;  
     while (my $token = $parser->get_token) {      while (my $token = $parser->get_token) {
  next if ($token->[0] ne 'S');   next if ($token->[0] ne 'S');
   
Line 253  sub loadmap { Line 249  sub loadmap {
     my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid);      my $resource_id = &parse_resource($token,$lpc,$ispage,$uri,$courseid);
     if (defined $resource_id) {      if (defined $resource_id) {
  push(@map_ids, $resource_id);   push(@map_ids, $resource_id);
                 if ($hash{'src_'.$lpc.'.'.$resource_id}) {  
                     $rescount{$lpc} ++;  
                     if (($hash{'src_'.$lpc.'.'.$resource_id}=~/\.sequence$/) ||  
                         ($hash{'src_'.$lpc.'.'.$resource_id}=~/\.page$/)) {  
                         $mapcount{$lpc} ++;  
                     }  
                 }  
                 unless ($codechecked) {                  unless ($codechecked) {
                     my $startsymb =                      my $startsymb =
                        &Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id,                         &Apache::lonnet::encode_symb($hash{'map_id_'.$lpc},$resource_id,
Line 289  sub loadmap { Line 278  sub loadmap {
     }      }
     undef($codechecked);      undef($codechecked);
   
   
     # Handle randomization and random selection      # Handle randomization and random selection
   
     if ($randomize) {      if ($randomize) {
         unless (&is_advanced($courseid)) {          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.              # Order of resources is not randomized if user has and advanced role in the course.
     my $seed;      my $seed;
   
Line 340  sub loadmap { Line 338  sub loadmap {
     @map_ids=&Math::Random::random_permutation(@map_ids);      @map_ids=&Math::Random::random_permutation(@map_ids);
  }   }
   
   
  my $from = shift(@map_ids);   my $from = shift(@map_ids);
  my $from_rid = $lpc.'.'.$from;   my $from_rid = $lpc.'.'.$from;
  $hash{'map_start_'.$uri} = $from_rid;   $hash{'map_start_'.$uri} = $from_rid;
Line 364  sub loadmap { Line 363  sub loadmap {
     $parser = HTML::TokeParser->new(\$instr);      $parser = HTML::TokeParser->new(\$instr);
     $parser->attr_encoded(1);      $parser->attr_encoded(1);
   
     # last parse out the mapalias params.  These provide mnemonic      # last parse out the mapalias params.  Thes provide mnemonic
     # tags to resources that can be used in conditions      # tags to resources that can be used in conditions
   
     while (my $token = $parser->get_token) {      while (my $token = $parser->get_token) {
Line 375  sub loadmap { Line 374  sub loadmap {
     }      }
 }  }
   
 sub is_advanced {  
     my ($courseid) = @_;  
     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'} = '';  
     }  
     return $advanced;  
 }  
   
 # -------------------------------------------------------------------- Resource  # -------------------------------------------------------------------- Resource
 #  #
Line 473  sub parse_resource { Line 460  sub parse_resource {
     # is not a page.  If the resource is a page then it must be      # is not a page.  If the resource is a page then it must be
     # assembled (at fetch time?).      # assembled (at fetch time?).
   
     if ($ispage) {      unless ($ispage) {
         if ($token->[2]->{'external'} eq 'true') { # external  
             $turi=~s{^http\://}{/ext/};  
         }  
     } else {  
  $turi=~/\.(\w+)$/;   $turi=~/\.(\w+)$/;
  my $embstyle=&Apache::loncommon::fileembstyle($1);   my $embstyle=&Apache::loncommon::fileembstyle($1);
  if ($token->[2]->{'external'} eq 'true') { # external   if ($token->[2]->{'external'} eq 'true') { # external
Line 492  sub parse_resource { Line 475  sub parse_resource {
     } elsif ($turi!~/\.(sequence|page)$/) {      } elsif ($turi!~/\.(sequence|page)$/) {
  $turi='/adm/coursedocs/showdoc'.$turi;   $turi='/adm/coursedocs/showdoc'.$turi;
     }      }
           } elsif ($turi=~ m{^/adm/$match_domain/$match_courseid/\d+/exttools?$}) {
               $turi='/adm/wrapper'.$turi;
  } elsif ($turi=~/\S/) { # normal non-empty internal resource   } elsif ($turi=~/\S/) { # normal non-empty internal resource
     my $mapdir=$uri;      my $mapdir=$uri;
     $mapdir=~s/[^\/]+$//;      $mapdir=~s/[^\/]+$//;
Line 567  sub parse_resource { Line 552  sub parse_resource {
     if (($turi=~/\.sequence$/) ||      if (($turi=~/\.sequence$/) ||
  ($turi=~/\.page$/)) {   ($turi=~/\.page$/)) {
  $hash{'is_map_'.$rid}=1;   $hash{'is_map_'.$rid}=1;
  if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) {   &loadmap($turi,$rid,$courseid);
     &loadmap($turi,$rid,$courseid);  
  }  
     }       } 
     return $token->[2]->{'id'};      return $token->[2]->{'id'};
 }  }
Line 725  sub parse_condition { Line 708  sub parse_condition {
 #  Typical attributes:  #  Typical attributes:
 #     to=n      - Number of the resource the parameter applies to.  #     to=n      - Number of the resource the parameter applies to.
 #     type=xx   - Type of parameter value (e.g. string_yesno or int_pos).  #     type=xx   - Type of parameter value (e.g. string_yesno or int_pos).
 #     name=xxx  - Name of parameter (e.g. parameter_randompick or parameter_randomorder).  #     name=xxx  - Name ofr parameter (e.g. parameter_randompick or parameter_randomorder).
 #     value=xxx - value of the parameter.  #     value=xxx - value of the parameter.
   
 sub parse_param {  sub parse_param {
Line 1133  sub hiddenurls { Line 1116  sub hiddenurls {
             if ($currentrids[$k]) {              if ($currentrids[$k]) {
  $hash{'randomout_'.$currentrids[$k]}=1;   $hash{'randomout_'.$currentrids[$k]}=1;
                 my ($mapid,$resid)=split(/\./,$currentrids[$k]);                  my ($mapid,$resid)=split(/\./,$currentrids[$k]);
                 if ($rescount{$mapid}) {  
                     $rescount{$mapid} --;  
                 }  
                 if ($hash{'is_map_'.$currentrids[$k]}) {  
                     if ($mapcount{$mapid}) {  
                         $mapcount{$mapid} --;  
                     }  
                 }  
                 $randomoutentry.='&'.                  $randomoutentry.='&'.
     &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},      &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
  $resid,   $resid,
Line 1153  sub hiddenurls { Line 1128  sub hiddenurls {
     foreach my $rid (keys(%hiddenurl)) {      foreach my $rid (keys(%hiddenurl)) {
  $hash{'randomout_'.$rid}=1;   $hash{'randomout_'.$rid}=1;
  my ($mapid,$resid)=split(/\./,$rid);   my ($mapid,$resid)=split(/\./,$rid);
         if ($rescount{$mapid}) {  
             $rescount{$mapid} --;  
         }  
         if ($hash{'is_map_'.$rid}) {  
             if ($mapcount{$mapid}) {  
                 $mapcount{$mapid} --;  
             }  
         }  
  $randomoutentry.='&'.   $randomoutentry.='&'.
     &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,      &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,
  $hash{'src_'.$rid}).'&';   $hash{'src_'.$rid}).'&';
Line 1171  sub hiddenurls { Line 1138  sub hiddenurls {
     }      }
 }  }
   
 # -------------------------------------- populate big hash with map breadcrumbs  
   
 # Create map_breadcrumbs_$pc from map_hierarchy_$pc by omitting intermediate  
 # maps not shown in Course Contents table.  
   
 sub mapcrumbs {  
     foreach my $key (keys(%rescount)) {  
         if ($hash{'map_hierarchy_'.$key}) {  
             my $skipnext = 0;  
             foreach my $id (split(/,/,$hash{'map_hierarchy_'.$key}),$key) {  
                 unless ($skipnext) {  
                     $hash{'map_breadcrumbs_'.$key} .= "$id,";  
                 }  
                 unless (($id == 0) || ($id == 1)) {  
                     if ((!$rescount{$id}) || ($rescount{$id} == 1 && $mapcount{$id} == 1)) {  
                         $skipnext = 1;  
                     } else {  
                         $skipnext = 0;  
                     }  
                 }  
             }  
             $hash{'map_breadcrumbs_'.$key} =~ s/,$//;  
         }  
     }  
 }  
   
 # ---------------------------------------------------- Read map and all submaps  # ---------------------------------------------------- Read map and all submaps
   
 sub readmap {  sub readmap {
     my ($short,$critmsg_check) = @_;      my $short=shift;
     $short=~s/^\///;      $short=~s/^\///;
   
     # TODO:  Hidden dependency on current user:      # TODO:  Hidden dependency on current user:
Line 1217  sub readmap { Line 1158  sub readmap {
     }      }
     @cond=('true:normal');      @cond=('true:normal');
   
     unless (open(LOCKFILE,">","$fn.db.lock")) {      unless (open(LOCKFILE,">$fn.db.lock")) {
  #    # 
  # Most likely a permissions problem on the lockfile or its directory.   # Most likely a permissions problem on the lockfile or its directory.
  #   #
Line 1235  sub readmap { Line 1176  sub readmap {
         &unlink_tmpfiles($fn);          &unlink_tmpfiles($fn);
     }      }
     undef %randompick;      undef %randompick;
     undef %randompickseed;  
     undef %randomorder;  
     undef %randomizationcode;  
     undef %hiddenurl;      undef %hiddenurl;
     undef %encurl;      undef %encurl;
     undef %rescount;  
     undef %mapcount;  
     $retfrid='';      $retfrid='';
     $errtext='';      $errtext='';
     my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.      my ($untiedhash,$untiedparmhash,$tiedhash,$tiedparmhash); # More state flags.
Line 1383  sub readmap { Line 1319  sub readmap {
             $lock=1;              $lock=1;
         }          }
         undef %randompick;          undef %randompick;
         undef %randompickseed;  
         undef %randomorder;  
         undef %randomizationcode;  
         undef %hiddenurl;          undef %hiddenurl;
         undef %encurl;          undef %encurl;
         undef %rescount;  
         undef %mapcount;  
         $errtext='';          $errtext='';
         $retfrid='';          $retfrid='';
  #   #
Line 1437  sub readmap { Line 1368  sub readmap {
   
 #  Depends on user must parameterize this as well..or separate as this is:  #  Depends on user must parameterize this as well..or separate as this is:
 #  more part of determining what someone sees on entering a course?  #  more part of determining what someone sees on entering a course?
 #  When lonuserstate::readmap() is called from lonroles.pm, i.e.,  
 #  after selecting a role in a course, critical_redirect will be called,  
 #  unless the course has a blocking event in effect, which suppresses  
 #  critical message checking (users without evb priv).  
 #  
   
     if ($critmsg_check) {      my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},
         my ($redirect,$url) = &Apache::loncommon::critical_redirect();     $env{'user.name'});
         if ($redirect) {      if ($what[0]) {
             $retfurl = $url;   if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
       $retfurl='/adm/email?critical=display';
         }          }
     }       }
     return ($retfurl,$errtext);      return ($retfurl,$errtext);
 }  }
   
Line 1512  sub build_tmp_hashes { Line 1439  sub build_tmp_hashes {
         &traceroute('0',$hash{'map_start_'.$uri},'&');          &traceroute('0',$hash{'map_start_'.$uri},'&');
         &accinit($uri,$short,$fn);          &accinit($uri,$short,$fn);
         &hiddenurls();          &hiddenurls();
         &mapcrumbs();  
     }      }
     $errtext .= &get_mapalias_errors();      $errtext .= &get_mapalias_errors();
 # ------------------------------------------------------- Put versions into src  # ------------------------------------------------------- Put versions into src
Line 1544  sub build_tmp_hashes { Line 1470  sub build_tmp_hashes {
 # ---------------------------------------------------- Store away initial state  # ---------------------------------------------------- Store away initial state
     {      {
         my $cfh;          my $cfh;
         if (open($cfh,">","$fn.state")) {          if (open($cfh,">$fn.state")) {
             print $cfh join("\n",@cond);              print $cfh join("\n",@cond);
             $gotstate = 1;              $gotstate = 1;
         } else {          } else {
Line 1581  sub evalstate { Line 1507  sub evalstate {
     if (-e $fn) {      if (-e $fn) {
  my @conditions=();   my @conditions=();
  {   {
     open(my $fh,"<",$fn);      open(my $fh,"<$fn");
     @conditions=<$fh>;      @conditions=<$fh>;
             close($fh);              close($fh);
  }     }  

Removed from v.1.149.2.5  
changed lines
  Added in v.1.150


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>