--- loncom/publisher/lonrights.pm 2005/04/07 06:56:27 1.17 +++ loncom/publisher/lonrights.pm 2006/12/20 22:41:08 1.21 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show and edit custom distribution rights # -# $Id: lonrights.pm,v 1.17 2005/04/07 06:56:27 albertel Exp $ +# $Id: lonrights.pm,v 1.21 2006/12/20 22:41:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -55,11 +55,9 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print( - 'LON-CAPA Custom Distribution Rights'. - &Apache::loncommon::coursebrowser_javascript().''); + my $js = &Apache::loncommon::coursebrowser_javascript(); - $r->print(&Apache::loncommon::bodytag('Custom Distribution Rights')); + $r->print(&Apache::loncommon::start_page('Custom Distribution Rights',$js)); $r->rflush(); my $uri=$r->uri; @@ -91,8 +89,8 @@ sub handler { ($rulehash{'effect'} eq 'allow')) { $rulehash{'effect'}='deny'; } - $rulehash{'domain'}=~s/\W//g; - $rulehash{'course'}=~s/\W//g; + $rulehash{'domain'} = &LONCAPA::clean_domain($rulehash{'domain'}); + $rulehash{'course'} = &LONCAPA::clean_courseid($rulehash{'course'}); $rulehash{'section'}=~s/\W//g; unless ($rulehash{'domain'}) { $rulehash{'domain'}=$env{'user.domain'}; @@ -177,7 +175,7 @@ sub handler { my %lt=&Apache::lonlocal::texthash('ef' => 'Effect', 'do' => 'Domain', 'co' => 'Course', - 'se' => 'Section/Group', + 'se' => 'Section', 'ro' => 'Role'); # ---------------------------------------------------------- Start table output $r->print(<print(''); # ---- realm my $realm=$token->[2]->{'realm'}; - $realm=~s/^\W//; my ($rdom,$rcourse,$rsec)=split(/[\/\_]/,$realm); + $rdom = &LONCAPA::clean_domain($rdom); + $rcourse = &LONCAPA::clean_courseid($rcourse); # realm domain if ($constructmode) { unless ($rdom) { $rdom=$env{'user.domain'}; } @@ -291,7 +290,8 @@ ENDSTARTTABLE $r->print(''); if ($rcourse) { my %descript= - &Apache::lonnet::coursedescription($rdom.'_'.$rcourse); + &Apache::lonnet::coursedescription($rdom.'_'.$rcourse, + {'one_time' => 1}); $r->print($descript{'description'}.'   '); } if ($constructmode) { @@ -307,7 +307,7 @@ ENDSTARTTABLE if ($constructmode) { $r->print(''); } - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; }