loncom/interface/lonparmset.pm - diff

Return to lonparmset.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.580 and 1.586

version 1.580, 2017/07/15 02:49:10	version 1.586, 2018/09/14 18:27:49
Line 1426 ENDHEAD	Line 1426 ENDHEAD
# @param {string} $cgroup - group name	# @param {string} $cgroup - group name
# @param {array reference} $usersgroups - list of groups the user belongs to, if any	# @param {array reference} $usersgroups - list of groups the user belongs to, if any
# @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters	# @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
# @param {boolean} $readonly - true if no editing allowed.	# @param {boolean} $readonly - true if no editing allowed.
	# @param {array reference} - $recurseup - list of maps containing current one, ending at top-level.
	# @param {hash reference} - $maptitles - - hash map id or src -> map title
	# @param {hash reference} - $allmaps_inverted - hash map src -> map pc
	# @param {scalar reference} - $reclinks - number of "parameter in effect" cells with link to map where recursive param was set
sub print_row {	sub print_row {
my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,	my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp,	$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp,
$readonly)=@_;	$readonly,$recurseup,$maptitles,$allmaps_inverted,$reclinks)=@_;
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);	my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
	my $numlinks = 0;

# get the values for the parameter in cascading order	# get the values for the parameter in cascading order
# empty levels will remain empty	# empty levels will remain empty
Line 1470 sub print_row {	Line 1475 sub print_row {
my $thismarker=$which;	my $thismarker=$which;
$thismarker=~s/^parameter\_//;	$thismarker=~s/^parameter\_//;
my $mprefix=$rid.'&'.$thismarker.'&';	my $mprefix=$rid.'&'.$thismarker.'&';
my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);	my ($parmname)=($thismarker=~/\_([^\_]+)$/);
my ($othergrp,$grp_parm,$controlgrp,$effparm_rec);	my ($othergrp,$grp_parm,$controlgrp,$effective_parm,$effparm_rec,$effparm_level,
if ($result == 17 \|\| $result == 11 \|\| $result == 7 \|\| $result == 3) {	$eff_groupparm,$recurse_check,$recursinfo);
	if ((ref($recurseup) eq 'ARRAY') && (@{$recurseup} > 0)) {
	if ($result eq '') {
	$recurse_check = 1;
	} elsif (($uname ne '') && ($result > 3)) {
	$recurse_check = 1;
	} elsif (($cgroup ne '') && ($result > 7)) {
	$recurse_check = 1;
	} elsif (($csec ne '') && ($result > 11)) {
	$recurse_check = 1;
	} elsif ($result > 17) {
	$recurse_check = 1;
	}
	if ($recurse_check) {
	my $what = $$part{$which}.'.'.$$name{$which};
	my $prefix;
	if (($uname ne '') && ($udom ne '')) {
	my $useropt = &Apache::lonnet::get_userresdata($uname,$udom);
	$prefix = $env{'request.course.id'};
	$recursinfo = &get_recursive($recurseup,$useropt,$what,$prefix);
	if (ref($recursinfo) eq 'ARRAY') {
	$effparm_rec = 1;
	$effparm_level = &mt('user: [_1]',$uname);
	}
	}
	if (($cgroup ne '') && (!$effparm_rec)) {
	$prefix = $env{'request.course.id'}.'.['.$cgroup.']';
	$recursinfo = &get_recursive($recurseup,$courseopt,$what,$prefix);
	if (ref($recursinfo) eq 'ARRAY') {
	$effparm_rec = 1;
	$effparm_level = &mt('group: [_1]',$cgroup);
	}
	}
	if (($csec ne '') && (!$effparm_rec)) {
	$prefix = $env{'request.course.id'}.'.['.$csec.']';
	$recursinfo = &get_recursive($recurseup,$courseopt,$what,$prefix);
	if (ref($recursinfo) eq 'ARRAY') {
	$effparm_rec = 1;
	$effparm_level = &mt('section: [_1]',$csec);
	}
	}
	if (!$effparm_rec) {
	$prefix = $env{'request.course.id'};
	$recursinfo = &get_recursive($recurseup,$courseopt,$what,$prefix);
	if (ref($recursinfo) eq 'ARRAY') {
	$effparm_rec = 1;
	}
	}
	}
	}
	if ((!$effparm_rec) && ($result == 17 \|\| $result == 11 \|\| $result == 7 \|\| $result == 3)) {
	$effparm_rec = 1;
	}
	if ((!$effparm_rec) &&
	(($$name{$which} eq 'encrypturl') \|\| ($$name{$which} eq 'hiddenresource')) &&
	($result == 16 \|\| $result == 10 \|\| $result == 6 \|\| $result == 2)) {
$effparm_rec = 1;	$effparm_rec = 1;
}	}
if ($parmlev eq 'general') {	if ($parmlev eq 'general') {
Line 1498 sub print_row {	Line 1558 sub print_row {
} else {	} else {
if ($uname) {	if ($uname) {
if (@{$usersgroups} > 1) {	if (@{$usersgroups} > 1) {
my ($coursereply,$grp_parm,$controlgrp);	(my $coursereply,$othergrp,$grp_parm,$controlgrp,my $grp_is_rec) =
($coursereply,$othergrp,$grp_parm,$controlgrp) =
&check_other_groups($$part{$which}.'.'.$$name{$which},	&check_other_groups($$part{$which}.'.'.$$name{$which},
$rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);	$rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
if ($coursereply && $result > 4) {	if (($coursereply) && ($result > 4)) {
if (defined($controlgrp)) {	if (defined($controlgrp)) {
if ($cgroup ne $controlgrp) {	if ($cgroup ne $controlgrp) {
$effective_parm = $grp_parm;	$eff_groupparm = $grp_parm;
$result = 0;	undef($result);
	undef($effparm_rec);
	if ($grp_is_rec) {
	$effparm_rec = 1;
	}
}	}
}	}
}	}
Line 1539 sub print_row {	Line 1602 sub print_row {
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
}	}

} # end of $parmlev if/else	} # end of $parmlev if/else
$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.	if (ref($recursinfo) eq 'ARRAY') {
($effparm_rec?'<br /><span class="LC_parm_recursive">'.&mt('recursive').	my $rectitle = &mt('recursive');
'</span>':'').'</td>');	if ((ref($maptitles) eq 'HASH') && (exists($maptitles->{$recursinfo->[2]}))) {
	if ((ref($allmaps_inverted) eq 'HASH') && (exists($allmaps_inverted->{$recursinfo->[2]}))) {
	$rectitle = &mt('set in: [_1]','"'.
	'<a href="javascript:pjumprec('."'".$allmaps_inverted->{$recursinfo->[2]}."',".
	"'$parmname','$$part{$which}'".');">'.
	$maptitles->{$recursinfo->[2]}.'</a>"');

	$numlinks ++;
	}
	}
	my ($parmname)=($thismarker=~/\_([^\_]+)$/);
	$effective_parm = &valout($recursinfo->[0],$recursinfo->[1],$parmname);
	$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.
	'<br /><span class="LC_parm_recursive">'.$rectitle.' '.
	$effparm_level.'</span></td>');
	} else {
	if ($result) {
	$effective_parm = &valout($outpar[$result],$typeoutpar[$result],$parmname);
	}
	if ($eff_groupparm) {
	$effective_parm = $eff_groupparm;
	}
	$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.
	($effparm_rec?'<br /><span class="LC_parm_recursive">'.&mt('recursive').
	'</span>':'').'</td>');
	}
if ($parmlev eq 'full') {	if ($parmlev eq 'full') {
my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.	my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
'.'.$$name{$which},$$symbp{$rid});	'.'.$$name{$which},$$symbp{$rid});
Line 1558 sub print_row {	Line 1644 sub print_row {
}	}
$r->print('</tr>');	$r->print('</tr>');
$r->print("\n");	$r->print("\n");
	if (($numlinks) && (ref($reclinks))) {
	$$reclinks = $numlinks;
	}
}	}

# Prints a cell for table mode.	# Prints a cell for table mode.
Line 1649 sub print_td {	Line 1738 sub print_td {
# @param {array reference} $usersgroups - list of groups the user belongs to, if any	# @param {array reference} $usersgroups - list of groups the user belongs to, if any
# @param {integer} $result - level	# @param {integer} $result - level
# @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)	# @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
# @returns {Array} - array (parameter value for the other group, HTML for the cell, HTML with the value, name of the other group)	# @returns {Array} - array (parameter value for the other group, HTML for the cell, HTML with the value, name of the other group, true if recursive)
sub check_other_groups {	sub check_other_groups {
my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;	my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
my $courseid = $env{'request.course.id'};	my $courseid = $env{'request.course.id'};
Line 1663 sub check_other_groups {	Line 1752 sub check_other_groups {
&parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,	&parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,
$recurseparm,$what,$courseopt);	$recurseparm,$what,$courseopt);
my $bgcolor = $defbg;	my $bgcolor = $defbg;
my $grp_parm;	my ($grp_parm,$grp_is_rec);
if (($coursereply) && ($cgroup ne $resultgroup)) {	if (($coursereply) && ($cgroup ne $resultgroup)) {
	my ($parmname) = ($what =~ /\.([^.]+)$/);
if ($result > 3) {	if ($result > 3) {
$bgcolor = '#AAFFAA';	$bgcolor = '#AAFFAA';
}	}
$grp_parm = &valout($coursereply,$resulttype,$what);	$grp_parm = &valout($coursereply,$resulttype,$parmname);
$output = '<td style="background-color:'.$bgcolor.';" align="center">';	$output = '<td style="background-color:'.$bgcolor.';" align="center">';
if ($resultgroup && $resultlevel) {	if ($resultgroup && $resultlevel) {
$output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;	if ($resultlevel eq 'recursive') {
	$resultlevel = 'map/folder';
	$grp_is_rec = 1;
	}
	$output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm.
	($grp_is_rec?'<span class="LC_parm_recursive">'.&mt('recursive').'</span>':'');

} else {	} else {
$output .= ' ';	$output .= ' ';
}	}
Line 1679 sub check_other_groups {	Line 1775 sub check_other_groups {
} else {	} else {
$output .= '<td style="background-color:'.$bgcolor.';"> </td>';	$output .= '<td style="background-color:'.$bgcolor.';"> </td>';
}	}
return ($coursereply,$output,$grp_parm,$resultgroup);	return ($coursereply,$output,$grp_parm,$resultgroup,$grp_is_rec);
}	}

# Looks for a group with a defined parameter for given user and parameter.	# Looks for a group with a defined parameter for given user and parameter.
Line 1760 sub extractResourceInformation {	Line 1856 sub extractResourceInformation {
my $srcf=$resource->src();	my $srcf=$resource->src();
$srcf=~/\.(\w+)$/;	$srcf=~/\.(\w+)$/;
$$typep{$id}=$1;	$$typep{$id}=$1;
	my $toolsymb;
	if ($srcf =~ /ext\.tool$/) {
	$toolsymb = $resource->symb();
	}
$$keyp{$id}='';	$$keyp{$id}='';
$$uris{$id}=$srcf;	$$uris{$id}=$srcf;

foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys',$toolsymb))) {
next if ($key!~/^parameter_/);	next if ($key!~/^parameter_/);

# Hidden parameters	# Hidden parameters
next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');	next if (&Apache::lonnet::metadata($srcf,$key.'.hidden',$toolsymb) eq 'parm');
#	#
# allparms is a hash of parameter names	# allparms is a hash of parameter names
#	#
my $name=&Apache::lonnet::metadata($srcf,$key.'.name');	my $name=&Apache::lonnet::metadata($srcf,$key.'.name',$toolsymb);
if (!exists($$allparms{$name}) \|\| $$allparms{$name} =~ m/^\s*$/ ) {	if (!exists($$allparms{$name}) \|\| $$allparms{$name} =~ m/^\s*$/ ) {
my ($display,$parmdis);	my ($display,$parmdis);
$display = &standard_parameter_names($name);	$display = &standard_parameter_names($name);
if ($display eq '') {	if ($display eq '') {
$display= &Apache::lonnet::metadata($srcf,$key.'.display');	$display= &Apache::lonnet::metadata($srcf,$key.'.display',$toolsymb);
$parmdis = $display;	$parmdis = $display;
$parmdis =~ s/\s\[Part.$//g;	$parmdis =~ s/\s\[Part.$//g;
} else {	} else {
Line 1785 sub extractResourceInformation {	Line 1885 sub extractResourceInformation {
$$allparms{$name}=$parmdis;	$$allparms{$name}=$parmdis;
if (ref($defkeytype)) {	if (ref($defkeytype)) {
$$defkeytype{$name}=	$$defkeytype{$name}=
&Apache::lonnet::metadata($srcf,$key.'.type');	&Apache::lonnet::metadata($srcf,$key.'.type',$toolsymb);
}	}
}	}

#	#
# allparts is a hash of all parts	# allparts is a hash of all parts
#	#
my $part= &Apache::lonnet::metadata($srcf,$key.'.part');	my $part= &Apache::lonnet::metadata($srcf,$key.'.part',$toolsymb);
$$allparts{$part} = &mt('Part: [_1]',$part);	$$allparts{$part} = &mt('Part: [_1]',$part);
#	#
# Remember all keys going with this resource	# Remember all keys going with this resource
Line 1833 sub extractResourceInformation {	Line 1933 sub extractResourceInformation {
}	}
}	}

	sub get_recursive {
	my ($recurseup,$resdata,$what,$prefix) = @_;
	if ((ref($resdata) eq 'HASH') && (ref($recurseup) eq 'ARRAY')) {
	foreach my $item (@{$recurseup}) {
	my $norecursechk=$prefix.'.'.$item.'___(all).'.$what;
	if (defined($resdata->{$norecursechk})) {
	if ($what =~ /\.(encrypturl\|hiddenresource)$/) {
	my $type = $resdata->{$norecursechk.'.type'};
	return [$resdata->{$norecursechk},$type,$item];
	} else {
	last;
	}
	}
	my $recursechk=$prefix.'.'.$item.'___(rec).'.$what;
	if (defined($resdata->{$recursechk})) {
	my $type = $resdata->{$recursechk.'.type'};
	return [$resdata->{$recursechk},$type,$item];
	}
	}
	}
	return;
	}


# Tells if a parameter type is a date.	# Tells if a parameter type is a date.
#	#
Line 1844 sub isdateparm {	Line 1967 sub isdateparm {
}	}

# Prints the HTML and Javascript to select parameters, with various shortcuts.	# Prints the HTML and Javascript to select parameters, with various shortcuts.
# FIXME: remove unused parameters
#	#
# @param {Apache2::RequestRec} $r - the Apache request (unused)	# @param {Apache2::RequestRec} $r - the Apache request
# @param {hash reference} $allparms - hash parameter name -> parameter title
# @param {array reference} $pscat - list of selected parameter names (unused)
# @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
sub parmmenu {	sub parmmenu {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r)=@_;
my $tempkey;
$r->print(<<ENDSCRIPT);	$r->print(<<ENDSCRIPT);
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 1929 sub parmmenu {	Line 2047 sub parmmenu {
ENDSCRIPT	ENDSCRIPT

$r->print('<hr />');	$r->print('<hr />');
&shortCuts($r,$allparms,$pscat,$keyorder);	&shortCuts($r);
$r->print('<hr />');	$r->print('<hr />');
}	}

Line 1998 sub lookUpTableParameter {	Line 2116 sub lookUpTableParameter {
'lenient' => 'grading',	'lenient' => 'grading',
'retrypartial' => 'tries',	'retrypartial' => 'tries',
'discussvote' => 'misc',	'discussvote' => 'misc',
'examcode' => 'high_level_randomization',	'examcode' => 'high_level_randomization',
);	);
}	}

Line 2110 sub parmboxes {	Line 2228 sub parmboxes {
}	}

# Prints HTML with shortcuts to select groups of parameters in one click, or deselect all.	# Prints HTML with shortcuts to select groups of parameters in one click, or deselect all.
# FIXME: remove unused parameters
#	#
# @param {Apache2::RequestRec} $r - the Apache request	# @param {Apache2::RequestRec} $r - the Apache request
# @param {hash reference} $allparms - hash parameter name -> parameter title (unused)
# @param {array reference} $pscat - list of selected parameter names (unused)
# @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
sub shortCuts {	sub shortCuts {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r)=@_;

# Parameter Selection	# Parameter Selection
$r->print(	$r->print(
Line 2207 sub usermenu {	Line 2321 sub usermenu {
if (($pssymb) \|\| &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	if (($pssymb) \|\| &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
%grouphash = &Apache::longroup::coursegroups();	%grouphash = &Apache::longroup::coursegroups();
} elsif ($env{'request.course.groups'} ne '') {	} elsif ($env{'request.course.groups'} ne '') {
map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});	map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
}	}

my $g_s_header='';	my $g_s_header='';
Line 2310 function group_or_section(caller) {	Line 2424 function group_or_section(caller) {
# @param {Apache2::RequestRec} $r - the Apache request	# @param {Apache2::RequestRec} $r - the Apache request
# @param {hash reference} $allparms - hash parameter name -> parameter title	# @param {hash reference} $allparms - hash parameter name -> parameter title
# @param {array reference} $pscat - list of selected parameter names	# @param {array reference} $pscat - list of selected parameter names
# @param {array reference} $psprt - list of selected parameter parts (unused)
# @param {hash reference} $keyorder - hash parameter key -> appearance rank	# @param {hash reference} $keyorder - hash parameter key -> appearance rank
# @param {string} [$divid] - name used to give an id to the HTML element for the scroll box	# @param {string} [$divid] - name used to give an id to the HTML element for the scroll box
sub displaymenu {	sub displaymenu {
my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;	my ($r,$allparms,$pscat,$keyorder,$divid)=@_;

$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));

&parmmenu($r,$allparms,$pscat,$keyorder); # only $allparms is used by parmmenu	&parmmenu($r);
$r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));	$r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
&parmboxes($r,$allparms,$pscat,$keyorder);	&parmboxes($r,$allparms,$pscat,$keyorder);
$r->print(&Apache::loncommon::end_scrollbox());	$r->print(&Apache::loncommon::end_scrollbox());
Line 2552 sub groupmenu {	Line 2665 sub groupmenu {
if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
%grouphash = &Apache::longroup::coursegroups();	%grouphash = &Apache::longroup::coursegroups();
} elsif ($env{'request.course.groups'} ne '') {	} elsif ($env{'request.course.groups'} ne '') {
map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});	map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
}	}
return '' if (!%grouphash);	return '' if (!%grouphash);

Line 2718 sub assessparms {	Line 2831 sub assessparms {
my %uris=(); # hash resource/map id -> resource src	my %uris=(); # hash resource/map id -> resource src
my %maptitles=(); # hash map pc or src -> map title	my %maptitles=(); # hash map pc or src -> map title
my %allmaps=(); # hash map pc -> map src	my %allmaps=(); # hash map pc -> map src
	my %allmaps_inverted=(); # hash map src -> map pc
my %alllevs=(); # hash English level title -> value	my %alllevs=(); # hash English level title -> value

my $uname; # selected user name	my $uname; # selected user name
Line 2726 sub assessparms {	Line 2840 sub assessparms {
my $csec; # selected section name	my $csec; # selected section name
my $cgroup; # selected group name	my $cgroup; # selected group name
my @usersgroups = (); # list of the user groups	my @usersgroups = (); # list of the user groups
	my $numreclinks = 0;

my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};	my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};

Line 2759 sub assessparms {	Line 2874 sub assessparms {
if ($cgroup ne '') {	if ($cgroup ne '') {
unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
if (($env{'request.course.groups'} eq '') \|\|	if (($env{'request.course.groups'} eq '') \|\|
(!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {	(!grep(/^\Q$cgroup\E$/,split(/:/,$env{'request.course.groups'})))) {
$noeditgrp = 1;	$noeditgrp = 1;
}	}
}	}
Line 2873 sub assessparms {	Line 2988 sub assessparms {
\%mapp, \%symbp,\%maptitles,\%uris,	\%mapp, \%symbp,\%maptitles,\%uris,
\%keyorder);	\%keyorder);

	%allmaps_inverted = reverse(%allmaps);

$mapp{'0.0'} = '';	$mapp{'0.0'} = '';
$symbp{'0.0'} = '';	$symbp{'0.0'} = '';

Line 3037 sub assessparms {	Line 3154 sub assessparms {
.'</p>';	.'</p>';
}	}
}	}

#----------------------------------------------- if all selected, fill in array	#----------------------------------------------- if all selected, fill in array
if ($pscat[0] eq "all") {	if ($pscat[0] eq "all") {
@pscat = (keys(%allparms));	@pscat = (keys(%allparms));
Line 3103 ENDPARMSELSCRIPT	Line 3221 ENDPARMSELSCRIPT

# Step 2	# Step 2
$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));	$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
&displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');	&displaymenu($r,\%allparms,\@pscat,\%keyorder,'parmmenuscroll');

# Step 3	# Step 3
$r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));	$r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
Line 3262 ENDTABLEHEADFOUR	Line 3380 ENDTABLEHEADFOUR
foreach my $rid (@ids) {	foreach my $rid (@ids) {

my ($inmapid)=($rid=~/\.(\d+)$/);	my ($inmapid)=($rid=~/\.(\d+)$/);

if ((!$pssymb &&	if ((!$pssymb &&
(($pschp eq 'all') \|\| ($allmaps{$pschp} eq $mapp{$rid})))	(($pschp eq 'all') \|\| ($allmaps{$pschp} eq $mapp{$rid})))
\|\|	\|\|
Line 3292 ENDTABLEHEADFOUR	Line 3409 ENDTABLEHEADFOUR
my %type= ();	my %type= ();
my %default=();	my %default=();
my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});
	my $toolsymb;
	if ($uri =~ /ext\.tool$/) {
	$toolsymb = $symbp{$rid};
	}

my $filter=$env{'form.filter'};	my $filter=$env{'form.filter'};
foreach my $tempkeyp (&keysplit($keyp{$rid})) {	foreach my $tempkeyp (&keysplit($keyp{$rid})) {
if (grep $_ eq $tempkeyp, @catmarker) {	if (grep $_ eq $tempkeyp, @catmarker) {
my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');	my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name',$toolsymb);
# We may only want certain parameters listed	# We may only want certain parameters listed
if ($filter) {	if ($filter) {
unless ($filter=~/\Q$parmname\E/) { next; }	unless ($filter=~/\Q$parmname\E/) { next; }
}	}
$name{$tempkeyp}=$parmname;	$name{$tempkeyp}=$parmname;
$part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');	$part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part',$toolsymb);

my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display',$toolsymb);
if ($allparms{$name{$tempkeyp}} ne '') {	if ($allparms{$name{$tempkeyp}} ne '') {
my $identifier;	my $identifier;
if ($parmdis =~ /(\s\[Part.)$/) {	if ($parmdis =~ /(\s\[Part.)$/) {
Line 3316 ENDTABLEHEADFOUR	Line 3437 ENDTABLEHEADFOUR
}	}
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }	unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';	$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);	$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp,$toolsymb);
$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');	$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type',$toolsymb);
$thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');	$thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title',$toolsymb);
}	}
}	}
my $totalparms=scalar(keys(%name));	my $totalparms=scalar(keys(%name));
if ($totalparms>0) {	if ($totalparms>0) {
my $firstrow=1;	my $firstrow=1;
my $title=&Apache::lonnet::gettitle($symbp{$rid});	my $title=&Apache::lonnet::gettitle($symbp{$rid});
	my $navmap = Apache::lonnavmaps::navmap->new();
	my @recurseup;
	if (ref($navmap) && $mapp{$rid}) {
	@recurseup = $navmap->recurseup_maps($mapp{$rid});
	}
$r->print('<tr><td style="background-color:'.$defbgone.';"'.	$r->print('<tr><td style="background-color:'.$defbgone.';"'.
' rowspan='.$totalparms.	' rowspan='.$totalparms.
'><tt><font size="-1">'.	'><tt><font size="-1">'.
Line 3356 ENDTABLEHEADFOUR	Line 3482 ENDTABLEHEADFOUR
&print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,	\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,	$defbgthree,$parmlev,$uname,$udom,$csec,
$cgroup,\@usersgroups,$noeditgrp,$readonly);	$cgroup,\@usersgroups,$noeditgrp,$readonly,
	\@recurseup,\%maptitles,\%allmaps_inverted,
	\$numreclinks);
}	}
}	}
}	}
Line 3402 ENDTABLEHEADFOUR	Line 3530 ENDTABLEHEADFOUR

if ($map eq $mapid) {	if ($map eq $mapid) {
my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});
	my $toolsymb;
	if ($uri =~ /ext\.tool$/) {
	$toolsymb = $symbp{$rid};
	}

# $r->print("Keys: $keyp{$rid} <br />\n");	# $r->print("Keys: $keyp{$rid} <br />\n");

#--------------------------------------------------------------------	#--------------------------------------------------------------------
Line 3417 ENDTABLEHEADFOUR	Line 3550 ENDTABLEHEADFOUR

if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name',$toolsymb);
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display',$toolsymb);
if ($allparms{$name{$tempkeyp}} ne '') {	if ($allparms{$name{$tempkeyp}} ne '') {
my $identifier;	my $identifier;
if ($parmdis =~ /(\s\[Part.)$/) {	if ($parmdis =~ /(\s\[Part.)$/) {
Line 3431 ENDTABLEHEADFOUR	Line 3564 ENDTABLEHEADFOUR
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }	unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';	$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$display{$tempkeyp} =~ s/_\w+_/_0_/;	$display{$tempkeyp} =~ s/_\w+_/_0_/;
$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);	$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp,$toolsymb);
$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');	$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type',$toolsymb);
}	}
} # end loop through keys	} # end loop through keys
}	}
Line 3474 ENDTABLEHEADFOUR	Line 3607 ENDTABLEHEADFOUR
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

	my $navmap = Apache::lonnavmaps::navmap->new();
	my @recurseup;
	if (ref($navmap)) {
	my $mapres = $navmap->getByMapPc($mapid);
	if (ref($mapres)) {
	@recurseup = $navmap->recurseup_maps($mapres->src());
	}
	}


foreach my $item (&keysinorder(\%name,\%keyorder)) {	foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,	\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,	$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
$readonly);	$readonly,\@recurseup,\%maptitles,\%allmaps_inverted,
	\$numreclinks);
}	}
$r->print(&Apache::loncommon::end_data_table().'</p>'	$r->print(&Apache::loncommon::end_data_table().'</p>'
.'</div>'	.'</div>'
Line 3506 ENDTABLEHEADFOUR	Line 3650 ENDTABLEHEADFOUR
my $rid = $id;	my $rid = $id;

my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});
	my $toolsymb;
	if ($uri =~ /ext\.tool$/) {
	$toolsymb = $symbp{$rid};
	}

#--------------------------------------------------------------------	#--------------------------------------------------------------------
# @catmarker contains list of all possible parameters including part #s	# @catmarker contains list of all possible parameters including part #s
Line 3519 ENDTABLEHEADFOUR	Line 3667 ENDTABLEHEADFOUR
$tempkeyp =~ s/_\w+_/_0_/;	$tempkeyp =~ s/_\w+_/_0_/;
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name',$toolsymb);
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display',$toolsymb);
if ($allparms{$name{$tempkeyp}} ne '') {	if ($allparms{$name{$tempkeyp}} ne '') {
my $identifier;	my $identifier;
if ($parmdis =~ /(\s\[Part.)$/) {	if ($parmdis =~ /(\s\[Part.)$/) {
Line 3533 ENDTABLEHEADFOUR	Line 3681 ENDTABLEHEADFOUR
unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }	unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';	$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$display{$tempkeyp} =~ s/_\w+_/_0_/;	$display{$tempkeyp} =~ s/_\w+_/_0_/;
$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);	$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp,$toolsymb);
$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');	$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type',$toolsymb);
}	}
} # end loop through keys	} # end loop through keys
} # end loop through ids	} # end loop through ids
Line 3579 ENDMAPONE	Line 3727 ENDMAPONE
} # end of $parmlev eq general	} # end of $parmlev eq general
}	}
$r->print('</form>');	$r->print('</form>');
	if ($numreclinks) {
	$r->print(<<"END");
	<form name="recurseform" action="/adm/parmset?action=settable" method="post">
	<input type="hidden" name="pschp" />
	<input type="hidden" name="pscat" />
	<input type="hidden" name="psprt" />
	<input type="hidden" name="hideparmsel" value="hidden" />
	</form>
	<script type="text/javascript">
	function pjumprec(rid,name,part) {
	document.forms.recurseform.pschp.value = rid;
	document.forms.recurseform.pscat.value = name;
	document.forms.recurseform.psprt.value = part;
	document.forms.recurseform.submit();
	return false;
	}
	</script>
	END
	}
&endSettingsScreen($r);	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
} # end sub assessparms	} # end sub assessparms
Line 4115 sub listdata {	Line 4282 sub listdata {
if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
%grouphash = &Apache::longroup::coursegroups();	%grouphash = &Apache::longroup::coursegroups();
} elsif ($env{'request.course.groups'} ne '') {	} elsif ($env{'request.course.groups'} ne '') {
map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});	map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
}	}
}	}

