--- loncom/auth/lonroles.pm 2002/05/04 02:30:00 1.35 +++ loncom/auth/lonroles.pm 2003/02/04 16:25:37 1.51 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.35 2002/05/04 02:30:00 matthew Exp $ +# $Id: lonroles.pm,v 1.51 2003/02/04 16:25:37 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,9 +36,7 @@ # 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 # ### @@ -69,14 +67,15 @@ sub handler { 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'); + &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) { - if ($envkey=~/^user\.role\./) { - my ($dum1,$dum2,$role,@pwhere)=split(/\./,$envkey); + next if ($envkey!~/^user\.role\./); + my (undef,undef,$role,@pwhere)=split(/\./,$envkey); my $where=join('.',@pwhere); my $trolecode=$role.'.'.$where; if ($ENV{'form.'.$trolecode}) { @@ -94,8 +93,9 @@ sub handler { if ($tstatus eq 'is') { $where=~s/^\///; my ($cdom,$cnum,$csec)=split(/\//,$where); - &Apache::lonnet::appenv('request.role' => $trolecode, - 'request.course.sec' => $csec); + &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)= @@ -115,17 +115,18 @@ sub handler { $r->content_type('text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; - my $swinfo=&Apache::lonmenu::rawconfig; + my $swinfo=&Apache::lonmenu::rawconfig($r); + my $bodytag=&Apache::loncommon::bodytag('Switching Role'); print (<Entering Course - +$bodytag -$msg +

$msg

ENDREDIR @@ -134,10 +135,9 @@ ENDREDIR } } } - } } - } - + } + # =============================================================== No Roles Init @@ -146,12 +146,17 @@ ENDREDIR $r->send_http_header; return OK if $r->header_only; - my $swinfo=&Apache::lonmenu::rawconfig; + my $swinfo=&Apache::lonmenu::rawconfig($r); + my $bodytag=&Apache::loncommon::bodytag('User Roles'); + my $helptag=&Apache::loncommon::help_open_topic + ("General_Intro","CLICK HERE FOR HELP"); $r->print(< LON-CAPA User Roles - + +$bodytag +$helptag