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.547 and 1.550

version 1.547, 2014/09/12 18:09:58	version 1.550, 2015/04/28 13:34:12
Line 932 function showHide_courseContent() {	Line 932 function showHide_courseContent() {
COURSECONTENTSCRIPT	COURSECONTENTSCRIPT
}	}

	sub toggleparmtextbox_js {
	return <<"ENDSCRIPT";

	if (!document.getElementsByClassName) {
	function getElementsByClassName(node, classname) {
	var a = [];
	var re = new RegExp('(^\| )'+classname+'( \|$)');
	var els = node.getElementsByTagName("*");
	for(var i=0,j=els.length; i<j; i++)
	if(re.test(els[i].className))a.push(els[i]);
	return a;
	}
	}

	function showHideLenient() {
	var lenients;
	var setRegExp = /^set_/;
	if (document.getElementsByClassName) {
	lenients = document.getElementsByClassName('LC_lenient_radio');
	} else {
	lenients = getElementsByClassName(document.body,'LC_lenient_radio');
	}
	if (lenients != 'undefined') {
	for (var i=0; i<lenients.length; i++) {
	if (lenients[i].checked) {
	if (lenients[i].value == 'weighted') {
	if (setRegExp.test(lenients[i].name)) {
	var identifier = lenients[i].name.replace(setRegExp,'');
	toggleParmTextbox(document.parmform,identifier);
	}
	}
	}
	}
	}
	return;
	}

	function toggleParmTextbox(form,key) {
	var divfortext = document.getElementById('LC_parmtext_'+key);
	if (divfortext) {
	var caller = form.elements['set_'+key];
	if (caller.length) {
	for (i=0; i<caller.length; i++) {
	if (caller[i].checked) {
	if (caller[i].value == 'weighted') {
	divfortext.style.display = 'inline';
	} else {
	divfortext.style.display = 'none';
	}
	}
	}
	}
	}
	return;
	}

	ENDSCRIPT
	}

	sub validateparms_js {
	return <<'ENDSCRIPT';

	function validateParms() {
	var textRegExp = /^settext_/;
	var tailLenient = /\.lenient$/;
	var patternRelWeight = /^\-?[\d.]+$/;
	var patternLenientStd = /^(yes\|no\|default)$/;
	var ipallowRegExp = /^setipallow_/;
	var ipdenyRegExp = /^setipdeny_/;
	var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
	if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') {
	if (document.parmform.elements.length) {
	for (i=0; i<document.parmform.elements.length; i++) {
	var name=document.parmform.elements[i].name;
	if (textRegExp.test(name)) {
	var identifier = name.replace(textRegExp,'');
	if (tailLenient.test(identifier)) {
	if (document.parmform.elements['set_'+identifier].length) {
	for (var j=0; j<document.parmform.elements['set_'+identifier].length; j++) {
	if (document.parmform.elements['set_'+identifier][j].checked) {
	if (!(patternLenientStd.test(document.parmform.elements['set_'+identifier][j].value))) {
	var relweight = document.parmform.elements[i].value;
	relweight = relweight.replace(/^\s+\|\s+$/g,'');
	if (!patternRelWeight.test(relweight)) {
	relweight = '0.0';
	}
	if (document.parmform.elements['set_'+identifier][j].value == 'weighted') {
	document.parmform.elements['set_'+identifier][j].value = relweight;
	} else {
	document.parmform.elements['set_'+identifier][j].value += ','+relweight;
	}
	}
	break;
	}
	}
	}
	}
	} else {
	if (ipallowRegExp.test(name)) {
	var identifier = name.replace(ipallowRegExp,'');
	var possallow = document.parmform.elements[i].value;
	possallow = possallow.replace(/^\s+\|\s+$/g,'');
	if (patternIP.test(possallow)) {
	if (document.parmform.elements['set_'+identifier].value) {
	possallow = ','+possallow;
	}
	document.parmform.elements['set_'+identifier].value += possallow;
	}
	} else {
	if (ipdenyRegExp.test(name)) {
	var identifier = name.replace(ipdenyRegExp,'');
	var possdeny = document.parmform.elements[i].value;
	possdeny = possdeny.replace(/^\s+\|\s+$/g,'');
	if (patternIP.test(possdeny)) {
	possdeny = '!'+possdeny;
	if (document.parmform.elements['set_'+identifier].value) {
	possdeny = ','+possdeny;
	}
	document.parmform.elements['set_'+identifier].value += possdeny;
	}
	}
	}
	}
	}
	}
	}
	return true;
	}

	ENDSCRIPT
	}

	sub ipacc_boxes_js {
	my $remove = &mt('Remove');
	return <<"END";
	\$(document).ready(function() {
	var wrapper = \$(".LC_string_ipacc_wrap");
	var add_button = \$(".LC_add_ipacc_button");
	var ipaccRegExp = /^LC_string_ipacc_/;

	\$(add_button).click(function(e){
	e.preventDefault();
	var identifier = \$(this).closest("div").attr("id");
	identifier = identifier.replace(ipaccRegExp,'');
	\$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'"/><a href="#" class="LC_remove_ipacc">$remove</a></div>');
	});

	\$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
	e.preventDefault(); \$(this).closest("div").remove();
	})
	});


	END
	}

