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.550 and 1.558

version 1.550, 2015/04/28 13:34:12	version 1.558, 2016/03/15 14:25:26
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 777 sub storeparm_by_symb_inner {	Line 810 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 824 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,$proctor,$secretkey) = 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 858 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 ($secretkey) {
	$result .= ' '.&mt('+ "done" with proctor key: [_1]',$secretkey);
	} else {
	$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 891 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 1076 sub ipacc_boxes_js {	Line 1117 sub ipacc_boxes_js {
e.preventDefault();	e.preventDefault();
var identifier = \$(this).closest("div").attr("id");	var identifier = \$(this).closest("div").attr("id");
identifier = identifier.replace(ipaccRegExp,'');	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>');	\$(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){	\$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
Line 1088 sub ipacc_boxes_js {	Line 1129 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 1138 ENDHEAD	Line 1204 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 1153 sub print_row {	Line 1220 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 1177 sub print_row {	Line 1244 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 1208 sub print_row {	Line 1278 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 1219 sub print_row {	Line 1289 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 1255 sub print_row {	Line 1329 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 1263 sub print_row {	Line 1337 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;
	} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
$nolink = 1;	$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 1279 sub print_td {	Line 1359 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 1295 sub print_usergroups {	Line 1375 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 1321 sub print_usergroups {	Line 1402 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 1435 sub extractResourceInformation {	Line 1516 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 1754 sub partmenu {	Line 1837 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 1763 sub usermenu {	Line 1846 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 1782 sub usermenu {	Line 1876 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 1815 function group_or_section(caller) {	Line 1909 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 1841 function group_or_section(caller) {	Line 1935 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 2040 sub levelmenu {	Line 2136 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 2197 sub assessparms {	Line 2301 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 2245 sub assessparms {	Line 2363 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 2322 sub assessparms {	Line 2440 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 ($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] =~ /\&(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 2353 sub assessparms {	Line 2480 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate\|acc)\&\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 = '';	my $valmatch = '';
Line 2390 sub assessparms {	Line 2517 sub assessparms {
}	}
}	}
}	}
	} 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:$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 2486 ENDPARMSELSCRIPT	Line 2653 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 2518 ENDPARMSELSCRIPT	Line 2685 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 2553 ENDPARMSELSCRIPT	Line 2720 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 2586 ENDPARMSELSCRIPT	Line 2753 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 2730 ENDTABLEHEADFOUR	Line 2898 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 2843 ENDTABLEHEADFOUR	Line 3011 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 2852 ENDTABLEHEADFOUR	Line 3021 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 2942 ENDMAPONE	Line 3111 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 2961 ENDMAPONE	Line 3130 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 2999 sub readdata {	Line 3175 sub readdata {
}	}
}	}
}	}
return $resourcedata;	if (wantarray) {
	return ($resourcedata,$classlist);
	} else {
	return $resourcedata;
	}
}	}


Line 3027 sub storedata {	Line 3207 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 3086 sub storedata {	Line 3266 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 ($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 3195 sub parse_listdata_key {	Line 3421 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 3206 sub listdata {	Line 3433 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 3247 sub listdata {	Line 3484 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 3305 sub listdata {	Line 3569 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 3375 sub get_date_interval_from_form {	Line 3630 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') \|\| ($env{'form.done_'.$key} eq '_done_proctor'))) {
	$seconds .= $env{'form.done_'.$key};
	if ($env{'form.done_'.$key.'_proctorkey'}) {
	$seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
	}
	}
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 {	sub string_ip_selector {
my ($thiskey, $showval) = @_;	my ($thiskey, $showval, $readonly) = @_;
my %access = (	my %access = (
allow => [],	allow => [],
deny => [],	deny => [],
Line 3411 sub string_ip_selector {	Line 3676 sub string_ip_selector {
if (!@{$access{'deny'}}) {	if (!@{$access{'deny'}}) {
@{$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.'" />	my $output = '<input type="hidden" name="set_'.$thiskey.'" />
<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';	<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
foreach my $acctype ('allow','deny') {	foreach my $acctype ('allow','deny') {
Line 3420 sub string_ip_selector {	Line 3691 sub string_ip_selector {
<div class="LC_string_ipacc_inner">'."\n";	<div class="LC_string_ipacc_inner">'."\n";
my $num = 0;	my $num = 0;
foreach my $curr (@{$access{$acctype}}) {	foreach my $curr (@{$access{$acctype}}) {
$output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'">';	$output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
if ($num > 0) {	if ($num > 0) {
$output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';	$output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
}	}
Line 3428 sub string_ip_selector {	Line 3699 sub string_ip_selector {
$num ++;	$num ++;
}	}
$output .= '	$output .= '
</div>	</div>'.$addmore.'
<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>
</div>	</div>
</td>';	</td>';
}	}
Line 3515 sub get_stringtype {	Line 3785 sub get_stringtype {
}	}

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;
Line 3549 sub string_selector {	Line 3819 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 3563 sub string_selector {	Line 3833 sub string_selector {
}	}

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

my $result;	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 3631 sub string_selector {	Line 3905 sub string_selector {
foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {	foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
$add .= '<tr><td> </td><td>'.$relatives{$reltype}.'</td>'."\n".	$add .= '<tr><td> </td><td>'.$relatives{$reltype}.'</td>'."\n".
'<td><input type="text" name="settext_'.$thiskey.'"'.	'<td><input type="text" name="settext_'.$thiskey.'"'.
' value="'.$textval{$reltype}.'" size="3" />'.	' value="'.$textval{$reltype}.'" size="3"'.$disabled.' />'.
'</td></tr>';	'</td></tr>';
}	}
$add .= '</table></div>'."\n";	$add .= '</table></div>'."\n";
Line 3642 sub string_selector {	Line 3916 sub string_selector {
$result .= '<td class="LC_left_item"'.$colspan.'>'.	$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.'"'.$onchange.$css_class;	'" value="'.$name.'"'.$onchange.$css_class.$disabled;
if ($showval eq $name) {	if ($showval eq $name) {
$result .= ' checked="checked"';	$result .= ' checked="checked"';
}	}
Line 3657 sub string_selector {	Line 3931 sub string_selector {
return $result;	return $result;
}	}

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

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

	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,undef,
	$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 $checkedproc = '';
	my $currproctorkey = '';
	my $currprocdisplay = 'hidden';
	my $checkedoff = ' checked="checked"';
	if ($currval =~ /^(\d+)_done$/) {
	$checkedon = ' checked="checked"';
	$checkedoff = '';
	} elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
	$currproctorkey = $1;
	$checkedproc = ' checked="checked"';
	$checkedoff = '';
	$currprocdisplay = 'text';
	}
	my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
	$result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
	'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'.
	&mt('No').'</label>'.(' 'x2).
	'<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="'.$currproctorkey.'" /></span>';
	}
	}
	unless ($readonly) {
	$result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
	}
	return $result;
	}

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 3703 sub oldversion_warning {	Line 4124 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 3771 sub newoverview {	Line 4191 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 3818 ENDOVER	Line 4239 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 3857 ENDOVER	Line 4281 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 3900 ENDOVER	Line 4334 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 3929 sub secgroup_lister {	Line 4363 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 3954 sub overview {	Line 4391 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 3974 sub overview {	Line 4412 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 3983 sub overview {	Line 4421 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 4793 sub components {	Line 5231 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 4850 sub standard_parameter_types {	Line 5294 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 4937 sub parm_change_log {	Line 5395 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 5138 sub parameter_release_vars {	Line 5603 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.550
changed lines
	Added in v.1.558