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.548 and 1.556

version 1.548, 2014/12/12 02:12:18	version 1.556, 2016/03/02 14:14:06
Line 54 Inputs: $what - a parameter spec (inclu	Line 54 Inputs: $what - a parameter spec (inclu
$id - a bighash Id number	$id - a bighash Id number
$def - the resource's default value 'stupid emacs	$def - the resource's default value 'stupid emacs

Returns: A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 14 possible levels	Returns: A list, the first item is the index into the remaining list of items of parm values that is the active one, the list consists of parm values at the 18 possible levels

14- General Course	18 - General Course
13- Map or Folder level in course	17 - Map or Folder level in course (recursive)
12- resource default	16 - Map or Folder level in course (non-recursive)
11- map default	15 - resource default
10- resource level in course	14 - map default
9 - General for section	13 - resource level in course
8 - Map or Folder level for section	12 - General for section
7 - resource level in section	11 - Map or Folder level for section (recursive)
6 - General for group	10 - Map or Folder level for section (non-recursive)
5 - Map or Folder level for group	9 - resource level in section
4 - resource level in group	8 - General for group
3 - General for specific student	7 - Map or Folder level for group (recursive)
2 - Map or Folder level for specific student	6 - Map or Folder level for group (non-recursive)
	5 - resource level in group
	4 - General for specific student
	3 - Map or Folder level for specific student (recursive)
	2 - Map or Folder level for specific student (non-recursive)
1 - resource level for specific student	1 - resource level for specific student

=item parmval_by_symb()	=item parmval_by_symb()
Line 369 sub parmval_by_symb {	Line 373 sub parmval_by_symb {
$map = &Apache::lonnet::deversion($map);	$map = &Apache::lonnet::deversion($map);

my $symbparm=$symb.'.'.$what;	my $symbparm=$symb.'.'.$what;
	my $recurseparm=$map.'___(rec).'.$what;
my $mapparm=$map.'___(all).'.$what;	my $mapparm=$map.'___(all).'.$what;

my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$what;	my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$what;
my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;	my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
	my $grpleveli=$env{'request.course.id'}.'.['.$cgroup.'].'.$recurseparm;
my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;	my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;

my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;	my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;	my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
	my $secleveli=$env{'request.course.id'}.'.['.$csec.'].'.$recurseparm;
my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;	my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;

my $courselevel=$env{'request.course.id'}.'.'.$what;	my $courselevel=$env{'request.course.id'}.'.'.$what;
my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;	my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
	my $courseleveli=$env{'request.course.id'}.'.'.$recurseparm;
my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;	my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;


# --------------------------------------------------------- first, check course	# --------------------------------------------------------- first, check course

if (defined($$courseopt{$courselevel})) {	if (defined($$courseopt{$courselevel})) {
$outpar[14]=$$courseopt{$courselevel};	$outpar[18]=$$courseopt{$courselevel};
$result=14;	$result=18;
	}

	if (defined($$courseopt{$courseleveli})) {
	$outpar[17]=$$courseopt{$courseleveli};
	$result=17;
}	}

if (defined($$courseopt{$courselevelm})) {	if (defined($$courseopt{$courselevelm})) {
$outpar[13]=$$courseopt{$courselevelm};	$outpar[16]=$$courseopt{$courselevelm};
$result=13;	$result=16;
}	}

# ------------------------------------------------------- second, check default	# ------------------------------------------------------- second, check default

if (defined($def)) { $outpar[12]=$def; $result=12; }	if (defined($def)) { $outpar[15]=$def; $result=15; }

# ------------------------------------------------------ third, check map parms	# ------------------------------------------------------ third, check map parms


my $thisparm=&parmhash($symbparm);	my $thisparm=&parmhash($symbparm);
if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }	if (defined($thisparm)) { $outpar[14]=$thisparm; $result=14; }

if (defined($$courseopt{$courselevelr})) {	if (defined($$courseopt{$courselevelr})) {
$outpar[10]=$$courseopt{$courselevelr};	$outpar[13]=$$courseopt{$courselevelr};
$result=10;	$result=13;
}	}

# ------------------------------------------------------ fourth, back to course	# ------------------------------------------------------ fourth, back to course
if ($csec ne '') {	if ($csec ne '') {
if (defined($$courseopt{$seclevel})) {	if (defined($$courseopt{$seclevel})) {
$outpar[9]=$$courseopt{$seclevel};	$outpar[12]=$$courseopt{$seclevel};
$result=9;	$result=12;
}	}
	if (defined($$courseopt{$secleveli})) {
	$outpar[11]=$$courseopt{$secleveli};
	$result=11;
	}
if (defined($$courseopt{$seclevelm})) {	if (defined($$courseopt{$seclevelm})) {
$outpar[8]=$$courseopt{$seclevelm};	$outpar[10]=$$courseopt{$seclevelm};
$result=8;	$result=10;
}	}

if (defined($$courseopt{$seclevelr})) {	if (defined($$courseopt{$seclevelr})) {
$outpar[7]=$$courseopt{$seclevelr};	$outpar[9]=$$courseopt{$seclevelr};
$result=7;	$result=9;
}	}
}	}
# ------------------------------------------------------ fifth, check course group	# ------------------------------------------------------ fifth, check course group
if ($cgroup ne '') {	if ($cgroup ne '') {
if (defined($$courseopt{$grplevel})) {	if (defined($$courseopt{$grplevel})) {
$outpar[6]=$$courseopt{$grplevel};	$outpar[8]=$$courseopt{$grplevel};
$result=6;	$result=8;
	}
	if (defined($$courseopt{$grpleveli})) {
	$outpar[7]=$$courseopt{$grpleveli};
	$result=7;
}	}
if (defined($$courseopt{$grplevelm})) {	if (defined($$courseopt{$grplevelm})) {
$outpar[5]=$$courseopt{$grplevelm};	$outpar[6]=$$courseopt{$grplevelm};
$result=5;	$result=6;
}	}
if (defined($$courseopt{$grplevelr})) {	if (defined($$courseopt{$grplevelr})) {
$outpar[4]=$$courseopt{$grplevelr};	$outpar[5]=$$courseopt{$grplevelr};
$result=4;	$result=5;
}	}
}	}

# ---------------------------------------------------------- fifth, check user	# ---------------------------------------------------------- sixth, check user

if ($uname ne '') {	if ($uname ne '') {
if (defined($$useropt{$courselevel})) {	if (defined($$useropt{$courselevel})) {
$outpar[3]=$$useropt{$courselevel};	$outpar[4]=$$useropt{$courselevel};
	$result=4;
	}

	if (defined($$useropt{$courseleveli})) {
	$outpar[3]=$$useropt{$courseleveli};
$result=3;	$result=3;
}	}

Line 686 sub storeparm_by_symb_inner {	Line 712 sub storeparm_by_symb_inner {
$map = &Apache::lonnet::deversion($map);	$map = &Apache::lonnet::deversion($map);

my $symbparm=$symb.'.'.$spnam;	my $symbparm=$symb.'.'.$spnam;
	my $recurseparm=$map.'___(rec).'.$spnam;
my $mapparm=$map.'___(all).'.$spnam;	my $mapparm=$map.'___(all).'.$spnam;

my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$spnam;	my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$spnam;
my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;	my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
	my $grpleveli=$env{'request.course.id'}.'.['.$cgroup.'].'.$recurseparm;
my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;	my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;

my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;	my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;	my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
	my $secleveli=$env{'request.course.id'}.'.['.$csec.'].'.$recurseparm;
my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;	my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;

my $courselevel=$env{'request.course.id'}.'.'.$spnam;	my $courselevel=$env{'request.course.id'}.'.'.$spnam;
my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;	my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
	my $courseleveli=$env{'request.course.id'}.'.'.$recurseparm;
my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;	my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;

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


my $delete;	my $delete;
Line 717 sub storeparm_by_symb_inner {	Line 750 sub storeparm_by_symb_inner {
my %storecontent = ($storeunder => $nval,	my %storecontent = ($storeunder => $nval,
$storeunder.'.type' => $ntype);	$storeunder.'.type' => $ntype);
my $reply='';	my $reply='';
if ($snum>3) {	if ($snum>4) {
# ---------------------------------------------------------------- Store Course	# ---------------------------------------------------------------- Store Course
#	#
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'};
# Expire sheets	# Expire sheets
&Apache::lonnet::expirespread('','','studentcalc');	&Apache::lonnet::expirespread('','','studentcalc');
if (($snum==10) \|\| ($snum==7) \|\| ($snum==4)) {	if (($snum==13) \|\| ($snum==9) \|\| ($snum==5)) {
&Apache::lonnet::expirespread('','','assesscalc',$symb);	&Apache::lonnet::expirespread('','','assesscalc',$symb);
} elsif (($snum==11) \|\| ($snum==8) \|\| ($snum==5)) {	#FIXME
	} elsif (($snum==14) \|\| ($snum==10) \|\| ($snum==6)) {
&Apache::lonnet::expirespread('','','assesscalc',$map);	&Apache::lonnet::expirespread('','','assesscalc',$map);
} else {	} else {
&Apache::lonnet::expirespread('','','assesscalc');	&Apache::lonnet::expirespread('','','assesscalc');
Line 777 sub storeparm_by_symb_inner {	Line 811 sub storeparm_by_symb_inner {


sub valout {	sub valout {
my ($value,$type,$editable)=@_;	my ($value,$type,$name,$editable)=@_;
my $result = '';	my $result = '';
# Values of zero are valid.	# Values of zero are valid.
if (! $value && $value ne '0') {	if (! $value && $value ne '0') {
Line 791 sub valout {	Line 825 sub valout {
}	}
} else {	} else {
if ($type eq 'date_interval') {	if ($type eq 'date_interval') {
my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);	my ($totalsecs,$donebutton) = split(/_/,$value);
	my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
my @timer;	my @timer;
$year=$year-70;	$year=$year-70;
$mday--;	$mday--;
Line 824 sub valout {	Line 859 sub valout {
push(@timer,&mt('[quant,_1,sec]',0));	push(@timer,&mt('[quant,_1,sec]',0));
}	}
$result.=join(", ",@timer);	$result.=join(", ",@timer);
	if ($donebutton eq 'done') {
	$result .= ' '.&mt('+ "done"');
	}
} elsif (&isdateparm($type)) {	} elsif (&isdateparm($type)) {
$result = &Apache::lonlocal::locallocaltime($value).	$result = &Apache::lonlocal::locallocaltime($value).
&date_sanity_info($value);	&date_sanity_info($value);
Line 850 sub plink {	Line 888 sub plink {
my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);	my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
my ($hour,$min,$sec,$val)=&preset_defaults($parmname);	my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
unless (defined($winvalue)) { $winvalue=$val; }	unless (defined($winvalue)) { $winvalue=$val; }
my $valout = &valout($value,$type,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) {
Line 932 function showHide_courseContent() {	Line 970 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 982 ENDHEAD	Line 1176 ENDHEAD

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)=@_;	$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
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);

# 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
my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},	my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
Line 997 sub print_row {	Line 1192 sub print_row {
$$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);	$$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
# cascade down manually	# cascade down manually
my $cascadetype=$$defaulttype{$which};	my $cascadetype=$$defaulttype{$which};
for (my $i=14;$i>0;$i--) {	for (my $i=18;$i>0;$i--) {
if ($typeoutpar[$i]) {	if ($typeoutpar[$i]) {
$cascadetype=$typeoutpar[$i];	$cascadetype=$typeoutpar[$i];
} else {	} else {
Line 1021 sub print_row {	Line 1216 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]);	my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
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,$which,\@typeoutpar,$display);	&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,18,$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,$which,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@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,$which,\@typeoutpar,$display);	&print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
} else {	} else {
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}
} else {	} else {
if ($uname) {	if ($uname) {
Line 1052 sub print_row {	Line 1250 sub print_row {
($coursereply,$othergrp,$grp_parm,$controlgrp) =	($coursereply,$othergrp,$grp_parm,$controlgrp) =
&print_usergroups($r,$$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 > 3) {	if ($coursereply && $result > 4) {
if (defined($controlgrp)) {	if (defined($controlgrp)) {
if ($cgroup ne $controlgrp) {	if ($cgroup ne $controlgrp) {
$effective_parm = $grp_parm;	$effective_parm = $grp_parm;
Line 1063 sub print_row {	Line 1261 sub print_row {
}	}
}	}

&print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
	&print_td($r,14,'#FFDDDD',$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,$which,\@typeoutpar,$display);
&print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);

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

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

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);
&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
Line 1099 sub print_row {	Line 1301 sub print_row {
my $sessionvaltype=$typeoutpar[$result];	my $sessionvaltype=$typeoutpar[$result];
if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }	if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
$r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.	$r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
&valout($sessionval,$sessionvaltype).' '.	&valout($sessionval,$sessionvaltype,$$name{$which}).' '.
'</font></td>');	'</font></td>');
}	}
$r->print('</tr>');	$r->print('</tr>');
Line 1107 sub print_row {	Line 1309 sub print_row {
}	}

sub print_td {	sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;	my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
$r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).	$r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
';" align="center">');	';" align="center">');
my $nolink = 0;	my $nolink = 0;
if ($which == 11 \|\| $which == 12) {	if ($which == 14 \|\| $which == 15) {
$nolink = 1;	$nolink = 1;
	} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
	$nolink = 1;
	} elsif ($which == 5 \|\| $which == 6 \|\| $which == 7 \|\| $which == 8) {
	if ($noeditgrp) {
	$nolink = 1;
	}
} elsif ($mprefix =~ /availablestudent\&$/) {	} elsif ($mprefix =~ /availablestudent\&$/) {
if ($which > 3) {	if ($which > 4) {
$nolink = 1;	$nolink = 1;
}	}
} elsif ($mprefix =~ /examcode\&$/) {	} elsif ($mprefix =~ /examcode\&$/) {
Line 1123 sub print_td {	Line 1331 sub print_td {
}	}
}	}
if ($nolink) {	if ($nolink) {
$r->print(&valout($$outpar[$which],$$typeoutpar[$which]));	$r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
} else {	} else {
$r->print(&plink($$typeoutpar[$which],	$r->print(&plink($$typeoutpar[$which],
$$display{$value},$$outpar[$which],	$$display{$value},$$outpar[$which],
Line 1139 sub print_usergroups {	Line 1347 sub print_usergroups {
my $symb = &symbcache($rid);	my $symb = &symbcache($rid);
my $symbparm=$symb.'.'.$what;	my $symbparm=$symb.'.'.$what;
my $map=(&Apache::lonnet::decode_symb($symb))[0];	my $map=(&Apache::lonnet::decode_symb($symb))[0];
	my $recurseparm=$map.'___(rec).'.$what;
my $mapparm=$map.'___(all).'.$what;	my $mapparm=$map.'___(all).'.$what;
my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype) =	my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype) =
&parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,$what,	&parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,
$courseopt);	$recurseparm,$what,$courseopt);
my $bgcolor = $defbg;	my $bgcolor = $defbg;
my $grp_parm;	my $grp_parm;
if (($coursereply) && ($cgroup ne $resultgroup)) {	if (($coursereply) && ($cgroup ne $resultgroup)) {
if ($result > 3) {	if ($result > 3) {
$bgcolor = '#AAFFAA';	$bgcolor = '#AAFFAA';
$grp_parm = &valout($coursereply,$resulttype);	$grp_parm = &valout($coursereply,$resulttype,$what);
}	}
$grp_parm = &valout($coursereply,$resulttype);	$grp_parm = &valout($coursereply,$resulttype,$what);
$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;	$output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
Line 1165 sub print_usergroups {	Line 1374 sub print_usergroups {
}	}

sub parm_control_group {	sub parm_control_group {
my ($courseid,$usersgroups,$symbparm,$mapparm,$what,$courseopt) = @_;	my ($courseid,$usersgroups,$symbparm,$mapparm,$recurseparm,$what,$courseopt) = @_;
my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);	my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
my $grpfound = 0;	my $grpfound = 0;
my @levels = ($symbparm,$mapparm,$what);	my @levels = ($symbparm,$mapparm,$recurseparm,$what);
my @levelnames = ('resource','map/folder','general');	my @levelnames = ('resource','map/folder','recursive','general');
foreach my $group (@{$usersgroups}) {	foreach my $group (@{$usersgroups}) {
if ($grpfound) { last; }	if ($grpfound) { last; }
for (my $i=0; $i<@levels; $i++) {	for (my $i=0; $i<@levels; $i++) {
Line 1279 sub extractResourceInformation {	Line 1488 sub extractResourceInformation {
$$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});	$$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
}	}
$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
$$symbp{$mapid}=$$mapp{$id}.'___(all)';	$$symbp{$mapid}=$$mapp{$id}.'___(all)'; # Added in rev. 1.57, but seems not to be used.
	# Lines 1038 and 1114 which use $symbp{$mapid}
	# are commented out in rev. 1.57
} else {	} else {
$$mapp{$id} = $$mapp{$mapid};	$$mapp{$id} = $$mapp{$mapid};
}	}
Line 1598 sub partmenu {	Line 1809 sub partmenu {
}	}

sub usermenu {	sub usermenu {
my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;	my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.	my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
&Apache::loncommon::selectstudent_link('parmform','uname','udom');	&Apache::loncommon::selectstudent_link('parmform','uname','udom');
my $selscript=&Apache::loncommon::studentbrowser_javascript();	my $selscript=&Apache::loncommon::studentbrowser_javascript();
Line 1607 sub usermenu {	Line 1818 sub usermenu {
my %sectionhash = &Apache::loncommon::get_sections();	my %sectionhash = &Apache::loncommon::get_sections();

my $groups;	my $groups;
my %grouphash = &Apache::longroup::coursegroups();	my %grouphash;
	if (($pssymb) \|\| &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
	%grouphash = &Apache::longroup::coursegroups();
	} elsif ($env{'request.course.groups'} ne '') {
	map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
	}

my $g_s_header='';	my $g_s_header='';
my $g_s_footer='';	my $g_s_footer='';

if (%sectionhash) {	my $currsec = $env{'request.course.sec'};
	if ($currsec) {
	$sections=&mt('Section:').' '.$currsec;
	if (%grouphash) {
	$sections .= ';'.(' ' x2);
	}
	} elsif (%sectionhash && $currsec eq '') {
$sections=&mt('Section:').' <select name="csec"';	$sections=&mt('Section:').' <select name="csec"';
if (%grouphash && $parmlev ne 'full') {	if (%grouphash && $parmlev ne 'full') {
$sections .= qq\| onchange="group_or_section('csec')" \|;	$sections .= qq\| onchange="group_or_section('csec')" \|;
Line 1626 sub usermenu {	Line 1848 sub usermenu {
$sections.='</select>';	$sections.='</select>';
}	}

if (%sectionhash && %grouphash && $parmlev ne 'full') {	if (%sectionhash && %grouphash && $parmlev ne 'full' && $currsec eq '') {
$sections .= ' '.&mt('or').' ';	$sections .= ' '.&mt('or').' ';
$sections .= qq\|	$sections .= qq\|
<script type="text/javascript">	<script type="text/javascript">
Line 1659 function group_or_section(caller) {	Line 1881 function group_or_section(caller) {

if (%grouphash) {	if (%grouphash) {
$groups=&mt('Group:').' <select name="cgroup"';	$groups=&mt('Group:').' <select name="cgroup"';
if (%sectionhash && $env{'form.action'} eq 'settable') {	if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
$groups .= qq\| onchange="group_or_section('cgroup')" \|;	$groups .= qq\| onchange="group_or_section('cgroup')" \|;
}	}
$groups .= '>';	$groups .= '>';
Line 1685 function group_or_section(caller) {	Line 1907 function group_or_section(caller) {
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
$r->print($sections.$groups);	$r->print($sections.$groups);
$r->print(&Apache::lonhtmlcommon::row_closure());	$r->print(&Apache::lonhtmlcommon::row_closure());
	} else {
	$r->print($sections);
}	}

$r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
Line 1884 sub levelmenu {	Line 2108 sub levelmenu {


sub sectionmenu {	sub sectionmenu {
my ($r,$selectedsections)=@_;	my ($selectedsections)=@_;
my %sectionhash = &Apache::loncommon::get_sections();	my %sectionhash = &Apache::loncommon::get_sections();
return if (!%sectionhash);	return '' if (!%sectionhash);

$r->print('<select name="Section" multiple="multiple" size="8">');	my (@possibles,$disabled);
foreach my $s ('all',sort(keys(%sectionhash))) {	if ($env{'request.course.sec'} ne '') {
$r->print(' <option value="'.$s.'"');	@possibles = ($env{'request.course.sec'});
foreach my $sec (@{$selectedsections}) {	$selectedsections = [$env{'request.course.sec'}];
if ($s eq $sec) {	$disabled = ' disabled="disabled"';
$r->print(' selected="selected"');	} else {
last;	@possibles = ('all',sort(keys(%sectionhash)));
}	}
	my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
	foreach my $s (@possibles) {
	$output .= ' <option value="'.$s.'"';
	if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {
	$output .= ' selected="selected"';
}	}
$r->print('>'.$s."</option>\n");	$output .= '>'."$s</option>\n";
}	}
$r->print("</select>\n");	$output .= "</select>\n";
	return $output;
}	}

sub groupmenu {	sub groupmenu {
my ($r,$selectedgroups)=@_;	my ($selectedgroups)=@_;
my %grouphash = &Apache::longroup::coursegroups();	my %grouphash;
return if (!%grouphash);	if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
	%grouphash = &Apache::longroup::coursegroups();
	} elsif ($env{'request.course.groups'} ne '') {
	map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
	}
	return '' if (!%grouphash);

$r->print('<select name="Group" multiple="multiple" size="8">');	my $output = '<select name="Group" multiple="multiple" size="8">';
foreach my $group (sort(keys(%grouphash))) {	foreach my $group (sort(keys(%grouphash))) {
$r->print(' <option value="'.$group.'"');	$output .= ' <option value="'.$group.'"';
foreach my $grp (@{$selectedgroups}) {	if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
if ($group eq $grp) {	$output .= ' selected="selected"';
$r->print(' selected="selected"');
last;
}
}	}
$r->print('>'.$group."</option>\n");	$output .= '>'."$group</option>\n";
}	}
$r->print("</select>\n");	$output .= "</select>\n";
	return $output;
}	}


sub keysplit {	sub keysplit {
my $keyp=shift;	my $keyp=shift;
return (split(/\,/,$keyp));	return (split(/\,/,$keyp));
Line 2041 sub assessparms {	Line 2273 sub assessparms {
my $message='';	my $message='';

$csec=$env{'form.csec'};	$csec=$env{'form.csec'};
	if ($env{'request.course.sec'} ne '') {
	$csec = $env{'request.course.sec'};
	}

	# Check group privs.
$cgroup=$env{'form.cgroup'};	$cgroup=$env{'form.cgroup'};
	my $noeditgrp;
	if ($cgroup ne '') {
	unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
	if (($env{'request.course.groups'} eq '') \|\|
	(!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
	$noeditgrp = 1;
	}
	}
	}

if ($udom=$env{'form.udom'}) {	if ($udom=$env{'form.udom'}) {
} elsif ($udom=$env{'request.role.domain'}) {	} elsif ($udom=$env{'request.role.domain'}) {
Line 2089 sub assessparms {	Line 2335 sub assessparms {

my $id=$env{'form.id'};	my $id=$env{'form.id'};
if (($id) && ($udom)) {	if (($id) && ($udom)) {
$uname=(&Apache::lonnet::idget($udom,$id))[1];	$uname=(&Apache::lonnet::idget($udom,[$id],'ids'))[1];
if ($uname) {	if ($uname) {
$id='';	$id='';
} else {	} else {
Line 2165 sub assessparms {	Line 2411 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 (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9\|10\|11\|12)$/)) {
	next if ($csec ne $env{'request.course.sec'});
	}
	if ($markers[$i] =~ /\&(8\|7\|6\|5)$/) {
	next if ($noeditgrp);
	}
	if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3\|4)$/) {
my (@ok_slots,@fail_slots,@del_slots);	my (@ok_slots,@fail_slots,@del_slots);
my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);	my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
my ($level,@all) =	my ($level,@all) =
Line 2198 sub assessparms {	Line 2449 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate)\&\d+$/) {	} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate\|acc\|interval)\&\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 2217 sub assessparms {	Line 2469 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;
	}
	}
	}
	}
	}
	} elsif ($name eq 'interval') {
	my $intervaltype = &get_intervaltype($name);
	my $intervalmatch = &standard_interval_matches($intervaltype);
	if (ref($intervalmatch) eq 'ARRAY') {
	foreach my $item (@{$intervalmatch}) {
	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 2313 ENDPARMSELSCRIPT	Line 2599 ENDPARMSELSCRIPT
# 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'));
$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);	&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
$r->print(&Apache::lonhtmlcommon::row_closure(1));	$r->print(&Apache::lonhtmlcommon::row_closure(1));
$r->print(&Apache::lonhtmlcommon::end_pick_box());	$r->print(&Apache::lonhtmlcommon::end_pick_box());

Line 2345 ENDPARMSELSCRIPT	Line 2631 ENDPARMSELSCRIPT
'<br />');	'<br />');
$r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));	$r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);	&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
$r->print(&Apache::lonhtmlcommon::row_closure(1));	$r->print(&Apache::lonhtmlcommon::row_closure(1));
$r->print(&Apache::lonhtmlcommon::end_pick_box());	$r->print(&Apache::lonhtmlcommon::end_pick_box());
$r->print('<p>'	$r->print('<p>'
Line 2380 ENDPARMSELSCRIPT	Line 2666 ENDPARMSELSCRIPT
#	#
# This produces the cascading table output of parameters	# This produces the cascading table output of parameters
#	#
my $coursespan=$csec?8:5;	my $coursespan=$csec?10:6;
my $userspan=3;	my $userspan=4;
if ($cgroup ne '') {	if ($cgroup ne '') {
$coursespan += 3;	$coursespan += 4;
}	}

$r->print(&Apache::loncommon::start_data_table());	$r->print(&Apache::loncommon::start_data_table());
Line 2413 ENDPARMSELSCRIPT	Line 2699 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="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>	</tr><tr><td colspan="5"></td><th colspan="3">$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="3">'.	$r->print('<th colspan="4">'.
&mt("in Section")." $csec</th>");	&mt("in Section")." $csec</th>");
}	}
if ($cgroup) {	if ($cgroup) {
$r->print('<th colspan="3">'.	$r->print('<th colspan="4">'.
&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{'foremf'}</th>	<th>$lt{'gen'}</th><th>$lt{'formfr'}</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>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
}	}

if ($cgroup) {	if ($cgroup) {
$r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.&mt('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>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');	$r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
}	}

$r->print('</tr>');	$r->print('</tr>');
Line 2557 ENDTABLEHEADFOUR	Line 2844 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);	$cgroup,\@usersgroups,$noeditgrp);
}	}
}	}
}	}
Line 2670 ENDTABLEHEADFOUR	Line 2957 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('Default Value').'</th>'	.'<th>'.&mt('Recursive 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()
);	);
Line 2679 ENDTABLEHEADFOUR	Line 2967 ENDTABLEHEADFOUR
$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);	$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
}	}
$r->print(&Apache::loncommon::end_data_table().'</p>'	$r->print(&Apache::loncommon::end_data_table().'</p>'
.'</div>'	.'</div>'
Line 2769 ENDMAPONE	Line 3057 ENDMAPONE
$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);	$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
}	}
$r->print(&Apache::loncommon::end_data_table()	$r->print(&Apache::loncommon::end_data_table()
.'</p>'	.'</p>'
Line 2788 ENDMAPONE	Line 3076 ENDMAPONE
my $tableopen;	my $tableopen;

sub tablestart {	sub tablestart {
	my ($readonly) = @_;
if ($tableopen) {	if ($tableopen) {
return '';	return '';
} else {	} else {
$tableopen=1;	$tableopen=1;
return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.	my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
&mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';	if ($readonly) {
	$output .= '<th>'.&mt('Current value').'</th>';
	} else {
	$output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
	}
	$output .= '</tr>';
	return $output;
}	}
}	}

Line 2826 sub readdata {	Line 3121 sub readdata {
}	}
}	}
}	}
return $resourcedata;	if (wantarray) {
	return ($resourcedata,$classlist);
	} else {
	return $resourcedata;
	}
}	}


Line 2847 sub storedata {	Line 3146 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 2863 sub storedata {	Line 3164 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 2896 sub storedata {	Line 3212 sub storedata {
}	}
} elsif ($cmd eq 'dateinterval') {	} elsif ($cmd eq 'dateinterval') {
$data=&get_date_interval_from_form($thiskey);	$data=&get_date_interval_from_form($thiskey);
	if ($thiskey =~ /\.interval$/) {
	$name = 'interval';
	my $intervaltype = &get_intervaltype($name);
	my $intervalmatch = &standard_interval_matches($intervaltype);
	if (ref($intervalmatch) eq 'ARRAY') {
	foreach my $item (@{$intervalmatch}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($pattern ne '') {
	if ($data =~ /$pattern/) {
	$valmatch = $regexpname;
	$valchk = '';
	last;
	}
	}
	}
	}
	}
	}
$typeof=$env{'form.typeof_'.$thiskey};	$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified date for');	$text = &mt('Saved modified date for');
}	}
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 3005 sub parse_listdata_key {	Line 3340 sub parse_listdata_key {
}	}

sub listdata {	sub listdata {
my ($r,$resourcedata,$listdata,$sortorder)=@_;	my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;

# Start list output	# Start list output

my $oldsection='';	my $oldsection='';
Line 3016 sub listdata {	Line 3352 sub listdata {
my $foundkeys=0;	my $foundkeys=0;
my %keyorder=&standardkeyorder();	my %keyorder=&standardkeyorder();

	my ($secidx,%grouphash);
	if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
	$secidx = &Apache::loncoursedata::CL_SECTION();
	if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
	%grouphash = &Apache::longroup::coursegroups();
	} elsif ($env{'request.course.groups'} ne '') {
	map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
	}
	}

foreach my $thiskey (sort {	foreach my $thiskey (sort {
my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);	my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);	my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
Line 3057 sub listdata {	Line 3403 sub listdata {
$result;	$result;
} keys(%{$listdata})) {	} keys(%{$listdata})) {

	my $readonly;
if ($$listdata{$thiskey.'.type'}) {	if ($$listdata{$thiskey.'.type'}) {
my $thistype=$$listdata{$thiskey.'.type'};	my $thistype=$$listdata{$thiskey.'.type'};
if ($$resourcedata{$thiskey.'.type'}) {	if ($$resourcedata{$thiskey.'.type'}) {
$thistype=$$resourcedata{$thiskey.'.type'};	$thistype=$$resourcedata{$thiskey.'.type'};
}	}
my ($middle,$part,$name)=	my ($middle,$part,$name)=
($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);	($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
my $section=&mt('All Students');	my $section=&mt('All Students');
if ($middle=~/^\[(.*)\]/) {	if ($middle=~/^\[(.*)\]/) {
my $issection=$1;	my $issection=$1;
if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {	if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
$section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);	my ($stuname,$studom) = ($1,$2);
} else {	if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
$section=&mt('Group/Section').': '.$issection;	if (ref($classlist) eq 'HASH') {
}	if (ref($classlist->{$stuname.':'.$studom}) eq 'ARRAY') {
$middle=~s/^\[(.*)\]//;	next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'});
	}
	}
	}
	$section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
	} else {
	if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
	if (exists($grouphash{$issection})) {
	$section=&mt('Group').': '.$issection;
	} elsif ($issection eq $env{'request.course.sec'}) {
	$section = &mt('Section').': '.$issection;
	} else {
	next;
	}
	} else {
	$section=&mt('Group/Section').': '.$issection;
	}
	}
	$middle=~s/^\[(.*)\]//;
	} elsif (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
	$readonly = 1;
}	}
$middle=~s/\.+$//;	$middle=~s/\.+$//;
$middle=~s/^\.+//;	$middle=~s/^\.+//;
my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';	my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
if ($middle=~/^(.+)\_\_\_$all$$/) {	if ($middle=~/^(.+)\_\_\_$(all\|rec)$$/) {
$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';	my $mapurl = $1;
	my $maplevel = $2;
	my $leveltitle = &mt('Folder/Map');
	if ($maplevel eq 'rec') {
	$leveltitle = &mt('Recursive');
	}
	$realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
} elsif ($middle) {	} elsif ($middle) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';	$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
Line 3115 sub listdata {	Line 3488 sub listdata {
# Ready to print	# Ready to print
#	#
my $parmitem = &standard_parameter_names($name);	my $parmitem = &standard_parameter_names($name);
$r->print(&tablestart().	$r->print(&tablestart($readonly).
&Apache::loncommon::start_data_table_row().	&Apache::loncommon::start_data_table_row().
'<td><b>'.&mt($parmitem).	'<td><b>'.&mt($parmitem).
'</b></td><td><input type="checkbox" name="del_'.	'</b></td>');
$thiskey.'" /></td><td>');	unless ($readonly) {
	$r->print('<td><input type="checkbox" name="del_'.
	$thiskey.'" /></td>');
	}
	$r->print('<td>');
$foundkeys++;	$foundkeys++;
if (&isdateparm($thistype)) {	if (&isdateparm($thistype)) {
my $jskey='key_'.$pointer;	my $jskey='key_'.$pointer;
$pointer++;	my $state;
$r->print(	$pointer++;
&Apache::lonhtmlcommon::date_setter('parmform',	if ($readonly) {
$jskey,	$state = 'disabled';
$$resourcedata{$thiskey},	}
'',1,'','').	$r->print(
	&Apache::lonhtmlcommon::date_setter('parmform',
	$jskey,
	$$resourcedata{$thiskey},
	'',1,$state));
	unless ($readonly) {
	$r->print(
'<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.	'<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
(($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.	(($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
&mt('Shift all dates based on this date').'</a></span>':'').	&mt('Shift all dates based on this date').'</a></span>':'').
&date_sanity_info($$resourcedata{$thiskey})	&date_sanity_info($$resourcedata{$thiskey})
);	);
	}
} elsif ($thistype eq 'date_interval') {	} elsif ($thistype eq 'date_interval') {
$r->print(&date_interval_selector($thiskey,	$r->print(&date_interval_selector($thiskey,$name,
$$resourcedata{$thiskey}));	$$resourcedata{$thiskey},$readonly));
} elsif ($thistype =~ m/^string/) {	} elsif ($thistype =~ m/^string/) {
$r->print(&string_selector($thistype,$thiskey,	$r->print(&string_selector($thistype,$thiskey,
$$resourcedata{$thiskey},$name));	$$resourcedata{$thiskey},$name,$readonly));
} else {	} else {
$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));	$r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
	}
	unless ($readonly) {
	$r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
	$thistype.'" />');
}	}
$r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
$thistype.'" />');
$r->print('</td>'.&Apache::loncommon::end_data_table_row());	$r->print('</td>'.&Apache::loncommon::end_data_table_row());
}	}
}	}
return $foundkeys;	return $foundkeys;
}	}


sub date_interval_selector {
my ($thiskey, $showval) = @_;
my $result;
foreach my $which (['days', 86400, 31],
['hours', 3600, 23],
['minutes', 60, 59],
['seconds', 1, 59]) {
my ($name, $factor, $max) = @{ $which };
my $amount = int($showval/$factor);
$showval %= $factor;
my %select = ((map {$_ => $_} (0..$max)),
'select_form_order' => [0..$max]);
$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
\%select);
$result .= ' '.&mt($name);
}
$result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
return $result;

}

sub get_date_interval_from_form {	sub get_date_interval_from_form {
my ($key) = @_;	my ($key) = @_;
my $seconds = 0;	my $seconds = 0;
Line 3185 sub get_date_interval_from_form {	Line 3549 sub get_date_interval_from_form {
$seconds += $env{'form.'.$name.'_'.$key} * $factor;	$seconds += $env{'form.'.$name.'_'.$key} * $factor;
}	}
}	}
	if (($key =~ /\.interval$/) && ($env{'form.done_'.$key} eq '_done')) {
	$seconds .= $env{'form.done_'.$key};
	}
return $seconds;	return $seconds;
}	}


sub default_selector {	sub default_selector {
my ($thiskey, $showval) = @_;	my ($thiskey, $showval, $readonly) = @_;
return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';	my $disabled;
	if ($readonly) {
	$disabled = ' disabled="disabled"';
	}
	return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
	}

	sub string_ip_selector {
	my ($thiskey, $showval, $readonly) = @_;
	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 ($disabled,$addmore);
	if ($disabled) {
	$disabled=' disabled="disabled"';
	} else {
	$addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
	}
	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.'"'.$disabled.' />';
	if ($num > 0) {
	$output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
	}
	$output .= '</div>'."\n";
	$num ++;
	}
	$output .= '
	</div>'.$addmore.'
	</div>
	</td>';
	}
	$output .= '
	</tr>
	</table>'."\n";
	return $output;
}	}

	{
my %strings =	my %strings =
(	(
'string_yesno'	'string_yesno'
Line 3216 my %strings =	Line 3648 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 3231 sub standard_string_options {	Line 3684 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, $readonly) = @_;

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

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;
	}
}	}
}	}
}	}
}	}


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

	my ($result,$disabled);

	if ($readonly) {
	$disabled = ' disabled="disabled"';
	}
my $numinrow = 3;	my $numinrow = 3;
if ($thistype eq 'string_problemstatus') {	if ($thistype eq 'string_problemstatus') {
$numinrow = 2;	$numinrow = 2;
Line 3278 sub string_selector {	Line 3771 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 3286 sub string_selector {	Line 3779 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"'.$disabled.' />'.
	'</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.$disabled;
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 3312 sub string_selector {	Line 3847 sub string_selector {
return $result;	return $result;
}	}

	my %intervals =
	(
	'date_interval'
	=> [[ 'done', 'Yes' ],
	[ '', 'No' ]],
	);

	my %intervalmatches = (
	'date_interval'
	=> [['done','\d+_done$'],],
	);

	my %intervaltypes = (
	interval => 'date_interval',
	);

	sub standard_interval_matches {
	my ($interval_type) = @_;
	if (ref($intervalmatches{$interval_type}) eq 'ARRAY') {
	return $intervalmatches{$interval_type};
	}
	return;
	}

	sub get_intervaltype {
	my ($name) = @_;
	if (exists($intervaltypes{$name})) {
	return $intervaltypes{$name};
	}
	return;
	}

	sub standard_interval_options {
	my ($interval_type) = @_;
	if (ref($intervals{$interval_type}) eq 'ARRAY') {
	return $intervals{$interval_type};
	}
	return;
	}

	sub date_interval_selector {
	my ($thiskey, $name, $showval, $readonly) = @_;
	my ($result,%skipval);
	if ($name eq 'interval') {
	my $intervaltype = &get_intervaltype($name);
	my ($got_chostname,$chostname,$cmajor,$cminor);
	foreach my $possibilities (@{ $intervals{$intervaltype} }) {
	next unless (ref($possibilities) eq 'ARRAY');
	my ($parmval, $description) = @{ $possibilities };
	my $parmmatch;
	if (ref($intervalmatches{$intervaltype}) eq 'ARRAY') {
	foreach my $item (@{$intervalmatches{$intervaltype}}) {
	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) {
	unless ($got_chostname) {
	($chostname,$cmajor,$cminor)=&parameter_release_vars();
	$got_chostname = 1;
	}
	my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
	$needsrelease,$cmajor,$cminor);
	if ($needsnewer) {
	if ($parmmatch ne '') {
	$skipval{$parmmatch} = 1;
	} elsif ($parmval ne '') {
	$skipval{$parmval} = 1;
	}
	}
	}
	}
	}

	my $currval = $showval;
	foreach my $which (['days', 86400, 31],
	['hours', 3600, 23],
	['minutes', 60, 59],
	['seconds', 1, 59]) {
	my ($name, $factor, $max) = @{ $which };
	my $amount = int($showval/$factor);
	$showval %= $factor;
	my %select = ((map {$_ => $_} (0..$max)),
	'select_form_order' => [0..$max]);
	$result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
	\%select,'',$readonly);
	$result .= ' '.&mt($name);
	}
	if ($name eq 'interval') {
	unless ($skipval{'done'}) {
	my $checkedon = '';
	my $checkedoff = ' checked="checked"';
	if ($currval =~ /^(\d+)_done$/) {
	$checkedon = ' checked="checked"';
	$checkedoff = '';
	}
	$result .= '<span class="LC_nobreak">'.(' ' x 3).'('.&mt('Include "done" button').
	'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'.
	&mt('Yes').'</label>'.
	'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'.
	&mt('No').'</label>)</span>';
	}
	}
	unless ($readonly) {
	$result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
	}
	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 3357 sub newoverview {	Line 4065 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 3365 sub newoverview {	Line 4073 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 3411 ENDOVER	Line 4123 ENDOVER
@selected_sections = ('all');	@selected_sections = ('all');
}	}
}	}
	if ($env{'request.course.sec'} ne '') {
	@selected_sections = ($env{'request.course.sec'});
	}
my @selected_groups =	my @selected_groups =
&Apache::loncommon::get_env_multiple('form.Group');	&Apache::loncommon::get_env_multiple('form.Group');

Line 3450 ENDOVER	Line 4165 ENDOVER
&displaymenu($r,\%allparms,\@pscat,\%keyorder);	&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 $groupselector = &groupmenu(\@selected_groups);
$r->print('<table>'.	$r->print('<table>'.
'<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').	'<tr><th>'.&mt('Parts').'</th>');
'</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');	if ($sectionselector) {
	$r->print('<th>'.&mt('Section(s)').'</th>');
	}
	if ($groupselector) {
	$r->print('<th>'.&mt('Group(s)').'</th>');
	}
	$r->print('</tr><tr><td>');
&partmenu($r,\%allparts,\@psprt);	&partmenu($r,\%allparts,\@psprt);
$r->print('</td><td>');	$r->print('</td>');
&sectionmenu($r,\@selected_sections);	if ($sectionselector) {
$r->print('</td><td>');	$r->print('<td>'.$sectionselector.'</td>');
&groupmenu($r,\@selected_groups);	}
$r->print('</td></tr></table>');	if ($groupselector) {
#$r->print('</td></tr></table>');	$r->print('<td>'.$groupselector.'</td>');
	}
	$r->print('</tr></table>');
$r->print(&Apache::lonhtmlcommon::row_closure(1));	$r->print(&Apache::lonhtmlcommon::row_closure(1));
$r->print(&Apache::lonhtmlcommon::end_pick_box());	$r->print(&Apache::lonhtmlcommon::end_pick_box());
$r->print('</div></div>');	$r->print('</div></div>');
Line 3493 ENDOVER	Line 4218 ENDOVER

# List data	# List data

&listdata($r,$resourcedata,$listdata,$sortorder);	&listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
}	}
$r->print(&tableend().	$r->print(&tableend().
((($env{'form.store'}) \|\| ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').	((($env{'form.store'}) \|\| ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
Line 3522 sub secgroup_lister {	Line 4247 sub secgroup_lister {
my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;	my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
$$listdata{$newparmkey}=1;	$$listdata{$newparmkey}=1;
$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};	$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
	$newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(rec).'.$part.'.'.$cat;
	$$listdata{$newparmkey}=1;
	$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
}	}
} else {	} else {
# resource-level parameter	# resource-level parameter
Line 3542 sub overview {	Line 4270 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 3557 sub overview {	Line 4295 sub overview {

# Read modified data	# Read modified data

my $resourcedata=&readdata($crs,$dom);	my ($resourcedata,$classlist)=&readdata($crs,$dom);


my $sortorder=$env{'form.sortorder'};	my $sortorder=$env{'form.sortorder'};
Line 3566 sub overview {	Line 4304 sub overview {

# List data	# List data

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

$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 4377 sub components {	Line 5114 sub components {
}	}
my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';	my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
my $realmdescription=&mt('all resources');	my $realmdescription=&mt('all resources');
if ($middle=~/^(.+)\_\_\_$all$$/) {	if ($middle=~/^(.+)\_\_\_$(all\|rec)$$/) {
$realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';	my $mapurl = $1;
$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);	my $maplevel = $2;
	my $leveltitle = &mt('Folder/Map');
	if ($maplevel eq 'rec') {
	$leveltitle = &mt('Recursive');
	}
	$realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <span class="LC_parm_folder"><br />('.$mapurl.')</span></span>';
	$realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($mapurl);
} elsif ($middle) {	} elsif ($middle) {
my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);	my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';	$realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
Line 4521 sub parm_change_log {	Line 5264 sub parm_change_log {
!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'},undef,undef,$typeflag);
	if ($env{'request.course.sec'} ne '') {
	next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
	if ($uname ne '') {
	my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
	next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'}));
	}
	}
if ($env{'form.displayfilter'} eq 'currentfolder') {	if ($env{'form.displayfilter'} eq 'currentfolder') {
if ($folder) {	if ($folder) {
if ($middle!~/^\Q$folder\E/) { next; }	if ($middle!~/^\Q$folder\E/) { next; }
Line 4722 sub parameter_release_vars {	Line 5472 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.548
changed lines
	Added in v.1.556