--- rat/lonuserstate.pm	2020/04/22 15:24:07	1.160
+++ rat/lonuserstate.pm	2021/04/19 20:09:07	1.161
@@ -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.160 2020/04/22 15:24:07 raeburn Exp $
+# $Id: lonuserstate.pm,v 1.161 2021/04/19 20:09:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1211,7 +1211,7 @@ sub mapcrumbs {
 # ---------------------------------------------------- Read map and all submaps
 
 sub readmap {
-    my $short=shift;
+    my ($short,$critmsg_check) = @_;
     $short=~s/^\///;
 
     # TODO:  Hidden dependency on current user:
@@ -1450,13 +1450,17 @@ sub readmap {
 
 #  Depends on user must parameterize this as well..or separate as this is:
 #  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, when suppresses
+#  critical message checking (users without evb priv).
+#
 
-    my @what=&Apache::lonnet::dump('critical',$env{'user.domain'},
-				   $env{'user.name'});
-    if ($what[0]) {
-	if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
-	    $retfurl='/adm/email?critical=display';
-        }
+   if ($critmsg_check) {
+       my ($redirect,$url) = &Apache::loncommon::critical_redirect();
+       if ($redirect) {
+           $retfurl = $url;
+       }
     }
     return ($retfurl,$errtext);
 }