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.554 and 1.559

version 1.554, 2015/09/13 21:48:05	version 1.559, 2016/05/13 22:48:05
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)) {	} 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 791 sub valout {	Line 824 sub valout {
}	}
} else {	} else {
if ($type eq 'date_interval') {	if ($type eq 'date_interval') {
my ($totalsecs,$donebutton) = split(/_/,$value);	my ($totalsecs,$donesuffix) = split(/_/,$value,2);
	my ($usesdone,$donebuttontext,$proctor,$secretkey);
	if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
	$donebuttontext = $1;
	(undef,$proctor,$secretkey) = split(/_/,$2);
	$usesdone = 'done';
	} elsif ($donesuffix =~ /^done(\|_.+)$/) {
	$donebuttontext = &mt('Done');
	($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
	}
my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);	my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
my @timer;	my @timer;
$year=$year-70;	$year=$year-70;
Line 825 sub valout {	Line 867 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') {	if ($usesdone eq 'done') {
$result .= ' '.&mt('+ "done"');	if ($secretkey) {
	$result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey);
	} else {
	$result .= ' + "'.$donebuttontext.'"';
	}
}	}
} elsif (&isdateparm($type)) {	} elsif (&isdateparm($type)) {
$result = &Apache::lonlocal::locallocaltime($value).	$result = &Apache::lonlocal::locallocaltime($value).
Line 1092 sub ipacc_boxes_js {	Line 1138 sub ipacc_boxes_js {
END	END
}	}

	sub done_proctor_js {
	return <<"END";
	function toggleSecret(form,radio,key) {
	var radios = form[radio+key];
	if (radios.length) {
	for (var i=0; i<radios.length; i++) {
	if (radios[i].checked) {
	if (radios[i].value == '_done_proctor') {
	if (document.getElementById('done_'+key+'_proctorkey')) {
	document.getElementById('done_'+key+'_proctorkey').type='text';
	}
	} else {
	if (document.getElementById('done_'+key+'_proctorkey')) {
	document.getElementById('done_'+key+'_proctorkey').type='hidden';
	document.getElementById('done_'+key+'_proctorkey').value='';
	}
	}
	}
	}
	}
	}
	END

	}

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

Line 1158 sub print_row {	Line 1229 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 1187 sub print_row {	Line 1258 sub print_row {

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,$noeditgrp);	&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,$noeditgrp);	&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 1213 sub print_row {	Line 1287 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 1224 sub print_row {	Line 1298 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,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
	&print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
&print_td($r,4,$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 1272 sub print_td {	Line 1350 sub print_td {
$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 > 9)) {	} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
$nolink = 1;	$nolink = 1;
} elsif ($which == 4 \|\| $which == 5 \|\| $which == 6) {	} elsif ($which == 5 \|\| $which == 6 \|\| $which == 7 \|\| $which == 8) {
if ($noeditgrp) {	if ($noeditgrp) {
$nolink = 1;	$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 1306 sub print_usergroups {	Line 1384 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)) {
Line 1332 sub print_usergroups {	Line 1411 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 1446 sub extractResourceInformation {	Line 1525 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 2291 sub assessparms {	Line 2372 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 2368 sub assessparms {	Line 2449 sub assessparms {
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,$namematch);
if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7\|8\|9)$/)) {	if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9\|10\|11\|12)$/)) {
next if ($csec ne $env{'request.course.sec'});	next if ($csec ne $env{'request.course.sec'});
}	}
if ($markers[$i] =~ /\&(6\|5\|4)$/) {	if ($markers[$i] =~ /\&(8\|7\|6\|5)$/) {
next if ($noeditgrp);	next if ($noeditgrp);
}	}
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {	if ($markers[$i] =~ /\&(17\|11\|7\|3)$/) {
	$namematch = 'maplevelrecurse';
	}
	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 2461 sub assessparms {	Line 2545 sub assessparms {
}	}
}	}
$needsrelease =	$needsrelease =
$Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};	$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,$valmatch,	$needsnewer = &parameter_releasecheck($name,$val,$valmatch,undef,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
}	}
}	}
if ($needsnewer) {	if ($needsnewer) {
$message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,	undef($namematch);
	} else {
	my $currneeded;
	if ($needsrelease) {
	$currneeded = $needsrelease;
	}
	if ($namematch) {
	$needsrelease =
	$Apache::lonnet::needsrelease{"parameter::::$namematch"};
	if (($needsrelease) && (($currneeded eq '') \|\| ($needsrelease < $currneeded))) {
	unless ($got_chostname) {
	($chostname,$cmajor,$cminor) = &parameter_release_vars();
	$got_chostname = 1;
	}
	$needsnewer = &parameter_releasecheck(undef,undef,undef,$namematch,
	$needsrelease,
	$cmajor,$cminor);
	} else {
	undef($namematch);
	}
	}
	}
	if ($needsnewer) {
	$message .= &oldversion_warning($name,$namematch,$values[$i],$chostname,$cmajor,
$cminor,$needsrelease);	$cminor,$needsrelease);
} else {	} else {
$message.=&storeparm(split(/\&/,$markers[$i]),	$message.=&storeparm(split(/\&/,$markers[$i]),
Line 2622 ENDPARMSELSCRIPT	Line 2729 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 2655 ENDPARMSELSCRIPT	Line 2762 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 2912 ENDTABLEHEADFOUR	Line 3020 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 3107 sub storedata {	Line 3216 sub storedata {
$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, $valmatch);	my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
if ($cmd eq 'set') {	if ($cmd eq 'set') {
$data=$env{$key};	$data=$env{$key};
$valmatch = '';	$valmatch = '';
Line 3188 sub storedata {	Line 3297 sub storedata {
$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 ($thiskey =~ m{\.(?:sequence\|page)___$rec$}) {
	$namematch = 'maplevelrecurse';
	}
	if (($name ne '') \|\| ($namematch ne '')) {
my ($needsrelease,$needsnewer);	my ($needsrelease,$needsnewer);
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};	if ($name ne '') {
if ($needsrelease) {	$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
unless ($got_chostname) {	if ($needsrelease) {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	unless ($got_chostname) {
$got_chostname = 1;	($chostname,$cmajor,$cminor)=&parameter_release_vars();
	$got_chostname = 1;
	}
	$needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
	$needsrelease,
	$cmajor,$cminor);
}	}
$needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,	}
$needsrelease,	if ($namematch ne '') {
$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
$r->print('<br />'.&oldversion_warning($name,$data,	undef($namematch);
$chostname,$cmajor,	} else {
$cminor,$needsrelease));	my $currneeded;
next;	if ($needsrelease) {
	$currneeded = $needsrelease;
	}
	$needsrelease =
	$Apache::lonnet::needsrelease{"parameter::::$namematch"};
	if (($needsrelease) && (($currneeded eq '') \|\| ($needsrelease < $currneeded))) {
	unless ($got_chostname) {
	($chostname,$cmajor,$cminor) = &parameter_release_vars();
	$got_chostname = 1;
	}
	$needsnewer = &parameter_releasecheck(undef,$valchk,$valmatch,$namematch,
	$needsrelease,$cmajor,$cminor);
	} else {
	undef($namematch);
	}
}	}
}	}
	if ($needsnewer) {
	$r->print('<br />'.&oldversion_warning($name,$namematch,$data,
	$chostname,$cmajor,
	$cminor,$needsrelease));
	next;
	}
}	}
if (defined($data) and $$olddata{$thiskey} ne $data) {	if (defined($data) and $$olddata{$thiskey} ne $data) {
if ($tuname) {	if ($tuname) {
Line 3398 sub listdata {	Line 3534 sub listdata {
$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 3497 sub get_date_interval_from_form {	Line 3639 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')) {	if (($key =~ /\.interval$/) && (($env{'form.done_'.$key} eq '_done') \|\| ($env{'form.done_'.$key} eq '_done_proctor'))) {
$seconds .= $env{'form.done_'.$key};	if ($env{'form.done_'.$key.'_buttontext'}) {
	$env{'form.done_'.$key.'_buttontext'} =~ s/\://g;
	$seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':';
	if ($env{'form.done_'.$key} eq '_done_proctor') {
	$seconds .= '_proctor';
	}
	} else {
	$seconds .= $env{'form.done_'.$key};
	}
	if (($env{'form.done_'.$key} eq '_done_proctor') &&
	($env{'form.done_'.$key.'_proctorkey'})) {
	$seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
	}
}	}
return $seconds;	return $seconds;
}	}
Line 3683 sub string_selector {	Line 3837 sub string_selector {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,	my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
$needsrelease,$cmajor,$cminor);	$needsrelease,$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
if ($parmmatch ne '') {	if ($parmmatch ne '') {
Line 3799 my %intervals =	Line 3953 my %intervals =
(	(
'date_interval'	'date_interval'
=> [[ 'done', 'Yes' ],	=> [[ 'done', 'Yes' ],
	[ 'done_proctor', 'Yes, with proctor key'],
[ '', 'No' ]],	[ '', 'No' ]],
);	);

my %intervalmatches = (	my %intervalmatches = (
'date_interval'	'date_interval'
=> [['done','\d+_done$'],],	=> [['done','\d+_done(\|\:[^\:]+\:)$'],
	['done_proctor','\d+_done(\|\:[^\:]+\:)_proctor_']],
);	);

my %intervaltypes = (	my %intervaltypes = (
Line 3862 sub date_interval_selector {	Line 4018 sub date_interval_selector {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,	my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
$needsrelease,$cmajor,$cminor);	$needsrelease,$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
if ($parmmatch ne '') {	if ($parmmatch ne '') {
Line 3892 sub date_interval_selector {	Line 4048 sub date_interval_selector {
if ($name eq 'interval') {	if ($name eq 'interval') {
unless ($skipval{'done'}) {	unless ($skipval{'done'}) {
my $checkedon = '';	my $checkedon = '';
	my $checkedproc = '';
	my $currproctorkey = '';
	my $currprocdisplay = 'hidden';
	my $currdonetext = &mt('Done');
my $checkedoff = ' checked="checked"';	my $checkedoff = ' checked="checked"';
if ($currval =~ /^(\d+)_done$/) {	if ($currval =~ /^(?:\d+)_done$/) {
	$checkedon = ' checked="checked"';
	$checkedoff = '';
	} elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
	$currdonetext = $1;
$checkedon = ' checked="checked"';	$checkedon = ' checked="checked"';
$checkedoff = '';	$checkedoff = '';
	} elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
	$currproctorkey = $1;
	$checkedproc = ' checked="checked"';
	$checkedoff = '';
	$currprocdisplay = 'text';
	} elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
	$currdonetext = $1;
	$currproctorkey = $2;
	$checkedproc = ' checked="checked"';
	$checkedoff = '';
	$currprocdisplay = 'text';
}	}
$result .= '<span class="LC_nobreak">'.(' ' x 3).'('.&mt('Include "done" button').	my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'.	$result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
&mt('Yes').'</label>'.	'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'.
'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'.	&mt('No').'</label>'.(' 'x2).
&mt('No').'</label>)</span>';	'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.' />'.
	&mt('Yes').'</label>'.(' 'x2).
	'<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.' />'.
	&mt('Yes, with proctor key').'</label>'.
	'<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
	'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'" /></span><br />'.
	'<span class="LC_nobreak">'.&mt('Button text').': '.
	'<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'" /></span>';
}	}
}	}
unless ($readonly) {	unless ($readonly) {
Line 3911 sub date_interval_selector {	Line 4093 sub date_interval_selector {
}	}

sub oldversion_warning {	sub oldversion_warning {
my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;	my ($name,$namematch,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
	my $standard_name = &standard_parameter_names($name);
	if ($namematch) {
	my $level = &standard_parameter_levels($namematch);
	my $msg = '';
	if ($level) {
	$msg = &mt('[_1] was [_2]not[_3] set at the level of: [_4].',
	$standard_name,'<b>','</b>','"'.$level.'"');
	} else {
	$msg = &mt('[_1] was [_2]not[_3] set.',
	$standard_name,'<b>','</b>');
	}
	return '<p class="LC_warning">'.$msg.'<br />'.
	&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
	$cmajor.'.'.$cminor,$chostname,
	$needsrelease).
	'</p>';
	}
my $desc;	my $desc;
my $stringtype = &get_stringtype($name);	my $stringtype = &get_stringtype($name);
if ($stringtype ne '') {	if ($stringtype ne '') {
Line 3956 sub oldversion_warning {	Line 4155 sub oldversion_warning {
}	}
}	}
}	}
my $standard_name = &standard_parameter_names($name);
return '<p class="LC_warning">'.	return '<p class="LC_warning">'.
&mt('[_1] was [_2]not[_3] set to [_4].',	&mt('[_1] was [_2]not[_3] set to [_4].',
$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.	$standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',	&mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
$cmajor.'.'.$cminor,$chostname,	$cmajor.'.'.$cminor,$chostname,
$needsrelease).	$needsrelease).
'</p>';	'</p>';
}	}

}	}
Line 4024 sub newoverview {	Line 4222 sub newoverview {
&toggleparmtextbox_js()."\n".	&toggleparmtextbox_js()."\n".
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
	&done_proctor_js()."\n".
'// ]]>	'// ]]>
</script>	</script>
';	';
Line 4195 sub secgroup_lister {	Line 4394 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 4220 sub overview {	Line 4422 sub overview {
&toggleparmtextbox_js()."\n".	&toggleparmtextbox_js()."\n".
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
	&done_proctor_js()."\n".
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
Line 5059 sub components {	Line 5262 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 5116 sub standard_parameter_types {	Line 5325 sub standard_parameter_types {
return;	return;
}	}

	sub standard_parameter_levels {
	my ($name)=@_;
	my %levels = (
	'resourcelevel' => 'a single resource',
	'maplevel' => 'the enclosing map/folder',
	'maplevelrecurse' => 'the enclosing map/folder (recursive into sub-folders)',
	'courselevel' => 'the general (course) level',
	);
	if ($levels{$name}) {
	return $levels{$name};
	}
	return;
	}

sub parm_change_log {	sub parm_change_log {
my ($r)=@_;	my ($r)=@_;
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
Line 5411 sub parameter_release_vars {	Line 5634 sub parameter_release_vars {
}	}

sub parameter_releasecheck {	sub parameter_releasecheck {
my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;	my ($name,$value,$valmatch,$namematch,$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;
} elsif ($valmatch) {	} elsif ($name) {
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});	if ($valmatch) {
} elsif ($value) {	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch.':'});
&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});	} elsif ($value) {
	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.'::'});
	}
	} elsif ($namematch) {
	&Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter::::'.$namematch});
}	}
return $needsnewer;	return $needsnewer;
}	}

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

Removed from v.1.554
changed lines
	Added in v.1.559