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.576 and 1.592

version 1.576, 2017/07/10 13:55:36	version 1.592, 2019/04/09 13:45:57
Line 36 lonparmset - Handler to set parameters f	Line 36 lonparmset - Handler to set parameters f

=head1 SYNOPSIS	=head1 SYNOPSIS

lonparmset provides an interface to setting course parameters.	lonparmset provides an interface to setting content parameters in a
	course.

It contains all the code for the "Content and Problem Settings" UI, except	It contains all the code for the "Content and Problem Settings" UI, except
for the helpers parameter.helper and resettimes.helper, and lonhelper.pm,	for the helpers parameter.helper and resettimes.helper, and lonhelper.pm,
Line 137 javascript function 'pjump'.	Line 138 javascript function 'pjump'.

=item print_td()	=item print_td()

=item print_usergroups()	=item check_other_groups()

=item parm_control_group()	=item parm_control_group()

Line 846 sub storeparm_by_symb_inner {	Line 847 sub storeparm_by_symb_inner {
my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;	my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;

my $storeunder='';	my $storeunder='';
	my $possreplace='';
if (($snum==18) \|\| ($snum==4)) { $storeunder=$courselevel; }	if (($snum==18) \|\| ($snum==4)) { $storeunder=$courselevel; }
if (($snum==17) \|\| ($snum==3)) { $storeunder=$courseleveli; }	if (($snum==17) \|\| ($snum==3)) {
if (($snum==16) \|\| ($snum==2)) { $storeunder=$courselevelm; }	$storeunder=$courseleveli;
	$possreplace=$courselevelm;
	}
	if (($snum==16) \|\| ($snum==2)) {
	$storeunder=$courselevelm;
	$possreplace=$courseleveli;
	}
if (($snum==13) \|\| ($snum==1)) { $storeunder=$courselevelr; }	if (($snum==13) \|\| ($snum==1)) { $storeunder=$courselevelr; }
if ($snum==12) { $storeunder=$seclevel; }	if ($snum==12) { $storeunder=$seclevel; }
if ($snum==11) { $storeunder=$secleveli; }	if ($snum==11) {
if ($snum==10) { $storeunder=$seclevelm; }	$storeunder=$secleveli;
	$possreplace=$seclevelm;
	}
	if ($snum==10) {
	$storeunder=$seclevelm;
	$possreplace=$secleveli;
	}
if ($snum==9) { $storeunder=$seclevelr; }	if ($snum==9) { $storeunder=$seclevelr; }
if ($snum==8) { $storeunder=$grplevel; }	if ($snum==8) { $storeunder=$grplevel; }
if ($snum==7) { $storeunder=$grpleveli; }	if ($snum==7) {
if ($snum==6) { $storeunder=$grplevelm; }	$storeunder=$grpleveli;
	$possreplace=$grplevelm;
	}
	if ($snum==6) {
	$storeunder=$grplevelm;
	$possreplace=$grpleveli;
	}
if ($snum==5) { $storeunder=$grplevelr; }	if ($snum==5) { $storeunder=$grplevelr; }


Line 875 sub storeparm_by_symb_inner {	Line 895 sub storeparm_by_symb_inner {
&Apache::lonnet::expirespread('','','studentcalc');	&Apache::lonnet::expirespread('','','studentcalc');
if (($snum==13) \|\| ($snum==9) \|\| ($snum==5)) {	if (($snum==13) \|\| ($snum==9) \|\| ($snum==5)) {
&Apache::lonnet::expirespread('','','assesscalc',$symb);	&Apache::lonnet::expirespread('','','assesscalc',$symb);
} elsif (($snum==14) \|\| ($snum==10) \|\| ($snum==6)) {	} elsif (($snum==17) \|\| ($snum==16) \|\| ($snum==11) \|\| ($snum==10) \|\| ($snum==7) \|\| ($snum==6)) {
&Apache::lonnet::expirespread('','','assesscalc',$map);	&Apache::lonnet::expirespread('','','assesscalc',$map);
} else {	} else {
&Apache::lonnet::expirespread('','','assesscalc');	&Apache::lonnet::expirespread('','','assesscalc');
Line 889 sub storeparm_by_symb_inner {	Line 909 sub storeparm_by_symb_inner {
$reply=&Apache::lonnet::cput	$reply=&Apache::lonnet::cput
('resourcedata',\%storecontent,$cdom,$cnum);	('resourcedata',\%storecontent,$cdom,$cnum);
&log_parmset(\%storecontent);	&log_parmset(\%storecontent);
	if ($possreplace) {
	my $resdata = &Apache::lonnet::get_courseresdata($cnum,$cdom);
	if (ref($resdata) eq 'HASH') {
	if (exists($resdata->{$possreplace})) {
	if (&Apache::lonnet::del
	('resourcedata',[$possreplace,$possreplace.'.type'],$cdom,$cnum) eq 'ok') {
	&log_parmset({$possreplace => '', $possreplace.'.type' => $ntype},1);
	}
	}
	}
	}
}	}
&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
} else {	} else {
Line 899 sub storeparm_by_symb_inner {	Line 930 sub storeparm_by_symb_inner {
if ($snum==1) {	if ($snum==1) {
&Apache::lonnet::expirespread	&Apache::lonnet::expirespread
($uname,$udom,'assesscalc',$symb);	($uname,$udom,'assesscalc',$symb);
} elsif ($snum==2) {	} elsif (($snum==2) \|\| ($snum==3)) {
&Apache::lonnet::expirespread	&Apache::lonnet::expirespread
($uname,$udom,'assesscalc',$map);	($uname,$udom,'assesscalc',$map);
} else {	} else {
Line 914 sub storeparm_by_symb_inner {	Line 945 sub storeparm_by_symb_inner {
$reply=&Apache::lonnet::cput	$reply=&Apache::lonnet::cput
('resourcedata',\%storecontent,$udom,$uname);	('resourcedata',\%storecontent,$udom,$uname);
&log_parmset(\%storecontent,0,$uname,$udom);	&log_parmset(\%storecontent,0,$uname,$udom);
	if ($possreplace) {
	my $resdata = &Apache::lonnet::get_userresdata($uname,$udom);
	if (ref($resdata) eq 'HASH') {
	if (exists($resdata->{$possreplace})) {
	if (&Apache::lonnet::del
	('resourcedata',[$possreplace,$possreplace.'.type'],$udom,$uname) eq 'ok') {
	&log_parmset({$possreplace => '',$possreplace.'.type' => $ntype},1,
	$uname,$udom);
	}
	}
	}
	}
}	}
&Apache::lonnet::devalidateuserresdata($uname,$udom);	&Apache::lonnet::devalidateuserresdata($uname,$udom);
}	}
Line 1022 sub valout {	Line 1065 sub valout {
# @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.	# @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.
# @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')	# @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')
# @param {string} $call - javascript function to call to submit the form ('psub')	# @param {string} $call - javascript function to call to submit the form ('psub')
	# @param {boolean} $recursive - true if link is for a map/folder where parameter is currently set to be recursive.
	# @param {string} $extra - optional additional information to send as tenth arg in call to javascript pjump function.
sub plink {	sub plink {
my ($type,$dis,$value,$marker,$return,$call)=@_;	my ($type,$dis,$value,$marker,$return,$call,$recursive,$extra)=@_;
my $winvalue=$value;	my $winvalue=$value;
unless ($winvalue) {	unless ($winvalue) {
if (&isdateparm($type)) {	if (&isdateparm($type) \|\| (&is_specialstring($type))) {
$winvalue=$env{'form.recent_'.$type};	$winvalue=$env{'form.recent_'.$type};
	} elsif ($type eq 'string_yesno') {
	if ($env{'form.recent_string'} =~ /^(yes\|no)$/i) {
	$winvalue=$env{'form.recent_string'};
	}
} else {	} else {
$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};	$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
}	}
Line 1038 sub plink {	Line 1087 sub plink {
my $valout = &valout($value,$type,$parmname,1);	my $valout = &valout($value,$type,$parmname,1);
my $unencmarker = $marker;	my $unencmarker = $marker;
foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,	foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
\$hour, \$min, \$sec) {	\$hour, \$min, \$sec, \$extra) {
$$item = &HTML::Entities::encode($$item,'"<>&');	$$item = &HTML::Entities::encode($$item,'"<>&');
$$item =~ s/\'/\\\'/g;	$$item =~ s/\'/\\\'/g;
}	}
return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.	return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
.$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.	.$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."','".$extra."'".');">'.
$valout.'</a></td></tr></table>';	$valout.'</a></td></tr>'.($recursive?'<tr><td align="center" class="LC_parm_recursive">'.
	&mt('recursive').'</td></tr>' : '').'</table>';

}	}

# Javascript for table mode.	# Javascript for table mode.
Line 1061 sub page_js {	Line 1112 sub page_js {
$pjump_def	$pjump_def

function psub() {	function psub() {
	var specstring = /^string_!(yesno\|any)/i;
if (document.parmform.pres_marker.value!='') {	if (document.parmform.pres_marker.value!='') {
document.parmform.action+='#'+document.parmform.pres_marker.value;	document.parmform.action+='#'+document.parmform.pres_marker.value;
var typedef=new Array();	var typedef=new Array();
typedef=document.parmform.pres_type.value.split('_');	typedef=document.parmform.pres_type.value.split('_');
if (document.parmform.pres_type.value!='') {	if (document.parmform.pres_type.value!='') {
if (typedef[0]=='date') {	if ((typedef[0]=='date') \|\|
	(specstring.test(document.parmform.pres_type.value))) {
eval('document.parmform.recent_'+	eval('document.parmform.recent_'+
document.parmform.pres_type.value+	document.parmform.pres_type.value+
'.value=document.parmform.pres_value.value;');	'.value=document.parmform.pres_value.value;');
Line 1191 function validateParms() {	Line 1244 function validateParms() {
var patternLenientStd = /^(yes\|no\|default)$/;	var patternLenientStd = /^(yes\|no\|default)$/;
var ipallowRegExp = /^setipallow_/;	var ipallowRegExp = /^setipallow_/;
var ipdenyRegExp = /^setipdeny_/;	var ipdenyRegExp = /^setipdeny_/;
	var deeplinkRegExp = /^deeplink_(listing\|scope)_/;
	var deeplinkUrlsRegExp = /^deeplink_urls_/;
	var deeplinkltiRegExp = /^deeplink_lti_/;
	var deeplinkkeyRegExp = /^deeplink_key_/;
var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;	var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') {	if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') {
if (document.parmform.elements.length) {	if (document.parmform.elements.length) {
for (i=0; i<document.parmform.elements.length; i++) {	for (i=0; i<document.parmform.elements.length; i++) {
var name=document.parmform.elements[i].name;	var name=document.parmform.elements[i].name;
if (textRegExp.test(name)) {	if (textRegExp.test(name)) {
var identifier = name.replace(textRegExp,'');	var identifier = name.replace(textRegExp,'');
if (tailLenient.test(identifier)) {	if (tailLenient.test(identifier)) {
if (document.parmform.elements['set_'+identifier].length) {	if (document.parmform.elements['set_'+identifier].length) {
Line 1219 function validateParms() {	Line 1276 function validateParms() {
}	}
}	}
}	}
} else {	} else if (ipallowRegExp.test(name)) {
if (ipallowRegExp.test(name)) {	var identifier = name.replace(ipallowRegExp,'');
var identifier = name.replace(ipallowRegExp,'');	var possallow = document.parmform.elements[i].value;
var possallow = document.parmform.elements[i].value;	possallow = possallow.replace(/^\s+\|\s+$/g,'');
possallow = possallow.replace(/^\s+\|\s+$/g,'');	if (patternIP.test(possallow)) {
if (patternIP.test(possallow)) {	if (document.parmform.elements['set_'+identifier].value) {
if (document.parmform.elements['set_'+identifier].value) {	possallow = ','+possallow;
possallow = ','+possallow;
}
document.parmform.elements['set_'+identifier].value += possallow;
}	}
} else {	document.parmform.elements['set_'+identifier].value += possallow;
if (ipdenyRegExp.test(name)) {	}
var identifier = name.replace(ipdenyRegExp,'');	} else if (ipdenyRegExp.test(name)) {
var possdeny = document.parmform.elements[i].value;	var identifier = name.replace(ipdenyRegExp,'');
possdeny = possdeny.replace(/^\s+\|\s+$/g,'');	var possdeny = document.parmform.elements[i].value;
if (patternIP.test(possdeny)) {	possdeny = possdeny.replace(/^\s+\|\s+$/g,'');
possdeny = '!'+possdeny;	if (patternIP.test(possdeny)) {
if (document.parmform.elements['set_'+identifier].value) {	possdeny = '!'+possdeny;
possdeny = ','+possdeny;	if (document.parmform.elements['set_'+identifier].value) {
}	possdeny = ','+possdeny;
document.parmform.elements['set_'+identifier].value += possdeny;	}
}	document.parmform.elements['set_'+identifier].value += possdeny;
	}
	} else if (deeplinkRegExp.test(name)) {
	var identifier = name.replace(deeplinkRegExp,'');
	var possdeeplink = document.parmform.elements[i].value;
	possdeeplink = possdeeplink.replace(/^\s+\|\s+$/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	possdeeplink = ','+possdeeplink;
	}
	document.parmform.elements['set_'+identifier].value += possdeeplink;
	} else if (deeplinkUrlsRegExp.test(name)) {
	if (document.parmform.elements[i].checked) {
	var identifier = name.replace(deeplinkUrlsRegExp,'');
	var posslinkurl = document.parmform.elements[i].value;
	posslinkurl = posslinkurl.replace(/^\s+\|\s+$/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslinkurl = ','+posslinkurl;
}	}
	document.parmform.elements['set_'+identifier].value += posslinkurl;
	}
	} else if (deeplinkltiRegExp.test(name)) {
	var identifier = name.replace(deeplinkltiRegExp,'');
	var posslti = document.parmform.elements[i].value;
	posslti = posslti.replace(/\D+/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslti = ':'+posslti;
	}
	document.parmform.elements['set_'+identifier].value += posslti;
	} else if (deeplinkkeyRegExp.test(name)) {
	var identifier = name.replace(deeplinkkeyRegExp,'');
	var posskey = document.parmform.elements[i].value;
	posskey = posskey.replace(/\W+/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslti = ':'+posskey;
}	}
	document.parmform.elements['set_'+identifier].value += posskey;
}	}
}	}
}	}
Line 1305 END	Line 1392 END

}	}

	# Javascript function toggle
	sub deeplink_js {
	return <<"END";
	function toggleDeepLink(form,item,key) {
	var radios = form['deeplink_'+item+'_'+key];
	if (radios.length) {
	var keybox;
	if (document.getElementById('deeplink_key_'+item+'_'+key)) {
	keybox = document.getElementById('deeplink_key_'+item+'_'+key);
	}
	var ltidiv;
	if (document.getElementById('deeplinkdiv_lti_'+item+'_'+key)) {
	ltidiv = document.getElementById('deeplinkdiv_lti_'+item+'_'+key);
	}
	for (var i=0; i<radios.length; i++) {
	if (radios[i].checked) {
	if (radios[i].value == 'lti') {
	ltidiv.style.display = 'inline-block';
	keybox.type = 'hidden';
	keybox.value = '';
	} else {
	if (ltidiv != '') {
	ltidiv.style.display = 'none';
	form['deeplink_lti_'+key].selectedIndex = 0;
	}
	if (radios[i].value == 'key') {
	keybox.type = 'text';
	} else {
	keybox.type = 'hidden';
	}
	}
	}
	}
	}
	}
	END

	}

# Prints HTML page start for table mode.	# Prints HTML page start for table mode.
# @param {Apache2::RequestRec} $r - the Apache request	# @param {Apache2::RequestRec} $r - the Apache request
# @param {string} $psymb - resource symb	# @param {string} $psymb - resource symb
Line 1380 ENDHEAD	Line 1506 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 1424 sub print_row {	Line 1555 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);	my ($othergrp,$grp_parm,$controlgrp,$effective_parm,$effparm_rec,$effparm_level,
	$eff_groupparm,$recurse_check,$recursinfo,$extra);
	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;
	}
	if ($parmname eq 'deeplink') {
	my %posslti;
	my %lti =
	&Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
	'provider');
	foreach my $item (keys(%lti)) {
	if (ref($lti{$item}) eq 'HASH') {
	unless ($lti{$item}{'requser'}) {
	$posslti{$item} = $lti{$item}{'consumer'};
	}
	}
	}
	if (keys(%posslti)) {
	$extra = 'lti_';
	foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
	$extra .= $lti.':'.&js_escape($posslti{$lti}).',';
	}
	$extra =~ s/,$//;
	}
	}
if ($parmlev eq 'general') {	if ($parmlev eq 'general') {
if ($uname) {	if ($uname) {
&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
} else {	} else {
&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
}	}
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {
if ($uname) {	if ($uname) {
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
} else {	} else {
&print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
}	}
} 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},
&print_usergroups($r,$$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;
	}
}	}
}	}
}	}
}	}
}	}

&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);

if ($csec) {	if ($csec) {
&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
}	}

if ($cgroup) {	if ($cgroup) {
&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
&print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly,'',$extra);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly);
}	}

if ($uname) {	if ($uname) {
if ($othergrp) {	if ($othergrp) {
$r->print($othergrp);	$r->print($othergrp);
}	}
&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&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.'</td>');	if (ref($recursinfo) eq 'ARRAY') {
	my $rectitle = &mt('recursive');
	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 1516 sub print_row {	Line 1744 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 1535 sub print_row {	Line 1766 sub print_row {
# @param {hash reference} $display - parameter key -> full title for the parameter	# @param {hash reference} $display - parameter key -> full title for the parameter
# @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 editing not allowed.	# @param {boolean} $readonly -true if editing not allowed.
	# @param {boolean} $ismaplevel - true if level is for a map.
	# @param {strring} $extra - extra informatio to pass to plink.
sub print_td {	sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;	my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,
$r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).	$noeditgrp,$readonly,$ismaplevel,$extra)=@_;
	my ($ineffect,$recursive,$currval,$currtype,$currlevel);
	$ineffect = 0;
	$currval = $$outpar[$which];
	$currtype = $$typeoutpar[$which];
	$currlevel = $which;
	if (($result) && ($result == $which)) {
	$ineffect = 1;
	}
	if ($ismaplevel) {
	if ($mprefix =~ /(hiddenresource\|encrypturl)\&/) {
	if (($result) && ($result == $which)) {
	$recursive = 1;
	}
	} elsif ($$outpar[$which+1] ne '') {
	$recursive = 1;
	$currlevel = $which+1;
	$currval = $$outpar[$currlevel];
	$currtype = $$typeoutpar[$currlevel];
	if (($result) && ($result == $currlevel)) {
	$ineffect = 1;
	}
	}
	}
	$r->print('<td style="background-color:'.($ineffect?'#AAFFAA':$defbg).
';" align="center">');	';" align="center">');
my $nolink = 0;	my $nolink = 0;
if ($readonly) {	if ($readonly) {
$nolink = 1;	$nolink = 1;
} else {	} else {
if ($which == 14 \|\| $which == 15 \|\| $mprefix =~ /mapalias\&/) {	if ($which == 14 \|\| $which == 15 \|\| $mprefix =~ /mapalias\&$/) {
$nolink = 1;	$nolink = 1;
} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {	} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
$nolink = 1;	$nolink = 1;
Line 1559 sub print_td {	Line 1816 sub print_td {
unless ($which == 2) {	unless ($which == 2) {
$nolink = 1;	$nolink = 1;
}	}
} elsif ($mprefix =~ /(encrypturl\|hiddenresource)/) {
if ($which == 16 \|\| $which == 10 \|\| $which == 6 \|\| $which == 2) {
$nolink = 1;
}
}	}
}	}
if ($nolink) {	if ($nolink) {
$r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));	my ($parmname)=((split(/\&/,$mprefix))[1]=~/\_([^\_]+)$/);
# FIXME: probably a good thing that mprefix is not used in valout, because it does not look like a parameter name !	$r->print(&valout($currval,$currtype,$parmname));
} else {	} else {
$r->print(&plink($$typeoutpar[$which],	$r->print(&plink($currtype,
$$display{$value},$$outpar[$which],	$$display{$value},$currval,
$mprefix."$which",'parmform.pres','psub'));	$mprefix.$currlevel,'parmform.pres','psub',$recursive,
	$extra));
}	}
$r->print('</td>'."\n");	$r->print('</td>'."\n");
}	}

# FIXME: Despite the name, this does not print anything, the $r parameter is unused.
# Returns HTML and other info for the cell added when a user is selected	# Returns HTML and other info for the cell added when a user is selected
# and that user is in several groups. This is the cell with the title "Control by other group".	# and that user is in several groups. This is the cell with the title "Control by other group".
#	#
# @param {Apache2::RequestRec} $r - the Apache request (unused)
# @param {string} $what - parameter part.'.'.parameter name	# @param {string} $what - parameter part.'.'.parameter name
# @param {string} $rid - resource id	# @param {string} $rid - resource id
# @param {string} $cgroup - group name	# @param {string} $cgroup - group name
Line 1588 sub print_td {	Line 1840 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 print_usergroups {	sub check_other_groups {
my ($r,$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'};
my $output;	my $output;
my $symb = &symbcache($rid);	my $symb = &symbcache($rid);
Line 1602 sub print_usergroups {	Line 1854 sub print_usergroups {
&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,$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 1619 sub print_usergroups {	Line 1877 sub print_usergroups {
} 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.
# Used by print_usergroups.	# Used by check_other_groups.
#	#
# @param {string} $courseid - the course id	# @param {string} $courseid - the course id
# @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
Line 1700 sub extractResourceInformation {	Line 1958 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 1725 sub extractResourceInformation {	Line 1987 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 1773 sub extractResourceInformation {	Line 2035 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 1783 sub isdateparm {	Line 2068 sub isdateparm {
return (($type=~/^date/) && (!($type eq 'date_interval')));	return (($type=~/^date/) && (!($type eq 'date_interval')));
}	}

	# Determine if parameter type is specialized string type (i.e.,
	# not just string or string_yesno.

	sub is_specialstring {
	my $type=shift;
	return (($type=~/^string_/) && (($type ne 'string_yesno')));
	}

# 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 1869 sub parmmenu {	Line 2157 sub parmmenu {
ENDSCRIPT	ENDSCRIPT

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

Line 1923 sub lookUpTableParameter {	Line 2211 sub lookUpTableParameter {
'buttonshide' => 'hiding',	'buttonshide' => 'hiding',
'turnoffeditor' => 'hiding',	'turnoffeditor' => 'hiding',
'encrypturl' => 'hiding',	'encrypturl' => 'hiding',
	'deeplink' => 'hiding',
'randomorder' => 'high_level_randomization',	'randomorder' => 'high_level_randomization',
'randompick' => 'high_level_randomization',	'randompick' => 'high_level_randomization',
'available' => 'slots',	'available' => 'slots',
Line 1938 sub lookUpTableParameter {	Line 2227 sub lookUpTableParameter {
'lenient' => 'grading',	'lenient' => 'grading',
'retrypartial' => 'tries',	'retrypartial' => 'tries',
'discussvote' => 'misc',	'discussvote' => 'misc',
'examcode' => 'high_level_randomization',	'examcode' => 'high_level_randomization',
);	);
}	}

Line 2050 sub parmboxes {	Line 2339 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 2147 sub usermenu {	Line 2432 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 2250 function group_or_section(caller) {	Line 2535 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 2492 sub groupmenu {	Line 2776 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 2658 sub assessparms {	Line 2942 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 2666 sub assessparms {	Line 2951 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 2699 sub assessparms {	Line 2985 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 2813 sub assessparms {	Line 3099 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 2977 sub assessparms {	Line 3265 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 2993 sub assessparms {	Line 3282 sub assessparms {
&startpage($r,$pssymb,$crstype);	&startpage($r,$pssymb,$crstype);

foreach my $item ('tolerance','date_default','date_start','date_end',	foreach my $item ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {	'date_interval','int','float','string','string_lenient',
	'string_examcode','string_deeplink','string_discussvote',
	'string_useslots','string_problemstatus','string_ip',
	'string_questiontype') {
$r->print('<input type="hidden" value="'.	$r->print('<input type="hidden" value="'.
&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').	&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
'" name="recent_'.$item.'" />');	'" name="recent_'.$item.'" />');
Line 3043 ENDPARMSELSCRIPT	Line 3335 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 3119 ENDPARMSELSCRIPT	Line 3411 ENDPARMSELSCRIPT
#	#
# This produces the cascading table output of parameters	# This produces the cascading table output of parameters
#	#
my $coursespan=$csec?10:6;	my $coursespan=$csec?8:5;
my $userspan=4;	my $userspan=3;
if ($cgroup ne '') {	if ($cgroup ne '') {
$coursespan += 4;	$coursespan += 3;
}	}

$r->print(&Apache::loncommon::start_data_table());	$r->print(&Apache::loncommon::start_data_table());
Line 3152 ENDPARMSELSCRIPT	Line 3444 ENDPARMSELSCRIPT
'femof' => 'from Enclosing Map or Folder',	'femof' => 'from Enclosing Map or Folder',
'gen' => 'general',	'gen' => 'general',
'foremf' => 'for Enclosing Map or Folder',	'foremf' => 'for Enclosing Map or Folder',
'formfr' => 'for Map or Folder (recursive)',
'fr' => 'for Resource'	'fr' => 'for Resource'
);	);
$r->print(<<ENDTABLETWO);	$r->print(<<ENDTABLETWO);
<th rowspan="3">$lt{'pie'}</th>	<th rowspan="3">$lt{'pie'}</th>
<th rowspan="3">$lt{'csv'}<br />($csuname:$csudom)</th>	<th rowspan="3">$lt{'csv'}<br />($csuname:$csudom)</th>
</tr><tr><td colspan="5"></td><th colspan="3">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>	</tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
<th colspan="1">$lt{'ic'}</th>	<th colspan="1">$lt{'ic'}</th>

ENDTABLETWO	ENDTABLETWO
if ($csec) {	if ($csec) {
$r->print('<th colspan="4">'.	$r->print('<th colspan="3">'.
&mt("in Section")." $csec</th>");	&mt("in Section")." $csec</th>");
}	}
if ($cgroup) {	if ($cgroup) {
$r->print('<th colspan="4">'.	$r->print('<th colspan="3">'.
&mt("in Group")." $cgroup</th>");	&mt("in Group")." $cgroup</th>");
}	}
$r->print(<<ENDTABLEHEADFOUR);	$r->print(<<ENDTABLEHEADFOUR);
</tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>	</tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
<th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>	<th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
<th>$lt{'gen'}</th><th>$lt{'formfr'}</th><th>$lt{'foremf'}</th>	<th>$lt{'gen'}</th><th>$lt{'foremf'}</th>
<th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>	<th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>
ENDTABLEHEADFOUR	ENDTABLEHEADFOUR

if ($csec) {	if ($csec) {
$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
}	}

if ($cgroup) {	if ($cgroup) {
$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.&mt('foremf').'</th><th>'.$lt{'fr'}.'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
}	}

if ($uname) {	if ($uname) {
if (@usersgroups > 1) {	if (@usersgroups > 1) {
$r->print('<th>'.&mt('Control by other group?').'</th>');	$r->print('<th>'.&mt('Control by other group?').'</th>');
}	}
$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
}	}

$r->print('</tr>');	$r->print('</tr>');
Line 3203 ENDTABLEHEADFOUR	Line 3494 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 3233 ENDTABLEHEADFOUR	Line 3523 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 3257 ENDTABLEHEADFOUR	Line 3551 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 3297 ENDTABLEHEADFOUR	Line 3596 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 3343 ENDTABLEHEADFOUR	Line 3644 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 3358 ENDTABLEHEADFOUR	Line 3664 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 3372 ENDTABLEHEADFOUR	Line 3678 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 3410 ENDTABLEHEADFOUR	Line 3716 ENDTABLEHEADFOUR
$r->print('<p>'.&Apache::loncommon::start_data_table()	$r->print('<p>'.&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()	.&Apache::loncommon::start_data_table_header_row()
.'<th>'.&mt('Parameter Name').'</th>'	.'<th>'.&mt('Parameter Name').'</th>'
.'<th>'.&mt('Recursive Value').'</th>'	.'<th>'.&mt('Value').'</th>'
.'<th>'.&mt('Non-Recursive Value').'</th>'
.'<th>'.&mt('Parameter in Effect').'</th>'	.'<th>'.&mt('Parameter in Effect').'</th>'
.&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 3448 ENDTABLEHEADFOUR	Line 3764 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 3461 ENDTABLEHEADFOUR	Line 3781 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 3475 ENDTABLEHEADFOUR	Line 3795 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 3521 ENDMAPONE	Line 3841 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 3606 sub readdata {	Line 3945 sub readdata {
# Stores parameter data, using form parameters directly.	# Stores parameter data, using form parameters directly.
#	#
# Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).	# Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).
# set_* (except settext, setipallow, setipdeny) - set a parameter value	# set_* (except settext, setipallow, setipdeny, setdeeplink) - set a parameter value
# del_* - remove a parameter	# del_* - remove a parameter
# datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)	# datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)
# dateinterval_* - set a date interval parameter (value refers to more form parameters)	# dateinterval_* - set a date interval parameter (value refers to more form parameters)
Line 3639 sub storedata {	Line 3978 sub storedata {
my $cmd=$1;	my $cmd=$1;
my $thiskey=$2;	my $thiskey=$2;
my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);	my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);
next if ($cmd eq 'rec' \|\| $cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny');	next if ($cmd eq 'rec' \|\| $cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny' \|\| $cmd eq 'setdeeplink');
if ((($cmd eq 'set') \|\| ($cmd eq 'datepointer') \|\| ($cmd eq 'dateinterval') \|\| ($cmd eq 'del')) &&	if ((($cmd eq 'set') \|\| ($cmd eq 'datepointer') \|\| ($cmd eq 'dateinterval') \|\| ($cmd eq 'del')) &&
($thiskey =~ /(?:sequence\|page)\Q___(all)\E/)) {	($thiskey =~ /(?:sequence\|page)\Q___(all)\E/)) {
unless ($thiskey =~ /(encrypturl\|hiddenresource)$/) {	unless ($thiskey =~ /(encrypturl\|hiddenresource)$/) {
Line 3670 sub storedata {	Line 4009 sub storedata {
$text = &mt('Saved modified parameter for');	$text = &mt('Saved modified parameter for');
if ($typeof eq 'string_questiontype') {	if ($typeof eq 'string_questiontype') {
$name = 'type';	$name = 'type';
} elsif ($typeof eq 'string_lenient') {	} elsif (($typeof eq 'string_lenient') \|\| ($typeof eq 'string_deeplink')) {
$name = 'lenient';	($name) = ($typeof =~ /^string_(lenient\|deeplink)$/);
my $stringmatch = &standard_string_matches($typeof);	my $stringmatch = &standard_string_matches($typeof);
if (ref($stringmatch) eq 'ARRAY') {	if (ref($stringmatch) eq 'ARRAY') {
foreach my $item (@{$stringmatch}) {	foreach my $item (@{$stringmatch}) {
Line 4057 sub listdata {	Line 4396 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 4402 sub string_ip_selector {	Line 4741 sub string_ip_selector {
return $output;	return $output;
}	}

	sub string_deeplink_selector {
	my ($thiskey, $showval, $readonly) = @_;
	my (@components,%values,@current,%titles,%options,%optiontext,%defaults,%posslti);
	@components = ('listing','scope','urls');
	%titles = &Apache::lonlocal::texthash (
	listing => 'In Contents and/or Gradebook',
	scope => 'Access scope for link',
	urls => 'Supported link types',
	);
	%options = (
	listing => ['full','absent','grades','details','datestatus'],
	scope => ['res','map','rec'],
	urls => ['any','only','key','lti'],
	);
	%optiontext = &Apache::lonlocal::texthash (
	full => 'Listed (linked) in both',
	absent => 'Not listed',
	grades => 'Listed in grades only',
	details => 'Listed (unlinked) in both',
	datestatus => 'Listed (unlinked) inc. status in both',
	res => 'resource only',
	map => 'enclosing map/folder',
	rec => 'recursive map/folder',
	any => 'regular + deep',
	only => 'deep only',
	key => 'deep with key',
	lti => 'deep with LTI launch',
	);
	if ($showval =~ /,/) {
	@current = split(/,/,$showval);
	($values{'listing'}) = ($current[0] =~ /^(full\|absent\|grades\|details\|datestatus)$/);
	($values{'scope'}) = ($current[1] =~ /^(res\|map\|rec)$/);
	($values{'urls'}) = ($current[2] =~ /^(any\|only\|key:\w+\|lti:\d+)$/);
	} else {
	$defaults{'listing'} = 'full';
	$defaults{'scope'} = 'res';
	$defaults{'urls'} = 'any';
	}
	my $disabled;
	if ($readonly) {
	$disabled=' disabled="disabled"';
	}
	my %lti =
	&Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
	'provider');
	foreach my $item (keys(%lti)) {
	if (ref($lti{$item}) eq 'HASH') {
	unless ($lti{$item}{'requser'}) {
	$posslti{$item} = $lti{$item}{'consumer'};
	}
	}
	}
	my $output = '<input type="hidden" name="set_'.$thiskey.'" /><table><tr>';
	foreach my $item ('listing','scope','urls') {
	$output .= '<th>'.$titles{$item}.'</th>';
	}
	$output .= '</tr><tr>';
	foreach my $item (@components) {
	$output .= '<td>';
	if ($item eq 'urls') {
	my $selected = $values{$item};
	foreach my $option (@{$options{$item}}) {
	if ($option eq 'lti') {
	next unless (keys(%posslti));
	}
	my $checked;
	if ($selected =~ /^\Q$option\E/) {
	$checked = ' checked="checked"';
	}
	my $onclick;
	unless ($readonly) {
	my $esc_key = &js_escape($thiskey);
	$onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"';
	}
	$output .= '<span class="LC_nobreak"><label>'.
	'<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
	$optiontext{$option}.'</label>';
	if ($option eq 'key') {
	my $visibility="hidden";
	my $currkey;
	if ($checked) {
	$visibility = "text";
	$currkey = (split(/\:/,$values{$item}))[1];
	}
	$output .= ' '.
	'<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="6"'.$disabled.' />';
	} elsif ($option eq 'lti') {
	my $display="none";
	my ($currlti,$blankcheck);
	if ($checked) {
	$display = 'inline-block';
	$currlti = (split(/\:/,$values{$item}))[1];
	} else {
	$blankcheck = ' selected="selected"';
	}
	$output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
	' style="display: '.$display.'"> <select name="'.
	'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>'.
	'<option value=""'.$blankcheck.'>'.&mt('Select Provider').'</option>'."\n";
	foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
	my $selected;
	if ($lti == $currlti) {
	$selected = ' selected="selected"';
	}
	$output .= '<option value="'.$lti.'"'.$selected.'>'.$posslti{$lti}.'</option>';
	}
	$output .= '</select></div>';
	}
	$output .= '</span> ';
	}
	} else {
	my $selected = $values{$item};
	my $defsel;
	if ($selected eq '') {
	$defsel = ' selected="selected"';
	}
	$output .= '<select name="deeplink_'.$item.'_'.$thiskey.'"'.$disabled.'>'."\n".
	'<option value=""'.$defsel.'>'.&mt('Please select').'</option>'."\n";
	foreach my $option (@{$options{$item}}) {
	$output .= '<option value="'.$option.'"';
	if ($option eq $selected) {
	$output .= ' selected="selected"';
	}
	$output .= '>'.$optiontext{$option}.'</option>';
	}
	$output .= '</select>';
	}
	$output .= '</td>';
	}
	$output .= '</tr></table>'."\n";
	return $output;
	}


{ # block using some constants related to parameter types (overview mode)	{ # block using some constants related to parameter types (overview mode)

Line 4435 my %strings =	Line 4907 my %strings =
['no','No']],	['no','No']],
'string_ip'	'string_ip'
=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],	=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'],	['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
);	'string_deeplink'
	=> [['on','Set choices for link protection, resource listing, and access scope']],
	);


my %stringmatches = (	my %stringmatches = (
'string_lenient'	'string_lenient'
Line 4444 my %stringmatches = (	Line 4919 my %stringmatches = (
'string_ip'	'string_ip'
=> [['_allowfrom_','[^\!]+'],	=> [['_allowfrom_','[^\!]+'],
['_denyfrom_','\!']],	['_denyfrom_','\!']],
	'string_deeplink'
	=> [['on','^(full\|absent\|grades\|details\|datestatus)\,(res\|map\|rec)\,(any\|only\|key\:\w+\|lti\:\d+)$']],
);	);

my %stringtypes = (	my %stringtypes = (
Line 4453 my %stringtypes = (	Line 4930 my %stringtypes = (
discussvote => 'string_discussvote',	discussvote => 'string_discussvote',
examcode => 'string_examcode',	examcode => 'string_examcode',
acc => 'string_ip',	acc => 'string_ip',
	deeplink => 'string_deeplink',
);	);

# Returns the possible values and titles for a given string type, or undef if there are none.	# Returns the possible values and titles for a given string type, or undef if there are none.
Line 4512 sub string_selector {	Line 4990 sub string_selector {
($thistype eq 'string_lenient') \|\|	($thistype eq 'string_lenient') \|\|
($thistype eq 'string_discussvote') \|\|	($thistype eq 'string_discussvote') \|\|
($thistype eq 'string_ip') \|\|	($thistype eq 'string_ip') \|\|
	($thistype eq 'string_deeplink') \|\|
($name eq 'retrypartial')) {	($name eq 'retrypartial')) {
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
foreach my $possibilities (@{ $strings{$thistype} }) {	foreach my $possibilities (@{ $strings{$thistype} }) {
Line 4550 sub string_selector {	Line 5029 sub string_selector {

if ($thistype eq 'string_ip') {	if ($thistype eq 'string_ip') {
return &string_ip_selector($thiskey,$showval,$readonly);	return &string_ip_selector($thiskey,$showval,$readonly);
	} elsif ($thistype eq 'string_deeplink') {
	return &string_deeplink_selector($thiskey,$showval,$readonly);
}	}

my ($result,$disabled);	my ($result,$disabled);
Line 4964 sub newoverview {	Line 5445 sub newoverview {
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
&done_proctor_js()."\n".	&done_proctor_js()."\n".
	&deeplink_js()."\n".
'// ]]>	'// ]]>
</script>	</script>
';	';
Line 5050 ENDOVER	Line 5532 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 5185 sub overview {	Line 5667 sub overview {
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
&done_proctor_js()."\n".	&done_proctor_js()."\n".
	&deeplink_js()."\n".
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
Line 5296 ENDOVER	Line 5779 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 5406 sub parse_key {	Line 5887 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 5753 sub continue {	Line 6233 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 5781 sub addmetafield {	Line 6261 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 5793 sub addmetafield {	Line 6276 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 5835 sub setrestrictmeta {	Line 6326 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 5873 sub setrestrictmeta {	Line 6369 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 6133 ENDYESNO	Line 6626 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 6195 my %standard_parms_types; # hash paramet	Line 6684 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 6358 sub parm_change_log {	Line 6847 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 6394 sub parm_change_log {	Line 6883 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.576
changed lines
	Added in v.1.592