--- loncom/auth/lonroles.pm 2000/10/04 15:29:50 1.11
+++ loncom/auth/lonroles.pm 2001/07/06 15:11:19 1.27
@@ -5,8 +5,12 @@
# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
# 11/23 Gerd Kortemeyer)
# 1/14,03/06,06/01,07/22,07/24,07/25,
-# 09/04,09/06,09/28,09/29,09/30,10/2 Gerd Kortemeyer
-#
+# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
+# 12/08,12/28,
+# 01/15/01 Gerd Kortemeyer
+# 02/27/01 Scott Harrison
+# 03/02,05/03,05/25,05/30,06/01,07/06 Gerd Kortemeyer
+
package Apache::lonroles;
use strict;
@@ -14,6 +18,7 @@ use Apache::lonnet();
use Apache::lonuserstate();
use Apache::Constants qw(:common);
use Apache::File();
+use Apache::lonmenu;
sub handler {
@@ -27,8 +32,13 @@ sub handler {
# ================================================================== Roles Init
if ($ENV{'form.selectrole'}) {
- foreach $envkey (keys %ENV) {
- if ($envkey=~/^user\.role\./) {
+ &Apache::lonnet::appenv("request.course.id" => '',
+ "request.course.fn" => '',
+ "request.course.uri" => '',
+ "request.course.sec" => '',
+ "request.role" => 'cm');
+ foreach $envkey (keys %ENV) {
+ if ($envkey=~/^user\.role\./) {
my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey);
my $where=join('.',@pwhere);
my $trolecode=$role.'.'.$where;
@@ -42,23 +52,53 @@ sub handler {
}
if ($tend) {
if ($tend<$then) { $tstatus='expired'; }
- if ($tend>$now) { $tstatus='will_not'; }
+ if ($tend<$now) { $tstatus='will_not'; }
}
if ($tstatus eq 'is') {
- &Apache::lonnet::appenv('request.role' => $trolecode);
- my ($cdom,$cnum)=split(/\//,$where);
- if ($cnum) {
- &Apache::lonuserstate::readmap($where);
- if ($ENV{'form.orgurl'}) {
+ $where=~s/^\///;
+ my ($cdom,$cnum,$csec)=split(/\//,$where);
+ &Apache::lonnet::appenv('request.role' => $trolecode,
+ 'request.course.sec' => $csec);
+ my $msg='Entering course ...';
+ if (($cnum) && ($role ne 'ca')) {
+ my ($furl,$ferr)=
+ &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+ if (($ENV{'form.orgurl'}) &&
+ ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) {
$r->internal_redirect($ENV{'form.orgurl'});
return OK;
- }
+ } else {
+ unless ($ENV{'request.course.id'}) {
+ &Apache::lonnet::appenv(
+ "request.course.id" => $cdom.'_'.$cnum);
+ $furl='/adm/notfound.html';
+ $msg=
+ 'Could not initialize top-level map.
';
+ }
+ $r->content_type('text/html');
+ $r->send_http_header;
+ my $swinfo=&Apache::lonmenu::rawconfig;
+ print (<Entering Course
+
+
+
+
+
+$msg
+
+
+ENDREDIR
+ return OK;
+ }
}
}
}
}
}
- }
+ }
# =============================================================== No Roles Init
@@ -67,18 +107,26 @@ sub handler {
$r->send_http_header;
return OK if $r->header_only;
+ my $swinfo=&Apache::lonmenu::rawconfig;
+
$r->print(<
LON-CAPA User Roles
+
ENDHEADER
# ------------------------------------------ Get Error Message from Environment
my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$ENV{'user.error.msg'});
- $r->log_reason(
- "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
+ if ($ENV{'user.error.msg'}) {
+ $r->log_reason(
+ "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
+ }
# ---------------------------------------------------------------- Who is this?
@@ -90,10 +138,6 @@ ENDHEADER
}
}
-# ---------------------------------------------- Get cached course descriptions
-
- my %cdes=Apache::lonnet::dump('coursedescriptions');
-
# -------------------------------------------------------- Generate Page Output
# --------------------------------------------------------------- Error Header?
if ($error) {
@@ -104,6 +148,11 @@ ENDHEADER
$r->print("Action : $msg\n
");
} else {
$r->print("LON-CAPA User Roles
");
+ if ($ENV{'user.error.msg'}) {
+ $r->print(
+ 'You need to choose another user role or '.
+ 'enter a specific course for this function
');
+ }
}
# -------------------------------------------------------- Choice or no choice?
if ($nochoose) {
@@ -125,19 +174,21 @@ ENDHEADER
} else {
$r->print("Enter a Course
\n");
}
+ if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
+ $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
+ }
$r->print('\n");
}
-# ------------------------------------------------------------ Priviledges Info
+# ------------------------------------------------------------ Privileges Info
if ($advanced) {
- $r->print('
Priviledges
');
+ $r->print('
Current Privileges
');
foreach $envkey (sort keys %ENV) {
- if ($envkey=~/^user\.priv\./) {
- my ($dum1,$dum2,@pwhere)=split(/\./,$envkey);
- my $where=join('.',@pwhere);
+ if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) {
+ my $where=$envkey;
+ $where=~s/^user\.priv\.$ENV{'request.role'}\.//;
my $ttype;
my $twhere;
- my ($tdom,$trest)=
+ my ($tdom,$trest,$tsec)=
split(/\//,Apache::lonnet::declutter($where));
if ($trest) {
+ if ($ENV{'course.'.$tdom.'_'.$trest.'.description'} eq 'ca') {
+ $ttype='Construction Space';
+ $twhere='User: '.$trest.', Domain: '.$tdom;
+ } else {
$ttype='Course';
- $twhere=$cdes{$tdom.'/'.$trest};
+ $twhere=$ENV{'course.'.$tdom.'_'.$trest.'.description'};
+ if ($tsec) {
+ $twhere.=' (Section/Group: '.$tsec.')';
+ }
+ }
} elsif ($tdom) {
$ttype='Domain';
$twhere=$tdom;
@@ -280,15 +370,6 @@ ENDHEADER
}
}
}
-# -------------------------------------------------------------- Debug - remove
-
- $->print("
Debugging
\n");
-
- foreach $envkey (sort keys %ENV) {
- $r->print("$envkey ---- $ENV{$envkey}
");
- }
-
-# ------------------------------------------------------------------- End Debug
$r->print("