--- loncom/auth/lonroles.pm 2014/05/05 03:24:37 1.303 +++ loncom/auth/lonroles.pm 2014/05/20 20:36:16 1.304 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.303 2014/05/05 03:24:37 raeburn Exp $ +# $Id: lonroles.pm,v 1.304 2014/05/20 20:36:16 musolffc Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,7 +128,7 @@ package Apache::lonroles; use strict; use Apache::lonnet; use Apache::lonuserstate(); -use Apache::Constants qw(:common); +use Apache::Constants qw(:common REDIRECT); use Apache::File(); use Apache::lonmenu; use Apache::loncommon; @@ -202,6 +202,17 @@ sub handler { my $r = shift; + # Check for critical messages and redirect if present. + print STDERR "crit check\n"; + my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); + print STDERR "(redirect, url) = $redirect, $url\n"; + if ($redirect) { + print STDERR "check passed. Redirecting to $url\n"; + &Apache::loncommon::content_type($r,'text/html'); + $r->header_out(Location => $url); + return REDIRECT; + } + my $now=time; my $then=$env{'user.login.time'}; my $refresh=$env{'user.refresh.time'}; @@ -247,7 +258,9 @@ sub handler { my $envkey; my %dcroles = (); my $numdc = &check_fordc(\%dcroles,$update,$then); - my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; +#my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; + my $loncaparev = $r->dir_config('lonVersion'); + print STDERR "loncaparev set ||$loncaparev||\n"; # ================================================================== Roles Init if ($env{'form.selectrole'}) { @@ -1754,6 +1767,7 @@ sub check_release_required { if ($required ne '') { my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); + print STDERR "version: required ||$required|| loncaparev ||$loncaparev||\n"; if ($reqdmajor ne '' && $reqdminor ne '') { my $otherserver; if (($major eq '' && $minor eq '') ||