--- loncom/auth/lonroles.pm 2001/02/27 20:44:18 1.22
+++ loncom/auth/lonroles.pm 2002/02/01 12:54:51 1.34
@@ -1,14 +1,47 @@
# The LearningOnline Network with CAPA
# User Roles Screen
+#
+# $Id: lonroles.pm,v 1.34 2002/02/01 12:54:51 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
# (Directory Indexer
# (Login Screen
+# YEAR=1999
# 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)
+# YEAR=2000
# 1/14,03/06,06/01,07/22,07/24,07/25,
# 09/04,09/06,09/28,09/29,09/30,10/2,10/5,10/26,10/28,
# 12/08,12/28,
+# YEAR=2001
# 01/15/01 Gerd Kortemeyer
# 02/27/01 Scott Harrison
+# 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer
+# 12/21 Scott Harrison
+# 12/29 Gerd Kortemeyer
+#
+###
package Apache::lonroles;
@@ -17,6 +50,8 @@ use Apache::lonnet();
use Apache::lonuserstate();
use Apache::Constants qw(:common);
use Apache::File();
+use Apache::lonmenu;
+use Apache::loncommon;
sub handler {
@@ -30,6 +65,10 @@ sub handler {
# ================================================================== 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::appenv("request.course.id" => '',
"request.course.fn" => '',
"request.course.uri" => '',
@@ -57,7 +96,8 @@ sub handler {
my ($cdom,$cnum,$csec)=split(/\//,$where);
&Apache::lonnet::appenv('request.role' => $trolecode,
'request.course.sec' => $csec);
- if ($cnum) {
+ my $msg='Entering course ...';
+ if (($cnum) && ($role ne 'ca')) {
my ($furl,$ferr)=
&Apache::lonuserstate::readmap($cdom.'/'.$cnum);
if (($ENV{'form.orgurl'}) &&
@@ -65,15 +105,27 @@ sub handler {
$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');
+ &Apache::loncommon::no_cache($r);
$r->send_http_header;
+ my $swinfo=&Apache::lonmenu::rawconfig;
print (<Entering Course
-Entering course ...
+
+$msg
ENDREDIR
@@ -90,15 +142,20 @@ ENDREDIR
# =============================================================== No Roles Init
$r->content_type('text/html');
+ &Apache::loncommon::no_cache($r);
$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
@@ -129,6 +186,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) {
@@ -157,6 +219,9 @@ ENDHEADER
$r->print('');
$r->print('');
}
+ $r->print(' Show all roles: print(' checked'); }
+ $r->print('> ');
# ----------------------------------------------------------------------- Table
$r->print('
');
unless ($nochoose) { $r->print('
'); }
@@ -181,14 +246,19 @@ ENDHEADER
$tpstart=localtime($tstart);
}
if ($tend) {
- if ($tend<$then) { $tstatus='expired'; }
- if ($tend<$now) { $tstatus='will_not'; }
+ if ($tend<$then) {
+ $tstatus='expired';
+ } elsif ($tend<$now) {
+ $tstatus='will_not';
+ }
$tpend=localtime($tend);
}
if ($ENV{'request.role'} eq $trolecode) {
$tstatus='selected';
}
my $tbg;
+ if (($tstatus eq 'is') || ($tstatus eq 'selected') ||
+ ($ENV{'form.showall'})) {
if ($tstatus eq 'is') {
$tbg='#77FF77';
} elsif ($tstatus eq 'future') {
@@ -218,6 +288,11 @@ ENDHEADER
my ($tdom,$trest,$tsection)=
split(/\//,Apache::lonnet::declutter($where));
if ($trest) {
+ if ($role eq 'ca') {
+ $ttype='Construction Space';
+ $twhere='User: '.$trest.' Domain: '.$tdom;
+ $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+ } else {
$ttype='Course';
if ($tsection) {
$ttype.=' Section/Group: '.$tsection;
@@ -233,7 +308,11 @@ ENDHEADER
$twhere='Currently not available';
$ENV{'course.'.$tcourseid.'.description'}=$twhere;
}
+ if ($trole ne 'st') {
+ $twhere.=" Domain:".$tdom;
+ }
}
+ }
} elsif ($tdom) {
$ttype='Domain';
$twhere=$tdom;
@@ -247,6 +326,10 @@ ENDHEADER
if ($tstatus eq 'is') {
$r->print('