sub startpage {	sub startpage {
my ($r,$psymb,$crstype) = @_;	my ($r,$psymb,$crstype) = @_;

Line 1025 sub print_row {	Line 1181 sub print_row {
my ($othergrp,$grp_parm,$controlgrp);	my ($othergrp,$grp_parm,$controlgrp);

if ($parmlev eq 'general') {	if ($parmlev eq 'general') {

if ($uname) {	if ($uname) {
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {

if ($uname) {	if ($uname) {
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}
} else {	} else {
if ($uname) {	if ($uname) {
Line 1064 sub print_row {	Line 1219 sub print_row {
}	}
}	}

&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
	if ($csec) {
if ($csec) {	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	}
}

if ($cgroup) {	if ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}

if ($uname) {	if ($uname) {
if ($othergrp) {	if ($othergrp) {
$r->print($othergrp);	$r->print($othergrp);
}	}
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}

} # end of $parmlev if/else	} # end of $parmlev if/else
$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');	$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
Line 1498 sub category_order {	Line 1652 sub category_order {

sub parmboxes {	sub parmboxes {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r,$allparms,$pscat,$keyorder)=@_;
my $tempkey;	my %categories = &categories();
my $tempparameter;
my %categories = &categories;
my %category_order = &category_order();	my %category_order = &category_order();
my %categoryList = (	my %categoryList = (
'time_settings' => [],	'time_settings' => [],
Line 1515 sub parmboxes {	Line 1667 sub parmboxes {
'misc' => [],	'misc' => [],
);	);

foreach $tempparameter (keys %$allparms) {	foreach my $tempparameter (keys(%$allparms)) {
&whatIsMyCategory($tempparameter, \%categoryList);	&whatIsMyCategory($tempparameter, \%categoryList);
}	}
#part to print the parm-list	#part to print the parm-list
Line 1622 sub usermenu {	Line 1774 sub usermenu {
$sections .= qq\| onchange="group_or_section('csec')" \|;	$sections .= qq\| onchange="group_or_section('csec')" \|;
}	}
$sections .= '>';	$sections .= '>';
foreach my $section ('',sort keys %sectionhash) {	foreach my $section ('',sort(keys(%sectionhash))) {
$sections.='<option value="'.$section.'" '.	$sections.='<option value="'.$section.'" '.
($section eq $csec?'selected="selected"':'').'>'.$section.	($section eq $csec?'selected="selected"':'').'>'.$section.
'</option>';	'</option>';
Line 1667 function group_or_section(caller) {	Line 1819 function group_or_section(caller) {
$groups .= qq\| onchange="group_or_section('cgroup')" \|;	$groups .= qq\| onchange="group_or_section('cgroup')" \|;
}	}
$groups .= '>';	$groups .= '>';
foreach my $grp ('',sort keys %grouphash) {	foreach my $grp ('',sort(keys(%grouphash))) {
$groups.='<option value="'.$grp.'" ';	$groups.='<option value="'.$grp.'" ';
if ($grp eq $cgroup) {	if ($grp eq $cgroup) {
unless ((defined($uname)) && ($grp eq '')) {	unless ((defined($uname)) && ($grp eq '')) {
Line 1873 sub mapmenu {	Line 2025 sub mapmenu {
sub levelmenu {	sub levelmenu {
my ($r,$alllevs,$parmlev)=@_;	my ($r,$alllevs,$parmlev)=@_;

$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').
	&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
$r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');	$r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');
foreach (reverse sort keys %{$alllevs}) {	foreach my $lev (reverse(sort(keys(%{$alllevs})))) {
$r->print('<option value="'.$$alllevs{$_}.'"');	$r->print('<option value="'.$$alllevs{$lev}.'"');
if ($parmlev eq $$alllevs{$_}) {	if ($parmlev eq $$alllevs{$lev}) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
}	}
$r->print('>'.&mt($_).'</option>');	$r->print('>'.&mt($lev).'</option>');
}	}
$r->print("</select>");	$r->print("</select>");
}	}
Line 1892 sub sectionmenu {	Line 2045 sub sectionmenu {
return if (!%sectionhash);	return if (!%sectionhash);

$r->print('<select name="Section" multiple="multiple" size="8">');	$r->print('<select name="Section" multiple="multiple" size="8">');
foreach my $s ('all',sort keys %sectionhash) {	foreach my $s ('all',sort(keys(%sectionhash))) {
$r->print(' <option value="'.$s.'"');	$r->print(' <option value="'.$s.'"');
foreach (@{$selectedsections}) {	foreach my $sec (@{$selectedsections}) {
if ($s eq $_) {	if ($s eq $sec) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
last;	last;
	}
}	}
}	$r->print('>'.$s."</option>\n");
$r->print('>'.$s."</option>\n");
}	}
$r->print("</select>\n");	$r->print("</select>\n");
}	}
Line 1912 sub groupmenu {	Line 2065 sub groupmenu {

$r->print('<select name="Group" multiple="multiple" size="8">');	$r->print('<select name="Group" multiple="multiple" size="8">');
foreach my $group (sort(keys(%grouphash))) {	foreach my $group (sort(keys(%grouphash))) {
$r->print(' <option value="'.$group.'"');	$r->print(' <option value="'.$group.'"');
foreach (@{$selectedgroups}) {	foreach my $grp (@{$selectedgroups}) {
if ($group eq $_) {	if ($group eq $grp) {
$r->print(' selected="selected"');	$r->print(' selected="selected"');
last;	last;
	}
}	}
}	$r->print('>'.$group."</option>\n");
$r->print('>'.$group."</option>\n");
}	}
$r->print("</select>\n");	$r->print("</select>\n");
}	}
Line 1934 sub keysinorder {	Line 2087 sub keysinorder {
my ($name,$keyorder)=@_;	my ($name,$keyorder)=@_;
return sort {	return sort {
$$keyorder{$a} <=> $$keyorder{$b};	$$keyorder{$a} <=> $$keyorder{$b};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub keysinorder_bytype {	sub keysinorder_bytype {
Line 1946 sub keysinorder_bytype {	Line 2099 sub keysinorder_bytype {
return ($a cmp $b);	return ($a cmp $b);
}	}
$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};	$$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub keysindisplayorder {	sub keysindisplayorder {
my ($name,$keyorder)=@_;	my ($name,$keyorder)=@_;
return sort {	return sort {
$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};	$$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
} (keys %{$name});	} (keys(%{$name}));
}	}

sub sortmenu {	sub sortmenu {
Line 2168 sub assessparms {	Line 2321 sub assessparms {
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
my $totalstored = 0;	my $totalstored = 0;
my $now = time;	my $now = time;

for (my $i=0;$i<=$#markers;$i++) {	for (my $i=0;$i<=$#markers;$i++) {
my ($needsrelease,$needsnewer,$name);	my ($needsrelease,$needsnewer,$name);
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {	if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {
Line 2201 sub assessparms {	Line 2353 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate)\&\d+$/) {	} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate\|acc)\&\d+$/) {
$name = $1;	$name = $1;
my $val = $values[$i];	my $val = $values[$i];
	my $valmatch = '';
if ($name eq 'examcode') {	if ($name eq 'examcode') {
if (&Apache::lonnet::validCODE($values[$i])) {	if (&Apache::lonnet::validCODE($values[$i])) {
$val = 'valid';	$val = 'valid';
Line 2220 sub assessparms {	Line 2373 sub assessparms {
$val = 'past';	$val = 'past';
}	}
}	}
	} elsif (($name eq 'lenient') \|\| ($name eq 'acc')) {
	my $stringtype = &get_stringtype($name);
	my $stringmatch = &standard_string_matches($stringtype);
	if (ref($stringmatch) eq 'ARRAY') {
	foreach my $item (@{$stringmatch}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($pattern ne '') {
	if ($val =~ /$pattern/) {
	$valmatch = $regexpname;
	$val = '';
	last;
	}
	}
	}
	}
	}
}	}
$needsrelease =	$needsrelease =
$Apache::lonnet::needsrelease{"parameter:$name:$val"};	$Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor) = &parameter_release_vars();	($chostname,$cmajor,$cminor) = &parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &parameter_releasecheck($name,$val,	$needsnewer = &parameter_releasecheck($name,$val,$valmatch,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
}	}
Line 2253 sub assessparms {	Line 2423 sub assessparms {
}	}
}	}
#----------------------------------------------- if all selected, fill in array	#----------------------------------------------- if all selected, fill in array
if ($pscat[0] eq "all") {@pscat = (keys %allparms);}	if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };	if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys %allparts);}	if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys(%allparts));}
# ------------------------------------------------------------------ Start page	# ------------------------------------------------------------------ Start page

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
&startpage($r,$pssymb,$crstype);	&startpage($r,$pssymb,$crstype);

foreach ('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') {
$r->print('<input type="hidden" value="'.	$r->print('<input type="hidden" value="'.
&HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').	&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
'" name="recent_'.$_.'" />');	'" name="recent_'.$item.'" />');
}	}

# ----- Start Parameter Selection	# ----- Start Parameter Selection
Line 2372 ENDPARMSELSCRIPT	Line 2542 ENDPARMSELSCRIPT

@pscat = @temp_pscat;	@pscat = @temp_pscat;


if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {	if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {
# ----------------------------------------------------------------- Start Table	# ----------------------------------------------------------------- Start Table
my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;	my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;
Line 2497 ENDTABLEHEADFOUR	Line 2668 ENDTABLEHEADFOUR
my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});

my $filter=$env{'form.filter'};	my $filter=$env{'form.filter'};
foreach (&keysplit($keyp{$rid})) {	foreach my $tempkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;
if (grep $_ eq $tempkeyp, @catmarker) {	if (grep $_ eq $tempkeyp, @catmarker) {
my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');	my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
# 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{$_}=$parmname;	$name{$tempkeyp}=$parmname;
$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');	$part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');

my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
if ($allparms{$name{$_}} ne '') {	if ($allparms{$name{$tempkeyp}} ne '') {
my $identifier;	my $identifier;
if ($parmdis =~ /(\s\[Part.)$/) {	if ($parmdis =~ /(\s\[Part.)$/) {
$identifier = $1;	$identifier = $1;
}	}
$display{$_} = $allparms{$name{$_}}.$identifier;	$display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
} else {	} else {
$display{$_} = $parmdis;	$display{$tempkeyp} = $parmdis;
}	}
unless ($display{$_}) { $display{$_}=''; }	unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
$display{$_}.=' ('.$name{$_}.')';	$display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
$default{$_}=&Apache::lonnet::metadata($uri,$_);	$default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
$type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');	$type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
$thistitle=&Apache::lonnet::metadata($uri,$_.'.title');	$thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
}	}
}	}
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});
Line 2551 ENDTABLEHEADFOUR	Line 2721 ENDTABLEHEADFOUR
$r->print('<td style="background-color:'.$defbgone.';"'.	$r->print('<td style="background-color:'.$defbgone.';"'.
' rowspan='.$totalparms.	' rowspan='.$totalparms.
'>'.$maptitles{$mapp{$rid}}.'</td>');	'>'.$maptitles{$mapp{$rid}}.'</td>');
foreach (&keysinorder_bytype(\%name,\%keyorder)) {	foreach my $item (&keysinorder_bytype(\%name,\%keyorder)) {

unless ($firstrow) {	unless ($firstrow) {
$r->print('<tr>');	$r->print('<tr>');
} else {	} else {
undef $firstrow;	undef $firstrow;
}	}
&print_row($r,$_,\%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);	$cgroup,\@usersgroups);
Line 2585 ENDTABLEHEADFOUR	Line 2754 ENDTABLEHEADFOUR

#-------------------------------------------- for each map, gather information	#-------------------------------------------- for each map, gather information
my $mapid;	my $mapid;
foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys %maplist) {	foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
my $maptitle = $maplist{$mapid};	my $maptitle = $maplist{$mapid};

#----------------------- loop through ids and get all parameter types for map	#----------------------- loop through ids and get all parameter types for map
Line 2599 ENDTABLEHEADFOUR	Line 2768 ENDTABLEHEADFOUR

# $r->print("Catmarker: @catmarker<br />\n");	# $r->print("Catmarker: @catmarker<br />\n");

foreach (@ids) {	foreach my $id (@ids) {
($map)=(/([\d]*?)\./);	($map)=($id =~ /([\d]*?)\./);
my $rid = $_;	my $rid = $id;

# $r->print("$mapid:$map: $rid <br /> \n");	# $r->print("$mapid:$map: $rid <br /> \n");

Line 2616 ENDTABLEHEADFOUR	Line 2785 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$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');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2680 ENDTABLEHEADFOUR	Line 2848 ENDTABLEHEADFOUR
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&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,$_,\%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);	$parmlev,$uname,$udom,$csec,$cgroup);
}	}
Line 2707 ENDTABLEHEADFOUR	Line 2875 ENDTABLEHEADFOUR
my %type = ();	my %type = ();
my %default = ();	my %default = ();

foreach (@ids) {	foreach $id (@ids) {
my $rid = $_;	my $rid = $id;

my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});

Line 2719 ENDTABLEHEADFOUR	Line 2887 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$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');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2771 ENDMAPONE	Line 2938 ENDMAPONE
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&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,$_,\%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);	$parmlev,$uname,$udom,$csec,$cgroup);
}	}
Line 2819 sub readdata {	Line 2986 sub readdata {
# Read userdata	# Read userdata

my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
foreach (keys %$classlist) {	foreach my $user (keys(%$classlist)) {
if ($_=~/^($match_username)\:($match_domain)$/) {	if ($user=~/^($match_username)\:($match_domain)$/) {
my ($tuname,$tudom)=($1,$2);	my ($tuname,$tudom)=($1,$2);
my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);	my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
foreach my $userkey (keys %{$useropt}) {	foreach my $userkey (keys(%{$useropt})) {
if ($userkey=~/^$env{'request.course.id'}/) {	if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
my $newkey=$userkey;	my $newkey=$userkey;
$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;	$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
$$resourcedata{$newkey}=$$useropt{$userkey};	$$resourcedata{$newkey}=$$useropt{$userkey};
}	}
	}
}	}
}	}
}
return $resourcedata;	return $resourcedata;
}	}

Line 2853 sub storedata {	Line 3020 sub storedata {
if ($key =~ /^form\.([a-z]+)\_(.+)$/) {	if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
my $cmd=$1;	my $cmd=$1;
my $thiskey=$2;	my $thiskey=$2;
	next if ($cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny');
my ($tuname,$tudom)=&extractuser($thiskey);	my ($tuname,$tudom)=&extractuser($thiskey);
my $tkey=$thiskey;	my $tkey=$thiskey;
if ($tuname) {	if ($tuname) {
$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;	$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
}	}
if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {	if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {
my ($data, $typeof, $text, $name, $valchk);	my ($data, $typeof, $text, $name, $valchk, $valmatch);
if ($cmd eq 'set') {	if ($cmd eq 'set') {
$data=$env{$key};	$data=$env{$key};
	$valmatch = '';
$valchk = $data;	$valchk = $data;
$typeof=$env{'form.typeof_'.$thiskey};	$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified parameter for');	$text = &mt('Saved modified parameter for');
Line 2869 sub storedata {	Line 3038 sub storedata {
$name = 'type';	$name = 'type';
} elsif ($typeof eq 'string_lenient') {	} elsif ($typeof eq 'string_lenient') {
$name = 'lenient';	$name = 'lenient';
	my $stringmatch = &standard_string_matches($typeof);
	if (ref($stringmatch) eq 'ARRAY') {
	foreach my $item (@{$stringmatch}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($pattern ne '') {
	if ($data =~ /$pattern/) {
	$valmatch = $regexpname;
	$valchk = '';
	last;
	}
	}
	}
	}
	}
} elsif ($typeof eq 'string_discussvote') {	} elsif ($typeof eq 'string_discussvote') {
$name = 'discussvote';	$name = 'discussvote';
} elsif ($typeof eq 'string_examcode') {	} elsif ($typeof eq 'string_examcode') {
Line 2907 sub storedata {	Line 3091 sub storedata {
}	}
if ($name ne '') {	if ($name ne '') {
my ($needsrelease,$needsnewer);	my ($needsrelease,$needsnewer);
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};	$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &parameter_releasecheck($name,$valchk,	$needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
Line 2960 sub storedata {	Line 3144 sub storedata {
}	}
# Store all course level	# Store all course level
my $delentries=$#deldata+1;	my $delentries=$#deldata+1;
my @newdatakeys=keys %newdata;	my @newdatakeys=keys(%newdata);
my $putentries=$#newdatakeys+1;	my $putentries=$#newdatakeys+1;
if ($delentries) {	if ($delentries) {
if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
Line 3061 sub listdata {	Line 3245 sub listdata {
}	}

$result;	$result;
} keys %{$listdata}) {	} keys(%{$listdata})) {

if ($$listdata{$thiskey.'.type'}) {	if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};	my $thistype=$$listdata{$thiskey.'.type'};
Line 3200 sub default_selector {	Line 3384 sub default_selector {
return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';	return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
}	}

	sub string_ip_selector {
	my ($thiskey, $showval) = @_;
	my %access = (
	allow => [],
	deny => [],
	);
	if ($showval ne '') {
	my @current;
	if ($showval =~ /,/) {
	@current = split(/,/,$showval);
	} else {
	@current = ($showval);
	}
	foreach my $item (@current) {
	if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
	push(@{$access{'deny'}},$1);
	} elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
	push(@{$access{'allow'}},$item);
	}
	}
	}
	if (!@{$access{'allow'}}) {
	@{$access{'allow'}} = ('');
	}
	if (!@{$access{'deny'}}) {
	@{$access{'deny'}} = ('');
	}
	my $output = '<input type="hidden" name="set_'.$thiskey.'" />
	<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
	foreach my $acctype ('allow','deny') {
	$output .= '
	<td valign="top">
	<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
	<div class="LC_string_ipacc_inner">'."\n";
	my $num = 0;
	foreach my $curr (@{$access{$acctype}}) {
	$output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'">';
	if ($num > 0) {
	$output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
	}
	$output .= '</div>'."\n";
	$num ++;
	}
	$output .= '
	</div>
	<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>
	</div>
	</td>';
	}
	$output .= '
	</tr>
	</table>'."\n";
	return $output;
	}

	{
my %strings =	my %strings =
(	(
'string_yesno'	'string_yesno'
Line 3222 my %strings =	Line 3462 my %strings =
'string_lenient'	'string_lenient'
=> [['yes', 'Yes' ],	=> [['yes', 'Yes' ],
[ 'no', 'No' ],	[ 'no', 'No' ],
[ 'default', 'Default - only bubblesheet grading is lenient' ]],	[ 'default', 'Default - only bubblesheet grading is lenient' ],
	[ 'weighted', 'Yes, weighted (optionresponse in checkbox mode)' ]],
'string_discussvote'	'string_discussvote'
=> [['yes','Yes'],	=> [['yes','Yes'],
['notended','Yes, unless discussion ended'],	['notended','Yes, unless discussion ended'],
['no','No']],	['no','No']],
	'string_ip'
	=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
	['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'],
);	);

	my %stringmatches = (
	'string_lenient'
	=> [['weighted','^\-?[.\d]+,\-?[.\d]+,\-?[.\d]+,\-?[.\d]+$'],],
	'string_ip'
	=> [['_allowfrom_','[^\!]+'],
	['_denyfrom_','\!']],
	);

	my %stringtypes = (
	type => 'string_questiontype',
	lenient => 'string_lenient',
	retrypartial => 'string_yesno',
	discussvote => 'string_discussvote',
	examcode => 'string_examcode',
	acc => 'string_ip',
	);

sub standard_string_options {	sub standard_string_options {
my ($string_type) = @_;	my ($string_type) = @_;
if (ref($strings{$string_type}) eq 'ARRAY') {	if (ref($strings{$string_type}) eq 'ARRAY') {
Line 3237 sub standard_string_options {	Line 3498 sub standard_string_options {
return;	return;
}	}

	sub standard_string_matches {
	my ($string_type) = @_;
	if (ref($stringmatches{$string_type}) eq 'ARRAY') {
	return $stringmatches{$string_type};
	}
	return;
	}

	sub get_stringtype {
	my ($name) = @_;
	if (exists($stringtypes{$name})) {
	return $stringtypes{$name};
	}
	return;
	}

sub string_selector {	sub string_selector {
my ($thistype, $thiskey, $showval, $name) = @_;	my ($thistype, $thiskey, $showval, $name) = @_;

if (!exists($strings{$thistype})) {	if (!exists($strings{$thistype})) {
return &default_selector($thiskey,$showval);	return &default_selector($thiskey,$showval);
}	}

my %skiptype;	my %skiptype;
if (($thistype eq 'string_questiontype') \|\|	if (($thistype eq 'string_questiontype') \|\|
($thistype eq 'string_lenient') \|\|	($thistype eq 'string_lenient') \|\|
($thistype eq 'string_discussvote') \|\|	($thistype eq 'string_discussvote') \|\|
	($thistype eq 'string_ip') \|\|
($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} }) {
next unless (ref($possibilities) eq 'ARRAY');	next unless (ref($possibilities) eq 'ARRAY');
my ($parmval, $description) = @{ $possibilities };	my ($parmval, $description) = @{ $possibilities };
my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};	my $parmmatch;
	if (ref($stringmatches{$thistype}) eq 'ARRAY') {
	foreach my $item (@{$stringmatches{$thistype}}) {
	if (ref($item) eq 'ARRAY') {
	if ($parmval eq $item->[0]) {
	$parmmatch = $parmval;
	$parmval = '';
	last;
	}
	}
	}
	}
	my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,	my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
$cmajor,$cminor);	$needsrelease,$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
$skiptype{$parmval} = 1;	if ($parmmatch ne '') {
	$skiptype{$parmmatch} = 1;
	} elsif ($parmval ne '') {
	$skiptype{$parmval} = 1;
	}
}	}
}	}
}	}
}	}

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

my $result;	my $result;
my $numinrow = 3;	my $numinrow = 3;
Line 3284 sub string_selector {	Line 3581 sub string_selector {
foreach my $possibilities (@{ $strings{$thistype} }) {	foreach my $possibilities (@{ $strings{$thistype} }) {
next unless (ref($possibilities) eq 'ARRAY');	next unless (ref($possibilities) eq 'ARRAY');
my ($name, $description) = @{ $possibilities };	my ($name, $description) = @{ $possibilities };
next if ($skiptype{$name});	next if ($skiptype{$name});
$rem = $i%($numinrow);	$rem = $i%($numinrow);
if ($rem == 0) {	if ($rem == 0) {
if ($i > 0) {	if ($i > 0) {
Line 3292 sub string_selector {	Line 3589 sub string_selector {
}	}
$result .= '<tr>';	$result .= '<tr>';
}	}
$result .= '<td class="LC_left_item">'.	my $colspan;
	if ($i == @{ $strings{$thistype} }-1) {
	$rem = @{ $strings{$thistype} }%($numinrow);
	if ($rem) {
	my $colsleft = $numinrow - $rem;
	if ($colsleft) {
	$colspan = $colsleft+1;
	$colspan = ' colspan="'.$colspan.'"';
	}
	}
	}
	my ($add,$onchange,$css_class);
	if ($thistype eq 'string_lenient') {
	if ($name eq 'weighted') {
	my $display;
	my %relatives = &Apache::lonlocal::texthash(
	corrchkd => 'Correct (checked)',
	corrunchkd => 'Correct (unchecked)',
	incorrchkd => 'Incorrect (checked)',
	incorrunchkd => 'Incorrect (unchecked)',
	);
	my %textval = (
	corrchkd => '1.0',
	corrunchkd => '1.0',
	incorrchkd => '0.0',
	incorrunchkd => '0.0',
	);
	if ($showval =~ /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/) {
	$textval{'corrchkd'} = $1;
	$textval{'corrunchkd'} = $2;
	$textval{'incorrchkd'} = $3;
	$textval{'incorrunchkd'} = $4;
	$display = 'inline';
	$showval = $name;
	} else {
	$display = 'none';
	}
	$add = ' <div id="LC_parmtext_'.$thiskey.'" style="display:'.$display.'"><table>'.
	'<tr><th colspan="2">'.&mt("Foil's submission status").'</th><th>'.&mt('Points').'</th></tr>';
	foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
	$add .= '<tr><td> </td><td>'.$relatives{$reltype}.'</td>'."\n".
	'<td><input type="text" name="settext_'.$thiskey.'"'.
	' value="'.$textval{$reltype}.'" size="3" />'.
	'</td></tr>';
	}
	$add .= '</table></div>'."\n";
	}
	$onchange = ' onclick="javascript:toggleParmTextbox(this.form,'."'$thiskey'".');"';
	$css_class = ' class="LC_lenient_radio"';
	}
	$result .= '<td class="LC_left_item"'.$colspan.'>'.
'<span class="LC_nobreak"><label>'.	'<span class="LC_nobreak"><label>'.
'<input type="radio" name="set_'.$thiskey.	'<input type="radio" name="set_'.$thiskey.
'" value="'.$name.'"';	'" value="'.$name.'"'.$onchange.$css_class;
if ($showval eq $name) {	if ($showval eq $name) {
$result .= ' checked="checked"';	$result .= ' checked="checked"';
}	}
$result .= ' />'.&mt($description).'</label></span></td>';	$result .= ' />'.&mt($description).'</label>'.$add.'</span></td>';
$i++;	$i++;
}	}
$rem = @{ $strings{$thistype} }%($numinrow);
my $colsleft = $numinrow - $rem;
if ($colsleft > 1 ) {
$result .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
' </td>';
} elsif ($colsleft == 1) {
$result .= '<td class="LC_left_item"> </td>';
}
$result .= '</tr>';	$result .= '</tr>';
}	}
if ($result) {	if ($result) {
Line 3318 sub string_selector {	Line 3657 sub string_selector {
return $result;	return $result;
}	}

	sub oldversion_warning {
	my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
	my $desc;
	my $stringtype = &get_stringtype($name);
	if ($stringtype ne '') {
	if ($name eq 'examcode') {
	$desc = $value;
	} elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
	foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
	next unless (ref($possibilities) eq 'ARRAY');
	my ($parmval, $description) = @{ $possibilities };
	my $parmmatch;
	if (ref($stringmatches{$stringtypes{$name}}) eq 'ARRAY') {
	foreach my $item (@{$stringmatches{$stringtypes{$name}}}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($parmval eq $regexpname) {
	if ($value =~ /$pattern/) {
	$desc = $description;
	$parmmatch = 1;
	last;
	}
	}
	}
	}
	last if ($parmmatch);
	} elsif ($parmval eq $value) {
	$desc = $description;
	last;
	}
	}
	}
	} elsif (($name eq 'printstartdate') \|\| ($name eq 'printenddate')) {
	my $now = time;
	if ($value =~ /^\d+$/) {
	if ($name eq 'printstartdate') {
	if ($value > $now) {
	$desc = &Apache::lonlocal::locallocaltime($value);
	}
	} elsif ($name eq 'printenddate') {
	if ($value < $now) {
	$desc = &Apache::lonlocal::locallocaltime($value);
	}
	}
	}
	}
	my $standard_name = &standard_parameter_names($name);
	return '<p class="LC_warning">'.
	&mt('[_1] was [_2]not[_3] set to [_4].',
	$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
	&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
	$cmajor.'.'.$cminor,$chostname,
	$needsrelease).
	'</p>';
	}

	}

#	#
# Shift all start and end dates by $shift	# Shift all start and end dates by $shift
#	#
Line 3328 sub dateshift {	Line 3725 sub dateshift {
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);	my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
# ugly retro fix for broken version of types	# ugly retro fix for broken version of types
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($key=~/\wtype$/) {	if ($key=~/\wtype$/) {
my $newkey=$key;	my $newkey=$key;
$newkey=~s/type$/\.type/;	$newkey=~s/type$/\.type/;
Line 3338 sub dateshift {	Line 3735 sub dateshift {
}	}
my %storecontent=();	my %storecontent=();
# go through all parameters and look for dates	# go through all parameters and look for dates
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($data{$key.'.type'}=~/^date_(start\|end)$/) {	if ($data{$key.'.type'}=~/^date_(start\|end)$/) {
my $newdate=$data{$key}+$shift;	my $newdate=$data{$key}+$shift;
$storecontent{$key}=$newdate;	$storecontent{$key}=$newdate;
Line 3363 sub newoverview {	Line 3760 sub newoverview {
text=>"Overview Mode"});	text=>"Overview Mode"});

my %loaditems = (	my %loaditems = (
'onload' => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1');",	'onload' => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1'); showHideLenient();",
);	);
my $js = '	my $js = '
<script type="text/javascript">	<script type="text/javascript">
Line 3371 sub newoverview {	Line 3768 sub newoverview {
'.	'.
&Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".	&Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
&showhide_js()."\n".	&showhide_js()."\n".
	&toggleparmtextbox_js()."\n".
	&validateparms_js()."\n".
	&ipacc_boxes_js()."\n".
'// ]]>	'// ]]>
</script>	</script>
';	';

my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,	my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,
{'add_entries' => \%loaditems,});	{'add_entries' => \%loaditems,});
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
&startSettingsScreen($r,'parmset',$crstype);	&startSettingsScreen($r,'parmset',$crstype);
$r->print(<<ENDOVER);	$r->print(<<ENDOVER);
<form method="post" action="/adm/parmset?action=newoverview" name="parmform">	<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
ENDOVER	ENDOVER
my @ids=();	my @ids=();
my %typep=();	my %typep=();
Line 3523 sub secgroup_lister {	Line 3924 sub secgroup_lister {
$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};	$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {
# map-level parameter	# map-level parameter
foreach my $mapid (keys %{$allmaps}) {	foreach my $mapid (keys(%{$allmaps})) {
if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }	if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;	my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
$$listdata{$newparmkey}=1;	$$listdata{$newparmkey}=1;
Line 3548 sub overview {	Line 3949 sub overview {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
	my $js = '<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	&toggleparmtextbox_js()."\n".
	&validateparms_js()."\n".
	&ipacc_boxes_js()."\n".
	'// ]]>'."\n".
	'</script>'."\n";
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
text=>"Overview Mode"});	text=>"Overview Mode"});
my $start_page=&Apache::loncommon::start_page('Modify Parameters');	my %loaditems = (
	'onload' => "showHideLenient();",
	);

	my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js,{'add_entries' => \%loaditems,});
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
&startSettingsScreen($r,'parmset',$crstype);	&startSettingsScreen($r,'parmset',$crstype);
$r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');	$r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');

# Store modified	# Store modified

Line 3573 sub overview {	Line 3984 sub overview {
# List data	# List data

my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);	my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);

$r->print(&tableend().'<p>'.	$r->print(&tableend().'<p>'.
($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.	($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
Line 3943 sub order_meta_fields {	Line 4353 sub order_meta_fields {
my $newpos = $env{'form.newpos'} - 1;	my $newpos = $env{'form.newpos'} - 1;
my $currentpos = $env{'form.currentpos'} - 1;	my $currentpos = $env{'form.currentpos'} - 1;
my @neworder = ();	my @neworder = ();
my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @oldorder = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
my $i;	my $i;
if ($newpos > $currentpos) {	if ($newpos > $currentpos) {
# moving stuff up	# moving stuff up
Line 3977 sub order_meta_fields {	Line 4387 sub order_meta_fields {
}	}
my $fields = &get_added_meta_fieldnames($env{'request.course.id'});	my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $ordered_fields;	my $ordered_fields;
my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @fields_in_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
if (!@fields_in_order) {	if (!@fields_in_order) {
# no order found, pick sorted order then create metadata.addedorder key.	# no order found, pick sorted order then create metadata.addedorder key.
foreach my $key (sort keys %$fields) {	foreach my $key (sort(keys(%$fields))) {
push @fields_in_order, $key;	push @fields_in_order, $key;
$ordered_fields = join ",", @fields_in_order;	$ordered_fields = join ",", @fields_in_order;
}	}
Line 4261 sub defaultsetter {	Line 4671 sub defaultsetter {
}	}
}	}
}	}
foreach my $key (keys %allparms) {	foreach my $key (keys(%allparms)) {
$newrules{$key.'_triggers'}=$triggers{$key};	$newrules{$key.'_triggers'}=$triggers{$key};
}	}
&Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);	&Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
Line 4728 sub parameter_release_vars {	Line 5138 sub parameter_release_vars {
}	}

sub parameter_releasecheck {	sub parameter_releasecheck {
my ($name,$value,$needsrelease,$cmajor,$cminor) = @_;	my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
my $needsnewer;	my $needsnewer;
my ($needsmajor,$needsminor) = split(/\./,$needsrelease);	my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
if (($cmajor < $needsmajor) \|\|	if (($cmajor < $needsmajor) \|\|
($cmajor == $needsmajor && $cminor < $needsminor)) {	($cmajor == $needsmajor && $cminor < $needsminor)) {
$needsnewer = 1;	$needsnewer = 1;
} else {	} elsif ($valmatch) {
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
	} elsif ($value) {
	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
}	}
return $needsnewer;	return $needsnewer;
}	}

sub oldversion_warning {
my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
my $desc;
my %stringtypes = (
type => 'string_questiontype',
lenient => 'string_lenient',
retrypartial => 'string_yesno',
discussvote => 'string_discussvote',
examcode => 'string_examcode',
);
if (exists($stringtypes{$name})) {
if ($name eq 'examcode') {
$desc = $value;
} elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
next unless (ref($possibilities) eq 'ARRAY');
my ($parmval, $description) = @{ $possibilities };
if ($parmval eq $value) {
$desc = $description;
last;
}
}
}
} elsif (($name eq 'printstartdate') \|\| ($name eq 'printenddate')) {
my $now = time;
if ($value =~ /^\d+$/) {
if ($name eq 'printstartdate') {
if ($value > $now) {
$desc = &Apache::lonlocal::locallocaltime($value);
}
} elsif ($name eq 'printenddate') {
if ($value < $now) {
$desc = &Apache::lonlocal::locallocaltime($value);
}
}
}
}
my $standard_name = &standard_parameter_names($name);
return '<p class="LC_warning">'.
&mt('[_1] was [_2]not[_3] set to [_4].',
$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
$cmajor.'.'.$cminor,$chostname,
$needsrelease).
'</p>';
}

sub handler {	sub handler {
my $r=shift;	my $r=shift;

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

Removed from v.1.547
changed lines
	Added in v.1.550