[BACK]Return to lonroles.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonroles.pm between versions 1.303 and 1.304

version 1.303, 2014/05/05 03:24:37 version 1.304, 2014/05/20 20:36:16
Line 128  package Apache::lonroles; Line 128  package Apache::lonroles;
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonuserstate();  use Apache::lonuserstate();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common REDIRECT);
 use Apache::File();  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::loncommon;  use Apache::loncommon;
Line 202  sub handler { Line 202  sub handler {
   
     my $r = shift;      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 $now=time;
     my $then=$env{'user.login.time'};      my $then=$env{'user.login.time'};
     my $refresh=$env{'user.refresh.time'};      my $refresh=$env{'user.refresh.time'};
Line 247  sub handler { Line 258  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 = $Apache::lonnet::perlvar{'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 1754  sub check_release_required { Line 1767  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 '') || 
Removed from v.1.303  
changed lines
  Added in v.1.304

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>