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.522.2.23.4.1 and 1.553

version 1.522.2.23.4.1, 2017/06/21 19:54:58	version 1.553, 2015/08/28 22:44:59
Line 149 Input: See list below	Line 149 Input: See list below

=back	=back

Outputs: See list below	Outputs: See list below:

=over 4	=over 4

Line 323 use HTML::Entities;	Line 323 use HTML::Entities;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);


	sub startSettingsScreen {
	my ($r,$mode,$crstype)=@_;

	my $tabtext = &mt('Course Settings');
	if ($crstype eq 'Community') {
	$tabtext = &mt('Community Settings');
	}
	$r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
	$r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>    '.
	$tabtext.
	'    </b></a></li>');

	$r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').' id="tabbededitor"><a href="/adm/parmset"><b>'.
	&mt('Content and Problem Settings').'</b></a></li>');
	$r->print("\n".'</ul>'."\n");
	$r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
	}

	sub endSettingsScreen {
	my ($r)=@_;
	$r->print('</div></div></div>');
	}



sub parmval {	sub parmval {
my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;	my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,	return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
Line 752 sub storeparm_by_symb_inner {	Line 777 sub storeparm_by_symb_inner {


sub valout {	sub valout {
my ($value,$type,$name,$editable)=@_;	my ($value,$type,$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 766 sub valout {	Line 791 sub valout {
}	}
} else {	} else {
if ($type eq 'date_interval') {	if ($type eq 'date_interval') {
my ($totalsecs,$donesuffix) = split(/_/,$value,2);	my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
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 @timer;	my @timer;
$year=$year-70;	$year=$year-70;
$mday--;	$mday--;
Line 809 sub valout {	Line 824 sub valout {
push(@timer,&mt('[quant,_1,sec]',0));	push(@timer,&mt('[quant,_1,sec]',0));
}	}
$result.=join(", ",@timer);	$result.=join(", ",@timer);
if ($usesdone eq '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).
&date_sanity_info($value);	&date_sanity_info($value);
Line 842 sub plink {	Line 850 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,$parmname,1);	my $valout = &valout($value,$type,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 895 sub page_js {	Line 903 sub page_js {
var newWin = window.open(url, wdwName, options);	var newWin = window.open(url, wdwName, options);
newWin.focus();	newWin.focus();
}	}

// ]]>	// ]]>

</script>	</script>
$selscript	$selscript
ENDJS	ENDJS
Line 922 function showHide_courseContent() {	Line 932 function showHide_courseContent() {
COURSECONTENTSCRIPT	COURSECONTENTSCRIPT
}	}

sub done_proctor_js {	sub toggleparmtextbox_js {
return <<"END";	return <<"ENDSCRIPT";
function toggleSecret(form,radio,key) {
var radios = form[radio+key];	if (!document.getElementsByClassName) {
if (radios.length) {	function getElementsByClassName(node, classname) {
for (var i=0; i<radios.length; i++) {	var a = [];
if (radios[i].checked) {	var re = new RegExp('(^\| )'+classname+'( \|$)');
if (radios[i].value == '_done_proctor') {	var els = node.getElementsByTagName("*");
if (document.getElementById('done_'+key+'_proctorkey')) {	for(var i=0,j=els.length; i<j; i++)
document.getElementById('done_'+key+'_proctorkey').type='text';	if(re.test(els[i].className))a.push(els[i]);
	return a;
	}
	}

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

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

	ENDSCRIPT
	}

	sub validateparms_js {
	return <<'ENDSCRIPT';

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

	ENDSCRIPT
	}

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

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

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


	END
}	}

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

my %loaditems = (	my %loaditems = (
'onload' => "group_or_section('cgroup')",	'onload' => "group_or_section('cgroup')",
Line 975 sub startpage {	Line 1116 sub startpage {
</script>	</script>
';	';
my $start_page =	my $start_page =
&Apache::loncommon::start_page('Set/Modify Course Parameters',$js,	&Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
{'add_entries' => \%loaditems,});	{'add_entries' => \%loaditems,});
my $breadcrumbs =	my $breadcrumbs =
&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');	&Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});	my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});	my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
	&startSettingsScreen($r,'parmset',$crstype);
$r->print(<<ENDHEAD);	$r->print(<<ENDHEAD);
<form method="post" action="/adm/parmset?action=settable" name="parmform">	<form method="post" action="/adm/parmset?action=settable" name="parmform">
<input type="hidden" value="" name="pres_value" />	<input type="hidden" value="" name="pres_value" />
Line 996 ENDHEAD	Line 1138 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,$noeditgrp,	$defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
$readonly)=@_;
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 1036 sub print_row {	Line 1178 sub print_row {
my $thismarker=$which;	my $thismarker=$which;
$thismarker=~s/^parameter\_//;	$thismarker=~s/^parameter\_//;
my $mprefix=$rid.'&'.$thismarker.'&';	my $mprefix=$rid.'&'.$thismarker.'&';
my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);	my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
my ($othergrp,$grp_parm,$controlgrp);	my ($othergrp,$grp_parm,$controlgrp);

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

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

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

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

if ($cgroup) {	if ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
&print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);	&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,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);	&print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
}	}

} # end of $parmlev if/else	} # end of $parmlev if/else
$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');	$r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
Line 1116 sub print_row {	Line 1256 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,$$name{$which}).' '.	&valout($sessionval,$sessionvaltype).' '.
'</font></td>');	'</font></td>');
}	}
$r->print('</tr>');	$r->print('</tr>');
Line 1124 sub print_row {	Line 1264 sub print_row {
}	}

sub print_td {	sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;	my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$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 ($readonly) {	if ($which == 11 \|\| $which == 12) {
$nolink = 1;	$nolink = 1;
} else {	} elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
if ($which == 11 \|\| $which == 12) {	$nolink = 1;
	} elsif ($which == 4 \|\| $which == 5 \|\| $which == 6) {
	if ($noeditgrp) {
	$nolink = 1;
	}
	} elsif ($mprefix =~ /availablestudent\&$/) {
	if ($which > 3) {
	$nolink = 1;
	}
	} elsif ($mprefix =~ /examcode\&$/) {
	unless ($which == 2) {
$nolink = 1;	$nolink = 1;
} elsif ($mprefix =~ /availablestudent\&$/) {
if ($which > 3) {
$nolink = 1;
}
} elsif ($mprefix =~ /examcode\&$/) {
unless ($which == 2) {
$nolink = 1;
}
}	}
}	}
if ($nolink) {	if ($nolink) {
$r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));	$r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
} else {	} else {
$r->print(&plink($$typeoutpar[$which],	$r->print(&plink($$typeoutpar[$which],
$$display{$value},$$outpar[$which],	$$display{$value},$$outpar[$which],
Line 1169 sub print_usergroups {	Line 1311 sub print_usergroups {
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,$what);	$grp_parm = &valout($coursereply,$resulttype);
}	}
$grp_parm = &valout($coursereply,$resulttype,$what);	$grp_parm = &valout($coursereply,$resulttype);
$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 1465 sub lookUpTableParameter {	Line 1607 sub lookUpTableParameter {
'lenient' => 'grading',	'lenient' => 'grading',
'retrypartial' => 'tries',	'retrypartial' => 'tries',
'discussvote' => 'misc',	'discussvote' => 'misc',
'examcode' => 'high_level_randomization',	'examcode' => 'high_level_randomization',
);	);
}	}

Line 1517 sub category_order {	Line 1659 sub category_order {

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

foreach $tempparameter (keys %$allparms) {	foreach my $tempparameter (keys(%$allparms)) {
&whatIsMyCategory($tempparameter, \%categoryList);	&whatIsMyCategory($tempparameter, \%categoryList);
}	}
#part to print the parm-list	#part to print the parm-list
$r->print('<div class="LC_columnSection">'."\n");	foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) {
	next if (@{$categoryList{$key}} == 0);
#Print parameters	next if ($key eq '');
for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
next if(@{$categoryList{$key}} == 0);
$r->print('<div class="LC_Box LC_400Box">'	$r->print('<div class="LC_Box LC_400Box">'
.'<h4 class="LC_hcell">'	.'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
.&mt($categories{$key})	foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
.'</h4>'."\n");
foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
$r->print('<span class="LC_nobreak">'	$r->print('<span class="LC_nobreak">'
.'<label><input type="checkbox" name="pscat" '	.'<label><input type="checkbox" name="pscat" '
.'value="'.$tempkey.'" ');	.'value="'.$tempkey.'" ');
if ($$pscat[0] eq "all" \|\| grep $_ eq $tempkey, @{$pscat}) {	if ($$pscat[0] eq "all" \|\| grep $_ eq $tempkey, @{$pscat}) {
$r->print(' checked="checked"');	$r->print( ' checked="checked"');
}	}
$r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}	$r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
: $tempkey)	: $tempkey)
.'</label></span><br />'."\n");	.'</label></span><br />'."\n");
}	}
$r->print("</div>\n");	$r->print('</div>');
}	}
	$r->print("\n");
$r->print("</div>\n");
}	}
#	#
# This function offers some links on the parameter section to get with one click a group a parameters	# This function offers some links on the parameter section to get with one click a group a parameters
Line 1626 sub partmenu {	Line 1761 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 1635 sub usermenu {	Line 1770 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')" \|;
}	}
$sections .= '>';	$sections .= '>';
foreach my $section ('',sort keys %sectionhash) {	foreach my $section ('',sort(keys(%sectionhash))) {
$sections.='<option value="'.$section.'" '.	$sections.='<option value="'.$section.'" '.
($section eq $csec?'selected="selected"':'').'>'.$section.	($section eq $csec?'selected="selected"':'').'>'.$section.
'</option>';	'</option>';
Line 1654 sub usermenu {	Line 1800 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 1673 function group_or_section(caller) {	Line 1819 function group_or_section(caller) {
// ]]>	// ]]>
</script>	</script>
\|;	\|;
} else {	} elsif ($currsec eq '') {
$sections .= qq\|	$sections .= qq\|
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 1687 function group_or_section(caller) {	Line 1833 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 .= '>';
foreach my $grp ('',sort keys %grouphash) {	foreach my $grp ('',sort(keys(%grouphash))) {
$groups.='<option value="'.$grp.'" ';	$groups.='<option value="'.$grp.'" ';
if ($grp eq $cgroup) {	if ($grp eq $cgroup) {
unless ((defined($uname)) && ($grp eq '')) {	unless ((defined($uname)) && ($grp eq '')) {
Line 1897 sub mapmenu {	Line 2043 sub mapmenu {
sub levelmenu {	sub levelmenu {
my ($r,$alllevs,$parmlev)=@_;	my ($r,$alllevs,$parmlev)=@_;

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


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 (@{$selectedsections}) {	$selectedsections = [$env{'request.course.sec'}];
if ($s eq $_) {	$disabled = ' disabled="disabled"';
$r->print(' selected="selected"');	} else {
last;	@possibles = ('all',sort(keys(%sectionhash)));
}
}	}
$r->print('>'.$s."</option>\n");	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"';
	}
	$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 (@{$selectedgroups}) {	if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
if ($group eq $_) {	$output .= ' selected="selected"';
$r->print(' selected="selected"');
last;
}	}
	$output .= '>'."$group</option>\n";
}	}
$r->print('>'.$group."</option>\n");	$output .= "</select>\n";
}	return $output;
$r->print("</select>\n");
}	}


sub keysplit {	sub keysplit {
my $keyp=shift;	my $keyp=shift;
return (split(/\,/,$keyp));	return (split(/\,/,$keyp));
Line 1958 sub keysinorder {	Line 2113 sub keysinorder {
my ($name,$keyorder)=@_;	my ($name,$keyorder)=@_;
return sort {	return sort {
$$keyorder{$a} <=> $$keyorder{$b};	$$keyorder{$a} <=> $$keyorder{$b};
} (keys %{$name});	} (keys(%{$name}));
}	}

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

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

sub sortmenu {	sub sortmenu {
Line 2024 sub standardkeyorder {	Line 2179 sub standardkeyorder {

sub assessparms {	sub assessparms {

my ($r,$parm_permission) = @_;	my $r=shift;



# -------------------------------------------------------- Variable declaration	# -------------------------------------------------------- Variable declaration
Line 2067 sub assessparms {	Line 2223 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;	my $noeditgrp;
if ($cgroup ne '') {	if ($cgroup ne '') {
unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
if (($env{'request.course.groups'} eq '') \|\|	if (($env{'request.course.groups'} eq '') \|\|
(!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {	(!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
$noeditgrp = 1;	$noeditgrp = 1;
}	}
Line 2091 sub assessparms {	Line 2252 sub assessparms {


my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');	my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
if (!@psprt) { $psprt[0]='0'; }	if (!@psprt) { $psprt[0]='all'; }
if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }	if (($env{'form.part'}) && ($psprt[0] ne 'all')) { $psprt[0]=$env{'form.part'}; }

my $pssymb='';	my $pssymb='';
Line 2129 sub assessparms {	Line 2290 sub assessparms {
$id='';	$id='';
} else {	} else {
$message=	$message=
'<span class="LC_error">'.&mt("Unknown ID")." '$id' ".	'<p class="LC_warning">'.
&mt('at domain')." '$udom'</span>";	&mt('Unknown ID [_1] at domain [_2]',
	"'".$id."'","'".$udom."'").
	'</p>';
}	}
} else {	} else {
$uname=$env{'form.uname'};	$uname=$env{'form.uname'};
Line 2141 sub assessparms {	Line 2304 sub assessparms {
$uhome=&Apache::lonnet::homeserver($uname,$udom);	$uhome=&Apache::lonnet::homeserver($uname,$udom);
if ($uhome eq 'no_host') {	if ($uhome eq 'no_host') {
$message=	$message=
'<span class="LC_error">'.&mt("Unknown user")." '$uname' ".	'<p class="LC_warning">'.
&mt("at domain")." '$udom'</span>";	&mt('Unknown user [_1] at domain [_2]',
	"'".$uname."'","'".$udom."'").
	'</p>';
$uname='';	$uname='';
} else {	} else {
$csec=&Apache::lonnet::getsection($udom,$uname,	$csec=&Apache::lonnet::getsection($udom,$uname,
$env{'request.course.id'});	$env{'request.course.id'});
if ($csec eq '-1') {	if ($csec eq '-1') {
$message='<span class="LC_error">'.	$message=
&mt("User")." '$uname' ".&mt("at domain")." '$udom' ".	'<p class="LC_warning">'.
&mt("not in this course")."</span>";	&mt('User [_1] at domain [_2] not in this course',
	"'".$uname."'","'".$udom."'").
	'</p>';
$uname='';	$uname='';
$csec=$env{'form.csec'};	$csec=$env{'form.csec'};
$cgroup=$env{'form.cgroup'};	$cgroup=$env{'form.cgroup'};
Line 2184 sub assessparms {	Line 2351 sub assessparms {
$symbp{'0.0'} = '';	$symbp{'0.0'} = '';

# ---------------------------------------------------------- Anything to store?	# ---------------------------------------------------------- Anything to store?
if ($env{'form.pres_marker'} && $parm_permission->{'edit'}) {	if ($env{'form.pres_marker'}) {
my @markers=split(/\&\&\&/,$env{'form.pres_marker'});	my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
my @values=split(/\&\&\&/,$env{'form.pres_value'});	my @values=split(/\&\&\&/,$env{'form.pres_value'});
my @types=split(/\&\&\&/,$env{'form.pres_type'});	my @types=split(/\&\&\&/,$env{'form.pres_type'});
Line 2194 sub assessparms {	Line 2361 sub assessparms {
my ($got_chostname,$chostname,$cmajor,$cminor);	my ($got_chostname,$chostname,$cmajor,$cminor);
my $totalstored = 0;	my $totalstored = 0;
my $now = time;	my $now = time;

for (my $i=0;$i<=$#markers;$i++) {	for (my $i=0;$i<=$#markers;$i++) {
my ($needsrelease,$needsnewer,$name);	my ($needsrelease,$needsnewer,$name);
	if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7\|8\|9)$/)) {
	next if ($csec ne $env{'request.course.sec'});
	}
	if ($markers[$i] =~ /\&(6\|5\|4)$/) {
	next if ($noeditgrp);
	}
if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {	if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1\|2\|3)$/) {
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);
Line 2227 sub assessparms {	Line 2399 sub assessparms {
}	}
}	}
}	}
} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate)\&\d+$/) {	} elsif ($markers[$i] =~ /_(type\|lenient\|retrypartial\|discussvote\|examcode\|printstartdate\|printenddate\|acc)\&\d+$/) {
$name = $1;	$name = $1;
my $val = $values[$i];	my $val = $values[$i];
	my $valmatch = '';
if ($name eq 'examcode') {	if ($name eq 'examcode') {
if (&Apache::lonnet::validCODE($values[$i])) {	if (&Apache::lonnet::validCODE($values[$i])) {
$val = 'valid';	$val = 'valid';
Line 2239 sub assessparms {	Line 2412 sub assessparms {
if ($val > $now) {	if ($val > $now) {
$val = 'future';	$val = 'future';
}	}
}	}
} elsif ($name eq 'printenddate') {	} elsif ($name eq 'printenddate') {
if ($val =~ /^\d+$/) {	if ($val =~ /^\d+$/) {
if ($val < $now) {	if ($val < $now) {
$val = 'past';	$val = 'past';
}	}
}	}
	} elsif (($name eq 'lenient') \|\| ($name eq 'acc')) {
	my $stringtype = &get_stringtype($name);
	my $stringmatch = &standard_string_matches($stringtype);
	if (ref($stringmatch) eq 'ARRAY') {
	foreach my $item (@{$stringmatch}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($pattern ne '') {
	if ($val =~ /$pattern/) {
	$valmatch = $regexpname;
	$val = '';
	last;
	}
	}
	}
	}
	}
}	}
$needsrelease =	$needsrelease =
$Apache::lonnet::needsrelease{"parameter:$name:$val"};	$Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor) = &parameter_release_vars();	($chostname,$cmajor,$cminor) = &parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &parameter_releasecheck($name,$val,	$needsnewer = &parameter_releasecheck($name,$val,$valmatch,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
}	}
Line 2279 sub assessparms {	Line 2469 sub assessparms {
}	}
}	}
#----------------------------------------------- if all selected, fill in array	#----------------------------------------------- if all selected, fill in array
if ($pscat[0] eq "all") {@pscat = (keys %allparms);}	if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };	if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys %allparts);}	if ($psprt[0] eq "all" \|\| !@psprt) {@psprt = (keys(%allparts));}
# ------------------------------------------------------------------ Start page	# ------------------------------------------------------------------ Start page

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

foreach ('tolerance','date_default','date_start','date_end',	foreach my $item ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {	'date_interval','int','float','string') {
$r->print('<input type="hidden" value="'.	$r->print('<input type="hidden" value="'.
&HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').	&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
'" name="recent_'.$_.'" />');	'" name="recent_'.$item.'" />');
}	}

# ----- Start Parameter Selection	# ----- Start Parameter Selection
Line 2341 ENDPARMSELSCRIPT	Line 2532 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 2364 ENDPARMSELSCRIPT	Line 2555 ENDPARMSELSCRIPT
.'</a>'	.'</a>'
.'</p>');	.'</p>');
} else {	} else {
$r->print();
# parameter screen for a single resource.	# parameter screen for a single resource.
my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);	my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
my $title = &Apache::lonnet::gettitle($pssymb);	my $title = &Apache::lonnet::gettitle($pssymb);
Line 2374 ENDPARMSELSCRIPT	Line 2564 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());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')).	&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
'<label>'.
'<input type="checkbox" name="psprt" value="all"'.
($env{'form.psprt'}?' checked="checked"':'').' />'.
&mt('Show all parts').
'</label></td></tr>');
&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
$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 2404 ENDPARMSELSCRIPT	Line 2588 ENDPARMSELSCRIPT

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


if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {	if (($env{'form.prevvisit'}) \|\| ($pschp) \|\| ($pssymb)) {
# ----------------------------------------------------------------- Start Table	# ----------------------------------------------------------------- Start Table
my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;	my @catmarker=map { tr\|.\|_\|; 'parameter_'.$_; } @pscat;
my $csuname=$env{'user.name'};	my $csuname=$env{'user.name'};
my $csudom=$env{'user.domain'};	my $csudom=$env{'user.domain'};
my $readonly = 1;
if ($parm_permission->{'edit'}) {
undef($readonly);
}

if ($parmlev eq 'full') {	if ($parmlev eq 'full') {
#	#
Line 2435 ENDPARMSELSCRIPT	Line 2616 ENDPARMSELSCRIPT
$userspan ++;	$userspan ++;
}	}
$r->print('<th colspan="'.$userspan.'" rowspan="2">');	$r->print('<th colspan="'.$userspan.'" rowspan="2">');
$r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");	$r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
}	}
my %lt=&Apache::lonlocal::texthash(	my %lt=&Apache::lonlocal::texthash(
'pie' => "Parameter in Effect",	'pie' => "Parameter in Effect",
Line 2498 ENDTABLEHEADFOUR	Line 2679 ENDTABLEHEADFOUR
my $defbgtwo='';	my $defbgtwo='';
my $defbgthree = '';	my $defbgthree = '';

foreach (@ids) {	foreach my $rid (@ids) {

my $rid=$_;
my ($inmapid)=($rid=~/\.(\d+)$/);	my ($inmapid)=($rid=~/\.(\d+)$/);

if ((!$pssymb &&	if ((!$pssymb &&
Line 2534 ENDTABLEHEADFOUR	Line 2714 ENDTABLEHEADFOUR
my $uri=&Apache::lonnet::declutter($uris{$rid});	my $uri=&Apache::lonnet::declutter($uris{$rid});

my $filter=$env{'form.filter'};	my $filter=$env{'form.filter'};
foreach (&keysplit($keyp{$rid})) {	foreach my $tempkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;
if (grep $_ eq $tempkeyp, @catmarker) {	if (grep $_ eq $tempkeyp, @catmarker) {
my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');	my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
# We may only want certain parameters listed	# We may only want certain parameters listed
if ($filter) {	if ($filter) {
unless ($filter=~/\Q$parmname\E/) { next; }	unless ($filter=~/\Q$parmname\E/) { next; }
}	}
$name{$_}=$parmname;	$name{$tempkeyp}=$parmname;
$part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');	$part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');

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

unless ($firstrow) {	unless ($firstrow) {
$r->print('<tr>');	$r->print('<tr>');
} else {	} else {
undef $firstrow;	undef $firstrow;
}	}
&print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,	\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,	$defbgthree,$parmlev,$uname,$udom,$csec,
$cgroup,\@usersgroups,$noeditgrp,$readonly);	$cgroup,\@usersgroups,$noeditgrp);
}	}
}	}
}	}
Line 2622 ENDTABLEHEADFOUR	Line 2800 ENDTABLEHEADFOUR

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

#----------------------- loop through ids and get all parameter types for map	#----------------------- loop through ids and get all parameter types for map
Line 2636 ENDTABLEHEADFOUR	Line 2814 ENDTABLEHEADFOUR

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

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

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

Line 2653 ENDTABLEHEADFOUR	Line 2831 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$tempkeyp =~ s/_\w+_/_0_/;
$tempkeyp =~ s/_\w+_/_0_/;

if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2717 ENDTABLEHEADFOUR	Line 2894 ENDTABLEHEADFOUR
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&keysinorder(\%name,\%keyorder)) {	foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,	\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,	$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
$readonly);
}	}
$r->print(&Apache::loncommon::end_data_table().'</p>'	$r->print(&Apache::loncommon::end_data_table().'</p>'
.'</div>'	.'</div>'
Line 2745 ENDTABLEHEADFOUR	Line 2921 ENDTABLEHEADFOUR
my %type = ();	my %type = ();
my %default = ();	my %default = ();

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

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

Line 2757 ENDTABLEHEADFOUR	Line 2933 ENDTABLEHEADFOUR
# When storing information, store as part 0	# When storing information, store as part 0
# When requesting information, request from full part	# When requesting information, request from full part
#-------------------------------------------------------------------	#-------------------------------------------------------------------
foreach (&keysplit($keyp{$rid})) {	foreach my $fullkeyp (&keysplit($keyp{$rid})) {
my $tempkeyp = $_;	my $tempkeyp = $fullkeyp;
my $fullkeyp = $tempkeyp;	$tempkeyp =~ s/_\w+_/_0_/;
$tempkeyp =~ s/_\w+_/_0_/;	if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
$part{$tempkeyp}="0";	$part{$tempkeyp}="0";
$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');	$name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');	my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
Line 2809 ENDMAPONE	Line 2984 ENDMAPONE
.&Apache::loncommon::end_data_table_header_row()	.&Apache::loncommon::end_data_table_header_row()
);	);

foreach (&keysinorder(\%name,\%keyorder)) {	foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());	$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,	&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,	\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,	$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
$readonly);
}	}
$r->print(&Apache::loncommon::end_data_table()	$r->print(&Apache::loncommon::end_data_table()
.'</p>'	.'</p>'
Line 2823 ENDMAPONE	Line 2997 ENDMAPONE
} # end of $parmlev eq general	} # end of $parmlev eq general
}	}
$r->print('</form>');	$r->print('</form>');
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
} # end sub assessparms	} # end sub assessparms

Line 2864 sub readdata {	Line 3039 sub readdata {
# Read userdata	# Read userdata

my $classlist=&Apache::loncoursedata::get_classlist();	my $classlist=&Apache::loncoursedata::get_classlist();
foreach (keys %$classlist) {	foreach my $user (keys(%$classlist)) {
if ($_=~/^($match_username)\:($match_domain)$/) {	if ($user=~/^($match_username)\:($match_domain)$/) {
my ($tuname,$tudom)=($1,$2);	my ($tuname,$tudom)=($1,$2);
my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);	my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
foreach my $userkey (keys %{$useropt}) {	foreach my $userkey (keys(%{$useropt})) {
if ($userkey=~/^$env{'request.course.id'}/) {	if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
my $newkey=$userkey;	my $newkey=$userkey;
$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;	$newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
$$resourcedata{$newkey}=$$useropt{$userkey};	$$resourcedata{$newkey}=$$useropt{$userkey};
}	}
	}
}	}
}	}
}
if (wantarray) {	if (wantarray) {
return ($resourcedata,$classlist);	return ($resourcedata,$classlist);
} else {	} else {
Line 2902 sub storedata {	Line 3077 sub storedata {
if ($key =~ /^form\.([a-z]+)\_(.+)$/) {	if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
my $cmd=$1;	my $cmd=$1;
my $thiskey=$2;	my $thiskey=$2;
	next if ($cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny');
my ($tuname,$tudom)=&extractuser($thiskey);	my ($tuname,$tudom)=&extractuser($thiskey);
my $tkey=$thiskey;	my $tkey=$thiskey;
if ($tuname) {	if ($tuname) {
$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;	$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
}	}
if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {	if ($cmd eq 'set' \|\| $cmd eq 'datepointer' \|\| $cmd eq 'dateinterval') {
my ($data, $typeof, $text, $name, $valchk);	my ($data, $typeof, $text, $name, $valchk, $valmatch);
if ($cmd eq 'set') {	if ($cmd eq 'set') {
$data=$env{$key};	$data=$env{$key};
	$valmatch = '';
$valchk = $data;	$valchk = $data;
$typeof=$env{'form.typeof_'.$thiskey};	$typeof=$env{'form.typeof_'.$thiskey};
$text = &mt('Saved modified parameter for');	$text = &mt('Saved modified parameter for');
Line 2918 sub storedata {	Line 3095 sub storedata {
$name = 'type';	$name = 'type';
} elsif ($typeof eq 'string_lenient') {	} elsif ($typeof eq 'string_lenient') {
$name = 'lenient';	$name = 'lenient';
	my $stringmatch = &standard_string_matches($typeof);
	if (ref($stringmatch) eq 'ARRAY') {
	foreach my $item (@{$stringmatch}) {
	if (ref($item) eq 'ARRAY') {
	my ($regexpname,$pattern) = @{$item};
	if ($pattern ne '') {
	if ($data =~ /$pattern/) {
	$valmatch = $regexpname;
	$valchk = '';
	last;
	}
	}
	}
	}
	}
} elsif ($typeof eq 'string_discussvote') {	} elsif ($typeof eq 'string_discussvote') {
$name = 'discussvote';	$name = 'discussvote';
} elsif ($typeof eq 'string_examcode') {	} elsif ($typeof eq 'string_examcode') {
Line 2956 sub storedata {	Line 3148 sub storedata {
}	}
if ($name ne '') {	if ($name ne '') {
my ($needsrelease,$needsnewer);	my ($needsrelease,$needsnewer);
$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk"};	$needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
if ($needsrelease) {	if ($needsrelease) {
unless ($got_chostname) {	unless ($got_chostname) {
($chostname,$cmajor,$cminor)=&parameter_release_vars();	($chostname,$cmajor,$cminor)=&parameter_release_vars();
$got_chostname = 1;	$got_chostname = 1;
}	}
$needsnewer = &parameter_releasecheck($name,$valchk,	$needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
$needsrelease,	$needsrelease,
$cmajor,$cminor);	$cmajor,$cminor);
if ($needsnewer) {	if ($needsnewer) {
Line 3009 sub storedata {	Line 3201 sub storedata {
}	}
# Store all course level	# Store all course level
my $delentries=$#deldata+1;	my $delentries=$#deldata+1;
my @newdatakeys=keys %newdata;	my @newdatakeys=keys(%newdata);
my $putentries=$#newdatakeys+1;	my $putentries=$#newdatakeys+1;
if ($delentries) {	if ($delentries) {
if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {	if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
Line 3060 sub parse_listdata_key {	Line 3252 sub parse_listdata_key {
}	}

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

# Start list output	# Start list output

my $oldsection='';	my $oldsection='';
Line 3071 sub listdata {	Line 3264 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 3110 sub listdata {	Line 3313 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/^\.+//;
Line 3192 sub listdata {	Line 3416 sub listdata {
$jskey,	$jskey,
$$resourcedata{$thiskey},	$$resourcedata{$thiskey},
'',1,$state));	'',1,$state));
unless ($readonly) {	unless ($readonly) {
$r->print(	$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,$name,	$r->print(&date_interval_selector($thiskey,
$$resourcedata{$thiskey},$readonly));	$$resourcedata{$thiskey},$readonly));
} elsif ($thistype =~ m/^string/) {	} elsif ($thistype =~ m/^string/) {
$r->print(&string_selector($thistype,$thiskey,	$r->print(&string_selector($thistype,$thiskey,
Line 3221 sub listdata {	Line 3445 sub listdata {


sub date_interval_selector {	sub date_interval_selector {
my ($thiskey, $pname, $showval, $readonly) = @_;	my ($thiskey, $showval, $readonly) = @_;
my ($result,%skipval);	my $result;
my $currval = $showval;
foreach my $which (['days', 86400, 31],	foreach my $which (['days', 86400, 31],
['hours', 3600, 23],	['hours', 3600, 23],
['minutes', 60, 59],	['minutes', 60, 59],
Line 3237 sub date_interval_selector {	Line 3460 sub date_interval_selector {
\%select,'',$readonly);	\%select,'',$readonly);
$result .= ' '.&mt($name);	$result .= ' '.&mt($name);
}	}
if ($pname eq 'interval') {
unless ($skipval{'done'}) {
my $checkedon = '';
my $checkedproc = '';
my $currproctorkey = '';
my $currprocdisplay = 'hidden';
my $currdonetext = &mt('Done');
my $checkedoff = ' checked="checked"';
if ($currval =~ /^(?:\d+)_done$/) {
$checkedon = ' checked="checked"';
$checkedoff = '';
} elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
$currdonetext = $1;
$checkedon = ' checked="checked"';
$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';
}
my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
my $disabled;
if ($readonly) {
$disabled = ' disabled="disabled"';
}
$result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
'<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.$disabled.' />'.
&mt('No').'</label>'.(' 'x2).
'<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.$disabled.' />'.
&mt('Yes').'</label>'.(' 'x2).
'<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.$disabled.' />'.
&mt('Yes, with proctor key').'</label>'.
'<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
'<span class="LC_nobreak">'.&mt('Button text').': '.
'<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
}
}
unless ($readonly) {	unless ($readonly) {
$result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';	$result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
}	}
Line 3314 sub default_selector {	Line 3492 sub default_selector {
return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';	return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
}	}

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

	{
my %strings =	my %strings =
(	(
'string_yesno'	'string_yesno'
Line 3328 my %strings =	Line 3567 my %strings =
=> [[ 'problem', 'Standard Problem'],	=> [[ 'problem', 'Standard Problem'],
[ 'survey', 'Survey'],	[ 'survey', 'Survey'],
[ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],	[ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
[ 'exam', 'Exam'],	[ 'exam', 'Bubblesheet Exam'],
[ 'anonsurvey', 'Anonymous Survey'],	[ 'anonsurvey', 'Anonymous Survey'],
[ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],	[ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
[ 'practice', 'Practice'],	[ 'practice', 'Practice'],
Line 3336 my %strings =	Line 3575 my %strings =
'string_lenient'	'string_lenient'
=> [['yes', 'Yes' ],	=> [['yes', 'Yes' ],
[ 'no', 'No' ],	[ 'no', 'No' ],
[ 'default', 'Default - only bubblesheet grading is lenient' ]],	[ 'default', 'Default - only bubblesheet grading is lenient' ],
	[ 'weighted', 'Yes, weighted (optionresponse in checkbox mode)' ]],
'string_discussvote'	'string_discussvote'
=> [['yes','Yes'],	=> [['yes','Yes'],
['notended','Yes, unless discussion ended'],	['notended','Yes, unless discussion ended'],
['no','No']],	['no','No']],
	'string_ip'
	=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
	['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'],
);	);

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

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

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

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

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

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

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

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

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

my ($result,$disabled);	my ($result,$disabled);

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

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

	}

#	#
# Shift all start and end dates by $shift	# Shift all start and end dates by $shift
#	#
Line 3445 sub dateshift {	Line 3842 sub dateshift {
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);	my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
# ugly retro fix for broken version of types	# ugly retro fix for broken version of types
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($key=~/\wtype$/) {	if ($key=~/\wtype$/) {
my $newkey=$key;	my $newkey=$key;
$newkey=~s/type$/\.type/;	$newkey=~s/type$/\.type/;
Line 3455 sub dateshift {	Line 3852 sub dateshift {
}	}
my %storecontent=();	my %storecontent=();
# go through all parameters and look for dates	# go through all parameters and look for dates
foreach my $key (keys %data) {	foreach my $key (keys(%data)) {
if ($data{$key.'.type'}=~/^date_(start\|end)$/) {	if ($data{$key.'.type'}=~/^date_(start\|end)$/) {
my $newdate=$data{$key}+$shift;	my $newdate=$data{$key}+$shift;
$storecontent{$key}=$newdate;	$storecontent{$key}=$newdate;
Line 3471 sub dateshift {	Line 3868 sub dateshift {
}	}

sub newoverview {	sub newoverview {
my ($r,$parm_permission) = @_;	my ($r) = @_;

my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $readonly = 1;	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
if ($parm_permission->{'edit'}) {
undef($readonly);
}
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
text=>"Overview Mode"});	text=>"Overview Mode"});

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

my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,	my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,
{'add_entries' => \%loaditems,});	{'add_entries' => \%loaditems,});
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
	&startSettingsScreen($r,'parmset',$crstype);
$r->print(<<ENDOVER);	$r->print(<<ENDOVER);
<form method="post" action="/adm/parmset?action=newoverview" name="parmform">	<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
ENDOVER	ENDOVER
my @ids=();	my @ids=();
my %typep=();	my %typep=();
Line 3527 ENDOVER	Line 3925 ENDOVER
my $pschp=$env{'form.pschp'};	my $pschp=$env{'form.pschp'};

my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');	my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
if (!@psprt) { $psprt[0]='0'; }	if (!@psprt) { $psprt[0]='all'; }

my @selected_sections =	my @selected_sections =
&Apache::loncommon::get_env_multiple('form.Section');	&Apache::loncommon::get_env_multiple('form.Section');
Line 3537 ENDOVER	Line 3935 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 3576 ENDOVER	Line 3977 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 3619 ENDOVER	Line 4030 ENDOVER

# List data	# List data

&listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);	&listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
}
$r->print(&tableend());
unless ($readonly) {
$r->print(((($env{'form.store'}) \|\| ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':''));
}	}
$r->print('</form>');	$r->print(&tableend().
	((($env{'form.store'}) \|\| ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
	'</form>');
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 3644 sub secgroup_lister {	Line 4054 sub secgroup_lister {
$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};	$$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {
# map-level parameter	# map-level parameter
foreach my $mapid (keys %{$allmaps}) {	foreach my $mapid (keys(%{$allmaps})) {
if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }	if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;	my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
$$listdata{$newparmkey}=1;	$$listdata{$newparmkey}=1;
Line 3665 sub secgroup_lister {	Line 4075 sub secgroup_lister {
}	}

sub overview {	sub overview {
my ($r,$parm_permission) = @_;	my ($r) = @_;
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
my $js = '<script type="text/javascript">'."\n".	my $js = '<script type="text/javascript">'."\n".
'// <![CDATA['."\n".	'// <![CDATA['."\n".
&done_proctor_js()."\n".	&toggleparmtextbox_js()."\n".
	&validateparms_js()."\n".
	&ipacc_boxes_js()."\n".
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";
my $readonly = 1;
if ($parm_permission->{'edit'}) {
undef($readonly);
}
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
text=>"Overview Mode"});	text=>"Overview Mode"});
my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);	my %loaditems = (
	'onload' => "showHideLenient();",
	);

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

# Store modified	# Store modified
unless ($readonly) {
&storedata($r,$crs,$dom);	&storedata($r,$crs,$dom);
}

# Read modified data	# Read modified data

Line 3699 sub overview {	Line 4111 sub overview {
unless ($sortorder) { $sortorder='realmstudent'; }	unless ($sortorder) { $sortorder='realmstudent'; }
&sortmenu($r,$sortorder);	&sortmenu($r,$sortorder);

my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';

if ($readonly) {
$r->print('<p>'.$submitbutton.'</p>');
}


# List data	# List data

my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist,$readonly);	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>'.
if ($foundkeys) {	&Apache::loncommon::end_page());
unless ($readonly) {
$r->print('<p>'.$submitbutton.'</p>');
}
} else {
$r->print('<p class="LC_info">'.&mt('There are no parameters.').'</p>');
}
$r->print('</form>'.&Apache::loncommon::end_page());
}	}

sub clean_parameters {	sub clean_parameters {
Line 3794 ENDOVER	Line 4192 ENDOVER
my ($map,$resid,$url) =	my ($map,$resid,$url) =
&Apache::lonnet::decode_symb($data{'realm'});	&Apache::lonnet::decode_symb($data{'realm'});
$r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',	$r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
$url.' <br />   ',	$url.' <br />   ',
$resid.' <br />   ',$map));	$resid.' <br />   ',$map));
}	}
$r->print(' <br />   '.&mt('Part: [_1]',$data{'parameter_part'}));	$r->print(' <br />   '.&mt('Part: [_1]',$data{'parameter_part'}));
$r->print('</td></tr>');	$r->print('</td></tr>');
Line 3805 ENDOVER	Line 4203 ENDOVER
$r->print(&Apache::loncommon::end_data_table().'<p>'.	$r->print(&Apache::loncommon::end_data_table().'<p>'.
'<input type="submit" value="'.&mt('Delete Selected').'" />'.	'<input type="submit" value="'.&mt('Delete Selected').'" />'.
'</p></form>');	'</p></form>');
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 3812 sub date_shift_one {	Line 4211 sub date_shift_one {
my ($r) = @_;	my ($r) = @_;
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};

&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
text=>"Shifting Dates"});	text=>"Shifting Dates"});
my $start_page=&Apache::loncommon::start_page('Shift Dates');	my $start_page=&Apache::loncommon::start_page('Shift Dates');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
	&startSettingsScreen($r,'parmset',$crstype);
$r->print('<form name="shiftform" method="post" action="">'.	$r->print('<form name="shiftform" method="post" action="">'.
'<table><tr><td>'.&mt('Currently set date:').'</td><td>'.	'<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
&Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.	&Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
Line 3830 sub date_shift_one {	Line 4231 sub date_shift_one {
'<input type="hidden" name="action" value="dateshift2" />'.	'<input type="hidden" name="action" value="dateshift2" />'.
'<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.	'<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
'<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');	'<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 3837 sub date_shift_two {	Line 4239 sub date_shift_two {
my ($r) = @_;	my ($r) = @_;
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
text=>"Shifting Dates"});	text=>"Shifting Dates"});
my $start_page=&Apache::loncommon::start_page('Shift Dates');	my $start_page=&Apache::loncommon::start_page('Shift Dates');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
	&startSettingsScreen($r,'parmset',$crstype);
my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');	my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
$r->print('<h2>'.&mt('Shift Dates').'</h2>'.	$r->print('<h2>'.&mt('Shift Dates').'</h2>'.
'<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',	'<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
Line 3854 sub date_shift_two {	Line 4258 sub date_shift_two {
'<br /><br />'.	'<br /><br />'.
&Apache::lonhtmlcommon::actionbox(	&Apache::lonhtmlcommon::actionbox(
['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));	['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 3898 sub parse_key {	Line 4303 sub parse_key {


sub header {	sub header {
return &Apache::loncommon::start_page('Content and Problem Settings');	return &Apache::loncommon::start_page('Settings');
}	}


Line 3911 sub print_main_menu {	Line 4316 sub print_main_menu {
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $lc_crstype = lc($crstype);	my $lc_crstype = lc($crstype);

	&startSettingsScreen($r,'parmset',$crstype);
$r->print(<<ENDMAINFORMHEAD);	$r->print(<<ENDMAINFORMHEAD);
<form method="post" enctype="multipart/form-data"	<form method="post" enctype="multipart/form-data"
action="/adm/parmset" name="studentform">	action="/adm/parmset" name="studentform">
Line 3921 ENDMAINFORMHEAD	Line 4327 ENDMAINFORMHEAD
my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});	my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
my $mgr = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});	my $mgr = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});	my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
my $vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'});
my $vpa = &Apache::lonnet::allowed('vpa',$env{'request.course.id'});
if ((!$dcm) && ($env{'request.course.sec'} ne '')) {	if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
$dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.	$dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
'/'.$env{'request.course.sec'});	'/'.$env{'request.course.sec'});
}	}
if ((!$vcb) && ($env{'request.course.sec'} ne '')) {
$vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'}.
'/'.$env{'request.course.sec'});
}
my (%linktext,%linktitle,%url);
if ($parm_permission->{'edit'}) {
%linktext = (
newoverview => 'Edit Resource Parameters - Overview Mode',
settable => 'Edit Resource Parameters - Table Mode',
setoverview => 'Modify Resource Parameters - Overview Mode',
);
%linktitle = (
newoverview => 'Set/Modify resource parameters in overview mode.',
settable => 'Set/Modify resource parameters in table mode.',
setoverview => 'Set/Modify existing resource parameters in overview mode.',
);
} else {
%linktext = (
newoverview => 'View Resource Parameters - Overview Mode',
settable => 'View Resource Parameters - Table Mode',
setoverview => 'View Resource Parameters - Overview Mode',
);
%linktitle = (
newoverview => 'Display resource parameters in overview mode.',
settable => 'Display resource parameters in table mode.',
setoverview => 'Display existing resource parameters in overview mode.',
);
}
if ($mgr) {
$linktext{'resettimes'} = 'Reset Student Access Times';
$linktitle{'resettimes'} = "Reset access times for folders/maps, resources or the $lc_crstype.";
$url{'resettimes'} = '/adm/helper/resettimes.helper';
} elsif ($vgr) {
$linktext{'resettimes'} = 'Display Student Access Times',
$linktitle{'resettimes'} = "Display access times for folders/maps, resources or the $lc_crstype.",
$url{'resettimes'} = '/adm/accesstimes';
}
my @menu =	my @menu =
( { categorytitle=>"Content Settings for this $crstype",	( { categorytitle=>"Content Settings for this $crstype",
items => [	items => [
{ linktext => 'Portfolio Metadata',	{ linktext => 'Portfolio Metadata',
url => '/adm/parmset?action=setrestrictmeta',	url => '/adm/parmset?action=setrestrictmeta',
permission => $parm_permission->{'setrestrictmeta'},	permission => $parm_permission,
linktitle => "Restrict metadata for this $lc_crstype." ,	linktitle => "Restrict metadata for this $lc_crstype." ,
icon =>'contact-new.png' ,	icon =>'contact-new.png' ,
},	},
{ linktext => $linktext{'resettimes'},	{ linktext => 'Reset Student Access Times',
url => $url{'resettimes'},	url => '/adm/helper/resettimes.helper',
permission => ($vgr \|\| $mgr),	permission => $mgr,
linktitle => $linktitle{'resettimes'},	linktitle => "Reset access times for folders/maps, resources or the $lc_crstype." ,
icon => 'start-here.png',	icon => 'start-here.png' ,
},	},
{ linktext => 'Blocking Communication/Resource Access',	{ linktext => 'Blocking Communication/Resource Access',
url => '/adm/setblock',	url => '/adm/setblock',
permission => ($vcb \|\| $dcm),	permission => $dcm,
linktitle => 'Configure blocking of communication/collaboration and access to resources during an exam',	linktitle => 'Configure blocking of communication/collaboration and access to resources during an exam',
icon => 'comblock.png',	icon => 'comblock.png',
},	},
{ linktext => 'Set Parameter Setting Default Actions',	{ linktext => 'Set Parameter Setting Default Actions',
url => '/adm/parmset?action=setdefaults',	url => '/adm/parmset?action=setdefaults',
permission => $parm_permission->{'setdefaults'},	permission => $parm_permission,
linktitle =>'Set default actions for parameters.' ,	linktitle =>'Set default actions for parameters.' ,
icon => 'folder-new.png' ,	icon => 'folder-new.png' ,
}]},	}]},
Line 3995 ENDMAINFORMHEAD	Line 4363 ENDMAINFORMHEAD
items => [	items => [
{ linktext => 'Edit Resource Parameters - Helper Mode',	{ linktext => 'Edit Resource Parameters - Helper Mode',
url => '/adm/helper/parameter.helper',	url => '/adm/helper/parameter.helper',
permission => $parm_permission->{'helper'},	permission => $parm_permission,
linktitle =>'Set/Modify resource parameters in helper mode.' ,	linktitle =>'Set/Modify resource parameters in helper mode.' ,
icon => 'dialog-information.png' ,	icon => 'dialog-information.png' ,
#help => 'Parameter_Helper',	#help => 'Parameter_Helper',
},	},
{ linktext => $linktext{'newoverview'},	{ linktext => 'Edit Resource Parameters - Overview Mode',
url => '/adm/parmset?action=newoverview',	url => '/adm/parmset?action=newoverview',
permission => $parm_permission->{'newoverview'},	permission => $parm_permission,
linktitle => $linktitle{'newoverview'},	linktitle =>'Set/Modify resource parameters in overview mode.' ,
icon => 'edit-find.png',	icon => 'edit-find.png' ,
#help => 'Parameter_Overview',	#help => 'Parameter_Overview',
},	},
{ linktext => $linktext{'settable'},	{ linktext => 'Edit Resource Parameters - Table Mode',
url => '/adm/parmset?action=settable',	url => '/adm/parmset?action=settable',
permission => $parm_permission->{'settable'},	permission => $parm_permission,
linktitle => $linktitle{'settable'},	linktitle =>'Set/Modify resource parameters in table mode.' ,
icon => 'edit-copy.png',	icon => 'edit-copy.png' ,
#help => 'Table_Mode',	#help => 'Table_Mode',
}]},	}]},
{ categorytitle => 'Existing Parameter Settings for Resources',	{ categorytitle => 'Existing Parameter Settings for Resources',
items => [	items => [
{ linktext => $linktext{'setoverview'},	{ linktext => 'Modify Resource Parameters - Overview Mode',
url => '/adm/parmset?action=setoverview',	url => '/adm/parmset?action=setoverview',
permission => $parm_permission->{'setoverview'},	permission => $parm_permission,
linktitle => $linktitle{'setoverview'},	linktitle =>'Set/Modify existing resource parameters in overview mode.' ,
icon => 'preferences-desktop-wallpaper.png',	icon => 'preferences-desktop-wallpaper.png' ,
#help => 'Parameter_Overview',	#help => 'Parameter_Overview',
},	},
{ linktext => 'Change Log',	{ linktext => 'Change Log',
url => '/adm/parmset?action=parameterchangelog',	url => '/adm/parmset?action=parameterchangelog',
permission => $parm_permission->{'parameterchangelog'},	permission => $parm_permission,
linktitle =>"View parameter and $lc_crstype blog posting/user notification change log." ,	linktitle =>"View parameter and $lc_crstype blog posting/user notification change log." ,
icon => 'document-properties.png',	icon => 'document-properties.png',
}]}	}]}
);	);
$r->print(&Apache::lonhtmlcommon::generate_menu(@menu));	$r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
$r->print('</form>'.&Apache::loncommon::end_page());	$r->print('</form>');
	&endSettingsScreen($r);
	$r->print(&Apache::loncommon::end_page());
return;	return;
}	}

Line 4099 sub order_meta_fields {	Line 4469 sub order_meta_fields {
my $idx = 1;	my $idx = 1;
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};;
$r->print(&Apache::loncommon::start_page('Order Metadata Fields'));	$r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
text=>"Add Metadata Field"});	text=>"Add Metadata Field"});
Line 4107 sub order_meta_fields {	Line 4478 sub order_meta_fields {
text=>"Restrict Metadata"},	text=>"Restrict Metadata"},
{text=>"Order Metadata"});	{text=>"Order Metadata"});
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
	&startSettingsScreen($r,'parmset',$crstype);
if ($env{'form.storeorder'}) {	if ($env{'form.storeorder'}) {
my $newpos = $env{'form.newpos'} - 1;	my $newpos = $env{'form.newpos'} - 1;
my $currentpos = $env{'form.currentpos'} - 1;	my $currentpos = $env{'form.currentpos'} - 1;
my @neworder = ();	my @neworder = ();
my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @oldorder = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
my $i;	my $i;
if ($newpos > $currentpos) {	if ($newpos > $currentpos) {
# moving stuff up	# moving stuff up
Line 4145 sub order_meta_fields {	Line 4517 sub order_meta_fields {
}	}
my $fields = &get_added_meta_fieldnames($env{'request.course.id'});	my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $ordered_fields;	my $ordered_fields;
my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};	my @fields_in_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
if (!@fields_in_order) {	if (!@fields_in_order) {
# no order found, pick sorted order then create metadata.addedorder key.	# no order found, pick sorted order then create metadata.addedorder key.
foreach my $key (sort keys %$fields) {	foreach my $key (sort(keys(%$fields))) {
push @fields_in_order, $key;	push @fields_in_order, $key;
$ordered_fields = join ",", @fields_in_order;	$ordered_fields = join ",", @fields_in_order;
}	}
Line 4176 sub order_meta_fields {	Line 4548 sub order_meta_fields {
$idx ++;	$idx ++;
}	}
$r->print('</table>');	$r->print('</table>');
	&endSettingsScreen($r);
return 'ok';	return 'ok';
}	}

Line 4197 sub addmetafield {	Line 4570 sub addmetafield {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
	&startSettingsScreen($r,'parmset',$crstype);
if (exists($env{'form.undelete'})) {	if (exists($env{'form.undelete'})) {
my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');	my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
foreach my $meta_field(@meta_fields) {	foreach my $meta_field(@meta_fields) {
Line 4231 sub addmetafield {	Line 4606 sub addmetafield {
$r->print('<input type="submit" name="undelete" value="Undelete" />');	$r->print('<input type="submit" name="undelete" value="Undelete" />');
$r->print('</form>');	$r->print('</form>');
}	}
$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata">');	$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
$r->print('<input type="text" name="fieldname" /><br />');	$r->print('<input type="text" name="fieldname" /><br />');
$r->print('<input type="submit" value="Add Metadata Field" />');	$r->print('<input type="submit" value="Add Metadata Field" />');
}	}
$r->print('</form>');	$r->print('</form>');
	&endSettingsScreen($r);
}	}


Line 4252 sub setrestrictmeta {	Line 4628 sub setrestrictmeta {
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
	&startSettingsScreen($r,'parmset',$crstype);
my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};	my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
my $save_field = '';	my $save_field = '';
if ($env{'form.restrictmeta'}) {	if ($env{'form.restrictmeta'}) {
Line 4322 ENDButtons	Line 4700 ENDButtons
$buttons	$buttons
</form>	</form>
ENDenv	ENDenv
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return 'ok';	return 'ok';
}	}
Line 4362 sub defaultsetter {	Line 4741 sub defaultsetter {

&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
text=>"Set Defaults"});	text=>"Set Defaults"});
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
my $start_page =	my $start_page =
&Apache::loncommon::start_page('Parameter Setting Default Actions');	&Apache::loncommon::start_page('Parameter Setting Default Actions');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');	my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
$r->print($start_page.$breadcrumbs);	$r->print($start_page.$breadcrumbs);
	&startSettingsScreen($r,'parmset',$crstype);
$r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');	$r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');

my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my @ids=();	my @ids=();
my %typep=();	my %typep=();
my %keyp=();	my %keyp=();
Line 4420 sub defaultsetter {	Line 4801 sub defaultsetter {
}	}
}	}
}	}
foreach my $key (keys %allparms) {	foreach my $key (keys(%allparms)) {
$newrules{$key.'_triggers'}=$triggers{$key};	$newrules{$key.'_triggers'}=$triggers{$key};
}	}
&Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);	&Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
&Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);	&Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
&resetrulescache();	&resetrulescache();
}	}
my %lt=&Apache::lonlocal::texthash('days' => 'Days',	my %lt=&Apache::lonlocal::texthash('days' => 'Days',
Line 4512 ENDYESNO	Line 4893 ENDYESNO
$r->print(&Apache::loncommon::end_data_table().	$r->print(&Apache::loncommon::end_data_table().
"\n".'<input type="submit" name="storerules" value="'.	"\n".'<input type="submit" name="storerules" value="'.
&mt('Save').'" /></form>'."\n");	&mt('Save').'" /></form>'."\n");
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return;	return;
}	}
Line 4599 sub standard_parameter_types {	Line 4981 sub standard_parameter_types {
}	}

sub parm_change_log {	sub parm_change_log {
my ($r,$parm_permission)=@_;	my ($r)=@_;
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
text=>"Parameter Change Log"});	text=>"Parameter Change Log"});
my $js = '<script type="text/javascript">'."\n".	my $js = '<script type="text/javascript">'."\n".
Line 4609 sub parm_change_log {	Line 4994 sub parm_change_log {
'</script>'."\n";	'</script>'."\n";
$r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));	$r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',	&startSettingsScreen($r,'parmset',$crstype);
$env{'course.'.$env{'request.course.id'}.'.domain'},	my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',$cdom,$cnum);
$env{'course.'.$env{'request.course.id'}.'.num'});

if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }	if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }

Line 4628 sub parm_change_log {	Line 5012 sub parm_change_log {
$r->print(&Apache::loncommon::display_filter('parmslog').' '."\n".	$r->print(&Apache::loncommon::display_filter('parmslog').' '."\n".
'<input type="submit" value="'.&mt('Display').'" />'.	'<input type="submit" value="'.&mt('Display').'" />'.
'</form></fieldset></div><br clear="all" />');	'</form></fieldset></div><br clear="all" />');
my $readonly = 1;
if ($parm_permission->{'edit'}) {	my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
undef($readonly);
}
my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
$env{'course.'.$env{'request.course.id'}.'.domain'});
$r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().	$r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
'<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.	'<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
&mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th>');	&mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
unless ($readonly) {	&Apache::loncommon::end_data_table_header_row());
$r->print('<th>'.&mt('Announce').'</th>');
}
$r->print(&Apache::loncommon::end_data_table_header_row());
my $shown=0;	my $shown=0;
my $folder='';	my $folder='';
if ($env{'form.displayfilter'} eq 'currentfolder') {	if ($env{'form.displayfilter'} eq 'currentfolder') {
Line 4673 sub parm_change_log {	Line 5050 sub parm_change_log {
$parmlog{$id}{'exe_uname'},	$parmlog{$id}{'exe_uname'},
$parmlog{$id}{'exe_udom'});	$parmlog{$id}{'exe_udom'});
my $send_msg_link='';	my $send_msg_link='';
if ((!$readonly) &&	if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
(($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
\|\| ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {	\|\| ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
$send_msg_link ='<br />'.	$send_msg_link ='<br />'.
&Apache::loncommon::messagewrapper(&mt('Send message'),	&Apache::loncommon::messagewrapper(&mt('Send message'),
Line 4691 sub parm_change_log {	Line 5067 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 4744 sub parm_change_log {	Line 5127 sub parm_change_log {
}	}
}	}
}	}
$output .= '</td>';	$output .= '</td><td>';

unless ($readonly) {	if ($stillactive) {
$output .= '<td>';	my $parmitem = &standard_parameter_names($parmname);
if ($stillactive) {	$parmitem = &mt($parmitem);
my $parmitem = &standard_parameter_names($parmname);	my $title=&mt('Changed [_1]',$parmitem);
$parmitem = &mt($parmitem);	my $description=&mt('Changed [_1] for [_2] to [_3]',
my $title=&mt('Changed [_1]',$parmitem);	$parmitem,$realmdescription,
my $description=&mt('Changed [_1] for [_2] to [_3]',	(&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
$parmitem,$realmdescription,	if (($uname) && ($udom)) {
(&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));	$output .=
if (($uname) && ($udom)) {	&Apache::loncommon::messagewrapper('Notify User',
$output .=	$uname,$udom,$title,
&Apache::loncommon::messagewrapper('Notify User',	$description);
$uname,$udom,$title,	} else {
$description);	$output .=
} else {	&Apache::lonrss::course_blog_link($id,$title,
$output .=	$description);
&Apache::lonrss::course_blog_link($id,$title,	}
$description);	}
}	$output .= '</td>'.&Apache::loncommon::end_data_table_row();
}
$output .= '</td>';
}
$output .= &Apache::loncommon::end_data_table_row();
}	}
if ($env{'form.displayfilter'} eq 'containing') {	if ($env{'form.displayfilter'} eq 'containing') {
my $wholeentry=$about_me_link.':'.	my $wholeentry=$about_me_link.':'.
Line 4788 sub parm_change_log {	Line 5167 sub parm_change_log {
\|\| $shown<=$env{'form.show'})) { last; }	\|\| $shown<=$env{'form.show'})) { last; }
}	}
$r->print(&Apache::loncommon::end_data_table());	$r->print(&Apache::loncommon::end_data_table());
	&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
}	}

Line 4836 sub update_slots {	Line 5216 sub update_slots {
context => 'parameter',	context => 'parameter',
);	);
&Apache::lonnet::write_log('course','slotreservationslog',\%storehash,	&Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
'',$uname,$udom,$cnum,$cdom);	'',$uname,$udom,$cnum,$cdom);

&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,	&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
'',$uname,$udom,$uname,$udom);	'',$uname,$udom,$uname,$udom);
}	}
return $success;	return $success;
}	}
Line 4870 sub delete_slots {	Line 5250 sub delete_slots {
context => 'parameter',	context => 'parameter',
);	);
&Apache::lonnet::write_log('course','slotreservationslog',\%storehash,	&Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
1,$uname,$udom,$cnum,$cdom);	1,$uname,$udom,$cnum,$cdom);
&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,	&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
1,$uname,$udom,$uname,$udom);	1,$uname,$udom,$uname,$udom);
}	}
}	}
}	}
Line 4895 sub parameter_release_vars {	Line 5275 sub parameter_release_vars {
}	}

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

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

sub get_permission {
my %permission;
my $allowed = 0;
return (\%permission,$allowed) unless ($env{'request.course.id'});
if ((&Apache::lonnet::allowed('opa',$env{'request.course.id'})) \|\|
(&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
$env{'request.course.sec'}))) {
%permission= (
'edit' => 1,
'set' => 1,
'setoverview' => 1,
'addmetadata' => 1,
'ordermetadata' => 1,
'setrestrictmeta' => 1,
'newoverview' => 1,
'setdefaults' => 1,
'settable' => 1,
'parameterchangelog' => 1,
'cleanparameters' => 1,
'dateshift1' => 1,
'dateshift2' => 1,
'helper' => 1,
);
} elsif ((&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) \|\|
(&Apache::lonnet::allowed('vpa',$env{'request.course.id'}.'/'.
$env{'request.course.sec'}))) {
%permission = (
'set' => 1,
'settable' => 1,
'newoverview' => 1,
'setoverview' => 1,
'parameterchangelog' => 1,
);
}
foreach my $perm (values(%permission)) {
if ($perm) { $allowed=1; last; }
}
return (\%permission,$allowed);
}

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

Line 5021 sub handler {	Line 5316 sub handler {
'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});	'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});

# ----------------------------------------------------- Needs to be in a course	# ----------------------------------------------------- Needs to be in a course
my ($parm_permission,$allowed) = &get_permission();	my $parm_permission =
	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) \|\|
	&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
	$env{'request.course.sec'}));
my $exists = &check_for_course_info();	my $exists = &check_for_course_info();

if ($env{'request.course.id'} && $allowed && $exists) {	if ($env{'request.course.id'} && $parm_permission && $exists) {
#	#
# Main switch on form.action and form.state, as appropriate	# Main switch on form.action and form.state, as appropriate
#	#
# Check first if coming from someone else headed directly for	# Check first if coming from someone else headed directly for
# the table mode	# the table mode
if (($parm_permission->{'set'}) &&	if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
((($env{'form.command'} eq 'set') && ($env{'form.url'})	&& (!$env{'form.dis'})) \|\| ($env{'form.symb'})) {
&& (!$env{'form.dis'})) \|\| ($env{'form.symb'}))) {	&assessparms($r);
&assessparms($r,$parm_permission);
} elsif (! exists($env{'form.action'})) {	} elsif (! exists($env{'form.action'})) {
&print_main_menu($r,$parm_permission);	&print_main_menu($r,$parm_permission);
} elsif (!$parm_permission->{$env{'form.action'}}) {
&print_main_menu($r,$parm_permission);
} elsif ($env{'form.action'} eq 'setoverview') {	} elsif ($env{'form.action'} eq 'setoverview') {
&overview($r,$parm_permission);	&overview($r);
} elsif ($env{'form.action'} eq 'addmetadata') {	} elsif ($env{'form.action'} eq 'addmetadata') {
&addmetafield($r);	&addmetafield($r);
} elsif ($env{'form.action'} eq 'ordermetadata') {	} elsif ($env{'form.action'} eq 'ordermetadata') {
&order_meta_fields($r);	&order_meta_fields($r);
} elsif ($env{'form.action'} eq 'setrestrictmeta') {	} elsif ($env{'form.action'} eq 'setrestrictmeta') {
&setrestrictmeta($r);	&setrestrictmeta($r);
} elsif ($env{'form.action'} eq 'newoverview') {	} elsif ($env{'form.action'} eq 'newoverview') {
&newoverview($r,$parm_permission);	&newoverview($r);
} elsif ($env{'form.action'} eq 'setdefaults') {	} elsif ($env{'form.action'} eq 'setdefaults') {
&defaultsetter($r);	&defaultsetter($r);
} elsif ($env{'form.action'} eq 'settable') {	} elsif ($env{'form.action'} eq 'settable') {
&assessparms($r,$parm_permission);	&assessparms($r);
} elsif ($env{'form.action'} eq 'parameterchangelog') {	} elsif ($env{'form.action'} eq 'parameterchangelog') {
&parm_change_log($r,$parm_permission);	&parm_change_log($r);
} elsif ($env{'form.action'} eq 'cleanparameters') {	} elsif ($env{'form.action'} eq 'cleanparameters') {
&clean_parameters($r);	&clean_parameters($r);
} elsif ($env{'form.action'} eq 'dateshift1') {	} elsif ($env{'form.action'} eq 'dateshift1') {
&date_shift_one($r);	&date_shift_one($r);
} elsif ($env{'form.action'} eq 'dateshift2') {	} elsif ($env{'form.action'} eq 'dateshift2') {

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

Removed from v.1.522.2.23.4.1
changed lines
	Added in v.1.553