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

Diff for /loncom/auth/lonroles.pm between versions 1.193 and 1.195

version 1.193, 2008/05/19 17:55:38 version 1.195, 2008/06/04 19:14:20
Line 137  sub handler { Line 137  sub handler {
 # Is this an ad-hoc CC-role?  # Is this an ad-hoc CC-role?
                 if (my ($domain,$coursenum) =                  if (my ($domain,$coursenum) =
     ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {      ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                    # See if that is even allowed  
                    my %crsenv=&Apache::lonnet::get('environment',['internal.courseowner'],$domain,$coursenum);  
                    # First find course owner  
                    my ($owneruser,$ownerdomain)=split(/\:/,$crsenv{'internal.courseowner'});  
                    # Check if course owner blocked cc-access  
                     if (($owneruser) && ($ownerdomain)) {  
                        my %blocked=&Apache::lonnet::get('environment',['domcoord.cc'],$ownerdomain,$owneruser);  
                        if ($blocked{'domcoord.cc'} eq 'blocked') {  
                           $env{'user.error.msg'}=':::1:Course owner '.$owneruser.' in domain '.$ownerdomain.' blocked domain coordinator access';  
                           last;  
                        }  
                     }  
                     if ($dcroles{$domain}) {                      if ($dcroles{$domain}) {
                         &check_privs($domain,$coursenum,$then,$now,'cc');                          &check_privs($domain,$coursenum,$then,$now,'cc');
                     }                      }
Line 798  ENDHEADER Line 786  ENDHEADER
     }      }
     $r->print(&Apache::lonnet::getannounce());      $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {      if ($advanced) {
  $r->print('<p><small><i>This is LON-CAPA '.   $r->print('<p><small><i>'
   $r->dir_config('lonVersion').'</i><br />'.                   .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
   '<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');   .'</i><br />'
    .'<a href="/adm/logout">'.&mt('Logout').'</a></small></p>');
     }      }
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
     return OK;      return OK;
Removed from v.1.193  
changed lines
  Added in v.1.195

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