--- loncom/interface/lonmainmenu.pm 2010/03/10 21:25:50 1.9 +++ loncom/interface/lonmainmenu.pm 2017/06/26 01:56:58 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # displays the main menu # -# $Id: lonmainmenu.pm,v 1.9 2010/03/10 21:25:50 droeschl Exp $ +# $Id: lonmainmenu.pm,v 1.12 2017/06/26 01:56:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,19 +35,27 @@ package Apache::lonmainmenu; use strict; -use Apache::Constants qw(:common); +use Apache::Constants qw(:common REDIRECT); use Apache::loncommon(); use Apache::lonnet; use Apache::lonmenu(); sub handler { my $r = shift; + + # Check for critical messages and redirect if present. + my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'menu'); + if ($redirect) { + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $url); + return REDIRECT; + } + &Apache::loncommon::no_cache($r); &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; - my $form; # ---- Print the screen, pretend to be in text mode to generate text-based menu # temporarily set interface to "faketextual" and remote to "off", which renders # the main menu @@ -56,7 +64,7 @@ sub handler { $r->print(&Apache::loncommon::start_page( 'Main Menu', undef, {'bread_crumbs' => 1})); - $r->print(&Apache::lonmenu::inlinemenu().$form); + $r->print(&Apache::lonmenu::inlinemenu()); $r->print(&Apache::loncommon::end_page()); return OK; }