Line 5108 ENDOVER	Line 5275 ENDOVER

$r->print('<div class="LC_Box">');	$r->print('<div class="LC_Box">');
$r->print('<div>');	$r->print('<div>');
&displaymenu($r,\%allparms,\@pscat,\%keyorder); # FIXME: wrong parameters, could make keysindisplayorderCategory crash because $keyorder is undefined	&displaymenu($r,\%allparms,\@pscat,\%keyorder);
$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
my $sectionselector = &sectionmenu(\@selected_sections);	my $sectionselector = &sectionmenu(\@selected_sections);
Line 5354 ENDOVER	Line 5521 ENDOVER
$r->print(&mt('All users'));	$r->print(&mt('All users'));
} elsif ($data{'scope_type'} eq 'user') {	} elsif ($data{'scope_type'} eq 'user') {
$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));	$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
} elsif ($data{'scope_type'} eq 'section') {	} elsif ($data{'scope_type'} eq 'secgroup') {
$r->print(&mt('Section: [_1]',$data{'scope'}));	$r->print(&mt('Group/Section: [_1]',$data{'scope'}));
} elsif ($data{'scope_type'} eq 'group') {
$r->print(&mt('Group: [_1]',$data{'scope'}));
}	}
$r->print('<br />');	$r->print('<br />');
if ($data{'realm_type'} eq 'all') {	if ($data{'realm_type'} eq 'all') {
Line 5464 sub parse_key {	Line 5629 sub parse_key {
$data{'scope_type'} = 'user';	$data{'scope_type'} = 'user';
$data{'scope'} = [$1,$2];	$data{'scope'} = [$1,$2];
} else {	} else {
#FIXME check for group scope	$data{'scope_type'} = 'secgroup';
$data{'scope_type'} = 'section';
}	}
$middle=~s/^\[(.*)\]//;	$middle=~s/^\[(.*)\]//;
}	}
Line 5811 sub continue {	Line 5975 sub continue {
my $output;	my $output;
$output .= '<form action="" method="post">';	$output .= '<form action="" method="post">';
$output .= '<input type="hidden" name="action" value="setrestrictmeta" />';	$output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
$output .= '<input type="submit" value="Continue" />';	$output .= '<input type="submit" value="'.&mt('Continue').'" />';
return ($output);	return ($output);
}	}

