--- loncom/auth/lonroles.pm 2001/06/02 16:14:40 1.26 +++ loncom/auth/lonroles.pm 2001/11/29 19:12:44 1.31 @@ -1,5 +1,30 @@ # 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) @@ -9,7 +34,7 @@ # 12/08,12/28, # 01/15/01 Gerd Kortemeyer # 02/27/01 Scott Harrison -# 03/02,05/03,05/25,05/30,06/01 Gerd Kortemeyer +# 03/02,05/03,05/25,05/30,06/01,07/06,08/06 Gerd Kortemeyer package Apache::lonroles; @@ -19,6 +44,7 @@ use Apache::lonuserstate(); use Apache::Constants qw(:common); use Apache::File(); use Apache::lonmenu; +use Apache::loncommon; sub handler { @@ -59,6 +85,7 @@ sub handler { 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); @@ -67,7 +94,15 @@ 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= + '