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.24 and 1.522.2.26.2.1

version 1.522.2.24, 2018/09/03 20:23:37	version 1.522.2.26.2.1, 2020/01/15 00:38:38
Line 36 lonparmset - Handler to set parameters f	Line 36 lonparmset - Handler to set parameters f

=head1 SYNOPSIS	=head1 SYNOPSIS

lonparmset provides an interface to setting course parameters.	lonparmset provides an interface to setting content parameters in a
	course.

=head1 DESCRIPTION	=head1 DESCRIPTION

Line 129 javascript function 'pjump'.	Line 130 javascript function 'pjump'.

=item print_td()	=item print_td()

=item print_usergroups()	=item check_other_groups()

=item parm_control_group()	=item parm_control_group()

Line 766 sub valout {	Line 767 sub valout {
}	}
} else {	} else {
if ($type eq 'date_interval') {	if ($type eq 'date_interval') {
my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);	my ($totalsecs,$donesuffix) = split(/_/,$value,2);
	my ($usesdone,$donebuttontext,$proctor,$secretkey);
	if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
	$donebuttontext = $1;
	(undef,$proctor,$secretkey) = split(/_/,$2);
	$usesdone = 'done';
	} elsif ($donesuffix =~ /^done(\|_.+)$/) {
	$donebuttontext = &mt('Done');
	($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
	}
	my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
my @timer;	my @timer;
$year=$year-70;	$year=$year-70;
$mday--;	$mday--;
Line 799 sub valout {	Line 810 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 816 sub plink {	Line 834 sub plink {
my ($type,$dis,$value,$marker,$return,$call)=@_;	my ($type,$dis,$value,$marker,$return,$call)=@_;
my $winvalue=$value;	my $winvalue=$value;
unless ($winvalue) {	unless ($winvalue) {
if (&isdateparm($type)) {	if ((&isdateparm($type)) \|\| (&is_specialstring($type))) {
$winvalue=$env{'form.recent_'.$type};	$winvalue=$env{'form.recent_'.$type};
	} elsif ($type eq 'string_yesno') {
	if ($env{'form.recent_string'} =~ /^(yes\|no)$/i) {
	$winvalue=$env{'form.recent_string'};
	}
} else {	} else {
$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};	$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
}	}
Line 850 sub page_js {	Line 872 sub page_js {
$pjump_def	$pjump_def

function psub() {	function psub() {
	var specstring = /^string_!(yesno\|any)/i;
if (document.parmform.pres_marker.value!='') {	if (document.parmform.pres_marker.value!='') {
document.parmform.action+='#'+document.parmform.pres_marker.value;	document.parmform.action+='#'+document.parmform.pres_marker.value;
var typedef=new Array();	var typedef=new Array();
typedef=document.parmform.pres_type.value.split('_');	typedef=document.parmform.pres_type.value.split('_');
if (document.parmform.pres_type.value!='') {	if (document.parmform.pres_type.value!='') {
if (typedef[0]=='date') {	if ((typedef[0]=='date') \|\|
eval('document.parmform.recent_'+	(specstring.test(document.parmform.pres_type.value))) {
document.parmform.pres_type.value+	eval('document.parmform.recent_'+
'.value=document.parmform.pres_value.value;');	document.parmform.pres_type.value+
} else {	'.value=document.parmform.pres_value.value;');
eval('document.parmform.recent_'+typedef[0]+	} else {
'.value=document.parmform.pres_value.value;');	eval('document.parmform.recent_'+typedef[0]+
	'.value=document.parmform.pres_value.value;');
	}
}	}
}
document.parmform.submit();	document.parmform.submit();
} else {	} else {
document.parmform.pres_value.value='';	document.parmform.pres_value.value='';
Line 905 function showHide_courseContent() {	Line 929 function showHide_courseContent() {
COURSECONTENTSCRIPT	COURSECONTENTSCRIPT
}	}

	sub validateparms_js {
	return <<'ENDSCRIPT';

	function validateParms() {
	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 (ipallowRegExp.test(name)) {
	var identifier = name.replace(ipallowRegExp,'');
	var possallow = document.parmform.elements[i].value;
	possallow = possallow.replace(/^\s+\|\s+$/g,'');
	if (patternIP.test(possallow)) {
	if (document.parmform.elements['set_'+identifier].value) {
	possallow = ','+possallow;
	}
	document.parmform.elements['set_'+identifier].value += possallow;
	}
	} else if (ipdenyRegExp.test(name)) {
	var identifier = name.replace(ipdenyRegExp,'');
	var possdeny = document.parmform.elements[i].value;
	possdeny = possdeny.replace(/^\s+\|\s+$/g,'');
	if (patternIP.test(possdeny)) {
	possdeny = '!'+possdeny;
	if (document.parmform.elements['set_'+identifier].value) {
	possdeny = ','+possdeny;
	}
	}
	}
	}
	}
	}
	return true;
	}

	ENDSCRIPT
	}

	# Javascript initialization, for overview mode
	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 done_proctor_js {
	return <<"END";
	function toggleSecret(form,radio,key) {
	var radios = form[radio+key];
	if (radios.length) {
	for (var i=0; i<radios.length; i++) {
	if (radios[i].checked) {
	if (radios[i].value == '_done_proctor') {
	if (document.getElementById('done_'+key+'_proctorkey')) {
	document.getElementById('done_'+key+'_proctorkey').type='text';
	}
	} else {
	if (document.getElementById('done_'+key+'_proctorkey')) {
	document.getElementById('done_'+key+'_proctorkey').type='hidden';
	document.getElementById('done_'+key+'_proctorkey').value='';
	}
	}
	}
	}
	}
	}
	END

	}

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

Line 1024 sub print_row {	Line 1139 sub print_row {
if (@{$usersgroups} > 1) {	if (@{$usersgroups} > 1) {
my ($coursereply,$grp_parm,$controlgrp);	my ($coursereply,$grp_parm,$controlgrp);
($coursereply,$othergrp,$grp_parm,$controlgrp) =	($coursereply,$othergrp,$grp_parm,$controlgrp) =
&print_usergroups($r,$$part{$which}.'.'.$$name{$which},	&check_other_groups($$part{$which}.'.'.$$name{$which},
$rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);	$rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
if ($coursereply && $result > 3) {	if ($coursereply && $result > 3) {
if (defined($controlgrp)) {	if (defined($controlgrp)) {
Line 1117 sub print_td {	Line 1232 sub print_td {
$r->print('</td>'."\n");	$r->print('</td>'."\n");
}	}

sub print_usergroups {	sub check_other_groups {
my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;	my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
my $courseid = $env{'request.course.id'};	my $courseid = $env{'request.course.id'};
my $output;	my $output;
my $symb = &symbcache($rid);	my $symb = &symbcache($rid);
Line 1133 sub print_usergroups {	Line 1248 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);
}	}
$grp_parm = &valout($coursereply,$resulttype);	$grp_parm = &valout($coursereply,$resulttype);
$output = '<td style="background-color:'.$bgcolor.';" align="center">';	$output = '<td style="background-color:'.$bgcolor.';" align="center">';
Line 1279 sub isdateparm {	Line 1393 sub isdateparm {
return (($type=~/^date/) && (!($type eq 'date_interval')));	return (($type=~/^date/) && (!($type eq 'date_interval')));
}	}

	# Determine if parameter type is specialized string type (i.e.,
	# not just string or string_yesno.

	sub is_specialstring {
	my $type=shift;
	return (($type=~/^string_/) && (($type ne 'string_yesno')));
	}

#	#
# parmmenu displays a list of the selected parameters.	# parmmenu displays a list of the selected parameters.
# It also offers a link to show/hide the complete parameter list	# It also offers a link to show/hide the complete parameter list
# from which you can select all desired parameters.	# from which you can select all desired parameters.
#	#
sub parmmenu {	sub parmmenu {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r)=@_;
my $tempkey;
$r->print(<<ENDSCRIPT);	$r->print(<<ENDSCRIPT);
<script type="text/javascript">	<script type="text/javascript">
// <![CDATA[	// <![CDATA[
Line 1365 sub parmmenu {	Line 1486 sub parmmenu {
ENDSCRIPT	ENDSCRIPT

$r->print('<hr />');	$r->print('<hr />');
&shortCuts($r,$allparms,$pscat,$keyorder);	&shortCuts($r);
$r->print('<hr />');	$r->print('<hr />');
}	}
# return a hash	# return a hash
Line 1430 sub lookUpTableParameter {	Line 1551 sub lookUpTableParameter {
'retrypartial' => 'tries',	'retrypartial' => 'tries',
'discussvote' => 'misc',	'discussvote' => 'misc',
'examcode' => 'high_level_randomization',	'examcode' => 'high_level_randomization',
);	);
}	}

sub whatIsMyCategory {	sub whatIsMyCategory {
Line 1512 sub parmboxes {	Line 1633 sub parmboxes {
.&mt($categories{$key})	.&mt($categories{$key})
.'</h4>'."\n");	.'</h4>'."\n");
foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {	foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
	next if ($tempkey eq '');
$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.'" ');
Line 1531 sub parmboxes {	Line 1653 sub parmboxes {
# 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
#	#
sub shortCuts {	sub shortCuts {
my ($r,$allparms,$pscat,$keyorder)=@_;	my ($r)=@_;

# Parameter Selection	# Parameter Selection
$r->print(	$r->print(
Line 1701 function group_or_section(caller) {	Line 1823 function group_or_section(caller) {
# This function shows on table Mode the available Parameters for the selected Resources	# This function shows on table Mode the available Parameters for the selected Resources
#	#
sub displaymenu {	sub displaymenu {
my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;	my ($r,$allparms,$pscat,$keyorder,$divid)=@_;

$r->print(&Apache::lonhtmlcommon::start_pick_box());	$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));	$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));

&parmmenu($r,$allparms,$pscat,$keyorder);	&parmmenu($r);
$r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));	$r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
&parmboxes($r,$allparms,$pscat,$keyorder);	&parmboxes($r,$allparms,$pscat,$keyorder);
$r->print(&Apache::loncommon::end_scrollbox());	$r->print(&Apache::loncommon::end_scrollbox());
Line 1906 sub sectionmenu {	Line 2028 sub sectionmenu {
}	}
$output .= '>'."$s</option>\n";	$output .= '>'."$s</option>\n";
}	}
$output .= "</select>\n");	$output .= "</select>\n";
return $output;	return $output;
}	}

Line 2279 sub assessparms {	Line 2401 sub assessparms {

&startpage($r,$pssymb);	&startpage($r,$pssymb);

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','string_lenient',
	'string_examcode','string_deeplink','string_discussvote',
	'string_useslots','string_problemstatus','string_ip',
	'string_questiontype') {
$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 2329 ENDPARMSELSCRIPT	Line 2454 ENDPARMSELSCRIPT

# Step 2	# Step 2
$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));	$r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
&displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');	&displaymenu($r,\%allparms,\@pscat,\%keyorder,'parmmenuscroll');

# 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'));
Line 2895 sub storedata {	Line 3020 sub storedata {
if ($key =~ /^form\.([a-z]+)\_(.+)$/) {	if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
my $cmd=$1;	my $cmd=$1;
my $thiskey=$2;	my $thiskey=$2;
	next if ($cmd eq 'setipallow' \|\| $cmd eq 'setipdeny');
my ($tuname,$tudom)=&extractuser($thiskey);	my ($tuname,$tudom)=&extractuser($thiskey);
my $tkey=$thiskey;	my $tkey=$thiskey;
if ($tuname) {	if ($tuname) {
Line 3225 sub listdata {	Line 3351 sub listdata {
);	);
}	}
} elsif ($thistype eq 'date_interval') {	} elsif ($thistype eq 'date_interval') {
$r->print(&date_interval_selector($thiskey,	$r->print(&date_interval_selector($thiskey,$name,
$$resourcedata{$thiskey},$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 3245 sub listdata {	Line 3371 sub listdata {


sub date_interval_selector {	sub date_interval_selector {
my ($thiskey, $showval, $readonly) = @_;	my ($thiskey, $pname, $showval, $readonly) = @_;
my $result;	my ($result,%skipval);
	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 3260 sub date_interval_selector {	Line 3387 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 3292 sub default_selector {	Line 3464 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 ($readonly) {
	$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 3319 my %strings =	Line 3553 my %strings =
=> [['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']],
);	);

sub standard_string_options {	sub standard_string_options {
Line 3359 sub string_selector {	Line 3596 sub string_selector {
}	}
}	}
}	}

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

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

Line 3413 sub string_selector {	Line 3654 sub string_selector {
return $result;	return $result;
}	}

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

	}

#	#
# Shift all start and end dates by $shift	# Shift all start and end dates by $shift
#	#
Line 3469 sub newoverview {	Line 3759 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".
'// ]]>	'// ]]>
</script>	</script>
';	';
Line 3658 sub overview {	Line 3949 sub overview {
my ($r,$parm_permission) = @_;	my ($r,$parm_permission) = @_;
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 $js = '<script type="text/javascript">'."\n".
	'// <![CDATA['."\n".
	&done_proctor_js()."\n".
	'// ]]>'."\n".
	'</script>'."\n";
my $readonly = 1;	my $readonly = 1;
if ($parm_permission->{'edit'}) {	if ($parm_permission->{'edit'}) {
undef($readonly);	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');	my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);
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">');	$r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
Line 3764 ENDOVER	Line 4061 ENDOVER
$r->print(&mt('All users'));	$r->print(&mt('All users'));
} elsif ($data{'scope_type'} eq 'user') {	} elsif ($data{'scope_type'} eq 'user') {
$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));	$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
} elsif ($data{'scope_type'} eq 'section') {	} elsif ($data{'scope_type'} eq 'secgroup') {
$r->print(&mt('Section: [_1]',$data{'scope'}));	$r->print(&mt('Group/Section: [_1]',$data{'scope'}));
} elsif ($data{'scope_type'} eq 'group') {
$r->print(&mt('Group: [_1]',$data{'scope'}));
}	}
$r->print('<br />');	$r->print('<br />');
if ($data{'realm_type'} eq 'all') {	if ($data{'realm_type'} eq 'all') {
Line 3853 sub parse_key {	Line 4148 sub parse_key {
$data{'scope_type'} = 'user';	$data{'scope_type'} = 'user';
$data{'scope'} = [$1,$2];	$data{'scope'} = [$1,$2];
} else {	} else {
#FIXME check for group scope	$data{'scope_type'} = 'secgroup';
$data{'scope_type'} = 'section';
}	}
$middle=~s/^\[(.*)\]//;	$middle=~s/^\[(.*)\]//;
}	}
Line 4168 sub continue {	Line 4462 sub continue {
my $output;	my $output;
$output .= '<form action="" method="post">';	$output .= '<form action="" method="post">';
$output .= '<input type="hidden" name="action" value="setrestrictmeta" />';	$output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
$output .= '<input type="submit" value="Continue" />';	$output .= '<input type="submit" value="'.&mt('Continue').'" />';
return ($output);	return ($output);
}	}

Line 4190 sub addmetafield {	Line 4484 sub addmetafield {
my $put_result = &Apache::lonnet::put('environment',	my $put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);	{'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);

$r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');	$r->print(&mt('Undeleted Metadata Field [_1] with result [_2]',
	'<strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}.
	'</strong>',$put_result).
	'<br />');
}	}
$r->print(&continue());	$r->print(&continue());
} elsif (exists($env{'form.fieldname'})) {	} elsif (exists($env{'form.fieldname'})) {
Line 4202 sub addmetafield {	Line 4499 sub addmetafield {
{'metadata.'.$meta_field.'.values'=>"",	{'metadata.'.$meta_field.'.values'=>"",
'metadata.'.$meta_field.'.added'=>"$display_field",	'metadata.'.$meta_field.'.added'=>"$display_field",
'metadata.'.$meta_field.'.options'=>""},$dom,$crs);	'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
$r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');	$r->print(&mt('Added new Metadata Field [_1] with result [_2]',
	'<strong>'.$env{'form.fieldname'}.'</strong>',$put_result).
	'<br />');
$r->print(&continue());	$r->print(&continue());
} else {	} else {
my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});	my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
if ($fields) {	if ($fields) {
$r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');	$r->print(&mt('You may undelete previously deleted fields.').
	'<br />'.
	&mt('Check those you wish to undelete and click Undelete.').
	'<br />');
$r->print('<form method="post" action="">');	$r->print('<form method="post" action="">');
foreach my $key(keys(%$fields)) {	foreach my $key(keys(%$fields)) {
$r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');	$r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
Line 4215 sub addmetafield {	Line 4517 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 />'.
	&mt('[_1]Or[_2] you may enter a new metadata field name.',
	'<strong>','</strong>').
	'<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="'.&mt('Add Metadata Field').'" />');
}	}
$r->print('</form>');	$r->print('</form>');
}	}
Line 4238 sub setrestrictmeta {	Line 4543 sub setrestrictmeta {
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};	my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
my $save_field = '';	my $save_field = '';
	my %lt = &Apache::lonlocal::texthash(
	addm => 'Add Metadata Field',
	ordm => 'Order Metadata Fields',
	save => 'Save',
	);
if ($env{'form.restrictmeta'}) {	if ($env{'form.restrictmeta'}) {
foreach my $field (sort(keys(%env))) {	foreach my $field (sort(keys(%env))) {
if ($field=~m/^form.(.+)_(.+)$/) {	if ($field=~m/^form.(.+)_(.+)$/) {
Line 4276 sub setrestrictmeta {	Line 4586 sub setrestrictmeta {
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');	my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
# Now get possible added metadata fields	# Now get possible added metadata fields
my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});	my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $row_alt = 1;
$output .= &Apache::loncommon::start_data_table();	$output .= &Apache::loncommon::start_data_table();
foreach my $field (sort(keys(%metadata_fields))) {	foreach my $field (sort(keys(%metadata_fields))) {
if ($field ne 'courserestricted') {	if ($field ne 'courserestricted') {
$row_alt = $row_alt ? 0 : 1;
$output.= &output_row($r, $field, $metadata_fields{$field});	$output.= &output_row($r, $field, $metadata_fields{$field});
}	}
}	}
my $buttons = (<<ENDButtons);	my $buttons = (<<ENDButtons);
<input type="submit" name="restrictmeta" value="Save" />	<input type="submit" name="restrictmeta" value="$lt{'save'}" />
</form><br />	</form><br />
<form method="post" action="/adm/parmset?action=addmetadata" name="form1">	<form method="post" action="/adm/parmset?action=addmetadata" name="form1">
<input type="submit" name="restrictmeta" value="Add a Metadata Field" />	<input type="submit" name="restrictmeta" value="$lt{'addm'}" />
</form>	</form>
<br />	<br />
<form method="post" action="/adm/parmset?action=ordermetadata" name="form2">	<form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
<input type="submit" name="restrictmeta" value="Order Metadata Fields" />	<input type="submit" name="restrictmeta" value="$lt{'ordm'}" />
ENDButtons	ENDButtons
my $added_flag = 1;	my $added_flag = 1;
foreach my $field (sort(keys(%$added_metadata_fields))) {	foreach my $field (sort(keys(%$added_metadata_fields))) {
$row_alt = $row_alt ? 0 : 1;	$output.= &output_row($r,$field,$$added_metadata_fields{$field},$added_flag);
$output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
}	}
$output .= &Apache::loncommon::end_data_table();	$output .= &Apache::loncommon::end_data_table();
$r->print(<<ENDenv);	$r->print(<<ENDenv);
Line 4542 my %standard_parms;	Line 4849 my %standard_parms;
my %standard_parms_types;	my %standard_parms_types;

sub load_parameter_names {	sub load_parameter_names {
open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");	open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
while (my $configline=<$config>) {	while (my $configline=<$config>) {
if ($configline !~ /\S/ \|\| $configline=~/^\#/) { next; }	if ($configline !~ /\S/ \|\| $configline=~/^\#/) { next; }
chomp($configline);	chomp($configline);
Line 4557 sub load_parameter_names {	Line 4864 sub load_parameter_names {
close($config);	close($config);
$standard_parms{'int_pos'} = 'Positive Integer';	$standard_parms{'int_pos'} = 'Positive Integer';
$standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';	$standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
	$standard_parms{'scoreformat'} = 'Format for display of score';
}	}

sub standard_parameter_names {	sub standard_parameter_names {
Line 4898 sub parameter_releasecheck {	Line 5206 sub parameter_releasecheck {
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 {	sub get_permission {
my %permission;	my %permission;
my $allowed = 0;	my $allowed = 0;

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

Removed from v.1.522.2.24
changed lines
	Added in v.1.522.2.26.2.1