[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 24 Mar 2003 18:46:44 -0000
This is a MIME encoded message
--albertel1048531604
Content-Type: text/plain
albertel Mon Mar 24 13:46:44 2003 EDT
Modified files:
/loncom/auth lonroles.pm
Log:
-tabinate
--albertel1048531604
Content-Type: text/plain
Content-Disposition: attachment; filename="albertel-20030324134644.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.54 loncom/auth/lonroles.pm:1.55
--- loncom/auth/lonroles.pm:1.54 Mon Mar 24 09:45:09 2003
+++ loncom/auth/lonroles.pm Mon Mar 24 13:46:44 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.54 2003/03/24 14:45:09 www Exp $
+# $Id: lonroles.pm,v 1.55 2003/03/24 18:46:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,50 +67,50 @@
my %temp=('logout_'.$ENV{'request.course.id'} => time);
&Apache::lonnet::put('email_status',\%temp);
}
- &Apache::lonnet::appenv("request.course.id" => '',
- "request.course.fn" => '',
- "request.course.uri" => '',
- "request.course.sec" => '',
- "request.role" => 'cm',
- "request.role.domain" => $ENV{'user.domain'});
+ &Apache::lonnet::appenv("request.course.id" => '',
+ "request.course.fn" => '',
+ "request.course.uri" => '',
+ "request.course.sec" => '',
+ "request.role" => 'cm',
+ "request.role.domain" => $ENV{'user.domain'});
foreach $envkey (keys %ENV) {
next if ($envkey!~/^user\.role\./);
my (undef,undef,$role,@pwhere)=split(/\./,$envkey);
my $where=join('.',@pwhere);
my $trolecode=$role.'.'.$where;
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);
+ 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);
# check for keyed access
- if (($role eq 'st') &&
- ($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) {
- unless (&Apache::lonnet::validate_access_key(
- $ENV{'environment.key.'.$cdom.'_'.$cnum},
- $cdom,$cnum)) {
+ if (($role eq 'st') &&
+ ($ENV{'course.'.$cdom.'_'.$cnum.'.keyaccess'} eq 'yes')) {
+ unless (&Apache::lonnet::validate_access_key(
+ $ENV{'environment.key.'.$cdom.'_'.$cnum},
+ $cdom,$cnum)) {
# there is no valid key
- if ($ENV{'form.newkey'}) {
+ if ($ENV{'form.newkey'}) {
# student attempts to register a new key
- } else {
+ } else {
# print form to enter a new key
- $r->content_type('text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- my $swinfo=&Apache::lonmenu::rawconfig();
- my $bodytag=&Apache::loncommon::bodytag
- ('Enter Access Key to Unlock this Course');
- $r->print(<<ENDENTERKEY);
+ $r->content_type('text/html');
+ &Apache::loncommon::no_cache($r);
+ $r->send_http_header;
+ my $swinfo=&Apache::lonmenu::rawconfig();
+ my $bodytag=&Apache::loncommon::bodytag
+ ('Enter Access Key to Unlock this Course');
+ $r->print(<<ENDENTERKEY);
<head><title>Entering Course Access Key</title>
</head>
<html>
@@ -125,35 +125,35 @@
</form>
</body></html>
ENDENTERKEY
- return OK;
- }
- }
- }
- &Apache::lonnet::appenv('request.role' => $trolecode,
- 'request.role.domain' => $cdom,
- '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=
+ return OK;
+ }
+ }
+ }
+ &Apache::lonnet::appenv('request.role' => $trolecode,
+ 'request.role.domain' => $cdom,
+ '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=
'<h1><font color=red>Could not initialize top-level map.</font></h1>';
- }
- $r->content_type('text/html');
- &Apache::loncommon::no_cache($r);
- $r->send_http_header;
- my $swinfo=&Apache::lonmenu::rawconfig();
- my $bodytag=&Apache::loncommon::bodytag('Switching Role');
- print (<<ENDREDIR);
+ }
+ $r->content_type('text/html');
+ &Apache::loncommon::no_cache($r);
+ $r->send_http_header;
+ my $swinfo=&Apache::lonmenu::rawconfig();
+ my $bodytag=&Apache::loncommon::bodytag('Switching Role');
+ print (<<ENDREDIR);
<head><title>Entering Course</title>
<meta HTTP-EQUIV="Refresh" CONTENT="1; url=$furl">
</head>
@@ -167,10 +167,10 @@
</html>
ENDREDIR
return OK;
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
}
@@ -203,8 +203,8 @@
my ($fn,$priv,$nochoose,$error,$msg)=split(/:/,$ENV{'user.error.msg'});
if ($ENV{'user.error.msg'}) {
- $r->log_reason(
- "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
+ $r->log_reason(
+ "$msg for $ENV{'user.name'} domain $ENV{'user.domain'} access $priv",$fn);
}
# ---------------------------------------------------------------- Who is this?
@@ -235,27 +235,27 @@
# -------------------------------------------------------- Choice or no choice?
if ($nochoose) {
if ($advanced) {
- $r->print("<h2>Assigned User Roles</h2>\n");
+ $r->print("<h2>Assigned User Roles</h2>\n");
} else {
- $r->print("<h2>Sorry ...</h2>\nThis resource might be part of");
- if ($ENV{'request.course.id'}) {
- $r->print(' another');
- } else {
- $r->print(' a certain');
- }
- $r->print(' course.</body></html>');
- return OK;
+ $r->print("<h2>Sorry ...</h2>\nThis resource might be part of");
+ if ($ENV{'request.course.id'}) {
+ $r->print(' another');
+ } else {
+ $r->print(' a certain');
+ }
+ $r->print(' course.</body></html>');
+ return OK;
}
} else {
if ($advanced) {
- $r->print("Your home server is ".
- $Apache::lonnet::hostname{&Apache::lonnet::homeserver
- ($ENV{'user.name'},$ENV{'user.domain'})}.
- "<br />\n");
- $r->print("Author and Co-Author roles may not be available on ".
- "servers other than your home server.");
+ $r->print("Your home server is ".
+ $Apache::lonnet::hostname{&Apache::lonnet::homeserver
+ ($ENV{'user.name'},$ENV{'user.domain'})}.
+ "<br />\n");
+ $r->print("Author and Co-Author roles may not be available on ".
+ "servers other than your home server.");
} else {
- $r->print("<h2>Enter a Course</h2>\n");
+ $r->print("<h2>Enter a Course</h2>\n");
}
if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
$fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -270,8 +270,8 @@
# ----------------------------------------------------------------------- Table
$r->print('<table><tr>');
unless ($nochoose) { $r->print('<th> </th>'); }
- $r->print('<th>User Role</th><th colspan=2>Extent</th>'.
- '<th>Start</th><th>End</th><th>Remark</th></tr>'."\n");
+ $r->print('<th>User Role</th><th colspan=2>Extent</th>'.
+ '<th>Start</th><th>End</th><th>Remark</th></tr>'."\n");
foreach $envkey (sort keys %ENV) {
my $button = 1;
@@ -384,10 +384,10 @@
if ($ENV{'course.'.$tcourseid.'.description'}) {
$twhere=$ENV{'course.'.$tcourseid.'.description'};
unless ($twhere eq 'Currently not available') {
- $twhere.=' <font size="-2">'.
+ $twhere.=' <font size="-2">'.
&Apache::loncommon::syllabuswrapper('Syllabus',$trest,$tdom,$tfont).
'</font>';
- }
+ }
} else {
my %newhash=Apache::lonnet::coursedescription
($tcourseid);
@@ -410,7 +410,6 @@
$twhere='system wide';
}
-# ----- do not trust the indention below here -----
$r->print('<tr bgcolor='.$tbg.'>');
unless ($nochoose) {
if (!$button) {
@@ -431,14 +430,14 @@
$r->print('<td> </td>');
}
}
- $r->print('<td><font color="'.$tfont.'">'.$trole.
+ $r->print('<td><font color="'.$tfont.'">'.$trole.
'</font></td><td><font color="'.$tfont.'">'.$ttype.
'</font></td><td><font color="'.$tfont.'">'.$twhere.
'</font></td><td><font color="'.$tfont.'">'.$tpstart.
'</font></td><td><font color="'.$tfont.'">'.$tpend.
'</font></td><td><font color="'.$tfont.'">'.$tremark.
' </font></td></tr>'."\n");
- }
+ }
}
}
my $tremark='';
@@ -451,11 +450,11 @@
$r->print('<tr bgcolor="#77FF77">');
}
unless ($nochoose) {
- if ($ENV{'request.role'} ne 'cm') {
- $r->print('<td><input type=submit value=Select name="cm"></td>');
- } else {
- $r->print('<td> </td>');
- }
+ if ($ENV{'request.role'} ne 'cm') {
+ $r->print('<td><input type=submit value=Select name="cm"></td>');
+ } else {
+ $r->print('<td> </td>');
+ }
}
$r->print('<td colspan=5><font color="'.$tfont.'">No role specified'.
'</font></td><td><font color="'.$tfont.'">'.$tremark.
@@ -466,58 +465,59 @@
$r->print("</form>\n");
}
# ------------------------------------------------------------ Privileges Info
- if (($advanced) && (($ENV{'user.error.msg'}) || ($error))) {
- $r->print('<hr><h2>Current Privileges</h2>');
+ if (($advanced) && (($ENV{'user.error.msg'}) || ($error))) {
+ $r->print('<hr><h2>Current Privileges</h2>');
- foreach $envkey (sort keys %ENV) {
- if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) {
- my $where=$envkey;
- $where=~s/^user\.priv\.$ENV{'request.role'}\.//;
- my $ttype;
- my $twhere;
- 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=$ENV{'course.'.$tdom.'_'.$trest.'.description'};
- if ($tsec) {
- $twhere.=' (Section/Group: '.$tsec.')';
- }
- }
- } elsif ($tdom) {
- $ttype='Domain';
- $twhere=$tdom;
- } else {
- $ttype='System';
- $twhere='/';
- }
- $r->print("\n<h3>".$ttype.': '.$twhere.'</h3><ul>');
- foreach (sort split(/:/,$ENV{$envkey})) {
- if ($_) {
- my ($prv,$restr)=split(/\&/,$_);
- my $trestr='';
- if ($restr ne 'F') {
- my $i;
- $trestr.=' (';
- for ($i=0;$i<length($restr);$i++) {
- $trestr.=
- Apache::lonnet::plaintext(substr($restr,$i,1));
- if ($i<length($restr)-1) { $trestr.=', '; }
- }
- $trestr.=')';
- }
- $r->print('<li>'.Apache::lonnet::plaintext($prv).$trestr.
- '</li>');
- }
- }
- $r->print('</ul>');
- }
+ foreach $envkey (sort keys %ENV) {
+ if ($envkey=~/^user\.priv\.$ENV{'request.role'}\./) {
+ my $where=$envkey;
+ $where=~s/^user\.priv\.$ENV{'request.role'}\.//;
+ my $ttype;
+ my $twhere;
+ 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=$ENV{'course.'.$tdom.'_'.$trest.'.description'};
+ if ($tsec) {
+ $twhere.=' (Section/Group: '.$tsec.')';
+ }
+ }
+ } elsif ($tdom) {
+ $ttype='Domain';
+ $twhere=$tdom;
+ } else {
+ $ttype='System';
+ $twhere='/';
+ }
+ $r->print("\n<h3>".$ttype.': '.$twhere.'</h3><ul>');
+ foreach (sort split(/:/,$ENV{$envkey})) {
+ if ($_) {
+ my ($prv,$restr)=split(/\&/,$_);
+ my $trestr='';
+ if ($restr ne 'F') {
+ my $i;
+ $trestr.=' (';
+ for ($i=0;$i<length($restr);$i++) {
+ $trestr.=
+ Apache::lonnet::plaintext(substr($restr,$i,1));
+ if ($i<length($restr)-1) { $trestr.=', '; }
+ }
+ $trestr.=')';
+ }
+ $r->print('<li>'.
+ Apache::lonnet::plaintext($prv).$trestr.
+ '</li>');
+ }
+ }
+ $r->print('</ul>');
+ }
+ }
}
- }
$r->print("</body></html>\n");
return OK;
--albertel1048531604--