--- loncom/auth/lonroles.pm 2004/11/11 22:18:23 1.106 +++ loncom/auth/lonroles.pm 2005/03/03 07:32:49 1.117 @@ -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.117 2005/03/03 07:32:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -82,32 +82,11 @@ sub handler { my $now=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); &Apache::lonnet::put('email_status',\%temp); @@ -121,28 +100,15 @@ sub handler { "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; } } } @@ -155,6 +121,13 @@ sub handler { 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')) { @@ -251,9 +224,6 @@ 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')) { @@ -265,6 +235,8 @@ ENDENTERKEY 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 { @@ -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 @@ -289,18 +263,6 @@ ENDENTERKEY '.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, @@ -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 @@ -377,18 +335,12 @@ ENDHEADER 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'}) { @@ -425,19 +377,16 @@ ENDHEADER $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'}; } $r->print('
'); - $r->print(''); - $r->print(''); + $r->print(''); + $r->print(''); } 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; @@ -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; @@ -672,70 +587,52 @@ 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'; @@ -851,18 +748,60 @@ sub role_status { } } -sub dc_script { - my $response = (<<"END"); -function setDCchoice(caller) { - var dcname = "dc./"+caller+"/" - document.rolechoice.dcselected.value = caller - document.rolechoice.elements[3].name = dcname - document.rolechoice.submit() +sub build_roletext { + my ($trolecode,$tdom,$trest,$tstatus,$tryagain,$advanced,$tremark,$tbg,$tfont,$trole,$ttype,$twhere,$tpstart,$tpend,$nochoose,$button,$switchserver) = @_; + my $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"; + return $roletext; } -END - return $response; + +sub check_privs { + my ($cckey,$then,$now) = @_; + 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')) { + &set_privileges($1,$2); + } + } else { + &set_privileges($1,$2); + } } - + sub check_fordc { my ($dcroles,$then) = @_; my $numdc = 0; @@ -884,151 +823,135 @@ sub check_fordc { return $numdc; } -sub choosecourse_display { - my ($r,$dcdom,$then,$now) = @_; - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'dom'); +sub courselink { + my ($dcdom) = @_; + my $courseform=&Apache::loncommon::selectcourse_link + ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom,$dcdom); + my $hiddenitems = ''. + ''. + ''. + ''; + return $courseform.$hiddenitems; +} + +sub coursepick_jscript { my $verify_script = <<"END"; END - my $courseform=&Apache::loncommon::selectcourse_link - ('roles','dccourse','dcdomain','coursedesc'); - $r->print($cb_jscript.$verify_script); - my $formaction='/adm/roles'; - $formaction=~s/\/+/\//g; - my $crs; - &select_recent_courses($r,$dcdom,$then,$now); - $r->print('
'); - $r->print('

'.&mt('Choose a course from domain').': '.$dcdom.'

'.$courseform.'

'. - ''. - 'Course Title:
'. - 'Course ID: '. - ''. - ''. - ''. - '

'. - '
'); - return; + return $verify_script; } -sub select_recent_courses { - my ($r,$dcdom,$then,$now)=@_; +sub processpick { + my $dcdom = shift; + my $process_pick = <<"END"; + +END + return $process_pick; +} + +sub display_cc_role { + my $rolekey = shift; + my $roletext; my $advanced = $ENV{'user.adv'}; my $tryagain = $ENV{'form.tryagain'}; - my %recent=&Apache::lonnet::dump(&recent_filename('cc_pickby_dc_'.$dcdom)); - my $numrecent = 0; - my $roletext = '

'.&mt('Enter a recently visited course').'

'. - '
'. - ''. - ''."\n". - ''. - ''."\n"; - foreach my $courseid (sort keys %recent) { - unless ($courseid =~/^error\:/) { - my ($dom,$crs) = split/_/,$courseid; - if ($dom eq $dcdom) { - $numrecent ++; - my $crskey = 'user.role.cc./'.$dom.'/'.$crs; - my ($where,$trolecode,$role,$tstatus,$tend,$tstart,$tbg,$tfont,$tremark,$inrole,$tpstart,$tpend); - my $button = 1; - &role_status($crskey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); - if ($tstart) { - $tpstart=&Apache::lonlocal::locallocaltime($tstart); - } - if ($tend) { - $tpend=&Apache::lonlocal::locallocaltime($tend); - } - my $ttype = &mt('Course'); - my $twhere; - if ($ENV{'course.'.$courseid.'.description'}) { - $twhere=$ENV{'course.'.$courseid.'.description'}; - } - my ($tdom,$trest,$tsection)= - split(/\//,Apache::lonnet::declutter($where)); - if ($ENV{'request.role'} eq $trolecode) { - $tstatus='selected'; - } - if ($tstatus eq 'is') { - $tbg='#77FF77'; - $tfont='#003300'; - } elsif ($tstatus eq 'future') { - $tbg='#FFFF77'; - $button=0; - } elsif ($tstatus eq 'will') { - $tbg='#FFAA77'; - $tremark.=&mt('Active at next login. '); - } elsif ($tstatus eq 'expired') { - $tbg='#FF7777'; - $tfont='#330000'; - $button=0; - } elsif ($tstatus eq 'will_not') { - $tbg='#AAFF77'; - $tremark.=&mt('Expired after logout. '); - } elsif ($tstatus eq 'selected') { - $tbg='#11CC55'; - $tfont='#002200'; - $inrole=1; - $tremark.=&mt('Currently selected. '); - } - my $trole=Apache::lonnet::plaintext($role); - $roletext.=''; - if (!$button) { - $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.=''."\n"; + unless ($rolekey =~/^error\:/) { + if ($rolekey =~ m-^user\.role.cc\./(\w+)/(\w+)$-) { + my $tcourseid = $1.'_'.$2; + my $trolecode = 'cc./'.$1.'/'.$2; + my $trole = Apache::lonnet::plaintext('cc'); + my $twhere; + my $tbg='#77FF77'; + my $tfont='#003300'; + my %newhash=&Apache::lonnet::coursedescription($tcourseid); + if (%newhash) { + $twhere=$newhash{'description'}. + ' '. + &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1,$tfont). + ''; + } else { + $twhere=&mt('Currently not available'); + $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,''); } } - if ($numrecent > 0) { - $r->print($roletext.'
 '.&mt('User Role').''.&mt('Extent'). - ''.&mt('Start').''.&mt('End').''. - &mt('Remarks and Calendar Announcements').'
'. - &mt('Domain').' - '.&mt('Recent courses accessed in this domain'). - '
  '.$trole. - ''.$ttype. - ''.$twhere. - ''.$tpstart. - ''.$tpend. - ''.$tremark. - ' 
'."\n"); - } + return $roletext; +} + +sub allcourses_row { + my $dcdom = shift; + my $ccrole = Apache::lonnet::plaintext('cc'); + my $selectlink = &courselink($dcdom); + my $output = ''. + ''. + ''. + ''. + $ccrole.''.&mt('Course').''. + ''.&mt('All courses').': '. + $selectlink.''. + '
'.&mt('Domain').':'.$dcdom.''. + ''. + &mt('Course Coordinator access to all courses in domain'). + ': '.$dcdom.''."\n"; + return $output; } sub recent_filename { @@ -1044,7 +967,8 @@ sub set_privileges { my $userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$ENV{'user.name'}); my %ccrole = (); &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area); - $userroles .= &Apache::lonnet::set_userprivs(\$userroles,\%ccrole); my @newprivs = split/\n/,$userroles; + my ($author,$adv)= &Apache::lonnet::set_userprivs(\$userroles,\%ccrole); + my @newprivs = split/\n/,$userroles; my %newccroles = (); foreach (@newprivs) { my ($key,$val) = split/=/,$_; @@ -1055,7 +979,6 @@ sub set_privileges { $ENV{'user.name'}, $ENV{'user.home'}, "Role ".$role); - &Apache::lonnet::appenv( 'request.role' => $role, 'request.role.domain' => $dcdom,