--- loncom/auth/lonroles.pm 2000/12/28 21:46:08 1.19 +++ loncom/auth/lonroles.pm 2001/11/29 19:12:44 1.31 @@ -1,13 +1,41 @@ # The LearningOnline Network with CAPA # User Roles Screen +# +# $Id: lonroles.pm,v 1.31 2001/11/29 19:12:44 www 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 # 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,10/5,10/26,10/28, -# 12/08,12/28 Gerd Kortemeyer -# +# 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,08/06 Gerd Kortemeyer + package Apache::lonroles; use strict; @@ -15,6 +43,8 @@ use Apache::lonnet(); use Apache::lonuserstate(); use Apache::Constants qw(:common); use Apache::File(); +use Apache::lonmenu; +use Apache::loncommon; sub handler { @@ -55,35 +85,66 @@ 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'}) { + if (($ENV{'form.orgurl'}) && + ($ENV{'form.orgurl'}!~/^\/adm\/flip/)) { $r->internal_redirect($ENV{'form.orgurl'}); return OK; } else { - $r->internal_redirect($furl); - return OK; + unless ($ENV{'request.course.id'}) { + &Apache::lonnet::appenv( + "request.course.id" => $cdom.'_'.$cnum); + $furl='/adm/notfound.html'; + $msg= + '
'); } @@ -166,14 +235,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') { @@ -203,6 +277,11 @@ ENDHEADER my ($tdom,$trest,$tsection)= split(/\//,Apache::lonnet::declutter($where)); if ($trest) { + if ($role eq 'ca') { + $ttype='Construction Space'; + $twhere='User: '.$trest.' | '); + } elsif ($ENV{'user.adv'}) { + $r->print( + ' | '); } else { $r->print(' | '); } @@ -240,6 +324,7 @@ ENDHEADER $ttype.' | '.$twhere.' | '.$tpstart. ' | '.$tpend. ' | '.$tremark.' |
---|