Diff for /loncom/auth/lonroles.pm between versions 1.60 and 1.61

version 1.60, 2003/06/18 13:13:10 version 1.61, 2003/06/18 15:05:32
Line 152  ENDENTERKEY Line 152  ENDENTERKEY
     unless ($ENV{'request.course.id'}) {      unless ($ENV{'request.course.id'}) {
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
       "request.course.id"  => $cdom.'_'.$cnum);        "request.course.id"  => $cdom.'_'.$cnum);
  $furl='/adm/roles';   $furl='/adm/roles?tryagain=1';
  $msg=   $msg=
  '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>';   '<h1><font color=red>Could not initialize course at this time.</font></h1><h3>Please try again.</h3>';
     }      }
Line 228  ENDHEADER Line 228  ENDHEADER
    "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);     "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
     }      }
   
 # ---------------------------------------------------------------- Who is this?  # ------------------------------------------------- Can this user re-init, etc?
   
     my $advanced=0;      my $advanced=$ENV{'user.adv'};
     foreach $envkey (keys %ENV) {      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['tryagain']);
         if ($envkey=~/^user\.role\./) {      my $tryagain=$ENV{'form.tryagain'};
     my (undef,undef,$role,@pwhere)=split(/\./,$envkey);  
             if ($role ne 'st') { $advanced=1; }  
         }  
     }  
   
 # -------------------------------------------------------- Generate Page Output  # -------------------------------------------------------- Generate Page Output
 # --------------------------------------------------------------- Error Header?  # --------------------------------------------------------------- Error Header?
Line 443  ENDHEADER Line 439  ENDHEADER
                     } elsif ($tstatus eq 'is') {                      } elsif ($tstatus eq 'is') {
                         $r->print('<td><input type=submit value=Select name="'.                          $r->print('<td><input type=submit value=Select name="'.
                                   $trolecode.'"></td>');                                    $trolecode.'"></td>');
                     } elsif ($ENV{'user.adv'}) {                      } elsif ($tryagain) {
                           $r->print
                           ('<td><input type=submit value="Try Selecting Again"'.
                                ' name="'.$trolecode.'"></td>');
                       } elsif ($advanced) {
                         $r->print                          $r->print
                             ('<td><input type=submit value="Re-Initialize"'.                              ('<td><input type=submit value="Re-Initialize"'.
                              ' name="'.$trolecode.'"></td>');                               ' name="'.$trolecode.'"></td>');

Removed from v.1.60  
changed lines
  Added in v.1.61


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