--- loncom/auth/lonroles.pm 2004/11/09 16:18:51 1.103 +++ loncom/auth/lonroles.pm 2004/11/14 18:27:08 1.110 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.103 2004/11/09 16:18:51 raeburn Exp $ +# $Id: lonroles.pm,v 1.110 2004/11/14 18:27:08 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,6 +36,7 @@ use Apache::Constants qw(:common); use Apache::File(); use Apache::lonmenu; use Apache::loncommon; +use Apache::lonhtmlcommon; use Apache::lonannounce; use Apache::lonlocal; @@ -81,7 +82,12 @@ sub handler { my $now=time; my $then=$ENV{'user.login.time'}; my $envkey; - + my %dcroles = (); + my $numdc = &check_fordc(\%dcroles,$then); + my %recentroles; + if ($numdc > 0) { + %recentroles = &Apache::lonnet::dump(&recent_filename('roles')); + } # ================================================================== Roles Init if ($ENV{'form.selectrole'}) { @@ -97,6 +103,30 @@ sub handler { "request.role" => 'cm', "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) { + if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) { + if ($dcroles{$1}) { + my $cckey = 'user.role.cc./'.$1.'/'.$2; + &check_privs($cckey,$then,$now); + } + last; + } + } + } + +# Check if user is a DC with courses in the recent list which need privs. +# if ($numdc > 0) { +# %recentroles = &Apache::lonnet::dump(&recent_filename('recent_roles')); +# foreach my $rolekey (keys %recentroles) { +# if ($rolekey =~ m-^user\.role.cc\./\w+/\w+$-) { +# &check_privs($rolekey,$then,$now); +# } +# } +# } + foreach $envkey (keys %ENV) { next if ($envkey!~/^user\.role\./); my ($where,$trolecode,$role,$tstatus,$tend,$tstart); @@ -239,6 +269,15 @@ ENDENTERKEY '.course.helper.not.run'}) { $furl = "/adm/helper/course.initialization.helper"; } + # Check to see if the user is a DC selecting a course + if (($numdc > 0) && ($role eq 'cc')) { + my $formaction = '/adm/roles/'; + my ($dcdom,$pickedcourse) = split/_/,$courseid; + if ($ENV{'user.role.dc./'.$dcdom.'/'}) { + &Apache::lonhtmlcommon::store_recent('roles', + $envkey,$formaction); + } + } # # Send the user to the course they selected &redirect_user($r,&mt('Entering Course'), @@ -262,6 +301,12 @@ ENDENTERKEY $redirect_url); return OK; } + if ($role eq 'dc') { + my $redirect_url = '/adm/menu/'; + &redirect_user($r,&mt('Loading Domain Coordinator Menu'), + $redirect_url); + return OK; + } } } } @@ -486,8 +531,7 @@ ENDHEADER ''; } } else { - my %newhash=Apache::lonnet::coursedescription - ($tcourseid); + my %newhash=&Apache::lonnet::coursedescription($tcourseid); if (%newhash) { $sortkey=$role."\0".$tdom."\0".$newhash{'description'}. "\0".$envkey; @@ -513,40 +557,7 @@ ENDHEADER } $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; @@ -593,11 +604,19 @@ ENDHEADER } if ($haverole) { $doheaders++; } } + if ($numdc > 0) { + &display_recent_roles($r,\%roletext,\%recentroles); + } 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 ($output) { @@ -605,7 +624,7 @@ ENDHEADER $r->print("". "".&mt($type).""); } - $r->print($output); + $r->print($output); } } my $tremark=''; @@ -707,25 +726,274 @@ sub role_status { $$trolecode=$$role.'.'.$$where; ($$tstart,$$tend)=split(/\./,$ENV{$rolekey}); $$tstatus='is'; - if ($$tstart) { - if ($tstart>$then) { - $tstatus='future'; - if ($tstart<$now) { $tstatus='will'; } - } - if ($$tstart>$then) { - $$tstatus='future'; - if ($$tstart<$now) { $$tstatus='will'; } - } + if ($$tstart && $$tstart>$then) { + $$tstatus='future'; + if ($$tstart<$now) { $$tstatus='will'; } } if ($$tend) { if ($$tend<$then) { $$tstatus='expired'; } elsif ($$tend<$now) { - $$tstatus='will_not'; + $$tstatus='will_not'; + } + } + } + } +} + +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; +} + +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; + 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}); + if ($tstart && $tstart>$then) { $livedc = 0; } + if ($tend && $tend <$then) { $livedc = 0; } + if ($livedc) { + $$dcroles{$dcdom} = $envkey; + $numdc++; } } } } + return $numdc; +} + +sub courselink { + my ($dcdom) = @_; + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom); + my $verify_script = &coursepick_jscript($dcdom); + my $courseform=&Apache::loncommon::selectcourse_link + ('rolechoice','dccourse_'.$dcdom,'dcdomain_'.$dcdom,'coursedesc_'.$dcdom); + my $hiddenitems = ''. + ''. + ''. + ''; + return $cb_jscript.$verify_script.$courseform.$hiddenitems; +} + +sub coursepick_jscript { + my ($dcdom) = @_; + my $verify_script = <<"END"; + +END + return $verify_script; +} + +sub processpick { + my $dcdom = shift; + my $process_pick = <<"END"; + +END + return $process_pick; +} + +sub display_recent_roles { + my ($r,$roletext,$recentroles)=@_; + my $advanced = $ENV{'user.adv'}; + my $tryagain = $ENV{'form.tryagain'}; + my $numrecent = 0; + my $roledisplay = ''. + ''. + &mt('Recent courses accessed by DC'). + ''."\n"; + foreach my $rolekey (sort keys %{$recentroles}) { + unless ($rolekey =~/^error\:/) { + unless ($$roletext{$rolekey}) { + 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{$rolekey} = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$tfont,$trole,&mt('Course'),$twhere,'','','',1,''); + } + } + $roledisplay.=$$roletext{$rolekey}; + $numrecent ++; + } + } + if ($numrecent > 0) { + $r->print("$roledisplay\n"); + } +} + +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 { + my $area=shift; + return 'nohist_recent_'.&Apache::lonnet::escape($area); +} + +sub set_privileges { + my ($dcdom,$pickedcourse) = @_; + my $area = '/'.$dcdom.'/'.$pickedcourse; + my $role = 'cc'; + my $spec = $role.'.'.$area; + 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); + my @newprivs = split/\n/,$userroles; + my %newccroles = (); + foreach (@newprivs) { + my ($key,$val) = split/=/,$_; + $newccroles{$key} = $val; + } + &Apache::lonnet::appenv(%newccroles); + &Apache::lonnet::log($ENV{'user.domain'}, + $ENV{'user.name'}, + $ENV{'user.home'}, + "Role ".$role); + &Apache::lonnet::appenv( + 'request.role' => $role, + 'request.role.domain' => $dcdom, + 'request.course.sec' => ''); + my $tadv=0; + if (&Apache::lonnet::allowed('adv') eq 'F') { $tadv=1; } + &Apache::lonnet::appenv('request.role.adv' => $tadv); } 1;