--- loncom/auth/lonroles.pm 2004/11/09 16:18:51 1.103
+++ loncom/auth/lonroles.pm 2004/11/11 23:17:13 1.107
@@ -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.107 2004/11/11 23:17:13 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,10 +82,33 @@ 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);
@@ -97,6 +121,33 @@ sub handler {
"request.role" => 'cm',
"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 and needs privs to be created
+ if ($numdc > 0) {
+ foreach my $envkey (keys %ENV) {
+ if ($envkey =~ m-^form\.cc\./(\w+)/(\w+)$-) {
+ if ($dcroles{$1}) {
+ unless ($ENV{'user.role.cc./'.$1.'/'.$2}) {
+ &set_privileges($1,$2);
+ }
+ }
+ last;
+ }
+ }
+ }
+
+ 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);
+ }
+ }
+ }
+ }
+
foreach $envkey (keys %ENV) {
next if ($envkey!~/^user\.role\./);
my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
@@ -239,6 +290,16 @@ 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
+ 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'),
@@ -262,6 +323,14 @@ ENDENTERKEY
$redirect_url);
return OK;
}
+ if ($role eq 'dc') {
+ unless ($dcselect) {
+ my $redirect_url = '/adm/menu/';
+ &redirect_user($r,&mt('Loading Domain Coordinator Menu'),
+ $redirect_url);
+ return OK;
+ }
+ }
}
}
}
@@ -276,6 +345,7 @@ 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
@@ -306,6 +377,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
");
@@ -486,8 +563,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;
@@ -593,20 +669,70 @@ ENDHEADER
}
if ($haverole) { $doheaders++; }
}
- 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 ($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;
+ }
+ }
+ 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)." | ");
+ if ($output) {
+ if ($doheaders > 0) {
+ $r->print("
".
+ "".&mt($type)." | ");
+ }
+ $r->print($output);
}
- $r->print($output);
- }
+ }
}
my $tremark='';
my $tfont='#003300';
@@ -707,25 +833,233 @@ 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 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()
+}
+END
+ return $response;
+}
+
+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 choosecourse_display {
+ my ($r,$dcdom,$then,$now) = @_;
+ my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'dom');
+ 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;
+}
+
+sub select_recent_courses {
+ my ($r,$dcdom,$then,$now)=@_;
+ 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");
+ }
+}
+
+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;