--- loncom/interface/lonpickstudent.pm 2005/04/07 06:56:23 1.9 +++ loncom/interface/lonpickstudent.pm 2006/03/15 22:11:04 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a student from the classlist # -# $Id: lonpickstudent.pm,v 1.9 2005/04/07 06:56:23 albertel Exp $ +# $Id: lonpickstudent.pm,v 1.11 2006/03/15 22:11:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,26 +42,25 @@ sub handler { return OK if $r->header_only; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - -ENDDOCUMENT - - + $r->print(&Apache::loncommon::start_page("Selecting a User")); &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['filter','form','unameelement','udomelement', 'roles']); # Allowed? + my $allowed; + my $scope = $env{'request.course.id'}; + if (!($allowed = &Apache::lonnet::allowed('srm',$scope))) { + $scope .= '/'.$env{'request.course.sec'}; + $allowed = &Apache::lonnet::allowed('srm',$scope); + if ($allowed) { $allowed = 'section'; } + } unless (($env{'form.roles'}) || - (($env{'request.course.id'}) && - (&Apache::lonnet::allowed('srm',$env{'request.course.id'})))) { - $r->print('No context.'); + (($env{'request.course.id'}) && ($allowed))) { + $r->print(&mt('No context.'). + &Apache::loncommon::end_page()); return OK; } @@ -75,7 +74,6 @@ ENDDOCUMENT # --------------------------------------- There is such a user, get environment - $r->print(&Apache::loncommon::bodytag("Selecting a User")); $r->print(< function gochoose(uname,udom) { @@ -91,8 +89,7 @@ function gochoose(uname,udom) { ENDSCRIPT $r->print('
'); - if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'})) && - (!$env{'form.roles'})) { + if ($allowed && (!$env{'form.roles'})) { # -------------------------------------------------------- Get course personnel $r->print('

'.$env{'course.'.$env{'request.course.id'}.'.description'}. '

'); @@ -120,6 +117,9 @@ ENDSCRIPT # the following undefs are for 'domain', and 'username' respectively. my (undef,undef,$end,$start,$id,$section,$fullname,$status)= @{$classlist->{$_}}; + if ($allowed eq 'section' && $section ne $env{'request.course.sec'}) { + next; + } if ($_=~/^(\w+)\:(\w+)$/) { my ($uname,$udom)=($1,$2); if (($uname=~/^$filter/) || @@ -168,7 +168,7 @@ ENDSCRIPT } $r->print('

'); } - $r->print('
'); + $r->print(''.&Apache::loncommon::end_page()); return OK; }