--- rat/lonpageflip.pm	2010/03/16 19:56:02	1.80
+++ rat/lonpageflip.pm	2014/12/11 13:16:49	1.86
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.80 2010/03/16 19:56:02 droeschl 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 {
@@ -432,13 +422,16 @@ sub handler {
 						     'explain' =>
 						     'You have reached the end of the sequence of materials.',
 						     'back' => 'Go Back',
-						     'nav' => 'Navigate Course Content',
+						     'nav' => 'Course Contents',
 						     'wherenext' =>
 						     'There are several possibilities of where to go next',
 						     'pick' =>
 						     'Please click on the the resource you intend to access',
 						     'titleheader' => 'Title',
 						     'type' => 'Type');
+                  if (&Apache::loncommon::course_type() eq 'Community') {
+                      $lt{'nav'} = &mt('Community Contents');
+                  }
                   if ($#possibilities>0) {
 		      my $start_page=
 			  &Apache::loncommon::start_page('Multiple Resources');
@@ -464,21 +457,17 @@ ENDSTART
                      }
                      $r->print('</table>');
                   } else {
-		      my $start_page=
-			  &Apache::loncommon::start_page('No Resource');
-		      $r->print(<<ENDNONE);
-$start_page
-<h3>$lt{'title'}</h3>
-<p>$lt{'explain'}</p>
-ENDNONE
-		  }
-		  $r->print(<<ENDMENU);
-<ul>
-<li><a href="/adm/flip?postdata=return:">$lt{'back'}</a></li>
-<li><a href="/adm/navmaps">$lt{'nav'}</a></li>
-</ul>
-ENDMENU
-                  $r->print(&Apache::loncommon::end_page());
+                      $r->print(
+                          &Apache::loncommon::start_page('No Resource')
+                         .'<h2>'.$lt{'title'}.'</h2>'
+                         .'<p>'.$lt{'explain'}.'</p>');
+                  }
+                  $r->print(
+                      &Apache::lonhtmlcommon::actionbox(
+                          ['<a href="/adm/flip?postdata=return:">'.$lt{'back'}.'</a></li>',
+                           '<a href="/adm/navmaps">'.$lt{'nav'}.'</a></li>'
+                          ])
+                     .&Apache::loncommon::end_page());
                   return OK;
 	      }
 	  } else {
@@ -489,6 +478,7 @@ ENDMENU
       } else {
 # ---------------------------------------- No, could not determine where we are
 	  $r->internal_redirect('/adm/ambiguous');
+          return OK;
       }
   } else {
 # -------------------------- Class was not initialized or page fliped strangely