--- loncom/auth/lonroles.pm 2004/10/11 18:27:49 1.94.2.2
+++ 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.94.2.2 2004/10/11 18:27:49 albertel Exp $
+# $Id: lonroles.pm,v 1.110 2004/11/14 18:27:08 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,16 +36,23 @@ use Apache::Constants qw(:common);
use Apache::File();
use Apache::lonmenu;
use Apache::loncommon;
+use Apache::lonhtmlcommon;
use Apache::lonannounce;
use Apache::lonlocal;
sub redirect_user {
- my ($r,$title,$url,$msg) = @_;
+ my ($r,$title,$url,$msg,$launch_nav) = @_;
$msg = $title if (! defined($msg));
&Apache::loncommon::content_type($r,'text/html');
&Apache::loncommon::no_cache($r);
$r->send_http_header;
my $swinfo=&Apache::lonmenu::rawconfig();
+ my $navwindow;
+ if ($launch_nav eq 'on') {
+ $navwindow.=&Apache::lonnavmaps::launch_win('now');
+ } else {
+ $navwindow.=&Apache::lonnavmaps::close();
+ }
my $bodytag=&Apache::loncommon::bodytag('Switching Role');
# Note to style police:
# This must only replace the spaces, nothing else, or it bombs elsewhere.
@@ -56,9 +63,10 @@ sub redirect_user {
$bodytag
-
+$navwindow
$msg
Continue
@@ -74,15 +82,20 @@ 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'}) {
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::appenv("request.course.id" => '',
"request.course.fn" => '',
"request.course.uri" => '',
@@ -90,23 +103,35 @@ 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 (undef,undef,$role,@pwhere)=split(/\./,$envkey);
- my $where=join('.',@pwhere);
- my $trolecode=$role.'.'.$where;
+ my ($where,$trolecode,$role,$tstatus,$tend,$tstart);
+ &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
if ($ENV{'form.'.$trolecode}) {
- my ($tstart,$tend)=split(/\./,$ENV{$envkey});
- my $tstatus='is';
- if ($tstart) {
- if ($tstart>$then) {
- $tstatus='future';
- }
- }
- if ($tend) {
- if ($tend<$then) { $tstatus='expired'; }
- if ($tend<$now) { $tstatus='will_not'; }
- }
if ($tstatus eq 'is') {
$where=~s/^\///;
my ($cdom,$cnum,$csec)=split(/\//,$where);
@@ -200,15 +225,15 @@ ENDENTERKEY
$ENV{'user.name'},
$ENV{'user.home'},
"Role ".$trolecode);
- my $tadv=0;
- if (($trolecode!~/^st/) &&
- ($trolecode!~/^ta/) &&
- ($trolecode!~/^cm/)) { $tadv=1; }
+
&Apache::lonnet::appenv(
- 'request.role' => $trolecode,
- 'request.role.adv' => $tadv,
+ 'request.role' => $trolecode,
'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')) {
@@ -244,10 +269,20 @@ 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'),
- $furl,$msg);
+ $furl,$msg,
+ $ENV{'environment.remotenavmap'});
return OK;
}
}
@@ -266,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;
+ }
}
}
}
@@ -372,29 +413,17 @@ ENDHEADER
my $roletext;
my $sortkey;
if ($envkey=~/^user\.role\./) {
- my (undef,undef,$role,@pwhere)=split(/\./,$envkey);
+ my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend,$tfont);
+ &role_status($envkey,$then,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
next if (!defined($role) || $role eq '');
- my $where=join('.',@pwhere);
- my $trolecode=$role.'.'.$where;
- my ($tstart,$tend)=split(/\./,$ENV{$envkey});
- my $tremark='';
- my $tstatus='is';
- my $tpstart=' ';
- my $tpend=' ';
- my $tfont='#000000';
+ $tremark='';
+ $tpstart=' ';
+ $tpend=' ';
+ $tfont='#000000';
if ($tstart) {
- if ($tstart>$then) {
- $tstatus='future';
- if ($tstart<$now) { $tstatus='will'; }
- }
$tpstart=&Apache::lonlocal::locallocaltime($tstart);
}
if ($tend) {
- if ($tend<$then) {
- $tstatus='expired';
- } elsif ($tend<$now) {
- $tstatus='will_not';
- }
$tpend=&Apache::lonlocal::locallocaltime($tend);
}
if ($ENV{'request.role'} eq $trolecode) {
@@ -502,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;
@@ -529,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;
@@ -598,7 +593,7 @@ ENDHEADER
unless ($nochoose) { $r->print(' | '); }
$r->print(''.&mt('User Role').' | '.&mt('Extent').
' | '.&mt('Start').' | '.&mt('End').' | '.
- &mt('Remark').' | '."\n");
+ &mt('Remarks and Calendar Announcements').''."\n");
my $doheaders=-1;
foreach my $type ('Construction Space','Course','Domain','System') {
my $haverole=0;
@@ -609,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.=&mt($roletext{$sortrole{$which}});
+ $output.=$roletext{$sortrole{$which}};
+ if ($sortrole{$which} =~ m-dc\./(\w+)/-) {
+ if ($dcroles{$1}) {
+ $output .= &allcourses_row($1);
+ }
+ }
}
}
if ($output) {
@@ -621,7 +624,7 @@ ENDHEADER
$r->print("".
"".&mt($type)." | ");
}
- $r->print($output);
+ $r->print($output);
}
}
my $tremark='';
@@ -711,7 +714,287 @@ ENDHEADER
}
$r->print("