version 1.304, 2014/05/20 20:36:16
|
version 1.305, 2014/05/20 20:46:13
|
Line 203 sub handler {
|
Line 203 sub handler {
|
my $r = shift; |
my $r = shift; |
|
|
# Check for critical messages and redirect if present. |
# Check for critical messages and redirect if present. |
print STDERR "crit check\n"; |
|
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); |
my ($redirect,$url) = &Apache::loncommon::critical_redirect(300); |
print STDERR "(redirect, url) = $redirect, $url\n"; |
|
if ($redirect) { |
if ($redirect) { |
print STDERR "check passed. Redirecting to $url\n"; |
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->header_out(Location => $url); |
$r->header_out(Location => $url); |
return REDIRECT; |
return REDIRECT; |
Line 258 sub handler {
|
Line 255 sub handler {
|
my $envkey; |
my $envkey; |
my %dcroles = (); |
my %dcroles = (); |
my $numdc = &check_fordc(\%dcroles,$update,$then); |
my $numdc = &check_fordc(\%dcroles,$update,$then); |
#my $loncaparev = $Apache::lonnet::perlvar{'lonVersion'}; |
|
my $loncaparev = $r->dir_config('lonVersion'); |
my $loncaparev = $r->dir_config('lonVersion'); |
print STDERR "loncaparev set ||$loncaparev||\n"; |
|
|
|
# ================================================================== Roles Init |
# ================================================================== Roles Init |
if ($env{'form.selectrole'}) { |
if ($env{'form.selectrole'}) { |
Line 1767 sub check_release_required {
|
Line 1762 sub check_release_required {
|
if ($required ne '') { |
if ($required ne '') { |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
print STDERR "version: required ||$required|| loncaparev ||$loncaparev||\n"; |
|
if ($reqdmajor ne '' && $reqdminor ne '') { |
if ($reqdmajor ne '' && $reqdminor ne '') { |
my $otherserver; |
my $otherserver; |
if (($major eq '' && $minor eq '') || |
if (($major eq '' && $minor eq '') || |