Line 5839 sub addmetafield {	Line 6003 sub addmetafield {
my $put_result = &Apache::lonnet::put('environment',	my $put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);	{'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);

$r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');	$r->print(&mt('Undeleted Metadata Field [_1] with result [_2]',
	'<strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}.
	'</strong>',$put_result).
	'<br />');
}	}
$r->print(&continue());	$r->print(&continue());
} elsif (exists($env{'form.fieldname'})) {	} elsif (exists($env{'form.fieldname'})) {
Line 5851 sub addmetafield {	Line 6018 sub addmetafield {
{'metadata.'.$meta_field.'.values'=>"",	{'metadata.'.$meta_field.'.values'=>"",
'metadata.'.$meta_field.'.added'=>"$display_field",	'metadata.'.$meta_field.'.added'=>"$display_field",
'metadata.'.$meta_field.'.options'=>""},$dom,$crs);	'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
$r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');	$r->print(&mt('Added new Metadata Field [_1] with result [_2]',
	'<strong>'.$env{'form.fieldname'}.'</strong>',$put_result).
	'<br />');
$r->print(&continue());	$r->print(&continue());
} else {	} else {
my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});	my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
if ($fields) {	if ($fields) {
$r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');	$r->print(&mt('You may undelete previously deleted fields.').
	'<br />'.
	&mt('Check those you wish to undelete and click Undelete.').
	'<br />');
$r->print('<form method="post" action="">');	$r->print('<form method="post" action="">');
foreach my $key(keys(%$fields)) {	foreach my $key(keys(%$fields)) {
$r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');	$r->print('<label><input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'</label><br /');
}	}
$r->print('<input type="submit" name="undelete" value="Undelete" />');	$r->print('<input type="submit" name="undelete" value="'.&mt('Undelete').'" />');
$r->print('</form>');	$r->print('</form>');
}	}
$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata">');	$r->print('<hr />'.
	&mt('[_1]Or[_2] you may enter a new metadata field name.',
	'<strong>','</strong>').
	'<form method="post" action="/adm/parmset?action=addmetadata">');
