loncom/interface/domainprefs.pm - diff

Return to domainprefs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/domainprefs.pm between versions 1.342 and 1.344

version 1.342, 2018/11/24 16:48:01	version 1.344, 2018/12/08 15:03:25
Line 2842 function toggleLTI(form,setting,item) {	Line 2842 function toggleLTI(form,setting,item) {
if (setting == 'user') {	if (setting == 'user') {
radioname = 'lti_mapuser_'+item;	radioname = 'lti_mapuser_'+item;
divid = 'lti_userfield_'+item;	divid = 'lti_userfield_'+item;
} else if (settings == 'crs') {	} else if (setting == 'crs') {
radioname = 'lti_mapcrs_'+item;	radioname = 'lti_mapcrs_'+item;
divid = 'lti_crsfield_'+item;	divid = 'lti_crsfield_'+item;
} else {	} else {
Line 16642 sub modify_usersessions {	Line 16642 sub modify_usersessions {
} else {	} else {
foreach my $type (@{$types{$prefix}}) {	foreach my $type (@{$types{$prefix}}) {
if (defined($changes{$prefix}{$type})) {	if (defined($changes{$prefix}{$type})) {
my $newvalue;	my ($newvalue,$notinuse);
if (ref($defaultshash{'usersessions'}) eq 'HASH') {	if (ref($defaultshash{'usersessions'}) eq 'HASH') {
if (ref($defaultshash{'usersessions'}{$prefix})) {	if (ref($defaultshash{'usersessions'}{$prefix})) {
if ($type eq 'version') {	if ($type eq 'version') {
$newvalue = $defaultshash{'usersessions'}{$prefix}{$type};	$newvalue = $defaultshash{'usersessions'}{$prefix}{$type};
} elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {	} else {
if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {	if (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') {
$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});	if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) {
	$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}});
	}
	} else {
	$notinuse = 1;
}	}
}	}
}	}
Line 16657 sub modify_usersessions {	Line 16661 sub modify_usersessions {
if ($newvalue eq '') {	if ($newvalue eq '') {
if ($type eq 'version') {	if ($type eq 'version') {
$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>';
	} elsif ($notinuse) {
	$resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
} else {	} else {
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
}	}
} else {	} else {
if ($type eq 'version') {	if ($type eq 'version') {
$newvalue .= ' '.&mt('(or later)');	$newvalue .= ' '.&mt('(or later)');
}	}
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';
}	}
Line 16850 sub modify_ssl {	Line 16856 sub modify_ssl {
$resulttext .= '<li>'.$titles{$prefix}.'<ul>';	$resulttext .= '<li>'.$titles{$prefix}.'<ul>';
foreach my $type (@{$types{$prefix}}) {	foreach my $type (@{$types{$prefix}}) {
if (defined($changes{$prefix}{$type})) {	if (defined($changes{$prefix}{$type})) {
my $newvalue;	my ($newvalue,$notinuse);
if (ref($defaultshash{$action}) eq 'HASH') {	if (ref($defaultshash{$action}) eq 'HASH') {
if (ref($defaultshash{$action}{$prefix})) {	if (ref($defaultshash{$action}{$prefix})) {
if (($prefix eq 'connto') \|\| ($prefix eq 'connfrom')) {	if (($prefix eq 'connto') \|\| ($prefix eq 'connfrom')) {
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}};	$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}};
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {	} else {
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {	if (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') {
$newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}});	if (@{$defaultshash{$action}{$prefix}{$type}} > 0) {
	$newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}});
	}
	} else {
	$notinuse = 1;
}	}
}	}
}	}
if ($newvalue eq '') {	if ($notinuse) {
	$resulttext .= '<li>'.&mt('[_1] set to: not in use',$titles{$type}).'</li>';
	} elsif ($newvalue eq '') {
$resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>';
} else {	} else {
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>';
Line 16975 sub modify_trust {	Line 16987 sub modify_trust {
$resulttext .= '<li>'.$lt{$prefix}.'<ul>';	$resulttext .= '<li>'.$lt{$prefix}.'<ul>';
foreach my $type (@types) {	foreach my $type (@types) {
if (defined($changes{$prefix}{$type})) {	if (defined($changes{$prefix}{$type})) {
my $newvalue;	my ($newvalue,$notinuse);
if (ref($defaultshash{'trust'}) eq 'HASH') {	if (ref($defaultshash{'trust'}) eq 'HASH') {
if (ref($defaultshash{'trust'}{$prefix})) {	if (ref($defaultshash{'trust'}{$prefix})) {
if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') {	if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') {
if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) {	if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) {
$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}});	$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}});
}	}
	} else {
	$notinuse = 1;
}	}
}	}
}	}
if ($newvalue eq '') {	if ($notinuse) {
	$resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>';
	} elsif ($newvalue eq '') {
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>';
} else {	} else {
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>';

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

Removed from v.1.342
changed lines
	Added in v.1.344