--- rat/lonpageflip.pm	2013/11/28 02:23:25	1.83
+++ rat/lonpageflip.pm	2014/12/11 13:16:49	1.86
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.83 2013/11/28 02:23:25 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.86 2014/12/11 13:16:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use LONCAPA;
 use Apache::Constants qw(:common :http REDIRECT);
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonlocal;
 use HTML::TokeParser;
 use GDBM_File;
 
@@ -389,7 +390,7 @@ sub handler {
 	      untie(%hash);
 # --------------------------------------------------------- Store position info
               $cachehash{$startoutmap}{'last_direction'}=[$direction,'notasymb'];
-              foreach my $thismap (keys %cachehash) {
+              foreach my $thismap (keys(%cachehash)) {
 		  my $mapnum=$cachehash{$thismap}->{'mapnum'};
 		  delete($cachehash{$thismap}->{'mapnum'});
 		  &Apache::lonnet::symblist($thismap,
@@ -404,24 +405,13 @@ sub handler {
 		  if ($direction eq 'back') {
                      &Apache::lonnet::linklog($redirecturl,$currenturl);
 		  }
-# ------------------------------------------------- Check for critical messages
-		  if ((time-$env{'user.criticalcheck.time'})>300) {
-                     my @what=&Apache::lonnet::dump
-                                  ('critical',$env{'user.domain'},
-                                              $env{'user.name'});
-                     if ($what[0]) {
-	                if (($what[0] ne 'con_lost') && 
-                            ($what[0]!~/^error\:/)) {
-	                   $redirecturl='/adm/email?critical=display';
-			   $redirectsymb='';
-                        }
-                     }
-                     &Apache::lonnet::appenv({'user.criticalcheck.time'=>time});
-		  }
-
+# ------------------------------------- Check for and display critical messages
+                  my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
+                  unless ($redirect) { 
+                      $url=&Apache::lonnet::absolute_url().$redirecturl;
+		      $url = &add_get_param($url, { 'symb' => $redirectsymb});
+                  }
 		  &Apache::loncommon::content_type($r,'text/html');
-		  my $url=&Apache::lonnet::absolute_url().$redirecturl;
-		  $url = &add_get_param($url, { 'symb' => $redirectsymb});
                   $r->header_out(Location => $url);
                   return REDIRECT;
 	      } else {