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.584 and 1.590

version 1.584, 2017/12/18 23:13:53	version 1.590, 2019/02/18 13:46:05
Line 1065 sub valout {	Line 1065 sub valout {
# @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.	# @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.
# @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')	# @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')
# @param {string} $call - javascript function to call to submit the form ('psub')	# @param {string} $call - javascript function to call to submit the form ('psub')
# @param {boolean} $recursive - true if link is for a map/folder where parameter is currently set to be recursive.	# @param {boolean} $recursive - true if link is for a map/folder where parameter is currently set to be recursive.
	# @param {string} $extra - optional additional information to send as tenth arg in call to javascript pjump function.
sub plink {	sub plink {
my ($type,$dis,$value,$marker,$return,$call,$recursive)=@_;	my ($type,$dis,$value,$marker,$return,$call,$recursive,$extra)=@_;
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};
} else {	} else {
$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};	$winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
Line 1082 sub plink {	Line 1083 sub plink {
my $valout = &valout($value,$type,$parmname,1);	my $valout = &valout($value,$type,$parmname,1);
my $unencmarker = $marker;	my $unencmarker = $marker;
foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,	foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
\$hour, \$min, \$sec) {	\$hour, \$min, \$sec, \$extra) {
$$item = &HTML::Entities::encode($$item,'"<>&');	$$item = &HTML::Entities::encode($$item,'"<>&');
$$item =~ s/\'/\\\'/g;	$$item =~ s/\'/\\\'/g;
}	}
return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.	return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
.$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.	.$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."','".$extra."'".');">'.
$valout.'</a></td></tr>'.($recursive?'<tr><td align="center" class="LC_parm_recursive">'.	$valout.'</a></td></tr>'.($recursive?'<tr><td align="center" class="LC_parm_recursive">'.
&mt('recursive').'</td></tr>' : '').'</table>';	&mt('recursive').'</td></tr>' : '').'</table>';

Line 1107 sub page_js {	Line 1108 sub page_js {
$pjump_def	$pjump_def

function psub() {	function psub() {
	var specstring = /^string_/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') \|\|
	(specstring.test(document.parmform.pres_type.value) && (typedef[1]!='yesno'))) {
eval('document.parmform.recent_'+	eval('document.parmform.recent_'+
document.parmform.pres_type.value+	document.parmform.pres_type.value+
'.value=document.parmform.pres_value.value;');	'.value=document.parmform.pres_value.value;');
Line 1237 function validateParms() {	Line 1240 function validateParms() {
var patternLenientStd = /^(yes\|no\|default)$/;	var patternLenientStd = /^(yes\|no\|default)$/;
var ipallowRegExp = /^setipallow_/;	var ipallowRegExp = /^setipallow_/;
var ipdenyRegExp = /^setipdeny_/;	var ipdenyRegExp = /^setipdeny_/;
	var deeplinkRegExp = /^deeplink_(listing\|scope)_/;
	var deeplinkUrlsRegExp = /^deeplink_urls_/;
	var deeplinkltiRegExp = /^deeplink_lti_/;
	var deeplinkkeyRegExp = /^deeplink_key_/;
var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;	var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') {	if ((document.parmform.elements.length != 'undefined') && (document.parmform.elements.length) != 'null') {
if (document.parmform.elements.length) {	if (document.parmform.elements.length) {
for (i=0; i<document.parmform.elements.length; i++) {	for (i=0; i<document.parmform.elements.length; i++) {
var name=document.parmform.elements[i].name;	var name=document.parmform.elements[i].name;
if (textRegExp.test(name)) {	if (textRegExp.test(name)) {
var identifier = name.replace(textRegExp,'');	var identifier = name.replace(textRegExp,'');
if (tailLenient.test(identifier)) {	if (tailLenient.test(identifier)) {
if (document.parmform.elements['set_'+identifier].length) {	if (document.parmform.elements['set_'+identifier].length) {
Line 1265 function validateParms() {	Line 1272 function validateParms() {
}	}
}	}
}	}
} else {	} else if (ipallowRegExp.test(name)) {
if (ipallowRegExp.test(name)) {	var identifier = name.replace(ipallowRegExp,'');
var identifier = name.replace(ipallowRegExp,'');	var possallow = document.parmform.elements[i].value;
var possallow = document.parmform.elements[i].value;	possallow = possallow.replace(/^\s+\|\s+$/g,'');
possallow = possallow.replace(/^\s+\|\s+$/g,'');	if (patternIP.test(possallow)) {
if (patternIP.test(possallow)) {	if (document.parmform.elements['set_'+identifier].value) {
if (document.parmform.elements['set_'+identifier].value) {	possallow = ','+possallow;
possallow = ','+possallow;
}
document.parmform.elements['set_'+identifier].value += possallow;
}	}
} else {	document.parmform.elements['set_'+identifier].value += possallow;
if (ipdenyRegExp.test(name)) {	}
var identifier = name.replace(ipdenyRegExp,'');	} else if (ipdenyRegExp.test(name)) {
var possdeny = document.parmform.elements[i].value;	var identifier = name.replace(ipdenyRegExp,'');
possdeny = possdeny.replace(/^\s+\|\s+$/g,'');	var possdeny = document.parmform.elements[i].value;
if (patternIP.test(possdeny)) {	possdeny = possdeny.replace(/^\s+\|\s+$/g,'');
possdeny = '!'+possdeny;	if (patternIP.test(possdeny)) {
if (document.parmform.elements['set_'+identifier].value) {	possdeny = '!'+possdeny;
possdeny = ','+possdeny;	if (document.parmform.elements['set_'+identifier].value) {
}	possdeny = ','+possdeny;
document.parmform.elements['set_'+identifier].value += possdeny;	}
}	document.parmform.elements['set_'+identifier].value += possdeny;
	}
	} else if (deeplinkRegExp.test(name)) {
	var identifier = name.replace(deeplinkRegExp,'');
	var possdeeplink = document.parmform.elements[i].value;
	possdeeplink = possdeeplink.replace(/^\s+\|\s+$/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	possdeeplink = ','+possdeeplink;
	}
	document.parmform.elements['set_'+identifier].value += possdeeplink;
	} else if (deeplinkUrlsRegExp.test(name)) {
	if (document.parmform.elements[i].checked) {
	var identifier = name.replace(deeplinkUrlsRegExp,'');
	var posslinkurl = document.parmform.elements[i].value;
	posslinkurl = posslinkurl.replace(/^\s+\|\s+$/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslinkurl = ','+posslinkurl;
}	}
	document.parmform.elements['set_'+identifier].value += posslinkurl;
	}
	} else if (deeplinkltiRegExp.test(name)) {
	var identifier = name.replace(deeplinkltiRegExp,'');
	var posslti = document.parmform.elements[i].value;
	posslti = posslti.replace(/\D+/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslti = ':'+posslti;
	}
	document.parmform.elements['set_'+identifier].value += posslti;
	} else if (deeplinkkeyRegExp.test(name)) {
	var identifier = name.replace(deeplinkkeyRegExp,'');
	var posskey = document.parmform.elements[i].value;
	posskey = posskey.replace(/\W+/g,'');
	if (document.parmform.elements['set_'+identifier].value) {
	posslti = ':'+posskey;
}	}
	document.parmform.elements['set_'+identifier].value += posskey;
}	}
}	}
}	}
Line 1351 END	Line 1388 END

}	}

	# Javascript function toggle
	sub deeplink_js {
	return <<"END";
	function toggleDeepLink(form,item,key) {
	var radios = form['deeplink_'+item+'_'+key];
	if (radios.length) {
	var keybox;
	if (document.getElementById('deeplink_key_'+item+'_'+key)) {
	keybox = document.getElementById('deeplink_key_'+item+'_'+key);
	}
	var ltidiv;
	if (document.getElementById('deeplinkdiv_lti_'+item+'_'+key)) {
	ltidiv = document.getElementById('deeplinkdiv_lti_'+item+'_'+key);
	}
	for (var i=0; i<radios.length; i++) {
	if (radios[i].checked) {
	if (radios[i].value == 'lti') {
	ltidiv.style.display = 'inline-block';
	keybox.type = 'hidden';
	keybox.value = '';
	} else {
	if (ltidiv != '') {
	ltidiv.style.display = 'none';
	form['deeplink_lti_'+key].selectedIndex = 0;
	}
	if (radios[i].value == 'key') {
	keybox.type = 'text';
	} else {
	keybox.type = 'hidden';
	}
	}
	}
	}
	}
	}
	END

	}

# Prints HTML page start for table mode.	# Prints HTML page start for table mode.
# @param {Apache2::RequestRec} $r - the Apache request	# @param {Apache2::RequestRec} $r - the Apache request
# @param {string} $psymb - resource symb	# @param {string} $psymb - resource symb
Line 1477 sub print_row {	Line 1553 sub print_row {
my $mprefix=$rid.'&'.$thismarker.'&';	my $mprefix=$rid.'&'.$thismarker.'&';
my ($parmname)=($thismarker=~/\_([^\_]+)$/);	my ($parmname)=($thismarker=~/\_([^\_]+)$/);
my ($othergrp,$grp_parm,$controlgrp,$effective_parm,$effparm_rec,$effparm_level,	my ($othergrp,$grp_parm,$controlgrp,$effective_parm,$effparm_rec,$effparm_level,
$eff_groupparm,$recurse_check,$recursinfo);	$eff_groupparm,$recurse_check,$recursinfo,$extra);
if ((ref($recurseup) eq 'ARRAY') && (@{$recurseup} > 0)) {	if ((ref($recurseup) eq 'ARRAY') && (@{$recurseup} > 0)) {
if ($result eq '') {	if ($result eq '') {
$recurse_check = 1;	$recurse_check = 1;
Line 1535 sub print_row {	Line 1611 sub print_row {
($result == 16 \|\| $result == 10 \|\| $result == 6 \|\| $result == 2)) {	($result == 16 \|\| $result == 10 \|\| $result == 6 \|\| $result == 2)) {
$effparm_rec = 1;	$effparm_rec = 1;
}	}
	if ($parmname eq 'deeplink') {
	my %posslti;
	my %lti =
	&Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
	'provider');
	foreach my $item (keys(%lti)) {
	if (ref($lti{$item}) eq 'HASH') {
	unless ($lti{$item}{'requser'}) {
	$posslti{$item} = $lti{$item}{'consumer'};
	}
	}
	}
	if (keys(%posslti)) {
	$extra = 'lti_';
	foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
	$extra .= $lti.':'.&js_escape($posslti{$lti}).',';
	}
	$extra =~ s/,$//;
	}
	}
if ($parmlev eq 'general') {	if ($parmlev eq 'general') {
if ($uname) {	if ($uname) {
&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
} else {	} else {
&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
}	}
} elsif ($parmlev eq 'map') {	} elsif ($parmlev eq 'map') {
if ($uname) {	if ($uname) {
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
} elsif ($cgroup) {	} elsif ($cgroup) {
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
} elsif ($csec) {	} elsif ($csec) {
&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
} else {	} else {
&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
}	}
} else {	} else {
if ($uname) {	if ($uname) {
Line 1576 sub print_row {	Line 1672 sub print_row {
}	}
}	}

&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);

if ($csec) {	if ($csec) {
&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
}	}

if ($cgroup) {	if ($cgroup) {
&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);	&print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1);	&print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly);	&print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly,'',$extra);
}	}

if ($uname) {	if ($uname) {
if ($othergrp) {	if ($othergrp) {
$r->print($othergrp);	$r->print($othergrp);
}	}
&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);	&print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);	&print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
}	}
} # end of $parmlev if/else	} # end of $parmlev if/else
if (ref($recursinfo) eq 'ARRAY') {	if (ref($recursinfo) eq 'ARRAY') {
Line 1666 sub print_row {	Line 1762 sub print_row {
# @param {hash reference} $display - parameter key -> full title for the parameter	# @param {hash reference} $display - parameter key -> full title for the parameter
# @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters	# @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
# @param {boolean} $readonly -true if editing not allowed.	# @param {boolean} $readonly -true if editing not allowed.
# @param {boolean} $ismaplevel - true if level is for a map.	# @param {boolean} $ismaplevel - true if level is for a map.
	# @param {strring} $extra - extra informatio to pass to plink.
sub print_td {	sub print_td {
my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,	my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,
$noeditgrp,$readonly,$ismaplevel)=@_;	$noeditgrp,$readonly,$ismaplevel,$extra)=@_;
my ($ineffect,$recursive,$currval,$currtype,$currlevel);	my ($ineffect,$recursive,$currval,$currtype,$currlevel);
$ineffect = 0;	$ineffect = 0;
$currval = $$outpar[$which];	$currval = $$outpar[$which];
Line 1723 sub print_td {	Line 1820 sub print_td {
} else {	} else {
$r->print(&plink($currtype,	$r->print(&plink($currtype,
$$display{$value},$currval,	$$display{$value},$currval,
$mprefix.$currlevel,'parmform.pres','psub',$recursive));	$mprefix.$currlevel,'parmform.pres','psub',$recursive,
	$extra));
}	}
$r->print('</td>'."\n");	$r->print('</td>'."\n");
}	}
Line 1966 sub isdateparm {	Line 2064 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')));
	}

# Prints the HTML and Javascript to select parameters, with various shortcuts.	# Prints the HTML and Javascript to select parameters, with various shortcuts.
#	#
# @param {Apache2::RequestRec} $r - the Apache request	# @param {Apache2::RequestRec} $r - the Apache request
Line 2101 sub lookUpTableParameter {	Line 2207 sub lookUpTableParameter {
'buttonshide' => 'hiding',	'buttonshide' => 'hiding',
'turnoffeditor' => 'hiding',	'turnoffeditor' => 'hiding',
'encrypturl' => 'hiding',	'encrypturl' => 'hiding',
	'deeplink' => 'hiding',
'randomorder' => 'high_level_randomization',	'randomorder' => 'high_level_randomization',
'randompick' => 'high_level_randomization',	'randompick' => 'high_level_randomization',
'available' => 'slots',	'available' => 'slots',
Line 2321 sub usermenu {	Line 2428 sub usermenu {
if (($pssymb) \|\| &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	if (($pssymb) \|\| &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
%grouphash = &Apache::longroup::coursegroups();	%grouphash = &Apache::longroup::coursegroups();
} elsif ($env{'request.course.groups'} ne '') {	} elsif ($env{'request.course.groups'} ne '') {
map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});	map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
}	}

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

Line 2874 sub assessparms {	Line 2981 sub assessparms {
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 3171 sub assessparms {	Line 3278 sub assessparms {
&startpage($r,$pssymb,$crstype);	&startpage($r,$pssymb,$crstype);

foreach my $item ('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_'.$item},'"&<>').	&HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
'" name="recent_'.$item.'" />');	'" name="recent_'.$item.'" />');
Line 3831 sub readdata {	Line 3941 sub readdata {
# Stores parameter data, using form parameters directly.	# Stores parameter data, using form parameters directly.
#	#
# Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).	# Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).
# set_* (except settext, setipallow, setipdeny) - set a parameter value	# set_* (except settext, setipallow, setipdeny, setdeeplink) - set a parameter value
# del_* - remove a parameter	# del_* - remove a parameter
# datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)	# datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)
# dateinterval_* - set a date interval parameter (value refers to more form parameters)	# dateinterval_* - set a date interval parameter (value refers to more form parameters)
Line 3864 sub storedata {	Line 3974 sub storedata {
my $cmd=$1;	my $cmd=$1;
my $thiskey=$2;	my $thiskey=$2;
my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);	my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);
next if ($cmd eq 'rec' \|\| $cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny');	next if ($cmd eq 'rec' \|\| $cmd eq 'settext' \|\| $cmd eq 'setipallow' \|\| $cmd eq 'setipdeny' \|\| $cmd eq 'setdeeplink');
if ((($cmd eq 'set') \|\| ($cmd eq 'datepointer') \|\| ($cmd eq 'dateinterval') \|\| ($cmd eq 'del')) &&	if ((($cmd eq 'set') \|\| ($cmd eq 'datepointer') \|\| ($cmd eq 'dateinterval') \|\| ($cmd eq 'del')) &&
($thiskey =~ /(?:sequence\|page)\Q___(all)\E/)) {	($thiskey =~ /(?:sequence\|page)\Q___(all)\E/)) {
unless ($thiskey =~ /(encrypturl\|hiddenresource)$/) {	unless ($thiskey =~ /(encrypturl\|hiddenresource)$/) {
Line 3895 sub storedata {	Line 4005 sub storedata {
$text = &mt('Saved modified parameter for');	$text = &mt('Saved modified parameter for');
if ($typeof eq 'string_questiontype') {	if ($typeof eq 'string_questiontype') {
$name = 'type';	$name = 'type';
} elsif ($typeof eq 'string_lenient') {	} elsif (($typeof eq 'string_lenient') \|\| ($typeof eq 'string_deeplink')) {
$name = 'lenient';	($name) = ($typeof =~ /^string_(lenient\|deeplink)$/);
my $stringmatch = &standard_string_matches($typeof);	my $stringmatch = &standard_string_matches($typeof);
if (ref($stringmatch) eq 'ARRAY') {	if (ref($stringmatch) eq 'ARRAY') {
foreach my $item (@{$stringmatch}) {	foreach my $item (@{$stringmatch}) {
Line 4282 sub listdata {	Line 4392 sub listdata {
if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {	if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
%grouphash = &Apache::longroup::coursegroups();	%grouphash = &Apache::longroup::coursegroups();
} elsif ($env{'request.course.groups'} ne '') {	} elsif ($env{'request.course.groups'} ne '') {
map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});	map { $grouphash{$_} = 1; } split(/:/,$env{'request.course.groups'});
}	}
}	}

Line 4627 sub string_ip_selector {	Line 4737 sub string_ip_selector {
return $output;	return $output;
}	}

	sub string_deeplink_selector {
	my ($thiskey, $showval, $readonly) = @_;
	my (@components,%values,@current,%titles,%options,%optiontext,%defaults,%posslti);
	@components = ('listing','scope','urls');
	%titles = &Apache::lonlocal::texthash (
	listing => 'In Contents and/or Gradebook',
	scope => 'Access scope for link',
	urls => 'Supported link types',
	);
	%options = (
	listing => ['full','absent','grades','details','datestatus'],
	scope => ['res','map','rec'],
	urls => ['any','only','key','lti'],
	);
	%optiontext = &Apache::lonlocal::texthash (
	full => 'Listed (linked) in both',
	absent => 'Not listed',
	grades => 'Listed in grades only',
	details => 'Listed (unlinked) in both',
	datestatus => 'Listed (unlinked) inc. status in both',
	res => 'resource only',
	map => 'enclosing map/folder',
	rec => 'recursive map/folder',
	any => 'regular + deep',
	only => 'deep only',
	key => 'deep with key',
	lti => 'deep with LTI launch',
	);
	if ($showval =~ /,/) {
	@current = split(/,/,$showval);
	($values{'listing'}) = ($current[0] =~ /^(full\|absent\|grades\|details\|datestatus)$/);
	($values{'scope'}) = ($current[1] =~ /^(res\|map\|rec)$/);
	($values{'urls'}) = ($current[2] =~ /^(any\|only\|key:\w+\|lti:\d+)$/);
	} else {
	$defaults{'listing'} = 'full';
	$defaults{'scope'} = 'res';
	$defaults{'urls'} = 'any';
	}
	my $disabled;
	if ($readonly) {
	$disabled=' disabled="disabled"';
	}
	my %lti =
	&Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
	'provider');
	foreach my $item (keys(%lti)) {
	if (ref($lti{$item}) eq 'HASH') {
	unless ($lti{$item}{'requser'}) {
	$posslti{$item} = $lti{$item}{'consumer'};
	}
	}
	}
	my $output = '<input type="hidden" name="set_'.$thiskey.'" /><table><tr>';
	foreach my $item ('listing','scope','urls') {
	$output .= '<th>'.$titles{$item}.'</th>';
	}
	$output .= '</tr><tr>';
	foreach my $item (@components) {
	$output .= '<td>';
	if ($item eq 'urls') {
	my $selected = $values{$item};
	foreach my $option (@{$options{$item}}) {
	if ($option eq 'lti') {
	next unless (keys(%posslti));
	}
	my $checked;
	if ($selected =~ /^\Q$option\E/) {
	$checked = ' checked="checked"';
	}
	my $onclick;
	unless ($readonly) {
	my $esc_key = &js_escape($thiskey);
	$onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"';
	}
	$output .= '<span class="LC_nobreak"><label>'.
	'<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
	$optiontext{$option}.'</label>';
	if ($option eq 'key') {
	my $visibility="hidden";
	my $currkey;
	if ($checked) {
	$visibility = "text";
	$currkey = (split(/\:/,$values{$item}))[1];
	}
	$output .= ' '.
	'<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="6"'.$disabled.' />';
	} elsif ($option eq 'lti') {
	my $display="none";
	my ($currlti,$blankcheck);
	if ($checked) {
	$display = 'inline-block';
	$currlti = (split(/\:/,$values{$item}))[1];
	} else {
	$blankcheck = ' selected="selected"';
	}
	$output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
	' style="display: '.$display.'"> <select name="'.
	'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>'.
	'<option value=""'.$blankcheck.'>'.&mt('Select Provider').'</option>'."\n";
	foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
	my $selected;
	if ($lti == $currlti) {
	$selected = ' selected="selected"';
	}
	$output .= '<option value="'.$lti.'"'.$selected.'>'.$posslti{$lti}.'</option>';
	}
	$output .= '</select></div>';
	}
	$output .= '</span> ';
	}
	} else {
	my $selected = $values{$item};
	my $defsel;
	if ($selected eq '') {
	$defsel = ' selected="selected"';
	}
	$output .= '<select name="deeplink_'.$item.'_'.$thiskey.'"'.$disabled.'>'."\n".
	'<option value=""'.$defsel.'>'.&mt('Please select').'</option>'."\n";
	foreach my $option (@{$options{$item}}) {
	$output .= '<option value="'.$option.'"';
	if ($option eq $selected) {
	$output .= ' selected="selected"';
	}
	$output .= '>'.$optiontext{$option}.'</option>';
	}
	$output .= '</select>';
	}
	$output .= '</td>';
	}
	$output .= '</tr></table>'."\n";
	return $output;
	}


{ # block using some constants related to parameter types (overview mode)	{ # block using some constants related to parameter types (overview mode)

Line 4660 my %strings =	Line 4903 my %strings =
['no','No']],	['no','No']],
'string_ip'	'string_ip'
=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],	=> [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'],	['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
);	'string_deeplink'
	=> [['on','Set choices for link protection, resource listing, and access scope']],
	);


my %stringmatches = (	my %stringmatches = (
'string_lenient'	'string_lenient'
Line 4669 my %stringmatches = (	Line 4915 my %stringmatches = (
'string_ip'	'string_ip'
=> [['_allowfrom_','[^\!]+'],	=> [['_allowfrom_','[^\!]+'],
['_denyfrom_','\!']],	['_denyfrom_','\!']],
	'string_deeplink'
	=> [['on','^(full\|absent\|grades\|details\|datestatus)\,(res\|map\|rec)\,(any\|only\|key\:\w+\|lti\:\d+)$']],
);	);

my %stringtypes = (	my %stringtypes = (
Line 4678 my %stringtypes = (	Line 4926 my %stringtypes = (
discussvote => 'string_discussvote',	discussvote => 'string_discussvote',
examcode => 'string_examcode',	examcode => 'string_examcode',
acc => 'string_ip',	acc => 'string_ip',
	deeplink => 'string_deeplink',
);	);

# Returns the possible values and titles for a given string type, or undef if there are none.	# Returns the possible values and titles for a given string type, or undef if there are none.
Line 4737 sub string_selector {	Line 4986 sub string_selector {
($thistype eq 'string_lenient') \|\|	($thistype eq 'string_lenient') \|\|
($thistype eq 'string_discussvote') \|\|	($thistype eq 'string_discussvote') \|\|
($thistype eq 'string_ip') \|\|	($thistype eq 'string_ip') \|\|
	($thistype eq 'string_deeplink') \|\|
($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} }) {
Line 4775 sub string_selector {	Line 5025 sub string_selector {

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

my ($result,$disabled);	my ($result,$disabled);
Line 5189 sub newoverview {	Line 5441 sub newoverview {
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
&done_proctor_js()."\n".	&done_proctor_js()."\n".
	&deeplink_js()."\n".
'// ]]>	'// ]]>
</script>	</script>
';	';
Line 5410 sub overview {	Line 5663 sub overview {
&validateparms_js()."\n".	&validateparms_js()."\n".
&ipacc_boxes_js()."\n".	&ipacc_boxes_js()."\n".
&done_proctor_js()."\n".	&done_proctor_js()."\n".
	&deeplink_js()."\n".
'// ]]>'."\n".	'// ]]>'."\n".
'</script>'."\n";	'</script>'."\n";
&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',	&Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
Line 5975 sub continue {	Line 6229 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 6003 sub addmetafield {	Line 6257 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 6015 sub addmetafield {	Line 6272 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('<label><input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'</label><br /');	$r->print('<label><input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'</label><br /');
}	}
$r->print('<input type="submit" name="undelete" value="Undelete" />');	$r->print('<input type="submit" name="undelete" value="'.&mt('Undelete').'" />');
$r->print('</form>');	$r->print('</form>');
}	}
$r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.'.	$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">');	'<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>');
}	}
&endSettingsScreen($r);	&endSettingsScreen($r);
Line 6058 sub setrestrictmeta {	Line 6322 sub setrestrictmeta {
&startSettingsScreen($r,'parmset',$crstype);	&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 = '';
	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 6096 sub setrestrictmeta {	Line 6365 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); # FIXME: wrong parameters
}	}
$output .= &Apache::loncommon::end_data_table();	$output .= &Apache::loncommon::end_data_table();
$r->print(<<ENDenv);	$r->print(<<ENDenv);

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

Removed from v.1.584
changed lines
	Added in v.1.590