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

Diff for /loncom/auth/lonroles.pm between versions 1.156 and 1.157

version 1.156, 2006/06/07 20:07:09 version 1.157, 2006/06/07 20:52:16
Line 266  ENDENTERKEY Line 266  ENDENTERKEY
  } else {   } else {
                             my $type = 'Course/Group';                              my $type = 'Course/Group';
     if (!$env{'request.course.id'}) {      if (!$env{'request.course.id'}) {
                                 if (defined($env{'course.'.   $type = &Apache::loncommon::course_type();
                                             $env{'request.course.id'}.'.type'})) {  
                                     $type = $env{'course.'.  
                                                  $env{'request.course.id'}.'.type'};  
                                 }  
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
       "request.course.id"  => $cdom.'_'.$cnum);        "request.course.id"  => $cdom.'_'.$cnum);
  $furl='/adm/roles?tryagain=1';   $furl='/adm/roles?tryagain=1';
  $msg=   $msg=
     '<h1><font color="red">'.      '<h1><span class="LC_error">'.
  &mt('Could not initialize [_1] at this time.',lc($type)).      &mt('Could not initialize '.lc($type).' at this time.').
     '</font></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;      '</span></h1><h3>'.&mt('Please try again.').'</h3>'.$ferr;
     }      }
     if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }      if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; }
     &Apache::lonnet::appenv('request.role.adv'=>$tadv);      &Apache::lonnet::appenv('request.role.adv'=>$tadv);
Line 305  ENDENTERKEY Line 301  ENDENTERKEY
  ) {   ) {
  my $startpage = &courseloadpage($courseid);   my $startpage = &courseloadpage($courseid);
  unless ($startpage eq 'firstres') {            unless ($startpage eq 'firstres') {         
     $msg = &mt('Entering [_1] ....',lc($type));      $msg = &mt('Entering '.lc($type).' ....');
     &redirect_user($r,&mt('New in course'),      &redirect_user($r,&mt('New in course'),
    '/adm/whatsnew?refpage=start',$msg,     '/adm/whatsnew?refpage=start',$msg,
    $env{'environment.remotenavmap'});     $env{'environment.remotenavmap'});
Line 318  ENDENTERKEY Line 314  ENDENTERKEY
 # Guess not ...  # Guess not ...
     $furl=&Apache::lonpageflip::first_accessible_resource();      $furl=&Apache::lonpageflip::first_accessible_resource();
  }   }
                                 $msg = &mt('Entering [_1] ...',lc($type));                                  $msg = &mt('Entering '.lc($type).' ...');
  &redirect_user($r,&mt('Entering [_1]',$type),   &redirect_user($r,&mt('Entering '.$type),
        $furl,$msg,         $furl,$msg,
        $env{'environment.remotenavmap'});         $env{'environment.remotenavmap'});
     }      }
Line 424  ENDHEADER Line 420  ENDHEADER
     } else {      } else {
         if ($env{'user.error.msg'}) {          if ($env{'user.error.msg'}) {
     $r->print(      $r->print(
  '<h3><font color="red">'.   '<h3><span class="LC_error">'.
  &mt('You need to choose another user role or enter a specific course for this function').'</font></h3>');   &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
  }   }
     }      }
 # -------------------------------------------------------- Choice or no choice?  # -------------------------------------------------------- Choice or no choice?
Line 745  ENDHEADER Line 741  ENDHEADER
  $ttype='Construction Space';   $ttype='Construction Space';
  $twhere='User: '.$trest.', Domain: '.$tdom;   $twhere='User: '.$trest.', Domain: '.$tdom;
     } else {      } else {
  $ttype='Course';   $ttype= 
                         if (defined($env{'course.'.$tdom.'_'.$trest.'.type'})) {      &Apache::loncommon::course_type($tdom.'_'.$trest);
                             $ttype = $env{'course.'.$tdom.'_'.$trest.'.type'};  
                         }  
  $twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};   $twhere=$env{'course.'.$tdom.'_'.$trest.'.description'};
  if ($tsec) {   if ($tsec) {
     $twhere.=' (Section: '.$tsec.')';      $twhere.=' (Section: '.$tsec.')';
Removed from v.1.156  
changed lines
  Added in v.1.157

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