--- loncom/publisher/lonrights.pm 2003/03/20 21:47:57 1.6 +++ loncom/publisher/lonrights.pm 2005/04/07 06:56:27 1.17 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show and edit custom distribution rights # -# $Id: lonrights.pm,v 1.6 2003/03/20 21:47:57 www Exp $ +# $Id: lonrights.pm,v 1.17 2005/04/07 06:56:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,19 +32,32 @@ package Apache::lonrights; use strict; use Apache::Constants qw(:common :http); -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use HTML::LCParser; use Apache::File; +use Apache::lonlocal; sub handler { my $r=shift; - $r->content_type('text/html'); + my $target = $env{'form.grade_target'}; + if ($target eq 'meta') { + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $env{'request.uri'}=$r->uri; + my $file = &Apache::lonnet::filelocation("",$r->uri); + my $content=&Apache::lonnet::getfile($file); + my $result=&Apache::lonxml::xmlparse(undef,'meta',$content); + $r->print($result); + return OK; + } + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print( - 'LON-CAPA Custom Distribution Rights'); + 'LON-CAPA Custom Distribution Rights'. + &Apache::loncommon::coursebrowser_javascript().''); $r->print(&Apache::loncommon::bodytag('Custom Distribution Rights')); $r->rflush(); @@ -56,16 +69,16 @@ sub handler { # ============================================================ Modify and store if ($constructmode) { - if ($ENV{'form.store'}) { + if ($env{'form.store'}) { my @newrules=(); undef @newrules; # read rules from form - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.effect\_(\d+)$/) { my $number=$1; my %rulehash=(); foreach ('effect','domain','course','section','role') { - $rulehash{$_}=$ENV{'form.'.$_.'_'.$number}; + $rulehash{$_}=$env{'form.'.$_.'_'.$number}; } if ($rulehash{'role'} eq 'au') { $rulehash{'course'}=''; @@ -82,7 +95,7 @@ sub handler { $rulehash{'course'}=~s/\W//g; $rulehash{'section'}=~s/\W//g; unless ($rulehash{'domain'}) { - $rulehash{'domain'}=$ENV{'user.domain'}; + $rulehash{'domain'}=$env{'user.domain'}; } my $realm=''; if ($number) { @@ -99,27 +112,27 @@ sub handler { } } # edit actions? - foreach (keys %ENV) { + foreach (keys %env) { if ($_=~/^form\.action\_(\d+)$/) { my $number=$1; - if ($ENV{$_} eq 'delete') { $newrules[$number]=''; } - if (($ENV{$_} eq 'moveup') && ($number>2)) { + if ($env{$_} eq 'delete') { $newrules[$number]=''; } + if (($env{$_} eq 'moveup') && ($number>1)) { my $buffer=$newrules[$number]; $newrules[$number]=$newrules[$number-1]; $newrules[$number-1]=$buffer; } - if (($ENV{$_} eq 'movedown') && ($number<$#newrules)) { + if (($env{$_} eq 'movedown') && ($number<$#newrules)) { my $buffer=$newrules[$number]; $newrules[$number]=$newrules[$number+1]; $newrules[$number+1]=$buffer; } - if ($ENV{$_} eq 'insertabove') { + if ($env{$_} eq 'insertabove') { for (my $i=$#newrules;$i>=$number;$i--) { $newrules[$i+1]=$newrules[$i]; } $newrules[$number]='deny'; } - if ($ENV{$_} eq 'insertbelow') { + if ($env{$_} eq 'insertbelow') { for (my $i=$#newrules;$i>$number;$i--) { $newrules[$i+1]=$newrules[$i]; } @@ -152,7 +165,7 @@ sub handler { $contents=join('',<$fh>); $fh->close(); } - $r->print('
'); + $r->print(''); } unless ($contents=~/\new(\$contents); my $token; my $rulecounter=0; - my $colzero=($constructmode?'Edit action':'Rule'); + my $colzero=&mt($constructmode?'Edit action':'Rule'); + my %lt=&Apache::lonlocal::texthash('ef' => 'Effect', + 'do' => 'Domain', + 'co' => 'Course', + 'se' => 'Section/Group', + 'ro' => 'Role'); # ---------------------------------------------------------- Start table output $r->print(< - $colzeroEffectDomainCourse -SectionRole + $colzero$lt{'ef'}$lt{'do'}$lt{'co'} +$lt{'se'}$lt{'ro'} ENDSTARTTABLE # --------------------------------------------------------------------- Default # Fast forward to first rule $token=$parser->get_token; while ($token->[1] ne 'accessrule') { $token=$parser->get_token; } # print default - $r->print(''); + $r->print(''); if ($constructmode) { $r->print(&Apache::loncommon::select_form('','action_0', - ('' => '', - 'insertbelow' => 'Insert rule below'))); + ('' => '', + 'insertbelow' => 'Insert rule below '))); } else { $r->print(' '); @@ -192,14 +210,15 @@ ENDSTARTTABLE } $r->print('Default'); if (($token->[2]->{'realm'}) || ($token->[2]->{'role'})) { - $r->print(' - Error! No default set.'); + $r->print(' - '.&mt('Error! No default set.'). + ''); } $r->print(''); # Additional roles while ($token=$parser->get_token) { if (($token->[0] eq 'S') && ($token->[1] eq 'accessrule')) { $rulecounter++; - $r->print(''); + $r->print(''); # insert, delete, etc $r->print($rulecounter.'. '); if ($constructmode) { @@ -208,11 +227,11 @@ ENDSTARTTABLE ('' => '', 'delete' => 'Delete this rule', 'insertabove' => 'Insert rule above', - 'insertbelow' => 'Insert rule below', + 'insertbelow' => 'Insert rule below ', 'moveup' => 'Move rule up', 'movedown' => 'Move rule down'))); } - $r->print(''); + $r->print(''); # effect if ($constructmode) { $r->print(&Apache::loncommon::select_form @@ -228,8 +247,9 @@ ENDSTARTTABLE my $realm=$token->[2]->{'realm'}; $realm=~s/^\W//; my ($rdom,$rcourse,$rsec)=split(/[\/\_]/,$realm); -# realm role +# realm domain if ($constructmode) { + unless ($rdom) { $rdom=$env{'user.domain'}; } $r->print(&Apache::loncommon::select_dom_form($rdom, 'domain_'.$rulecounter)); } else { @@ -253,7 +273,7 @@ ENDSTARTTABLE $r->print($rsec); } - $r->print(''); + $r->print(''); # role if ($constructmode) { my %hash=('' => ''); @@ -267,6 +287,17 @@ ENDSTARTTABLE } else { $r->print(&Apache::lonnet::plaintext($token->[2]->{'role'})); } +# course selection link + $r->print(''); + if ($rcourse) { + my %descript= + &Apache::lonnet::coursedescription($rdom.'_'.$rcourse); + $r->print($descript{'description'}.'   '); + } + if ($constructmode) { + $r->print(&Apache::loncommon::selectcourse_link('rules', + 'course_'.$rulecounter,'domain_'.$rulecounter)); + } # close row $r->print(''); } @@ -274,7 +305,7 @@ ENDSTARTTABLE $r->print(''); # ------------------------------------------------------------ End table output if ($constructmode) { - $r->print(''); + $r->print(''); } $r->print(''); return OK;