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

Diff for /loncom/auth/lonroles.pm between versions 1.272 and 1.273

version 1.272, 2012/08/15 14:37:23 version 1.273, 2012/08/15 16:56:52
Line 799  ENDHEADER Line 799  ENDHEADER
     my ($requestauthor,$requestcrs);      my ($requestauthor,$requestcrs);
     unless ($reqauthor) {      unless ($reqauthor) {
         if ($env{'environment.canrequest.author'}) {          if ($env{'environment.canrequest.author'}) {
             unless (&is_active_author()) {              unless (&Apache::loncoursequeueadmin::is_active_author()) {
                 my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});                  my ($status,$timestamp) = split(/:/,$env{'environment.requestauthorqueued'});
                 if ($status eq 'approval') {                  if ($status eq 'approval') {
                     $requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp));                       $requestauthor = &mt('A request for authoring space submitted on [_1] is awaiting approval',&Apache::lonlocal::locallocaltime($timestamp)); 
Line 1049  ENDHEADER Line 1049  ENDHEADER
     return OK;      return OK;
 }  }
   
 sub is_active_author {  
     if ($env{'user.role.au./'.$env{'user.domain'}.'/'} =~ /^(\d*)\.(\d*)$/) {  
         if ((!$1 || $1 < time) &&  
             (!$2 || $2 > time)) {  
             return 1;  
         }  
     }  
     return;  
 }  
   
 sub reqauthor_check {  
     my $queued = $env{'environment.requestauthorqueued'};  
     my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],  
                                          $env{'user.domain'},$env{'user.name'});  
     my $reqstatus = $reqauthor{'author_status'};  
     if (($reqstatus eq '' && $queued ne '') ||   
         ($env{'environment.requestauthorqueued'} !~ /^\Q$reqstatus\E/)) {  
         if (ref($reqauthor{'author'}) eq 'HASH') {  
             $queued = $reqstatus.':'.$reqauthor{'author'}{'timestamp'};  
         } else {  
             undef($queued);  
         }  
         &Apache::lonnet::appenv({'environment.requestauthorqueued' => $queued});  
     }  
     return $queued;  
 }  
   
 sub gather_roles {  sub gather_roles {
     my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;      my ($update,$refresh,$now,$reinit,$nochoose,$roletext,$sortrole,$roleclass,$futureroles,$timezones,$loncaparev) = @_;
     my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');      my ($countactive,$countfuture,$inrole,$possiblerole) = (0,0,0,'');
Removed from v.1.272  
changed lines
  Added in v.1.273

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