--- loncom/auth/lonroles.pm 2004/11/11 22:18:23 1.106 +++ loncom/auth/lonroles.pm 2005/04/07 06:56:21 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.106 2004/11/11 22:18:23 raeburn Exp $ +# $Id: lonroles.pm,v 1.118 2005/04/07 06:56:21 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(); @@ -80,97 +80,70 @@ sub handler { my $r = shift; my $now=time; - my $then=$ENV{'user.login.time'}; + my $then=$env{'user.login.time'}; my $envkey; - my $dcselect=''; - + my %dcroles = (); + my $numdc = &check_fordc(\%dcroles,$then); # ================================================================== Roles Init - if ($ENV{'form.selectrole'}) { - if ($ENV{'form.dcselected'}) { - my $dcdom = $ENV{'form.dcselected'}; - my $dckey = 'user.role.dc./'.$dcdom.'/'; - if ($ENV{$dckey}) { - my ($dcstart,$dcend)=split(/\./,$ENV{$dckey}); - my $active_dc = 1; - if ($dcstart) { - if ($dcstart>$then) { - $active_dc = 0; - } - } - if ($dcend) { - if ($dcend < $then) { - $active_dc = 0; - } - } - if ($active_dc) { - $dcselect = $dcdom; - } - } - } - 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 to see if the user is a DC trying to enter a course -# course selection page - my $dcflag = 0; - if ($ENV{'form.dccourse'}) { - my $dcdom = $ENV{'form.dcdomain'}; - my $pickedcourse = $ENV{'form.dccourse'}; - if ($dcdom && $pickedcourse) { - unless ($ENV{'user.role.cc./'.$dcdom.'/'.$pickedcourse}) { - if ($ENV{'user.role.dc./'.$dcdom.'/'}) { - &set_privileges($dcdom,$pickedcourse); - my $msg=&mt('Entering course ...'); - my ($furl,$ferr)=&Apache::lonuserstate::readmap($dcdom.'/'.$pickedcourse); - my $formaction = '/adm/roles/'; - my $courseid = $dcdom.'_'.$pickedcourse; - &Apache::lonhtmlcommon::store_recent('cc_pickby_dc_'.$dcdom, - $courseid,$formaction); - # Send the user to the course they selected - &redirect_user($r,&mt('Entering Course'), - $furl,$msg, - $ENV{'environment.remotenavmap'}); - return OK; +# 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) { + if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) { + if ($dcroles{$1}) { + my $cckey = 'user.role.cc./'.$1.'/'.$2; + &check_privs($cckey,$then,$now); } + last; } } } - 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'}) { + &Apache::lonhtmlcommon::store_recent('roles', + $trolecode,' '); + } + + # 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); @@ -182,11 +155,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') { @@ -232,7 +205,7 @@ $swinfo
- +
@@ -241,9 +214,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( @@ -251,24 +224,23 @@ ENDENTERKEY 'request.role.domain' => $cdom, 'request.course.sec' => $csec); my $tadv=0; - if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } - &Apache::lonnet::appenv('request.role.adv' => $tadv); - my $msg=&mt('Entering course ...'); 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 (($env{'form.orgurl'}) && + ($env{'form.orgurl'}!~/^\/adm\/flip/)) { + my $dest=$env{'form.orgurl'}; if ( &Apache::lonnet::mod_perl_version() == 2 ) { &Apache::lonnet::cleanenv(); } + 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'; @@ -277,6 +249,8 @@ ENDENTERKEY &mt('Could not initialize course at this time.'). '

'.&mt('Please try again.').'

'.$ferr; } + if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } + &Apache::lonnet::appenv('request.role.adv'=>$tadv); # Check to see if the user is a CC entering a course # for the first time @@ -285,26 +259,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"; } - # Check to see if the user is a DC coming from the - # course selection page - my $dcflag = 0; - if ($ENV{'form.dccourse'}) { - my $formaction = '/adm/roles/'; - my ($dcdom,$pickedcourse) = split/_/,$courseid; - if ($ENV{'user.role.dc./'.$dcdom.'/'}) { - &Apache::lonhtmlcommon::store_recent('cc_pickby_dc_'.$dcdom, - $courseid,$formaction); - } - } - # # Send the user to the course they selected &redirect_user($r,&mt('Entering Course'), $furl,$msg, - $ENV{'environment.remotenavmap'}); + $env{'environment.remotenavmap'}); return OK; } } @@ -313,7 +275,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; @@ -324,12 +286,10 @@ ENDENTERKEY return OK; } if ($role eq 'dc') { - unless ($dcselect) { - my $redirect_url = '/adm/menu/'; - &redirect_user($r,&mt('Loading Domain Coordinator Menu'), + my $redirect_url = '/adm/menu/'; + &redirect_user($r,&mt('Loading Domain Coordinator Menu'), $redirect_url); - return OK; - } + return OK; } } } @@ -345,7 +305,6 @@ ENDENTERKEY return OK if $r->header_only; my $swinfo=&Apache::lonmenu::rawconfig(); - my $setDCchoice = &dc_script(); my $bodytag=&Apache::loncommon::bodytag('User Roles'); my $helptag='
'.&Apache::loncommon::help_open_menu('','General Intro','General_Intro','User Roles',1,undef,undef,undef,undef,,&mt("Click here for help")).'
'; $r->print(< 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 -# -------------------------------------------------------- Domain Coordinator? - if ($dcselect ne '') { - &choosecourse_display($r,$dcselect,$then,$now); - return OK; - } - # --------------------------------------------------------------- Error Header? if ($error) { $r->print("

LON-CAPA Access Control

"); $r->print("
Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
-        $r->print("Resource: $fn\n");
+        $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n
"); } 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').'

'); @@ -404,7 +356,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')); @@ -416,7 +368,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.")); @@ -425,24 +377,21 @@ ENDHEADER $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; } $r->print('
'); - $r->print(''); - $r->print(''); + $r->print(''); + $r->print(''); } - if ($ENV{'user.adv'}) { + if ($env{'user.adv'}) { $r->print( - '
'.&mt('Show all roles').': print(' checked'); } - $r->print('>'); + '
'); } - my %dcroles = (); - my $numdc = &check_fordc(\%dcroles,$then); - my (%roletext,%sortrole,%roleclass); 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; @@ -461,12 +410,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'; @@ -515,8 +464,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'); @@ -525,13 +474,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; } } @@ -539,17 +488,17 @@ 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'; @@ -557,8 +506,8 @@ ENDHEADER $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.=' '. @@ -576,7 +525,7 @@ 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; } } @@ -591,41 +540,7 @@ ENDHEADER $sortkey=$role.$twhere; } - $roletext.=''; - unless ($nochoose) { - if (!$button) { - if ($switchserver) { - $roletext.=''.&mt('Switch Server').''; - } else { - $roletext.=(' '); - } - } elsif ($tstatus eq 'is') { - $roletext.=(''); - } elsif ($tryagain) { - $roletext.= - ''; - } elsif ($advanced) { - $roletext.= - ''; - } else { - $roletext.=' '; - } - } - $tremark.=&Apache::lonannounce::showday(time,1, - &Apache::lonannounce::readcalendar($tdom.'_'.$trest)); - - $roletext.=''.$trole. - ''.$ttype. - ''.$twhere. - ''.$tpstart. - ''.$tpend. - ''.$tremark. - ' '."\n"; + $roletext.=&build_roletext($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver); $roletext{$envkey}=$roletext; if (!$sortkey) {$sortkey=$twhere."\0".$envkey;} $sortrole{$sortkey}=$envkey; @@ -643,7 +558,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"); @@ -672,74 +587,56 @@ ENDHEADER } if ($haverole) { $doheaders++; } } + + if ($env{'environment.recentroles'}) { + my %recent_roles = + &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'}); + my $output=''; + foreach (sort(keys(%recent_roles))) { + if (defined($roletext{'user.role.'.$_})) { + $output.=$roletext{'user.role.'.$_}; + } elsif ($numdc > 0) { + unless ($_ =~/^error\:/) { + $output.=&display_cc_role('user.role.'.$_); + } + } + } + if ($output) { + $r->print("". + &mt('Recent Roles').""); + $r->print($output); + $r->print(""); + $doheaders ++; + } + } + if ($numdc > 0) { - $r->print(''. - ''. - ''. - ''. - &mt('Domain').''); - foreach my $dcdom (keys %dcroles) { - my $output = $roletext{$dcroles{$dcdom}}; - my $ccrole = Apache::lonnet::plaintext('cc'); - if ($ENV{'request.role'} =~ m-cc\./$dcdom/-) { - $output.=$roletext{'user.role.'.$ENV{'request.role'}}; - } - $r->print($output); - $r->print(''); - $r->print(''. - ''. - $ccrole.''.&mt('Course').''. - ''.&mt('All courses').''. - '
'.&mt('Domain').':'.$dcdom.''. - ''. - &mt('Course Coordinator access to all courses in domain'). - ': '.$dcdom.''."\n"); - } - foreach my $type ('Construction Space','Course','Domain','System') { - my $output; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - my $skiprole = 0; - foreach my $dcdom (keys %dcroles) { - if ($sortrole{$which} =~ m-(dc)\./$dcdom/-) { - $skiprole = 1; - last; + $r->print(&coursepick_jscript()); + $r->print(&Apache::loncommon::coursebrowser_javascript()); + } + foreach my $type ('Construction Space','Course','Domain','System') { + my $output; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { + $output.=$roletext{$sortrole{$which}}; + if ($sortrole{$which} =~ m-dc\./(\w+)/-) { + if ($dcroles{$1}) { + $output .= &allcourses_row($1); } } - if (($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) && (!$skiprole)) { - $output.=$roletext{$sortrole{$which}}; - } - } - if ($output) { - if ($doheaders > 0) { - $r->print("". - "".&mt($type)." -"); - } - $r->print($output); - } - } - } else { - foreach my $type ('Construction Space','Course','Domain','System') { - my $output; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { - $output.=$roletext{$sortrole{$which}}; - } } - if ($output) { - if ($doheaders > 0) { - $r->print("". - "".&mt($type).""); - } - $r->print($output); + } + if ($output) { + if ($doheaders > 0) { + $r->print("". + "".&mt($type).""); } - } + $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'; @@ -747,7 +644,7 @@ ENDHEADER $r->print(''); } unless ($nochoose) { - if ($ENV{'request.role'} ne 'cm') { + if ($env{'request.role'} ne 'cm') { $r->print(''); } else { @@ -763,24 +660,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.')'; } @@ -793,7 +690,7 @@ ENDHEADER $twhere='/'; } $r->print("\n

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