$r->print('<input type="text" name="fieldname" /><br />');	$r->print('<input type="text" name="fieldname" /><br />');
$r->print('<input type="submit" value="Add Metadata Field" />');	$r->print('<input type="submit" value="'.&mt('Add Metadata Field').'" />');
	$r->print('</form>');
}	}
$r->print('</form>');
&endSettingsScreen($r);	&endSettingsScreen($r);
}	}

Line 5893 sub setrestrictmeta {	Line 6068 sub setrestrictmeta {
&startSettingsScreen($r,'parmset',$crstype);	&startSettingsScreen($r,'parmset',$crstype);
my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};	my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
my $save_field = '';	my $save_field = '';
	my %lt = &Apache::lonlocal::texthash(
	addm => 'Add Metadata Field',
	ordm => 'Order Metadata Fields',
	save => 'Save',
	);
if ($env{'form.restrictmeta'}) {	if ($env{'form.restrictmeta'}) {
foreach my $field (sort(keys(%env))) {	foreach my $field (sort(keys(%env))) {
if ($field=~m/^form.(.+)_(.+)$/) {	if ($field=~m/^form.(.+)_(.+)$/) {
Line 5931 sub setrestrictmeta {	Line 6111 sub setrestrictmeta {
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');	my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
# Now get possible added metadata fields	# Now get possible added metadata fields
my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});	my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $row_alt = 1;
$output .= &Apache::loncommon::start_data_table();	$output .= &Apache::loncommon::start_data_table();
foreach my $field (sort(keys(%metadata_fields))) {	foreach my $field (sort(keys(%metadata_fields))) {
if ($field ne 'courserestricted') {	if ($field ne 'courserestricted') {
$row_alt = $row_alt ? 0 : 1;	$output.= &output_row($r,$field,$metadata_fields{$field});
$output.= &output_row($r, $field, $metadata_fields{$field});
}	}
}	}
my $buttons = (<<ENDButtons);	my $buttons = (<<ENDButtons);
<input type="submit" name="restrictmeta" value="Save" />	<input type="submit" name="restrictmeta" value="$lt{'save'}" />
</form><br />	</form><br />
<form method="post" action="/adm/parmset?action=addmetadata" name="form1">	<form method="post" action="/adm/parmset?action=addmetadata" name="form1">
<input type="submit" name="restrictmeta" value="Add a Metadata Field" />	<input type="submit" name="restrictmeta" value="$lt{'addm'}" />
</form>	</form>
<br />	<br />
<form method="post" action="/adm/parmset?action=ordermetadata" name="form2">	<form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
<input type="submit" name="restrictmeta" value="Order Metadata Fields" />	<input type="submit" name="restrictmeta" value="$lt{'ordm'}" />
ENDButtons	ENDButtons
my $added_flag = 1;	my $added_flag = 1;
foreach my $field (sort(keys(%$added_metadata_fields))) {	foreach my $field (sort(keys(%$added_metadata_fields))) {
$row_alt = $row_alt ? 0 : 1;	$output.= &output_row($r,$field,$$added_metadata_fields{$field},$added_flag);
$output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt); # FIXME: wrong parameters
}	}
$output .= &Apache::loncommon::end_data_table();	$output .= &Apache::loncommon::end_data_table();
$r->print(<<ENDenv);	$r->print(<<ENDenv);
Line 6191 ENDYESNO	Line 6368 ENDYESNO
# $issection - section or group name	# $issection - section or group name
# $realmdescription - title for the parameter level and resource (without using HTML)	# $realmdescription - title for the parameter level and resource (without using HTML)
#	#
# FIXME: remove unused fields.
#
# @param {string} $key - parameter log key	# @param {string} $key - parameter log key
# @param {string} $uname - user name	# @param {string} $uname - user name
# @param {string} $udom - user domain	# @param {string} $udom - user domain
# @param {string} $exeuser - unused
# @param {string} $exedomain - unused
# @param {boolean} $typeflag - .type log entry	# @param {boolean} $typeflag - .type log entry
# @returns {Array}	# @returns {Array}
sub components {	sub components {
my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;	my ($key,$uname,$udom,$typeflag)=@_;

if ($typeflag) {	if ($typeflag) {
$key=~s/\.type$//;	$key=~s/\.type$//;
Line 6253 my %standard_parms_types; # hash paramet	Line 6426 my %standard_parms_types; # hash paramet

# Reads parameter info from packages.tab into %standard_parms.	# Reads parameter info from packages.tab into %standard_parms.
sub load_parameter_names {	sub load_parameter_names {
open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");	open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
while (my $configline=<$config>) {	while (my $configline=<$config>) {
if ($configline !~ /\S/ \|\| $configline=~/^\#/) { next; }	if ($configline !~ /\S/ \|\| $configline=~/^\#/) { next; }
chomp($configline);	chomp($configline);
Line 6416 sub parm_change_log {	Line 6589 sub parm_change_log {
my $typeflag = ($changed =~/\.type$/ &&	my $typeflag = ($changed =~/\.type$/ &&
!exists($parmlog{$id}{'logentry'}{$changed.'.type'}));	!exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=	my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);	&components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},$typeflag);
if ($env{'request.course.sec'} ne '') {	if ($env{'request.course.sec'} ne '') {
next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));	next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
if ($uname ne '') {	if ($uname ne '') {
Line 6452 sub parm_change_log {	Line 6625 sub parm_change_log {
$parmitem = &mt($parmitem);	$parmitem = &mt($parmitem);
$output .= &mt('Type: [_1]',$parmitem);	$output .= &mt('Type: [_1]',$parmitem);
} else {	} else {
	my $toolsymb;
	if ($middle =~ /ext\.tool$/) {
	$toolsymb = $middle;
	}
my ($level,@all)=&parmval_by_symb($what,$middle,	my ($level,@all)=&parmval_by_symb($what,$middle,
&Apache::lonnet::metadata($middle,$what),	&Apache::lonnet::metadata($middle,$what,$toolsymb),
$uname,$udom,$issection,$issection,$courseopt);	$uname,$udom,$issection,$issection,$courseopt);
my $showvalue = $value;	my $showvalue = $value;
if ($istype{$parmname} eq '') {	if ($istype{$parmname} eq '') {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.580
changed lines
	Added in v.1.586