Diff for /rat/lonuserstate.pm between versions 1.159 and 1.163

version 1.159, 2020/04/22 14:52:56 version 1.163, 2021/04/29 14:54:36
Line 570  sub parse_resource { Line 570  sub parse_resource {
     if (($turi=~/\.sequence$/) ||      if (($turi=~/\.sequence$/) ||
  ($turi=~/\.page$/)) {   ($turi=~/\.page$/)) {
  $hash{'is_map_'.$rid}=1;   $hash{'is_map_'.$rid}=1;
  if ((&is_advanced($courseid)) || (!$hiddenurl{$rid})) {   if ((!$hiddenurl{$rid}) || (&is_advanced($courseid))) {
     &loadmap($turi,$rid,$courseid);      &loadmap($turi,$rid,$courseid);
  }   }
     }       } 
Line 1211  sub mapcrumbs { Line 1211  sub mapcrumbs {
 # ---------------------------------------------------- Read map and all submaps  # ---------------------------------------------------- Read map and all submaps
   
 sub readmap {  sub readmap {
     my $short=shift;      my ($short,$critmsg_check) = @_;
     $short=~s/^\///;      $short=~s/^\///;
   
     # TODO:  Hidden dependency on current user:      # TODO:  Hidden dependency on current user:
Line 1450  sub readmap { Line 1450  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).
   #
   
     my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},      if ($critmsg_check) {
    $env{'user.name'});          my ($redirect,$url) = &Apache::loncommon::critical_redirect();
     if ($what[0]) {          if ($redirect) {
  if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {              $retfurl = $url;
     $retfurl='/adm/email?critical=display';  
         }          }
     }      }
     return ($retfurl,$errtext);      return ($retfurl,$errtext);

Removed from v.1.159  
changed lines
  Added in v.1.163


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