--- loncom/auth/lonroles.pm 2005/03/03 07:32:49 1.117 +++ loncom/auth/lonroles.pm 2005/06/05 07:57:28 1.121 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.117 2005/03/03 07:32:49 albertel Exp $ +# $Id: lonroles.pm,v 1.121 2005/06/05 07:57:28 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,7 +30,7 @@ package Apache::lonroles; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonuserstate(); use Apache::Constants qw(:common); use Apache::File(); @@ -39,6 +39,7 @@ use Apache::loncommon; use Apache::lonhtmlcommon; use Apache::lonannounce; use Apache::lonlocal; +use GDBM_File; sub redirect_user { my ($r,$title,$url,$msg,$launch_nav) = @_; @@ -80,29 +81,29 @@ sub handler { my $r = shift; my $now=time; - my $then=$ENV{'user.login.time'}; + my $then=$env{'user.login.time'}; my $envkey; my %dcroles = (); my $numdc = &check_fordc(\%dcroles,$then); # ================================================================== Roles Init - if ($ENV{'form.selectrole'}) { - if ($ENV{'request.course.id'}) { - my %temp=('logout_'.$ENV{'request.course.id'} => time); + if ($env{'form.selectrole'}) { + if ($env{'request.course.id'}) { + my %temp=('logout_'.$env{'request.course.id'} => time); &Apache::lonnet::put('email_status',\%temp); - &Apache::lonnet::delenv('user.state.'.$ENV{'request.course.id'}); + &Apache::lonnet::delenv('user.state.'.$env{'request.course.id'}); } &Apache::lonnet::appenv("request.course.id" => '', "request.course.fn" => '', "request.course.uri" => '', "request.course.sec" => '', "request.role" => 'cm', - "request.role.adv" => $ENV{'user.adv'}, - "request.role.domain" => $ENV{'user.domain'}); + "request.role.adv" => $env{'user.adv'}, + "request.role.domain" => $env{'user.domain'}); # Check if user is a DC trying to enter a course and needs privs to be created if ($numdc > 0) { - foreach my $envkey (keys %ENV) { + foreach my $envkey (keys %env) { if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) { if ($dcroles{$1}) { my $cckey = 'user.role.cc./'.$1.'/'.$2; @@ -113,16 +114,16 @@ sub handler { } } - foreach $envkey (keys %ENV) { + foreach $envkey (keys %env) { next if ($envkey!~/^user\.role\./); my ($where,$trolecode,$role,$tstatus,$tend,$tstart); &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); - if ($ENV{'form.'.$trolecode}) { + if ($env{'form.'.$trolecode}) { if ($tstatus eq 'is') { $where=~s/^\///; my ($cdom,$cnum,$csec)=split(/\//,$where); # store role if recent_role list being kept - if ($ENV{'environment.recentroles'}) { + if ($env{'environment.recentroles'}) { &Apache::lonhtmlcommon::store_recent('roles', $trolecode,' '); } @@ -130,20 +131,20 @@ sub handler { # check for keyed access if (($role eq 'st') && - ($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) { + ($env{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) { # who is key authority? my $authdom=$cdom; my $authnum=$cnum; - if ($ENV{'course.'.$cdom.'_'.$cnum.'.keyauth'}) { + if ($env{'course.'.$cdom.'_'.$cnum.'.keyauth'}) { ($authnum,$authdom)= - split(/\W/,$ENV{'course.'.$cdom.'_'.$cnum.'.keyauth'}); + split(/\W/,$env{'course.'.$cdom.'_'.$cnum.'.keyauth'}); } # check with key authority unless (&Apache::lonnet::validate_access_key( - $ENV{'environment.key.'.$cdom.'_'.$cnum}, + $env{'environment.key.'.$cdom.'_'.$cnum}, $authdom,$authnum)) { # there is no valid key - if ($ENV{'form.newkey'}) { + if ($env{'form.newkey'}) { # student attempts to register a new key &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); @@ -155,11 +156,11 @@ sub handler { my $message=&mt('Successfully registered key'); my $assignresult= &Apache::lonnet::assign_access_key( - $ENV{'form.newkey'}, + $env{'form.newkey'}, $authdom,$authnum, $cdom,$cnum, - $ENV{'user.domain'}, - $ENV{'user.name'}, + $env{'user.domain'}, + $env{'user.name'}, 'Assigned from '.$ENV{'REMOTE_ADDR'}.' at '.localtime().' for '. $trolecode); unless ($assignresult eq 'ok') { @@ -205,7 +206,7 @@ $swinfo
- +
@@ -214,9 +215,9 @@ ENDENTERKEY } } } - &Apache::lonnet::log($ENV{'user.domain'}, - $ENV{'user.name'}, - $ENV{'user.home'}, + &Apache::lonnet::log($env{'user.domain'}, + $env{'user.name'}, + $env{'user.home'}, "Role ".$trolecode); &Apache::lonnet::appenv( @@ -229,18 +230,15 @@ ENDENTERKEY if (($cnum) && ($role ne 'ca')) { my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum); - if (($ENV{'form.orgurl'}) && - ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) { - my $dest=$ENV{'form.orgurl'}; - if ( &Apache::lonnet::mod_perl_version() == 2 ) { - &Apache::lonnet::cleanenv(); - } + if (($env{'form.orgurl'}) && + ($env{'form.orgurl'}!~/^\/adm\/flip/)) { + my $dest=$env{'form.orgurl'}; if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } &Apache::lonnet::appenv('request.role.adv'=>$tadv); $r->internal_redirect($dest); return OK; } else { - unless ($ENV{'request.course.id'}) { + unless ($env{'request.course.id'}) { &Apache::lonnet::appenv( "request.course.id" => $cdom.'_'.$cnum); $furl='/adm/roles?tryagain=1'; @@ -259,14 +257,14 @@ ENDENTERKEY $courseid = substr($courseid, 1); } $courseid =~ s/\//_/; - if ($role eq 'cc' && $ENV{'course.' . $courseid . + if ($role eq 'cc' && $env{'course.' . $courseid . '.course.helper.not.run'}) { $furl = "/adm/helper/course.initialization.helper"; } # Send the user to the course they selected &redirect_user($r,&mt('Entering Course'), $furl,$msg, - $ENV{'environment.remotenavmap'}); + $env{'environment.remotenavmap'}); return OK; } } @@ -275,7 +273,7 @@ ENDENTERKEY if ($role =~ /^(au|ca)$/) { my $redirect_url = '/priv/'; if ($role eq 'au') { - $redirect_url.=$ENV{'user.name'}; + $redirect_url.=$env{'user.name'}; } else { $where =~ /\/(.*)$/; $redirect_url .= $1; @@ -322,17 +320,17 @@ ENDHEADER # ------------------------------------------ Get Error Message from Environment - my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$ENV{'user.error.msg'}); - if ($ENV{'user.error.msg'}) { + my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$env{'user.error.msg'}); + if ($env{'user.error.msg'}) { $r->log_reason( - "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn); + "$msg for $env{'user.name'} domain $env{'user.domain'} access $priv",$fn); } # ------------------------------------------------- Can this user re-init, etc? - my $advanced=$ENV{'user.adv'}; + my $advanced=$env{'user.adv'}; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['tryagain']); - my $tryagain=$ENV{'form.tryagain'}; + my $tryagain=$env{'form.tryagain'}; # -------------------------------------------------------- Generate Page Output # --------------------------------------------------------------- Error Header? @@ -341,9 +339,20 @@ ENDHEADER $r->print("
Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
-        $r->print("Action  : $msg\n
"); + $r->print("Action : $msg\n
"); + my $url=$fn; + my $last; + if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', + &GDBM_READER(),0640)) { + $last=$hash{'last_known'}; + untie(%hash); + } + if ($last) { $fn.='?symb='.&Apache::lonnet::escape($last); } + + &Apache::londocs::changewarning($r,undef,'You have modified your course recently, [_1] may fix this access problem.', + &Apache::lonenc::check_encrypt($fn)); } else { - if ($ENV{'user.error.msg'}) { + if ($env{'user.error.msg'}) { $r->print( '

'. &mt('You need to choose another user role or enter a specific course for this function').'

'); @@ -356,7 +365,7 @@ ENDHEADER } else { $r->print("

".&mt('Sorry ...')."

\n". &mt('This resource might be part of')); - if ($ENV{'request.course.id'}) { + if ($env{'request.course.id'}) { $r->print(&mt(' another')); } else { $r->print(&mt(' a certain')); @@ -368,7 +377,7 @@ ENDHEADER if ($advanced) { $r->print(&mt("Your home server is "). $Apache::lonnet::hostname{&Apache::lonnet::homeserver - ($ENV{'user.name'},$ENV{'user.domain'})}. + ($env{'user.name'},$env{'user.domain'})}. "
\n"); $r->print(&mt( "Author and Co-Author roles may not be available on servers other than your home server.")); @@ -380,10 +389,10 @@ ENDHEADER $r->print(''); $r->print(''); } - if ($ENV{'user.adv'}) { + if ($env{'user.adv'}) { $r->print( '
'); } @@ -391,7 +400,7 @@ ENDHEADER my $countactive=0; my $inrole=0; my $possiblerole=''; - foreach $envkey (sort keys %ENV) { + foreach $envkey (sort keys %env) { my $button = 1; my $switchserver=''; my $roletext; @@ -410,12 +419,12 @@ ENDHEADER if ($tend) { $tpend=&Apache::lonlocal::locallocaltime($tend); } - if ($ENV{'request.role'} eq $trolecode) { + if ($env{'request.role'} eq $trolecode) { $tstatus='selected'; } my $tbg; if (($tstatus eq 'is') || ($tstatus eq 'selected') || - ($ENV{'form.showall'})) { + ($env{'form.showall'})) { if ($tstatus eq 'is') { $tbg='#77FF77'; $tfont='#003300'; @@ -464,8 +473,8 @@ ENDHEADER $button=0; $switchserver=&Apache::lonnet::escape('http://'. $Apache::lonnet::hostname{$home}. - '/adm/login?domain='.$ENV{'user.domain'}. - '&username='.$ENV{'user.name'}. + '/adm/login?domain='.$env{'user.domain'}. + '&username='.$env{'user.name'}. '&firsturl=/priv/'.$trest.'/'); } #next if ($home eq 'no_host'); @@ -474,13 +483,13 @@ ENDHEADER $twhere=&mt('User').': '.$trest.'
'.&mt('Domain'). ': '.$tdom.'
'. ' '.&mt('Server').': '.$home; - $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca'; + $env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$trest.'/'); $sortkey=$role."$trest:$tdom"; } elsif ($role eq 'au') { # Authors my $home = &Apache::lonnet::homeserver - ($ENV{'user.name'},$ENV{'user.domain'}); + ($env{'user.name'},$env{'user.domain'}); my $allowed=0; my @ids=&Apache::lonnet::current_machine_ids(); foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } @@ -488,26 +497,23 @@ ENDHEADER $button=0; $switchserver=&Apache::lonnet::escape('http://'. $Apache::lonnet::hostname{$home}. - '/adm/login?domain='.$ENV{'user.domain'}. - '&username='.$ENV{'user.name'}. - '&firsturl=/priv/'.$ENV{'user.name'}.'/'); + '/adm/login?domain='.$env{'user.domain'}. + '&username='.$env{'user.name'}. + '&firsturl=/priv/'.$env{'user.name'}.'/'); } #next if ($home eq 'no_host'); $home = $Apache::lonnet::hostname{$home}; $ttype='Construction Space'; $twhere=&mt('Domain').': '.$tdom.'
'.&mt('Server'). ': '.$home; - $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca'; - $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$ENV{'user.name'}.'/'); + $env{'course.'.$tdom.'_'.$trest.'.description'}='ca'; + $tremark.=&Apache::lonhtmlcommon::authorbombs('/res/'.$tdom.'/'.$env{'user.name'}.'/'); $sortkey=$role; } elsif ($trest) { $ttype='Course'; - if ($tsection) { - $ttype.='
'.&mt('Section/Group').': '.$tsection; - } my $tcourseid=$tdom.'_'.$trest; - if ($ENV{'course.'.$tcourseid.'.description'}) { - $twhere=$ENV{'course.'.$tcourseid.'.description'}; + if ($env{'course.'.$tcourseid.'.description'}) { + $twhere=$env{'course.'.$tcourseid.'.description'}; $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; unless ($twhere eq &mt('Currently not available')) { $twhere.=' '. @@ -525,10 +531,14 @@ ENDHEADER ''; } else { $twhere=&mt('Currently not available'); - $ENV{'course.'.$tcourseid.'.description'}=$twhere; + $env{'course.'.$tcourseid.'.description'}=$twhere; $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey; } } + if ($tsection) { + $twhere.='
'.&mt('Section/Group').': '.$tsection; + } + if ($role ne 'st') { $twhere.="
".&mt('Domain').":".$tdom; } } elsif ($tdom) { $ttype='Domain'; @@ -558,7 +568,7 @@ ENDHEADER $r->print(''); return OK; # Is there only one choice? - } elsif (($countactive==1) && ($ENV{'request.role'} eq 'cm')) { + } elsif (($countactive==1) && ($env{'request.role'} eq 'cm')) { $r->print('

'.&mt('Please stand by.').'

'. ''); $r->print("\n"); @@ -574,7 +584,7 @@ ENDHEADER } $r->print('
'); unless ($nochoose) { $r->print(''); } - $r->print(''."\n"); my $doheaders=-1; @@ -588,9 +598,9 @@ ENDHEADER if ($haverole) { $doheaders++; } } - if ($ENV{'environment.recentroles'}) { + if ($env{'environment.recentroles'}) { my %recent_roles = - &Apache::lonhtmlcommon::get_recent('roles',$ENV{'environment.recentrolesn'}); + &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); my $output=''; foreach (sort(keys(%recent_roles))) { if (defined($roletext{'user.role.'.$_})) { @@ -602,7 +612,7 @@ ENDHEADER } } if ($output) { - $r->print(""); $r->print($output); $r->print(""); @@ -629,14 +639,14 @@ ENDHEADER if ($output) { if ($doheaders > 0) { $r->print("". - ""); + ""); } $r->print($output); } } my $tremark=''; my $tfont='#003300'; - if ($ENV{'request.role'} eq 'cm') { + if ($env{'request.role'} eq 'cm') { $r->print(''); $tremark=&mt('Currently selected. '); $tfont='#002200'; @@ -644,14 +654,14 @@ ENDHEADER $r->print(''); } unless ($nochoose) { - if ($ENV{'request.role'} ne 'cm') { + if ($env{'request.role'} ne 'cm') { $r->print(''); } else { $r->print(''); } } - $r->print(''."\n"); @@ -660,24 +670,24 @@ ENDHEADER $r->print("\n"); } # ------------------------------------------------------------ Privileges Info - if (($advanced) && (($ENV{'user.error.msg'}) || ($error))) { + if (($advanced) && (($env{'user.error.msg'}) || ($error))) { $r->print('

Current Privileges

'); - foreach $envkey (sort keys %ENV) { - if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) { + foreach $envkey (sort keys %env) { + if ($envkey=~/^user\.priv\.$env{'request.role'}\./) { my $where=$envkey; - $where=~s/^user\.priv\.$ENV{'request.role'}\.//; + $where=~s/^user\.priv\.$env{'request.role'}\.//; my $ttype; my $twhere; my ($tdom,$trest,$tsec)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { - if ($ENV{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { + if ($env{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') { $ttype='Construction Space'; $twhere='User: '.$trest.', Domain: '.$tdom; } else { $ttype='Course'; - $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'}; + $twhere=$env{'course.'.$tdom.'_'.$trest.'.description'}; if ($tsec) { $twhere.=' (Section/Group: '.$tsec.')'; } @@ -690,7 +700,7 @@ ENDHEADER $twhere='/'; } $r->print("\n

".$ttype.': '.$twhere.'

'. ''. + $ccrole.''. ''."\n"; return $output; @@ -964,7 +973,7 @@ sub set_privileges { my $area = '/'.$dcdom.'/'.$pickedcourse; my $role = 'cc'; my $spec = $role.'.'.$area; - my $userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$ENV{'user.name'}); + my $userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'}); my %ccrole = (); &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area); my ($author,$adv)= &Apache::lonnet::set_userprivs(\$userroles,\%ccrole); @@ -975,9 +984,9 @@ sub set_privileges { $newccroles{$key} = $val; } &Apache::lonnet::appenv(%newccroles); - &Apache::lonnet::log($ENV{'user.domain'}, - $ENV{'user.name'}, - $ENV{'user.home'}, + &Apache::lonnet::log($env{'user.domain'}, + $env{'user.name'}, + $env{'user.home'}, "Role ".$role); &Apache::lonnet::appenv( 'request.role' => $role,
 '.&mt('User Role').''.&mt('Extent'). + $r->print(''.&mt('User Role').''.&mt('Extent'). ''.&mt('Start').''.&mt('End').''. &mt('Remarks and Calendar Announcements').'
". + $r->print("
". &mt('Recent Roles')."
".&mt($type)."
".&mt($type)."
 '.&mt('No role specified'). + $r->print(''.&mt('No role specified'). ''.$tremark. ' 
'.$trole. - ''.$ttype. - ''.$twhere. + ''.$twhere. ''.$tpstart. ''.$tpend. ''.$tremark. @@ -791,7 +800,7 @@ sub build_roletext { sub check_privs { my ($cckey,$then,$now) = @_; - if ($ENV{$cckey}) { + if ($env{$cckey}) { my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont); &role_status($cckey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) { @@ -805,12 +814,12 @@ sub check_privs { sub check_fordc { my ($dcroles,$then) = @_; my $numdc = 0; - if ($ENV{'user.adv'}) { - foreach my $envkey (sort keys %ENV) { + if ($env{'user.adv'}) { + foreach my $envkey (sort keys %env) { if ($envkey=~/^user\.role\.dc\.\/(\w+)\/$/) { my $dcdom = $1; my $livedc = 1; - my ($tstart,$tend)=split(/\./,$ENV{$envkey}); + my ($tstart,$tend)=split(/\./,$env{$envkey}); if ($tstart && $tstart>$then) { $livedc = 0; } if ($tend && $tend <$then) { $livedc = 0; } if ($livedc) { @@ -907,8 +916,8 @@ END sub display_cc_role { my $rolekey = shift; my $roletext; - my $advanced = $ENV{'user.adv'}; - my $tryagain = $ENV{'form.tryagain'}; + my $advanced = $env{'user.adv'}; + my $tryagain = $env{'form.tryagain'}; unless ($rolekey =~/^error\:/) { if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) { my $tcourseid = $1.'_'.$2; @@ -925,7 +934,7 @@ sub display_cc_role { ''; } else { $twhere=&mt('Currently not available'); - $ENV{'course.'.$tcourseid.'.description'}=$twhere; + $env{'course.'.$tcourseid.'.description'}=$twhere; } $twhere.="
".&mt('Domain').":".$1; $roletext = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,''); @@ -944,11 +953,11 @@ sub allcourses_row { 'onClick="verifyCoursePick(this)">'. '		'. - $ccrole.''.&mt('Course').''.&mt('All courses').': '. $selectlink.''. '
'.&mt('Domain').':'.$dcdom.''. - '		'. + ''. &mt('Course Coordinator access to all courses in domain'). ': '.$dcdom.'