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.160.6.84.4.1 and 1.160.6.97

version 1.160.6.84.4.1, 2017/08/15 23:40:33	version 1.160.6.97, 2019/08/17 19:24:29
Line 363 sub handler {	Line 363 sub handler {
modify => \&modify_usermodification,	modify => \&modify_usermodification,
},	},
'scantron' =>	'scantron' =>
{ text => 'Bubblesheet format file',	{ text => 'Bubblesheet format',
help => 'Domain_Configuration_Scantron_Format',	help => 'Domain_Configuration_Scantron_Format',
header => [ {col1 => 'Item',	header => [ {col1 => 'Bubblesheet format file',
col2 => '',	col2 => ''},
}],	{col1 => 'Bubblesheet data upload formats',
	col2 => 'Settings'}],
print => \&print_scantron,	print => \&print_scantron,
modify => \&modify_scantron,	modify => \&modify_scantron,
},	},
Line 534 END	Line 535 END
if (grep(/^contacts$/,@actions)) {	if (grep(/^contacts$/,@actions)) {
$js .= &contacts_javascript();	$js .= &contacts_javascript();
}	}
	if (grep(/^scantron$/,@actions)) {
	$js .= &scantron_javascript();
	}
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);	&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js);
} else {	} else {
# check if domconfig user exists for the domain.	# check if domconfig user exists for the domain.
Line 722 sub print_config_box {	Line 726 sub print_config_box {
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);	$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal);
} elsif ($action eq 'coursecategories') {	} elsif ($action eq 'coursecategories') {
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);	$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal);
	} elsif ($action eq 'scantron') {
	$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal);
} elsif ($action eq 'login') {	} elsif ($action eq 'login') {
if ($numheaders == 4) {	if ($numheaders == 4) {
$colspan = ' colspan="2"';	$colspan = ' colspan="2"';
Line 777 sub print_config_box {	Line 783 sub print_config_box {
($action eq 'defaults') \|\| ($action eq 'directorysrch') \|\|	($action eq 'defaults') \|\| ($action eq 'directorysrch') \|\|
($action eq 'helpsettings')) {	($action eq 'helpsettings')) {
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);	$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
	} elsif ($action eq 'scantron') {
	$output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal);
} elsif ($action eq 'login') {	} elsif ($action eq 'login') {
if ($numheaders == 4) {	if ($numheaders == 4) {
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'	$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).'
Line 935 sub print_config_box {	Line 943 sub print_config_box {
} elsif (($action eq 'autoenroll') \|\| ($action eq 'autocreate') \|\|	} elsif (($action eq 'autoenroll') \|\| ($action eq 'autocreate') \|\|
($action eq 'serverstatuses') \|\| ($action eq 'loadbalancing')) {	($action eq 'serverstatuses') \|\| ($action eq 'loadbalancing')) {
$output .= $item->{'print'}->($dom,$settings,\$rowtotal);	$output .= $item->{'print'}->($dom,$settings,\$rowtotal);
} elsif ($action eq 'scantron') {
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
}	}
}	}
$output .= '	$output .= '
Line 1281 sub print_login {	Line 1287 sub print_login {
} else {	} else {
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />';	$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />';
}	}
$datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';	$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>';
}	}
$datatable .= '</table></td></tr>';	$datatable .= '</table></td></tr>';
}	}
Line 1441 sub display_color_options {	Line 1447 sub display_color_options {
my $datatable = '<tr'.$css_class.'>'.	my $datatable = '<tr'.$css_class.'>'.
'<td>'.$choices->{'font'}.'</td>';	'<td>'.$choices->{'font'}.'</td>';
if (!$is_custom->{'font'}) {	if (!$is_custom->{'font'}) {
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';	$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
} else {	} else {
$datatable .= '<td> </td>';	$datatable .= '<td> </td>';
}	}
Line 1450 sub display_color_options {	Line 1456 sub display_color_options {
$datatable .= '<td><span class="LC_nobreak">'.	$datatable .= '<td><span class="LC_nobreak">'.
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.	'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'.
' value="'.$current_color.'" /> '.	' value="'.$current_color.'" /> '.
' </td></tr>';	' </span></td></tr>';
unless ($role eq 'login') {	unless ($role eq 'login') {
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td>'.$choices->{'fontmenu'}.'</td>';	'<td>'.$choices->{'fontmenu'}.'</td>';
if (!$is_custom->{'fontmenu'}) {	if (!$is_custom->{'fontmenu'}) {
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';	$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
} else {	} else {
$datatable .= '<td> </td>';	$datatable .= '<td> </td>';
}	}
Line 1465 sub display_color_options {	Line 1471 sub display_color_options {
'<input class="colorchooser" type="text" size="10" name="'	'<input class="colorchooser" type="text" size="10" name="'
.$role.'_fontmenu"'.	.$role.'_fontmenu"'.
' value="'.$current_color.'" /> '.	' value="'.$current_color.'" /> '.
' </td></tr>';	' </span></td></tr>';
}	}
my $switchserver = &check_switchserver($dom,$confname);	my $switchserver = &check_switchserver($dom,$confname);
foreach my $img (@{$images}) {	foreach my $img (@{$images}) {
Line 1524 sub display_color_options {	Line 1530 sub display_color_options {
if ($fullwidth ne '' && $fullheight ne '') {	if ($fullwidth ne '' && $fullheight ne '') {
if ($fullwidth > $width && $fullheight > $height) {	if ($fullwidth > $width && $fullheight > $height) {
my $size = $width.'x'.$height;	my $size = $width.'x'.$height;
system("convert -sample $size $input $output");	my @args = ('convert','-sample',$size,$input,$output);
	system({$args[0]} @args);
$showfile = "/$imgdir/tn-".$filename;	$showfile = "/$imgdir/tn-".$filename;
}	}
}	}
Line 1582 sub display_color_options {	Line 1589 sub display_color_options {
my $bgs_def;	my $bgs_def;
foreach my $item (@{$bgs}) {	foreach my $item (@{$bgs}) {
if (!$is_custom->{$item}) {	if (!$is_custom->{$item}) {
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">   </span><br />'.$defaults->{'bgs'}{$item}.'</td>';	$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';">   </span><br />'.$defaults->{'bgs'}{$item}.'</td>';
}	}
}	}
if ($bgs_def) {	if ($bgs_def) {
Line 1610 sub display_color_options {	Line 1617 sub display_color_options {
my $links_def;	my $links_def;
foreach my $item (@{$links}) {	foreach my $item (@{$links}) {
if (!$is_custom->{$item}) {	if (!$is_custom->{$item}) {
$links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';	$links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>';
}	}
}	}
if ($links_def) {	if ($links_def) {
Line 1696 sub image_changes {	Line 1703 sub image_changes {
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;	my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
my $output;	my $output;
if ($img eq 'login') {	if ($img eq 'login') {
# suppress image for Log-in header	$output = '</td><td>'.$logincolors; # suppress image for Log-in header
} elsif (!$is_custom) {	} elsif (!$is_custom) {
if ($img ne 'domlogo') {	if ($img ne 'domlogo') {
$output .= &mt('Default image:').'<br />';	$output = &mt('Default image:').'<br />';
} else {	} else {
$output .= &mt('Default in use:').'<br />';	$output = &mt('Default in use:').'<br />';
}	}
}	}
if ($img eq 'login') { # suppress image for Log-in header	if ($img ne 'login') {
$output .= '<td>'.$logincolors;
} else {
if ($img_import) {	if ($img_import) {
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';	$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
}	}
Line 2329 sub print_textbookcourses {	Line 2334 sub print_textbookcourses {
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';	$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
}	}
$datatable .= '</select> '."\n".	$datatable .= '</select> '."\n".
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n".	'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</span></td>'."\n".
'<td colspan="2">'.	'<td colspan="2">'.
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n".	'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n".
(' 'x2).	(' 'x2).
Line 2346 sub print_textbookcourses {	Line 2351 sub print_textbookcourses {
} else {	} else {
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />';	$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />';
}	}
	$datatable .= '</span>'."\n";
}	}
$datatable .= '</span>'."\n".	$datatable .= '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '.
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '.
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').	&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom').
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'.	'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'.
&Apache::loncommon::selectcourse_link	&Apache::loncommon::selectcourse_link
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course');	('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course').
'</span></td>'."\n".	'</span></td>'."\n".
'</tr>'."\n";	'</tr>'."\n";
$itemcount ++;	$itemcount ++;
Line 2531 sub print_autoenroll {	Line 2536 sub print_autoenroll {
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.	'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'.
'<td class="LC_right_item"><span class="LC_nobreak">'.	'<td class="LC_right_item"><span class="LC_nobreak">'.
'<input type="text" name="autoenroll_failsafe"'.	'<input type="text" name="autoenroll_failsafe"'.
' value="'.$failsafe.'" size="4" /></td></tr>';	' value="'.$failsafe.'" size="4" /></span></td></tr>';
$$rowtotal += 4;	$$rowtotal += 4;
return $datatable;	return $datatable;
}	}
Line 2824 sub print_contacts {	Line 2829 sub print_contacts {
}	}
} elsif ($position eq 'middle') {	} elsif ($position eq 'middle') {
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',	@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
'updatesmail','idconflictsmail');	'updatesmail','idconflictsmail','hostipmail');
foreach my $type (@mailings) {	foreach my $type (@mailings) {
$otheremails{$type} = '';	$otheremails{$type} = '';
}	}
Line 2901 sub print_contacts {	Line 2906 sub print_contacts {
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';	$checked{'requestsmail'}{'adminemail'} = ' checked="checked" ';
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';	$checked{'updatesmail'}{'adminemail'} = ' checked="checked" ';
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';	$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" ';
	$checked{'hostipmail'}{'adminemail'} = ' checked="checked" ';
} elsif ($position eq 'bottom') {	} elsif ($position eq 'bottom') {
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';	$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" ';	$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" ';
Line 2959 sub print_contacts {	Line 2965 sub print_contacts {
'value="'.$bccemails{$type}.'" /></fieldset>'.	'value="'.$bccemails{$type}.'" /></fieldset>'.
'<fieldset><legend>'.&mt('Optional added text').'</legend>'.	'<fieldset><legend>'.&mt('Optional added text').'</legend>'.
&mt('Text automatically added to e-mail:').' '.	&mt('Text automatically added to e-mail:').' '.
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br >'.	'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br />'.
'<span class="LC_nobreak">'.&mt('Location:').' '.	'<span class="LC_nobreak">'.&mt('Location:').' '.
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.	'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'.
(' 'x2).	(' 'x2).
Line 3020 sub print_contacts {	Line 3026 sub print_contacts {
if ($currfield{$field} eq 'no') {	if ($currfield{$field} eq 'no') {
$display = ' style="display:none"';	$display = ' style="display:none"';
}	}
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'.	$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.'>'.
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'.	'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'.
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />';	'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />';
}	}
Line 3117 sub print_helpsettings {	Line 3123 sub print_helpsettings {
@jsarray = ('bystatus');	@jsarray = ('bystatus');
}	}
}	}
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh'.'da']);	my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']);
if (keys(%domhelpdesk)) {	if (keys(%domhelpdesk)) {
push(@accesstypes,('inc','exc'));	push(@accesstypes,('inc','exc'));
push(@jsarray,('notinc','notexc'));	push(@jsarray,('notinc','notexc'));
Line 3226 sub print_helpsettings {	Line 3232 sub print_helpsettings {
\@templateroles,$newcust).	\@templateroles,$newcust).
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,	&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels,
\%levelscurrent,$newcust).	\%levelscurrent,$newcust).
'</fieldset></td></tr>';	'</fieldset>'.
	&helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname).
	'</td></tr>';
$count ++;	$count ++;
$$rowtotal += $count;	$$rowtotal += $count;
}	}
Line 3507 sub print_coursedefaults {	Line 3515 sub print_coursedefaults {
coursecredits => 'Credits can be specified for courses',	coursecredits => 'Credits can be specified for courses',
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',	uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',	usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
	texengine => 'Default method to display mathematics',
postsubmit => 'Disable submit button/keypress following student submission',	postsubmit => 'Disable submit button/keypress following student submission',
canclone => "People who may clone a course (besides course's owner and coordinators)",	canclone => "People who may clone a course (besides course's owner and coordinators)",
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',	mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
Line 3524 sub print_coursedefaults {	Line 3533 sub print_coursedefaults {
'canclone' => 'none',	'canclone' => 'none',
);	);
@toggles = ('uselcmath','usejsme');	@toggles = ('uselcmath','usejsme');
	my $deftex = $Apache::lonnet::deftex;
	if (ref($settings) eq 'HASH') {
	if ($settings->{'texengine'}) {
	if ($settings->{'texengine'} =~ /^(MathJax\|mimetex\|tth)$/) {
	$deftex = $settings->{'texengine'};
	}
	}
	}
	$css_class = $itemcount%2?' class="LC_odd_row"':'';
	my $mathdisp = '<tr'.$css_class.'><td style="vertical-align: top">'.
	'<span class="LC_nobreak">'.$choices{'texengine'}.
	'</span></td><td class="LC_right_item">'.
	'<select name="texengine">'."\n";
	my %texoptions = (
	MathJax => 'MathJax',
	mimetex => &mt('Convert to Images'),
	tth => &mt('TeX to HTML'),
	);
	foreach my $renderer ('MathJax','mimetex','tth') {
	my $selected = '';
	if ($renderer eq $deftex) {
	$selected = ' selected="selected"';
	}
	$mathdisp .= '<option value="'.$renderer.'"'.$selected.'>'.$texoptions{$renderer}.'</option>'."\n";
	}
	$mathdisp .= '</select></td></tr>'."\n";
	$itemcount ++;
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,	($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
\%choices,$itemcount);	\%choices,$itemcount);
	$datatable = $mathdisp.$datatable;
$css_class = $itemcount%2?' class="LC_odd_row"':'';	$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .=	$datatable .=
'<tr'.$css_class.'><td valign="top">'.	'<tr'.$css_class.'><td valign="top">'.
Line 3943 sub print_validation_rows {	Line 3980 sub print_validation_rows {
'</label></span> ';	'</label></span> ';
}	}
} elsif ($item eq 'markup') {	} elsif ($item eq 'markup') {
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'.	$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5">'.
$currvalidation{$item}.	$currvalidation{$item}.
'</textarea>';	'</textarea>';
}	}
Line 3965 sub print_validation_rows {	Line 4002 sub print_validation_rows {
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',	my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio',
'validationdc',%currhash);	'validationdc',%currhash);
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';	my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '</td></tr><tr'.$css_class.'><td>';	$datatable .= '<tr'.$css_class.'><td>';
if ($numdc > 1) {	if ($numdc > 1) {
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');	$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
} else {	} else {
Line 4409 sub print_loadbalancing {	Line 4446 sub print_loadbalancing {
my $numinrow = 1;	my $numinrow = 1;
my $datatable;	my $datatable;
my %servers = &Apache::lonnet::internet_dom_servers($dom);	my %servers = &Apache::lonnet::internet_dom_servers($dom);
my (%currbalancer,%currtargets,%currrules,%existing);	my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
%existing = %{$settings};	%existing = %{$settings};
}	}
if ((keys(%servers) > 1) \|\| (keys(%existing) > 0)) {	if ((keys(%servers) > 1) \|\| (keys(%existing) > 0)) {
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,	&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
\%currtargets,\%currrules);	\%currtargets,\%currrules,\%currcookies);
} else {	} else {
return;	return;
}	}
Line 4492 sub print_loadbalancing {	Line 4529 sub print_loadbalancing {
my %hostherechecked = (	my %hostherechecked = (
no => ' checked="checked"',	no => ' checked="checked"',
);	);
	my %balcookiechecked = (
	no => ' checked="checked"',
	);
foreach my $sparetype (@sparestypes) {	foreach my $sparetype (@sparestypes) {
my $targettable;	my $targettable;
for (my $i=0; $i<$numspares; $i++) {	for (my $i=0; $i<$numspares; $i++) {
Line 4547 sub print_loadbalancing {	Line 4587 sub print_loadbalancing {
}	}
}	}
}	}
	if ($currcookies{$lonhost}) {
	%balcookiechecked = (
	yes => ' checked="checked"',
	);
	}
$datatable .= &mt('Hosting on balancer itself').'<br />'.	$datatable .= &mt('Hosting on balancer itself').'<br />'.
'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'.	'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'.
$hostherechecked{'no'}.' />'.&mt('No').'</label><br />';	$hostherechecked{'no'}.' />'.&mt('No').'</label><br />';
Line 4555 sub print_loadbalancing {	Line 4600 sub print_loadbalancing {
'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}.	'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}.
'</i></label><br />';	'</i></label><br />';
}	}
$datatable .= '</div></td></tr>'.	$datatable .= &mt('Use balancer cookie').'<br />'.
	'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="1"'.
	$balcookiechecked{'yes'}.' />'.&mt('Yes').'</label><br />'.
	'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="0"'.
	$balcookiechecked{'no'}.' />'.&mt('No').'</label><br />'.
	'</div></td></tr>'.
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},	&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
$othertitle,$usertypes,$types,\%servers,	$othertitle,$usertypes,$types,\%servers,
\%currbalancer,$lonhost,	\%currbalancer,$lonhost,
Line 4569 sub print_loadbalancing {	Line 4619 sub print_loadbalancing {
}	}

sub get_loadbalancers_config {	sub get_loadbalancers_config {
my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;	my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
return unless ((ref($servers) eq 'HASH') &&	return unless ((ref($servers) eq 'HASH') &&
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&	(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));	(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
	(ref($currcookies) eq 'HASH'));
if (keys(%{$existing}) > 0) {	if (keys(%{$existing}) > 0) {
my $oldlonhost;	my $oldlonhost;
foreach my $key (sort(keys(%{$existing}))) {	foreach my $key (sort(keys(%{$existing}))) {
Line 4591 sub get_loadbalancers_config {	Line 4642 sub get_loadbalancers_config {
$currbalancer->{$key} = 1;	$currbalancer->{$key} = 1;
$currtargets->{$key} = $existing->{$key}{'targets'};	$currtargets->{$key} = $existing->{$key}{'targets'};
$currrules->{$key} = $existing->{$key}{'rules'};	$currrules->{$key} = $existing->{$key}{'rules'};
	if ($existing->{$key}{'cookie'}) {
	$currcookies->{$key} = 1;
	}
}	}
}	}
} else {	} else {
Line 4786 sub contact_titles {	Line 4840 sub contact_titles {
'requestsmail' => 'E-mail from course requests requiring approval',	'requestsmail' => 'E-mail from course requests requiring approval',
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',	'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',	'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
	'hostipmail' => 'E-mail from nightly check of hostname/IP network changes',
);	);
my %short_titles = &Apache::lonlocal::texthash (	my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',	adminemail => 'Admin E-mail address',
Line 5054 sub print_selfcreation {	Line 5109 sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,	($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);	\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;	$$rowtotal += $itemcount;

if (ref($usertypes) eq 'HASH') {	if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {	if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,	$datatable .= &insttypes_row($createsettings,$types,$usertypes,
Line 5072 sub print_selfcreation {	Line 5127 sub print_selfcreation {
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'.	'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'.
'<td class="LC_left_item">'."\n".	'<td class="LC_left_item">'."\n".
'<table><tr><td>'."\n";	'<table>'."\n";
for (my $i=0; $i<@fields; $i++) {	for (my $i=0; $i<@fields; $i++) {
$rem = $i%($numperrow);	$rem = $i%($numperrow);
if ($rem == 0) {	if ($rem == 0) {
Line 5856 sub print_defaults {	Line 5911 sub print_defaults {
1 => 'Yes, allow login then update passwd file using default cost (if higher)',	1 => 'Yes, allow login then update passwd file using default cost (if higher)',
2 => 'Yes, disallow login if stored cost is less than domain default',	2 => 'Yes, disallow login if stored cost is less than domain default',
);	);
$datatable .= '<table wisth="100%">';	$datatable .= '<table width="100%">';
foreach my $option (@options) {	foreach my $option (@options) {
my $checked = ' ';	my $checked = ' ';
my $onclick;	my $onclick;
Line 5903 sub print_defaults {	Line 5958 sub print_defaults {
$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '.	$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '.
'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.	'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'.
&mt('delete').'</span></td>'.	&mt('delete').'</span></td>'.
'<td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.&mt('Name displayed:').	'<td class="LC_left_item"><span class="LC_nobreak">'.&mt('Name displayed:').
'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.	'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'.
'</span></td></tr>';	'</span></td></tr>';
}	}
Line 5922 sub print_defaults {	Line 5977 sub print_defaults {
$datatable .= '</select> '.&mt('Internal ID:').	$datatable .= '</select> '.&mt('Internal ID:').
'<input type="text" size="10" name="addinststatus" value="" />'.	'<input type="text" size="10" name="addinststatus" value="" />'.
' '.&mt('(new)').	' '.&mt('(new)').
'</span></td><td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.	'</span></td><td class="LC_left_item"><span class="LC_nobreak">'.
&mt('Name displayed:').	&mt('Name displayed:').
'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.	'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'.
'</tr>'."\n";	'</tr>'."\n";
Line 5971 sub defaults_titles {	Line 6026 sub defaults_titles {
return (\%titles);	return (\%titles);
}	}

	sub print_scantron {
	my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_;
	if ($position eq 'top') {
	return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
	} else {
	return &print_scantronconfig($dom,$settings,\$rowtotal);
	}
	}

	sub scantron_javascript {
	return <<"ENDSCRIPT";

	<script type="text/javascript">
	// <![CDATA[

	function toggleScantron(form) {
	var csvfieldset = new Array();
	if (document.getElementById('scantroncsv_cols')) {
	csvfieldset.push(document.getElementById('scantroncsv_cols'));
	}
	if (document.getElementById('scantroncsv_options')) {
	csvfieldset.push(document.getElementById('scantroncsv_options'));
	}
	if (csvfieldset.length) {
	if (document.getElementById('scantronconfcsv')) {
	var scantroncsv = document.getElementById('scantronconfcsv');
	if (scantroncsv.checked) {
	for (var i=0; i<csvfieldset.length; i++) {
	csvfieldset[i].style.display = 'block';
	}
	} else {
	for (var i=0; i<csvfieldset.length; i++) {
	csvfieldset[i].style.display = 'none';
	}
	var csvselects = document.getElementsByClassName('scantronconfig_csv');
	if (csvselects.length) {
	for (var j=0; j<csvselects.length; j++) {
	csvselects[j].selectedIndex = 0;
	}
	}
	}
	}
	}
	return;
	}
	// ]]>
	</script>

	ENDSCRIPT

	}

sub print_scantronformat {	sub print_scantronformat {
my ($r,$dom,$confname,$settings,$rowtotal) = @_;	my ($r,$dom,$confname,$settings,$rowtotal) = @_;
my $itemcount = 1;	my $itemcount = 1;
Line 5997 sub print_scantronformat {	Line 6104 sub print_scantronformat {
if ($configuserok eq 'ok') {	if ($configuserok eq 'ok') {
if ($author_ok eq 'ok') {	if ($author_ok eq 'ok') {
my %legacyfile = (	my %legacyfile = (
default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',	default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab',
custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',	custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab',
);	);
my %md5chk;	my %md5chk;
foreach my $type (keys(%legacyfile)) {	foreach my $type (keys(%legacyfile)) {
Line 6007 sub print_scantronformat {	Line 6114 sub print_scantronformat {
}	}
if ($md5chk{'default'} ne $md5chk{'custom'}) {	if ($md5chk{'default'} ne $md5chk{'custom'}) {
foreach my $type (keys(%legacyfile)) {	foreach my $type (keys(%legacyfile)) {
($scantronurls{$type},my $error) =	($scantronurls{$type},my $error) =
&legacy_scantronformat($r,$dom,$confname,	&legacy_scantronformat($r,$dom,$confname,
$type,$legacyfile{$type},	$type,$legacyfile{$type},
$scantronurls{$type},	$scantronurls{$type},
Line 6018 sub print_scantronformat {	Line 6125 sub print_scantronformat {
}	}
if (keys(%error) == 0) {	if (keys(%error) == 0) {
$is_custom = 1;	$is_custom = 1;
$confhash{'scantron'}{'scantronformat'} =	$confhash{'scantron'}{'scantronformat'} =
$scantronurls{'custom'};	$scantronurls{'custom'};
my $putresult =	my $putresult =
&Apache::lonnet::put_dom('configuration',	&Apache::lonnet::put_dom('configuration',
\%confhash,$dom);	\%confhash,$dom);
if ($putresult ne 'ok') {	if ($putresult ne 'ok') {
$error{'custom'} =	$error{'custom'} =
'<span class="LC_error">'.	'<span class="LC_error">'.
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';	&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>';
}	}
Line 6144 sub legacy_scantronformat {	Line 6251 sub legacy_scantronformat {
return ($url,$error);	return ($url,$error);
}	}

	sub print_scantronconfig {
	my ($dom,$settings,$rowtotal) = @_;
	my $itemcount = 2;
	my $is_checked = ' checked="checked"';
	my %optionson = (
	hdr => ' checked="checked"',
	pad => ' checked="checked"',
	rem => ' checked="checked"',
	);
	my %optionsoff = (
	hdr => '',
	pad => '',
	rem => '',
	);
	my $currcsvsty = 'none';
	my ($datatable,%csvfields,%checked,%onclick,%csvoptions);
	my @fields = &scantroncsv_fields();
	my %titles = &scantronconfig_titles();
	if (ref($settings) eq 'HASH') {
	if (ref($settings->{config}) eq 'HASH') {
	if ($settings->{config}->{dat}) {
	$checked{'dat'} = $is_checked;
	}
	if (ref($settings->{config}->{csv}) eq 'HASH') {
	if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') {
	%csvfields = %{$settings->{config}->{csv}->{fields}};
	if (keys(%csvfields) > 0) {
	$checked{'csv'} = $is_checked;
	$currcsvsty = 'block';
	}
	}
	if (ref($settings->{config}->{csv}->{options}) eq 'HASH') {
	%csvoptions = %{$settings->{config}->{csv}->{options}};
	foreach my $option (keys(%optionson)) {
	unless ($csvoptions{$option}) {
	$optionsoff{$option} = $optionson{$option};
	$optionson{$option} = '';
	}
	}
	}
	}
	} else {
	$checked{'dat'} = $is_checked;
	}
	} else {
	$checked{'dat'} = $is_checked;
	}
	$onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
	my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
	$datatable = '<tr '.$css_class.'><td>'.&mt('Supported formats').'</td>'.
	'<td class="LC_left_item" valign="top"><span class="LC_nobreak">';
	foreach my $item ('dat','csv') {
	my $id;
	if ($item eq 'csv') {
	$id = 'id="scantronconfcsv" ';
	}
	$datatable .= '<label><input type="checkbox" name="scantronconfig" '.$id.'value="'.$item.'"'.$checked{$item}.$onclick{$item}.' />'.
	$titles{$item}.'</label>'.(' 'x3);
	if ($item eq 'csv') {
	$datatable .= '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_cols">'.
	'<legend>'.&mt('CSV Column Mapping').'</legend>'.
	'<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Location').'</th></tr>'."\n";
	foreach my $col (@fields) {
	my $selnone;
	if ($csvfields{$col} eq '') {
	$selnone = ' selected="selected"';
	}
	$datatable .= '<tr><td>'.$titles{$col}.'</td>'.
	'<td><select name="scantronconfig_csv_'.$col.'" class="scantronconfig_csv">'.
	'<option value=""'.$selnone.'></option>';
	for (my $i=0; $i<20; $i++) {
	my $shown = $i+1;
	my $sel;
	unless ($selnone) {
	if (exists($csvfields{$col})) {
	if ($csvfields{$col} == $i) {
	$sel = ' selected="selected"';
	}
	}
	}
	$datatable .= '<option value="'.$i.'"'.$sel.'>'.$shown.'</option>';
	}
	$datatable .= '</select></td></tr>';
	}
	$datatable .= '</table></fieldset>'.
	'<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_options">'.
	'<legend>'.&mt('CSV Options').'</legend>';
	foreach my $option ('hdr','pad','rem') {
	$datatable .= '<span class="LC_nobreak">'.$titles{$option}.':'.
	'<label><input type="radio" name="scantroncsv_'.$option.'" value="1"'.$optionson{$option}.' />'.
	&mt('Yes').'</label>'.(' 'x2)."\n".
	'<label><input type="radio" name="scantroncsv_'.$option.'" value="0"'.$optionsoff{$option}.' />'.&mt('No').'</label></span><br />';
	}
	$datatable .= '</fieldset>';
	$itemcount ++;
	}
	}
	$datatable .= '</td></tr>';
	$$rowtotal ++;
	return $datatable;
	}

	sub scantronconfig_titles {
	return &Apache::lonlocal::texthash(
	dat => 'Standard format (.dat)',
	csv => 'Comma separated values (.csv)',
	hdr => 'Remove first line in file (contains column titles)',
	pad => 'Prepend 0s to PaperID',
	rem => 'Remove leading spaces (except Question Response columns)',
	CODE => 'CODE',
	ID => 'Student ID',
	PaperID => 'Paper ID',
	FirstName => 'First Name',
	LastName => 'Last Name',
	FirstQuestion => 'First Question Response',
	Section => 'Section',
	);
	}

	sub scantroncsv_fields {
	return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion');
	}

sub print_coursecategories {	sub print_coursecategories {
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;	my ($position,$dom,$hdritem,$settings,$rowtotal) = @_;
my $datatable;	my $datatable;
Line 6186 sub print_coursecategories {	Line 6416 sub print_coursecategories {
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.	'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked.
' />'.$lt{$type}.'</label> ';	' />'.$lt{$type}.'</label> ';
}	}
$datatable .= '</td></tr>';	$datatable .= '</span></td></tr>';
$itemcount ++;	$itemcount ++;
}	}
$$rowtotal += $itemcount;	$$rowtotal += $itemcount;
Line 6397 sub print_coursecategories {	Line 6627 sub print_coursecategories {
$datatable .= &initialize_categories($itemcount);	$datatable .= &initialize_categories($itemcount);
}	}
} else {	} else {
$datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>'	$datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>'
.&initialize_categories($itemcount);	.&initialize_categories($itemcount);
}	}
$$rowtotal += $itemcount;	$$rowtotal += $itemcount;
Line 6445 sub print_serverstatuses {	Line 6675 sub print_serverstatuses {
'<span class="LC_nobreak">'.	'<span class="LC_nobreak">'.
'<input type="text" name="'.$type.'_machines" '.	'<input type="text" name="'.$type.'_machines" '.
'value="'.$machineaccess{$type}.'" size="10" />'.	'value="'.$machineaccess{$type}.'" size="10" />'.
'</td></tr>'."\n";	'</span></td></tr>'."\n";
}	}
$$rowtotal += $rownum;	$$rowtotal += $rownum;
return $datatable;	return $datatable;
Line 6670 sub initialize_categories {	Line 6900 sub initialize_categories {
my $select1 = '';	my $select1 = '';
foreach my $default ('instcode','communities') {	foreach my $default ('instcode','communities') {
$css_class = $itemcount%2?' class="LC_odd_row"':'';	$css_class = $itemcount%2?' class="LC_odd_row"':'';
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"';	$chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"';
if ($default eq 'communities') {	if ($default eq 'communities') {
$select1 = $select0;	$select1 = $select0;
$select0 = '';	$select0 = '';
Line 6695 sub initialize_categories {	Line 6925 sub initialize_categories {
.'<option value="0">1</option>'	.'<option value="0">1</option>'
.'<option value="1">2</option>'	.'<option value="1">2</option>'
.'<option value="2" selected="selected">3</option></select> '	.'<option value="2" selected="selected">3</option></select> '
.&mt('Add category').'</td><td>'.&mt('Name:')	.&mt('Add category').'</span></td><tda<span class="LC_nobreak">>'.&mt('Name:')
.' <input type="text" size="20" name="addcategory_name" value="" /></td></tr>';	.' <input type="text" size="20" name="addcategory_name" value="" /></span>'
	.'</td></tr>';
return $datatable;	return $datatable;
}	}

Line 6751 sub build_category_rows {	Line 6982 sub build_category_rows {
pop(@{$path});	pop(@{$path});
}	}
} else {	} else {
$text .= &mt('Add subcategory:').' </span><input type="textbox" size="20" name="addcategory_name_';	$text .= &mt('Add subcategory:').' </span><input type="text" size="20" name="addcategory_name_';
if ($j == $numchildren) {	if ($j == $numchildren) {
$text .= $name;	$text .= $name;
} else {	} else {
Line 6774 sub build_category_rows {	Line 7005 sub build_category_rows {
my $colspan;	my $colspan;
if ($parent ne 'instcode') {	if ($parent ne 'instcode') {
$colspan = $maxdepth - $depth - 1;	$colspan = $maxdepth - $depth - 1;
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>';	$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>';
}	}
}	}
}	}
Line 6999 sub insttypes_row {	Line 7230 sub insttypes_row {
$output .= '<td class="LC_left_item">'.	$output .= '<td class="LC_left_item">'.
'<span class="LC_nobreak"><label>'.	'<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="'.$context.'" '.	'<input type="checkbox" name="'.$context.'" '.
'value="'.$types->[$i].'"'.$check.$onclick.' />'.	'value="'.$types->[$i].'"'.$check.$onclick.'/>'.
$usertypes->{$types->[$i]}.'</label></span></td>';	$usertypes->{$types->[$i]}.'</label></span></td>';
}	}
}	}
$rem = @{$types}%($numinrow);	$rem = @{$types}%($numinrow);
}	}
my $colsleft = $numinrow - $rem;	my $colsleft = $numinrow - $rem;
if (($rem == 0) && (@{$types} > 0)) {	if ($rem == 0) {
$output .= '<tr>';	$output .= '<tr>';
}	}
if ($colsleft > 1) {	if ($colsleft > 1) {
Line 7026 sub insttypes_row {	Line 7257 sub insttypes_row {
}	}
$output .= '<span class="LC_nobreak"><label>'.	$output .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="'.$context.'" '.	'<input type="checkbox" name="'.$context.'" '.
'value="default"'.$defcheck.$onclick.' />'.	'value="default"'.$defcheck.$onclick.'/>'.
$othertitle.'</label></span></td>'.	$othertitle.'</label></span></td>'.
'</tr></table></td></tr>';	'</tr></table></td></tr>';
return $output;	return $output;
Line 8062 sub publishlogo {	Line 8293 sub publishlogo {
} else {	} else {
my $source = $filepath.'/'.$file;	my $source = $filepath.'/'.$file;
my $logfile;	my $logfile;
if (!open($logfile,">>$source".'.log')) {	if (!open($logfile,">>",$source.'.log')) {
return (&mt('No write permission to Authoring Space'));	return (&mt('No write permission to Authoring Space'));
}	}
print $logfile	print $logfile
"\n================= Publish ".localtime()." ================\n".	"\n================= Publish ".localtime()." ================\n".
$env{'user.name'}.':'.$env{'user.domain'}."\n";	$env{'user.name'}.':'.$env{'user.domain'}."\n";
# Save the file	# Save the file
if (!open(FH,'>'.$source)) {	if (!open(FH,">",$source)) {
&Apache::lonnet::logthis('Failed to create '.$source);	&Apache::lonnet::logthis('Failed to create '.$source);
return (&mt('Failed to create file'));	return (&mt('Failed to create file'));
}	}
Line 8130 $env{'user.name'}.':'.$env{'user.domain'	Line 8361 $env{'user.name'}.':'.$env{'user.domain'
if ($fullwidth ne '' && $fullheight ne '') {	if ($fullwidth ne '' && $fullheight ne '') {
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {	if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
my $thumbsize = $thumbwidth.'x'.$thumbheight;	my $thumbsize = $thumbwidth.'x'.$thumbheight;
system("convert -sample $thumbsize $inputfile $outfile");	my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile);
	system({$args[0]} @args);
chmod(0660, $filepath.'/tn-'.$file);	chmod(0660, $filepath.'/tn-'.$file);
if (-e $outfile) {	if (-e $outfile) {
my $copyfile=$targetdir.'/tn-'.$file;	my $copyfile=$targetdir.'/tn-'.$file;
Line 8209 sub write_metadata {	Line 8441 sub write_metadata {
{	{
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;	print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
my $mfh;	my $mfh;
if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {	if (open($mfh,">",$targetdir.'/'.$file.'.meta')) {
foreach (sort(keys(%metadatafields))) {	foreach (sort(keys(%metadatafields))) {
unless ($_=~/\./) {	unless ($_=~/\./) {
my $unikey=$_;	my $unikey=$_;
Line 8243 sub notifysubscribed {	Line 8475 sub notifysubscribed {
next unless (ref($targetsource) eq 'ARRAY');	next unless (ref($targetsource) eq 'ARRAY');
my ($target,$source)=@{$targetsource};	my ($target,$source)=@{$targetsource};
if ($source ne '') {	if ($source ne '') {
if (open(my $logfh,'>>'.$source.'.log')) {	if (open(my $logfh,">>",$source.'.log')) {
print $logfh "\nCleanup phase: Notifications\n";	print $logfh "\nCleanup phase: Notifications\n";
my @subscribed=&subscribed_hosts($target);	my @subscribed=&subscribed_hosts($target);
foreach my $subhost (@subscribed) {	foreach my $subhost (@subscribed) {
Line 8269 sub notifysubscribed {	Line 8501 sub notifysubscribed {
sub subscribed_hosts {	sub subscribed_hosts {
my ($target) = @_;	my ($target) = @_;
my @subscribed;	my @subscribed;
if (open(my $fh,"<$target.subscription")) {	if (open(my $fh,"<","$target.subscription")) {
while (my $subline=<$fh>) {	while (my $subline=<$fh>) {
if ($subline =~ /^($match_lonid):/) {	if ($subline =~ /^($match_lonid):/) {
my $host = $1;	my $host = $1;
Line 8468 sub modify_quotas {	Line 8700 sub modify_quotas {
#FIXME need to obsolete item in RES space	#FIXME need to obsolete item in RES space
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {	} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) {
my ($cdom,$cnum) = split(/_/,$key);	my ($cdom,$cnum) = split(/_/,$key);
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,	if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
$cdom,$cnum,$type,$configuserok,	$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>';
$switchserver,$author_ok);	} else {
if ($imgurl) {	my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i,
$confhash{$type}{$key}{'image'} = $imgurl;	$cdom,$cnum,$type,$configuserok,
$changes{$type}{$key} = 1;	$switchserver,$author_ok);
}	if ($imgurl) {
if ($error) {	$confhash{$type}{$key}{'image'} = $imgurl;
&Apache::lonnet::logthis($error);	$changes{$type}{$key} = 1;
$errors .= '<li><span class="LC_error">'.$error.'</span></li>';	}
	if ($error) {
	&Apache::lonnet::logthis($error);
	$errors .= '<li><span class="LC_error">'.$error.'</span></li>';
	}
}	}
} elsif ($domconfig{$action}{$type}{$key}{'image'}) {	} elsif ($domconfig{$action}{$type}{$key}{'image'}) {
$confhash{$type}{$key}{'image'} =	$confhash{$type}{$key}{'image'} =
Line 8511 sub modify_quotas {	Line 8747 sub modify_quotas {
if ($type eq 'textbooks') {	if ($type eq 'textbooks') {
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') {	if ($env{'form.'.$type.'_addbook_image.filename'} ne '') {
my ($cdom,$cnum) = split(/_/,$newbook{$type});	my ($cdom,$cnum) = split(/_/,$newbook{$type});
my ($imageurl,$error) =	if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') {
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type,	$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>';
$configuserok,$switchserver,$author_ok);	} else {
if ($imageurl) {	my ($imageurl,$error) =
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl;	&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type,
}	$configuserok,$switchserver,$author_ok);
if ($error) {	if ($imageurl) {
&Apache::lonnet::logthis($error);	$confhash{$type}{$newbook{$type}}{'image'} = $imageurl;
$errors .= '<li><span class="LC_error">'.$error.'</span></li>';	}
	if ($error) {
	&Apache::lonnet::logthis($error);
	$errors .= '<li><span class="LC_error">'.$error.'</span></li>';
	}
}	}
}	}
}	}
Line 9011 sub process_textbook_image {	Line 9251 sub process_textbook_image {
} elsif ($author_ok eq 'ok') {	} elsif ($author_ok eq 'ok') {
my ($result,$imageurl) =	my ($result,$imageurl) =
&publishlogo($r,'upload',$caller,$dom,$confname,	&publishlogo($r,'upload',$caller,$dom,$confname,
"$type/$dom/$cnum/cover",$width,$height);	"$type/$cdom/$cnum/cover",$width,$height);
if ($result eq 'ok') {	if ($result eq 'ok') {
$url = $imageurl;	$url = $imageurl;
} else {	} else {
Line 9611 sub modify_contacts {	Line 9851 sub modify_contacts {
my (%others,%to,%bcc,%includestr,%includeloc);	my (%others,%to,%bcc,%includestr,%includeloc);
my @contacts = ('supportemail','adminemail');	my @contacts = ('supportemail','adminemail');
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',	my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail',
'lonstatusmail','requestsmail','updatesmail','idconflictsmail');	'lonstatusmail','requestsmail','updatesmail','idconflictsmail','hostipmail');
my @toggles = ('reporterrors','reportupdates');	my @toggles = ('reporterrors','reportupdates');
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();	my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields();
foreach my $type (@mailings) {	foreach my $type (@mailings) {
Line 9727 sub modify_contacts {	Line 9967 sub modify_contacts {
$default{'lonstatusmail'} = 'adminemail';	$default{'lonstatusmail'} = 'adminemail';
$default{'requestsmail'} = 'adminemail';	$default{'requestsmail'} = 'adminemail';
$default{'updatesmail'} = 'adminemail';	$default{'updatesmail'} = 'adminemail';
	$default{'hostipmail'} = 'adminemail';
foreach my $item (@contacts) {	foreach my $item (@contacts) {
if ($to{$item} ne $default{$item}) {	if ($to{$item} ne $default{$item}) {
$changes{$item} = 1;	$changes{$item} = 1;
Line 10687 sub modify_selfcreation {	Line 10928 sub modify_selfcreation {
);	);
if (@types) {	if (@types) {
if (@statuses) {	if (@statuses) {
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').	$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').
'<ul>';	'<ul>';
foreach my $status (@statuses) {	foreach my $status (@statuses) {
if ($status eq 'default') {	if ($status eq 'default') {
$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>';	$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>';
} else {	} else {
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}.'</li>';	$chgtext .= '<li>'.$usertypes{$status}.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>';
}	}
}	}
$chgtext .= '</ul>';	$chgtext .= '</ul>';
Line 10713 sub modify_selfcreation {	Line 10954 sub modify_selfcreation {
$chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:').	$chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:').
'<ul>';	'<ul>';
foreach my $status (@statuses) {	foreach my $status (@statuses) {
if ($type eq 'default') {	if ($status eq 'default') {
$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';	$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';
} else {	} else {
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';	$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>';
Line 10853 sub modify_selfcreation {	Line 11094 sub modify_selfcreation {
$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';	$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';
}	}
} else {	} else {
$chgtext .= &mt('When self creating account with e-mail verficiation, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';	$chgtext .= &mt('When self creating account with e-mail verification, no information besides e-mail address will be provided by [_1].',"'$usertypes{$type}'").'<br />';
}	}
}	}
}	}
}	}
} elsif ($type eq 'notify') {	} elsif ($type eq 'notify') {
my $numapprove = 0;	my $numapprove = 0;
if (ref($changes{'cancreate'}) eq 'ARRAY') {	if (ref($changes{'cancreate'}) eq 'ARRAY') {
if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) {	if ((grep(/^notify$/,@{$changes{'cancreate'}})) && (ref($cancreate{'notify'}) eq 'HASH')) {
if ($cancreate{'notify'}{'approval'}) {	if ($cancreate{'notify'}{'approval'}) {
Line 11432 sub modify_scantron {	Line 11673 sub modify_scantron {
my $custom = 'custom.tab';	my $custom = 'custom.tab';
my $default = 'default.tab';	my $default = 'default.tab';
my $servadm = $r->dir_config('lonAdmEMail');	my $servadm = $r->dir_config('lonAdmEMail');
my ($configuserok,$author_ok,$switchserver) =	my ($configuserok,$author_ok,$switchserver) =
&config_check($dom,$confname,$servadm);	&config_check($dom,$confname,$servadm);
if ($env{'form.scantronformat.filename'} ne '') {	if ($env{'form.scantronformat.filename'} ne '') {
my $error;	my $error;
Line 11467 sub modify_scantron {	Line 11708 sub modify_scantron {
if ($env{'form.scantronformat_del'}) {	if ($env{'form.scantronformat_del'}) {
$confhash{'scantron'}{'scantronformat'} = '';	$confhash{'scantron'}{'scantronformat'} = '';
$changes{'scantronformat'} = 1;	$changes{'scantronformat'} = 1;
	} else {
	$confhash{'scantron'}{'scantronformat'} = $domconfig{'scantron'}{'scantronformat'};
	}
	}
	}
	my @options = ('hdr','pad','rem');
	my @fields = &scantroncsv_fields();
	my %titles = &scantronconfig_titles();
	my @formats = &Apache::loncommon::get_env_multiple('form.scantronconfig');
	my ($newdat,$currdat,%newcol,%currcol);
	if (grep(/^dat$/,@formats)) {
	$confhash{'scantron'}{config}{dat} = 1;
	$newdat = 1;
	} else {
	$newdat = 0;
	}
	if (grep(/^csv$/,@formats)) {
	my %bynum;
	foreach my $field (@fields) {
	if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) {
	my $posscol = $1;
	if (($posscol < 20) && (!$bynum{$posscol})) {
	$confhash{'scantron'}{config}{csv}{fields}{$field} = $posscol;
	$bynum{$posscol} = $field;
	$newcol{$field} = $posscol;
	}
	}
	}
	if (keys(%newcol)) {
	foreach my $option (@options) {
	if ($env{'form.scantroncsv_'.$option}) {
	$confhash{'scantron'}{config}{csv}{options}{$option} = 1;
	}
	}
	}
	}
	$currdat = 1;
	if (ref($domconfig{'scantron'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') {
	unless (exists($domconfig{'scantron'}{'config'}{'dat'})) {
	$currdat = 0;
	}
	if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') {
	if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	%currcol = %{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}};
	}
	}
	}
	}
	if ($currdat != $newdat) {
	$changes{'config'} = 1;
	} else {
	foreach my $field (@fields) {
	if ($currcol{$field} ne '') {
	if ($currcol{$field} ne $newcol{$field}) {
	$changes{'config'} = 1;
	last;
	}
	} elsif ($newcol{$field} ne '') {
	$changes{'config'} = 1;
	last;
}	}
}	}
}	}
Line 11477 sub modify_scantron {	Line 11779 sub modify_scantron {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
if (ref($confhash{'scantron'}) eq 'HASH') {	if (ref($confhash{'scantron'}) eq 'HASH') {
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
if ($confhash{'scantron'}{'scantronformat'} eq '') {	if ($changes{'scantronformat'}) {
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';	if ($confhash{'scantron'}{'scantronformat'} eq '') {
} else {	$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>';
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';	} else {
	$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>';
	}
	}
	if ($changes{'config'}) {
	if (ref($confhash{'scantron'}{'config'}) eq 'HASH') {
	if ($confhash{'scantron'}{'config'}{'dat'}) {
	$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .dat format').'</li>';
	}
	if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') {
	if (ref($confhash{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') {
	if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'fields'}})) {
	$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'<ul>';
	foreach my $field (@fields) {
	if ($confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} ne '') {
	my $showcol = $confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} + 1;
	$resulttext .= '<li>'.$titles{$field}.': '.$showcol.'</li>';
	}
	}
	$resulttext .= '</ul></li>';
	if (ref($confhash{'scantron'}{'config'}{'csv'}{'options'}) eq 'HASH') {
	if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'options'}})) {
	$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following options:').'<ul>';
	foreach my $option (@options) {
	if ($confhash{'scantron'}{'config'}{'csv'}{'options'}{$option} ne '') {
	$resulttext .= '<li>'.$titles{$option}.'</li>';
	}
	}
	$resulttext .= '</ul></li>';
	}
	}
	}
	}
	}
	} else {
	$resulttext .= '<li>'.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'</li>';
	}
}	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
} else {	} else {
$resulttext = &mt('Changes made to bubblesheet format file.');	$resulttext = &mt('Changes made to bubblesheet format file.');
}	}
$resulttext .= '</ul>';
&Apache::loncommon::devalidate_domconfig_cache($dom);	&Apache::loncommon::devalidate_domconfig_cache($dom);
if (ref($lastactref) eq 'HASH') {	if (ref($lastactref) eq 'HASH') {
$lastactref->{'domainconfig'} = 1;	$lastactref->{'domainconfig'} = 1;
}	}
} else {	} else {
$resulttext = &mt('No changes made to bubblesheet format file');	$resulttext = &mt('No changes made to bubblesheet format settings');
}	}
} else {	} else {
$resulttext = '<span class="LC_error">'.	$resulttext = '<span class="LC_error">'.
&mt('An error occurred: [_1]',$putresult).'</span>';	&mt('An error occurred: [_1]',$putresult).'</span>';
}	}
} else {	} else {
$resulttext = &mt('No changes made to bubblesheet format file');	$resulttext = &mt('No changes made to bubblesheet format settings');
}	}
if ($errors) {	if ($errors) {
$resulttext .= &mt('The following errors occurred: ').'<ul>'.	$resulttext .= &mt('The following errors occurred: ').'<ul>'.
Line 11748 sub modify_coursecategories {	Line 12085 sub modify_coursecategories {
}	}
$resulttext .= '</ul></li>';	$resulttext .= '</ul></li>';
}	}
	&Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'cats'} = 1;
	}
}	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
if ($changes{'unauth'} \|\| $changes{'auth'}) {	if ($changes{'unauth'} \|\| $changes{'auth'}) {
Line 12241 sub modify_coursedefaults {	Line 12582 sub modify_coursedefaults {
postsubmit => 60,	postsubmit => 60,
mysqltables => 172800,	mysqltables => 172800,
);	);
	my %texoptions = (
	MathJax => 'MathJax',
	mimetex => &mt('Convert to Images'),
	tth => &mt('TeX to HTML'),
	);
$defaultshash{'coursedefaults'} = {};	$defaultshash{'coursedefaults'} = {};

if (ref($domconfig{'coursedefaults'}) ne 'HASH') {	if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
Line 12288 sub modify_coursedefaults {	Line 12633 sub modify_coursedefaults {
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;	$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef;
}	}
if ($currdef ne $newdef) {	if ($currdef ne $newdef) {
my $staticdef;
if ($item eq 'anonsurvey_threshold') {	if ($item eq 'anonsurvey_threshold') {
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {	unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
$changes{$item} = 1;	$changes{$item} = 1;
Line 12301 sub modify_coursedefaults {	Line 12645 sub modify_coursedefaults {
}	}
}	}
}	}
	my $texengine;
	if ($env{'form.texengine'} =~ /^(MathJax\|mimetex\|tth)$/) {
	$texengine = $env{'form.texengine'};
	my $currdef = $domconfig{'coursedefaults'}{'texengine'};
	if ($currdef eq '') {
	unless ($texengine eq $Apache::lonnet::deftex) {
	$changes{'texengine'} = 1;
	}
	} elsif ($currdef ne $texengine) {
	$changes{'texengine'} = 1;
	}
	}
	if ($texengine ne '') {
	$defaultshash{'coursedefaults'}{'texengine'} = $texengine;
	}
my $currclone = $domconfig{'coursedefaults'}{'canclone'};	my $currclone = $domconfig{'coursedefaults'}{'canclone'};
my @currclonecode;	my @currclonecode;
if (ref($currclone) eq 'HASH') {	if (ref($currclone) eq 'HASH') {
Line 12421 sub modify_coursedefaults {	Line 12780 sub modify_coursedefaults {
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
if (($changes{'uploadquota'}) \|\| ($changes{'postsubmit'}) \|\|	if (($changes{'uploadquota'}) \|\| ($changes{'postsubmit'}) \|\|
($changes{'coursecredits'}) \|\| ($changes{'uselcmath'}) \|\| ($changes{'usejsme'}) \|\|	($changes{'coursecredits'}) \|\| ($changes{'uselcmath'}) \|\| ($changes{'usejsme'}) \|\|
($changes{'canclone'}) \|\| ($changes{'mysqltables'})) {	($changes{'canclone'}) \|\| ($changes{'mysqltables'}) \|\| ($changes{'texengine'})) {
foreach my $item ('uselcmath','usejsme') {	foreach my $item ('uselcmath','usejsme','texengine') {
if ($changes{$item}) {	if ($changes{$item}) {
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};	$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
}	}
Line 12485 sub modify_coursedefaults {	Line 12844 sub modify_coursedefaults {
} else {	} else {
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';	$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
}	}
	} elsif ($item eq 'texengine') {
	if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
	$resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"',
	$texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'</li>';
	}
} elsif ($item eq 'anonsurvey_threshold') {	} elsif ($item eq 'anonsurvey_threshold') {
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';	$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
} elsif ($item eq 'uploadquota') {	} elsif ($item eq 'uploadquota') {
Line 13167 sub modify_loadbalancing {	Line 13531 sub modify_loadbalancing {
my @sparestypes = ('primary','default');	my @sparestypes = ('primary','default');
my %typetitles = &sparestype_titles();	my %typetitles = &sparestype_titles();
my $resulttext;	my $resulttext;
my (%currbalancer,%currtargets,%currrules,%existing);	my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {	if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
%existing = %{$domconfig{'loadbalancing'}};	%existing = %{$domconfig{'loadbalancing'}};
}	}
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,	&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
\%currtargets,\%currrules);	\%currtargets,\%currrules,\%currcookies);
my ($saveloadbalancing,%defaultshash,%changes);	my ($saveloadbalancing,%defaultshash,%changes);
my ($alltypes,$othertypes,$titles) =	my ($alltypes,$othertypes,$titles) =
&loadbalancing_titles($dom,$intdom,$usertypes,$types);	&loadbalancing_titles($dom,$intdom,$usertypes,$types);
Line 13224 sub modify_loadbalancing {	Line 13588 sub modify_loadbalancing {
}	}
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;	$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto;
}	}
	if ($env{'form.loadbalancing_cookie_'.$i}) {
	$defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1;
	if (exists($currbalancer{$balancer})) {
	unless ($currcookies{$balancer}) {
	$changes{'curr'}{$balancer}{'cookie'} = 1;
	}
	}
	} elsif (exists($currbalancer{$balancer})) {
	if ($currcookies{$balancer}) {
	$changes{'curr'}{$balancer}{'cookie'} = 1;
	}
	}
if (ref($currtargets{$balancer}) eq 'HASH') {	if (ref($currtargets{$balancer}) eq 'HASH') {
foreach my $sparetype (@sparestypes) {	foreach my $sparetype (@sparestypes) {
if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') {	if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') {
Line 13377 sub modify_loadbalancing {	Line 13753 sub modify_loadbalancing {
}	}
}	}
}	}
	if ($changes{'curr'}{$balancer}{'cookie'}) {
	$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled',
	$balancer).'</li>';
	}
if (keys(%toupdate)) {	if (keys(%toupdate)) {
my %thismachine;	my %thismachine;
my $updatedhere;	my $updatedhere;
Line 13606 sub lonbalance_targets_js {	Line 13986 sub lonbalance_targets_js {
}	}
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');	push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external');
$allinsttypes = join("','",@alltypes);	$allinsttypes = join("','",@alltypes);
my (%currbalancer,%currtargets,%currrules,%existing);	my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
%existing = %{$settings};	%existing = %{$settings};
}	}
&get_loadbalancers_config($servers,\%existing,\%currbalancer,	&get_loadbalancers_config($servers,\%existing,\%currbalancer,
\%currtargets,\%currrules);	\%currtargets,\%currrules,\%currcookies);
my $balancers = join("','",sort(keys(%currbalancer)));	my $balancers = join("','",sort(keys(%currbalancer)));
return <<"END";	return <<"END";

Line 14153 sub devalidate_remote_domconfs {	Line 14533 sub devalidate_remote_domconfs {
my %servers = &Apache::lonnet::internet_dom_servers($dom);	my %servers = &Apache::lonnet::internet_dom_servers($dom);
my %thismachine;	my %thismachine;
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();	map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
my @posscached = ('domainconfig','domdefaults','usersessions','directorysrch');	my @posscached = ('domainconfig','domdefaults','usersessions','directorysrch','cats');
if (keys(%servers)) {	if (keys(%servers)) {
foreach my $server (keys(%servers)) {	foreach my $server (keys(%servers)) {
next if ($thismachine{$server});	next if ($thismachine{$server});

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

Removed from v.1.160.6.84.4.1
changed lines
	Added in v.1.160.6.97