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.197 and 1.215

version 1.197, 2013/07/02 19:04:36	version 1.215, 2013/12/23 13:20:31
Line 86 $dom,$settings,$rowtotal,$action.	Line 86 $dom,$settings,$rowtotal,$action.

$dom is the domain, $settings is a reference to a hash of current settings for	$dom is the domain, $settings is a reference to a hash of current settings for
the current context, $rowtotal is a reference to the scalar used to record the	the current context, $rowtotal is a reference to the scalar used to record the
number of rows displayed on the page, and $action is the context (quotas,	number of rows displayed on the page, and $action is the context (quotas,
requestcourses or requestauthor).	requestcourses or requestauthor).

The print_quotas routine was orginally created to display/store information	The print_quotas routine was orginally created to display/store information
Line 259 sub handler {	Line 259 sub handler {
help => 'Domain_Configuration_Quotas',	help => 'Domain_Configuration_Quotas',
header => [{col1 => 'User affiliation',	header => [{col1 => 'User affiliation',
col2 => 'Available tools',	col2 => 'Available tools',
col3 => 'Quotas, Mb; (Authoring requires role)',}],	col3 => 'Quotas, MB; (Authoring requires role)',}],
},	},
'autoenroll' =>	'autoenroll' =>
{ text => 'Auto-enrollment settings',	{ text => 'Auto-enrollment settings',
Line 416 sub handler {	Line 416 sub handler {
my $confname = $dom.'-domainconfig';	my $confname = $dom.'-domainconfig';

if ($phase eq 'process') {	if ($phase eq 'process') {
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);	my $result = &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,
	\%prefs,\%domconfig,$confname,\@roles);
	if (ref($result) eq 'HASH') {
	$r->rflush();
	&devalidate_remote_domconfs($dom,$result);
	}
} elsif ($phase eq 'display') {	} elsif ($phase eq 'display') {
my $js = &recaptcha_js().	my $js = &recaptcha_js().
&credits_js();	&credits_js();
Line 438 sub handler {	Line 443 sub handler {
unless ($configuserok eq 'ok') {	unless ($configuserok eq 'ok') {
&Apache::lonconfigsettings::print_header($r,$phase,$context);	&Apache::lonconfigsettings::print_header($r,$phase,$context);
$r->print(&mt('The domain configuration user "[_1]" has yet to be created.',	$r->print(&mt('The domain configuration user "[_1]" has yet to be created.',
$confname).	$confname).
'<br />'	'<br />'
);	);
if ($switchserver) {	if ($switchserver) {
Line 498 sub handler {	Line 503 sub handler {
}	}

sub process_changes {	sub process_changes {
my ($r,$dom,$confname,$action,$roles,$values) = @_;	my ($r,$dom,$confname,$action,$roles,$values,$lastactref) = @_;
my %domconfig;	my %domconfig;
if (ref($values) eq 'HASH') {	if (ref($values) eq 'HASH') {
%domconfig = %{$values};	%domconfig = %{$values};
}	}
my $output;	my $output;
if ($action eq 'login') {	if ($action eq 'login') {
$output = &modify_login($r,$dom,$confname,%domconfig);	$output = &modify_login($r,$dom,$confname,$lastactref,%domconfig);
} elsif ($action eq 'rolecolors') {	} elsif ($action eq 'rolecolors') {
$output = &modify_rolecolors($r,$dom,$confname,$roles,	$output = &modify_rolecolors($r,$dom,$confname,$roles,
%domconfig);	$lastactref,%domconfig);
} elsif ($action eq 'quotas') {	} elsif ($action eq 'quotas') {
$output = &modify_quotas($dom,$action,%domconfig);	$output = &modify_quotas($dom,$action,$lastactref,%domconfig);
} elsif ($action eq 'autoenroll') {	} elsif ($action eq 'autoenroll') {
$output = &modify_autoenroll($dom,%domconfig);	$output = &modify_autoenroll($dom,$lastactref,%domconfig);
} elsif ($action eq 'autoupdate') {	} elsif ($action eq 'autoupdate') {
$output = &modify_autoupdate($dom,%domconfig);	$output = &modify_autoupdate($dom,%domconfig);
} elsif ($action eq 'autocreate') {	} elsif ($action eq 'autocreate') {
Line 524 sub process_changes {	Line 529 sub process_changes {
} elsif ($action eq 'usermodification') {	} elsif ($action eq 'usermodification') {
$output = &modify_usermodification($dom,%domconfig);	$output = &modify_usermodification($dom,%domconfig);
} elsif ($action eq 'contacts') {	} elsif ($action eq 'contacts') {
$output = &modify_contacts($dom,%domconfig);	$output = &modify_contacts($dom,$lastactref,%domconfig);
} elsif ($action eq 'defaults') {	} elsif ($action eq 'defaults') {
$output = &modify_defaults($dom,$r);	$output = &modify_defaults($dom,$lastactref,%domconfig);
} elsif ($action eq 'scantron') {	} elsif ($action eq 'scantron') {
$output = &modify_scantron($r,$dom,$confname,%domconfig);	$output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig);
} elsif ($action eq 'coursecategories') {	} elsif ($action eq 'coursecategories') {
$output = &modify_coursecategories($dom,%domconfig);	$output = &modify_coursecategories($dom,%domconfig);
} elsif ($action eq 'serverstatuses') {	} elsif ($action eq 'serverstatuses') {
$output = &modify_serverstatuses($dom,%domconfig);	$output = &modify_serverstatuses($dom,%domconfig);
} elsif ($action eq 'requestcourses') {	} elsif ($action eq 'requestcourses') {
$output = &modify_quotas($dom,$action,%domconfig);	$output = &modify_quotas($dom,$action,$lastactref,%domconfig);
} elsif ($action eq 'requestauthor') {	} elsif ($action eq 'requestauthor') {
$output = &modify_quotas($dom,$action,%domconfig);	$output = &modify_quotas($dom,$action,$lastactref,%domconfig);
} elsif ($action eq 'helpsettings') {	} elsif ($action eq 'helpsettings') {
$output = &modify_helpsettings($r,$dom,$confname,%domconfig);	$output = &modify_helpsettings($r,$dom,$confname,%domconfig);
} elsif ($action eq 'coursedefaults') {	} elsif ($action eq 'coursedefaults') {
$output = &modify_coursedefaults($dom,%domconfig);	$output = &modify_coursedefaults($dom,$lastactref,%domconfig);
} elsif ($action eq 'usersessions') {	} elsif ($action eq 'usersessions') {
$output = &modify_usersessions($dom,%domconfig);	$output = &modify_usersessions($dom,$lastactref,%domconfig);
} elsif ($action eq 'loadbalancing') {	} elsif ($action eq 'loadbalancing') {
$output = &modify_loadbalancing($dom,%domconfig);	$output = &modify_loadbalancing($dom,%domconfig);
}	}
Line 571 sub print_config_box {	Line 576 sub print_config_box {
if ($numheaders > 1) {	if ($numheaders > 1) {
my $colspan = '';	my $colspan = '';
my $rightcolspan = '';	my $rightcolspan = '';
if (($action eq 'rolecolors') \|\| ($action eq 'coursecategories') \|\|	if (($action eq 'rolecolors') \|\| ($action eq 'coursecategories') \|\|
(($action eq 'login') && ($numheaders < 3))) {	(($action eq 'login') && ($numheaders < 3))) {
$colspan = ' colspan="2"';	$colspan = ' colspan="2"';
}	}
Line 790 sub print_config_box {	Line 795 sub print_config_box {
} elsif ($action eq 'contacts') {	} elsif ($action eq 'contacts') {
$output .= &print_contacts($dom,$settings,\$rowtotal);	$output .= &print_contacts($dom,$settings,\$rowtotal);
} elsif ($action eq 'defaults') {	} elsif ($action eq 'defaults') {
$output .= &print_defaults($dom,\$rowtotal);	$output .= &print_defaults($dom,$settings,\$rowtotal);
} elsif ($action eq 'scantron') {	} elsif ($action eq 'scantron') {
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);	$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
} elsif ($action eq 'serverstatuses') {	} elsif ($action eq 'serverstatuses') {
Line 1142 sub print_rolecolors {	Line 1147 sub print_rolecolors {
my %designhash = &Apache::loncommon::get_domainconf($dom);	my %designhash = &Apache::loncommon::get_domainconf($dom);
my %defaultdesign = %Apache::loncommon::defaultdesign;	my %defaultdesign = %Apache::loncommon::defaultdesign;
my (%is_custom,%designs);	my (%is_custom,%designs);
my %defaults = (	my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
img => $defaultdesign{$role.'.img'},
font => $defaultdesign{$role.'.font'},
fontmenu => $defaultdesign{$role.'.fontmenu'},
);
foreach my $item (@bgs) {
$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
}
foreach my $item (@links) {
$defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
}
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
if (ref($settings->{$role}) eq 'HASH') {	if (ref($settings->{$role}) eq 'HASH') {
if ($settings->{$role}->{'img'} ne '') {	if ($settings->{$role}->{'img'} ne '') {
Line 1213 sub print_rolecolors {	Line 1208 sub print_rolecolors {
return $datatable;	return $datatable;
}	}

	sub role_defaults {
	my ($role,$bgs,$links,$images,$logintext) = @_;
	my %defaults;
	unless ((ref($bgs) eq 'ARRAY') && (ref($links) eq 'ARRAY') && (ref($images) eq 'ARRAY')) {
	return %defaults;
	}
	my %defaultdesign = %Apache::loncommon::defaultdesign;
	if ($role eq 'login') {
	%defaults = (
	font => $defaultdesign{$role.'.font'},
	);
	if (ref($logintext) eq 'ARRAY') {
	foreach my $item (@{$logintext}) {
	$defaults{'logintext'}{$item} = $defaultdesign{$role.'.'.$item};
	}
	}
	foreach my $item (@{$images}) {
	$defaults{'showlogo'}{$item} = 1;
	}
	} else {
	%defaults = (
	img => $defaultdesign{$role.'.img'},
	font => $defaultdesign{$role.'.font'},
	fontmenu => $defaultdesign{$role.'.fontmenu'},
	);
	}
	foreach my $item (@{$bgs}) {
	$defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item};
	}
	foreach my $item (@{$links}) {
	$defaults{'links'}{$item} = $defaultdesign{$role.'.'.$item};
	}
	foreach my $item (@{$images}) {
	$defaults{$item} = $defaultdesign{$role.'.'.$item};
	}
	return %defaults;
	}

sub display_color_options {	sub display_color_options {
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,	my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;	$images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
Line 1229 sub display_color_options {	Line 1262 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>';	' </td></tr>';
unless ($role eq 'login') {	unless ($role eq 'login') {
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
Line 1239 sub display_color_options {	Line 1272 sub display_color_options {
} else {	} else {
$datatable .= '<td> </td>';	$datatable .= '<td> </td>';
}	}
$current_color = $designs->{'fontmenu'} ?	$current_color = $designs->{'fontmenu'} ?
$designs->{'fontmenu'} : $defaults->{'fontmenu'};	$designs->{'fontmenu'} : $defaults->{'fontmenu'};
$datatable .= '<td><span class="LC_nobreak">'.	$datatable .= '<td><span class="LC_nobreak">'.
'<input class="colorchooser" type="text" size="10" name="'	'<input class="colorchooser" type="text" size="10" name="'
Line 1260 sub display_color_options {	Line 1293 sub display_color_options {
&login_header_options($img,$role,$defaults,$is_custom,$choices);	&login_header_options($img,$role,$defaults,$is_custom,$choices);
$logincolors =	$logincolors =
&login_text_colors($img,$role,$logintext,$phase,$choices,	&login_text_colors($img,$role,$logintext,$phase,$choices,
$designs);	$designs,$defaults);
} elsif ($img ne 'domlogo') {	} elsif ($img ne 'domlogo') {
$datatable.= &logo_display_options($img,$defaults,$designs);	$datatable.= &logo_display_options($img,$defaults,$designs);
}	}
Line 1339 sub display_color_options {	Line 1372 sub display_color_options {
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,	$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
$showfile,$fullsize,$role,$img,$imgfile,$logincolors);	$showfile,$fullsize,$role,$img,$imgfile,$logincolors);
} else {	} else {
$datatable .= '<td colspan="2" class="LC_right_item"><br />'.	$datatable .= '<td> </td><td class="LC_left_item">'.
&mt('Upload:');	&mt('Upload:').'<br />';
}	}
} else {	} else {
$datatable .= '<td colspan="2" class="LC_right_item"><br />'.	$datatable .= '<td> </td><td class="LC_left_item">'.
&mt('Upload:');	&mt('Upload:').'<br />';
}	}
if ($switchserver) {	if ($switchserver) {
$datatable .= &mt('Upload to library server: [_1]',$switchserver);	$datatable .= &mt('Upload to library server: [_1]',$switchserver);
Line 1374 sub display_color_options {	Line 1407 sub display_color_options {
'<table border="0"><tr>';	'<table border="0"><tr>';

foreach my $item (@{$bgs}) {	foreach my $item (@{$bgs}) {
$datatable .= '<td align="center">';	$datatable .= '<td align="center">'.$choices->{$item};
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
if ($designs->{'bgs'}{$item}) {	if ($designs->{'bgs'}{$item}) {
$datatable .= ' ';	$datatable .= ' ';
Line 1402 sub display_color_options {	Line 1435 sub display_color_options {
'<table border="0"><tr>';	'<table border="0"><tr>';
foreach my $item (@{$links}) {	foreach my $item (@{$links}) {
my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};	my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
$datatable .= '<td align="center">'."\n";	$datatable .= '<td align="center">'.$choices->{$item}."\n";

if ($designs->{'links'}{$item}) {	if ($designs->{'links'}{$item}) {
$datatable.=' ';	$datatable.=' ';
}	}
Line 1461 sub login_header_options {	Line 1493 sub login_header_options {
}	}

sub login_text_colors {	sub login_text_colors {
my ($img,$role,$logintext,$phase,$choices,$designs) = @_;	my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
my $color_menu = '<table border="0"><tr>';	my $color_menu = '<table border="0"><tr>';
foreach my $item (@{$logintext}) {	foreach my $item (@{$logintext}) {
my $link = &color_pick($phase,$role,$item,$choices->{$item},$designs->{'logintext'}{$item});	$color_menu .= '<td align="center">'.$choices->{$item};
$color_menu .= '<td align="center">'.$link;	my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
if ($designs->{'logintext'}{$item}) {	$color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
$color_menu .= ' <span id="css_'.$role.'_'.$item.'" style="background-color: '.$designs->{'logintext'}{$item}.';">   </span>';	'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
}
$color_menu .= '<br /><input type="text" size="8" name="'.$role.'_'.$item.'" value="'.
$designs->{'logintext'}{$item}.'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>'.
'<td> </td>';
}	}
$color_menu .= '</tr></table><br />';	$color_menu .= '</tr></table><br />';
return $color_menu;	return $color_menu;
Line 1503 sub image_changes {	Line 1531 sub image_changes {
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').	$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
'</label> '.&mt('Replace:').'</span><br />';	'</label> '.&mt('Replace:').'</span><br />';
} else {	} else {
$output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';	$output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />';
}	}
}	}
return $output;	return $output;
}	}

sub color_pick {
my ($phase,$role,$item,$desc,$curcol) = @_;
my $link = '<a href="javascript:pjump('."'color_custom','".$desc.
"','".$curcol."','".$role.'_'.$item."','parmform.pres','psub'".
');">'.$desc.'</a>';
return $link;
}

sub print_quotas {	sub print_quotas {
my ($dom,$settings,$rowtotal,$action) = @_;	my ($dom,$settings,$rowtotal,$action) = @_;
my $context;	my $context;
Line 1537 sub print_quotas {	Line 1557 sub print_quotas {
} elsif ($context eq 'requestauthor') {	} elsif ($context eq 'requestauthor') {
@usertools = ('author');	@usertools = ('author');
@options = ('norequest','approval','automatic');	@options = ('norequest','approval','automatic');
%titles = &authorrequest_titles();	%titles = &authorrequest_titles();
} else {	} else {
@usertools = ('aboutme','blog','webdav','portfolio');	@usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();	%titles = &tool_titles();
Line 1944 sub print_quotas {	Line 1964 sub print_quotas {

sub print_requestmail {	sub print_requestmail {
my ($dom,$action,$settings,$rowtotal) = @_;	my ($dom,$action,$settings,$rowtotal) = @_;
my ($now,$datatable,%currapp,$rows);	my ($now,$datatable,%currapp);
$now = time;	$now = time;
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
if (ref($settings->{'notify'}) eq 'HASH') {	if (ref($settings->{'notify'}) eq 'HASH') {
Line 2137 sub print_autocreate {	Line 2157 sub print_autocreate {
}	}
}	}
}	}
if ($settings->{'xmldc'} ne '') {	if ($settings->{'xmldc'} ne '') {
$currhash{$settings->{'xmldc'}} = 1;	$currhash{$settings->{'xmldc'}} = 1;
}	}
} else {	} else {
Line 2294 sub print_contacts {	Line 2314 sub print_contacts {
my @contacts = ('adminemail','supportemail');	my @contacts = ('adminemail','supportemail');
my (%checked,%to,%otheremails,%bccemails);	my (%checked,%to,%otheremails,%bccemails);
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',	my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
'requestsmail','updatesmail');	'requestsmail','updatesmail','idconflictsmail');
foreach my $type (@mailings) {	foreach my $type (@mailings) {
$otheremails{$type} = '';	$otheremails{$type} = '';
}	}
Line 2331 sub print_contacts {	Line 2351 sub print_contacts {
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';	$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
$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" ';
}	}
my ($titles,$short_titles) = &contact_titles();	my ($titles,$short_titles) = &contact_titles();
my $rownum = 0;	my $rownum = 0;
my $css_class;	my $css_class;
foreach my $item (@contacts) {	foreach my $item (@contacts) {
$rownum ++;
$css_class = $rownum%2?' class="LC_odd_row"':'';	$css_class = $rownum%2?' class="LC_odd_row"':'';
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td><span class="LC_nobreak">'.$titles->{$item}.	'<td><span class="LC_nobreak">'.$titles->{$item}.
'</span></td><td class="LC_right_item">'.	'</span></td><td class="LC_right_item">'.
'<input type="text" name="'.$item.'" value="'.	'<input type="text" name="'.$item.'" value="'.
$to{$item}.'" /></td></tr>';	$to{$item}.'" /></td></tr>';
	$rownum ++;
}	}
foreach my $type (@mailings) {	foreach my $type (@mailings) {
$rownum ++;
$css_class = $rownum%2?' class="LC_odd_row"':'';	$css_class = $rownum%2?' class="LC_odd_row"':'';
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td><span class="LC_nobreak">'.	'<td><span class="LC_nobreak">'.
Line 2368 sub print_contacts {	Line 2388 sub print_contacts {
'value="'.$bccemails{$type}.'" />';	'value="'.$bccemails{$type}.'" />';
}	}
$datatable .= '</td></tr>'."\n";	$datatable .= '</td></tr>'."\n";
	$rownum ++;
}	}
	my %choices;
	$choices{'reporterrors'} = &mt('E-mail error reports to [_1]',
	&Apache::loncommon::modal_link('http://loncapa.org/core.html',
	&mt('LON-CAPA core group - MSU'),600,500));
	$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]',
	&Apache::loncommon::modal_link('http://loncapa.org/core.html',
	&mt('LON-CAPA core group - MSU'),600,500));
	my @toggles = ('reporterrors','reportupdates');
	my %defaultchecked = ('reporterrors' => 'on',
	'reportupdates' => 'on');
	(my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
	\%choices,$rownum);
	$datatable .= $reports;
$$rowtotal += $rownum;	$$rowtotal += $rownum;
return $datatable;	return $datatable;
}	}
Line 2445 sub print_coursedefaults {	Line 2479 sub print_coursedefaults {
my $itemcount = 1;	my $itemcount = 1;
my %choices = &Apache::lonlocal::texthash (	my %choices = &Apache::lonlocal::texthash (
canuse_pdfforms => 'Course/Community users can create/upload PDF forms',	canuse_pdfforms => 'Course/Community users can create/upload PDF forms',
	uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)',
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',	anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys',
coursecredits => 'Credits can be specified for courses',	coursecredits => 'Credits can be specified for courses',
);	);
	my %staticdefaults = (
	anonsurvey_threshold => 10,
	uploadquota => 500,
	);
if ($position eq 'top') {	if ($position eq 'top') {
%defaultchecked = ('canuse_pdfforms' => 'off');	%defaultchecked = ('canuse_pdfforms' => 'off');
@toggles = ('canuse_pdfforms');	@toggles = ('canuse_pdfforms');
Line 2455 sub print_coursedefaults {	Line 2494 sub print_coursedefaults {
\%choices,$itemcount);	\%choices,$itemcount);
} else {	} else {
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';	$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
my ($currdefresponder,$def_official_credits,$def_unofficial_credits);	my ($currdefresponder,$def_official_credits,$def_unofficial_credits,%curruploadquota);
my $currusecredits = 0;	my $currusecredits = 0;
	my @types = ('official','unofficial','community');
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
$currdefresponder = $settings->{'anonsurvey_threshold'};	$currdefresponder = $settings->{'anonsurvey_threshold'};
	if (ref($settings->{'uploadquota'}) eq 'HASH') {
	foreach my $type (keys(%{$settings->{'uploadquota'}})) {
	$curruploadquota{$type} = $settings->{'uploadquota'}{$type};
	}
	}
if (ref($settings->{'coursecredits'}) eq 'HASH') {	if (ref($settings->{'coursecredits'}) eq 'HASH') {
$def_official_credits = $settings->{'coursecredits'}->{'official'};	$def_official_credits = $settings->{'coursecredits'}->{'official'};
$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};	$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'};
Line 2468 sub print_coursedefaults {	Line 2513 sub print_coursedefaults {
}	}
}	}
if (!$currdefresponder) {	if (!$currdefresponder) {
$currdefresponder = 10;	$currdefresponder = $staticdefaults{'anonsurvey_threshold'};
} elsif ($currdefresponder < 1) {	} elsif ($currdefresponder < 1) {
$currdefresponder = 1;	$currdefresponder = 1;
}	}
	foreach my $type (@types) {
	if ($curruploadquota{$type} eq '') {
	$curruploadquota{$type} = $staticdefaults{'uploadquota'};
	}
	}
$datatable .=	$datatable .=
'<tr'.$css_class.'><td><span class="LC_nobreak">'.	'<tr'.$css_class.'><td><span class="LC_nobreak">'.
$choices{'anonsurvey_threshold'}.	$choices{'anonsurvey_threshold'}.
Line 2479 sub print_coursedefaults {	Line 2529 sub print_coursedefaults {
'<td class="LC_right_item"><span class="LC_nobreak">'.	'<td class="LC_right_item"><span class="LC_nobreak">'.
'<input type="text" name="anonsurvey_threshold"'.	'<input type="text" name="anonsurvey_threshold"'.
' value="'.$currdefresponder.'" size="5" /></span>'.	' value="'.$currdefresponder.'" size="5" /></span>'.
'</td></tr>'."\n";	'</td></tr>'."\n".
$itemcount ++;	'<tr><td><span class="LC_nobreak">'.
	$choices{'uploadquota'}.
	'</span></td>'.
	'<td align="right" class="LC_right_item">'.
	'<table><tr>';
	foreach my $type (@types) {
	$datatable .= '<td align="center">'.&mt($type).'<br />'.
	'<input type="text" name="uploadquota_'.$type.'"'.
	' value="'.$curruploadquota{$type}.'" size="5" /></td>';
	}
	$datatable .= '</tr></table></td></tr>'."\n";
	$itemcount += 2;
my $onclick = 'toggleCredits(this.form);';	my $onclick = 'toggleCredits(this.form);';
my $display = 'none';	my $display = 'none';
if ($currusecredits) {	if ($currusecredits) {
$display = 'block';	$display = 'block';
}	}
Line 2937 sub print_loadbalancing {	Line 2998 sub print_loadbalancing {
}	}
my ($othertitle,$usertypes,$types) =	my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($dom);	&Apache::loncommon::sorted_inst_types($dom);
my $rownum = 6;	my $rownum = 8;
if (ref($types) eq 'ARRAY') {	if (ref($types) eq 'ARRAY') {
$rownum += scalar(@{$types});	$rownum += scalar(@{$types});
}	}
Line 2968 sub print_loadbalancing {	Line 3029 sub print_loadbalancing {
'<td rowspan="'.$rownum.'" valign="top">'.	'<td rowspan="'.$rownum.'" valign="top">'.
'<p>';	'<p>';
if ($lonhost eq '') {	if ($lonhost eq '') {
$datatable .= '<span class="LC_nobreak">';	$datatable .= '<span class="LC_nobreak">';
if (keys(%currbalancer) > 0) {	if (keys(%currbalancer) > 0) {
$datatable .= &mt('Add balancer:');	$datatable .= &mt('Add balancer:');
} else {	} else {
Line 2984 sub print_loadbalancing {	Line 3045 sub print_loadbalancing {
next if ($currbalancer{$server});	next if ($currbalancer{$server});
$datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n";	$datatable .= '<option value="'.$server.'">'.$server.'</option>'."\n";
}	}
$datatable .=	$datatable .=
'</select>'."\n".	'</select>'."\n".
'<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" /> </span>'."\n";	'<input type="hidden" name="loadbalancing_prevlonhost_'.$balnum.'" id="loadbalancing_prevlonhost_'.$balnum.'" value="" /> </span>'."\n";
} else {	} else {
Line 3023 sub print_loadbalancing {	Line 3084 sub print_loadbalancing {
if (exists($currbalancer{$spares[$i]})) {	if (exists($currbalancer{$spares[$i]})) {
$disabled = ' disabled="disabled"';	$disabled = ' disabled="disabled"';
}	}
$targettable .=	$targettable .=
'<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.	'<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'.
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval.	$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval.
'</span></label></td>';	'</span></label></td>';
Line 3107 sub loadbalancing_rules {	Line 3168 sub loadbalancing_rules {
$css_class,$balnum,$islast) = @_;	$css_class,$balnum,$islast) = @_;
my $output;	my $output;
my $num = 0;	my $num = 0;
my ($alltypes,$othertypes,$titles) =	my ($alltypes,$othertypes,$titles) =
&loadbalancing_titles($dom,$intdom,$usertypes,$types);	&loadbalancing_titles($dom,$intdom,$usertypes,$types);
if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) {	if ((ref($alltypes) eq 'ARRAY') && (ref($titles) eq 'HASH')) {
foreach my $type (@{$alltypes}) {	foreach my $type (@{$alltypes}) {
Line 3116 sub loadbalancing_rules {	Line 3177 sub loadbalancing_rules {
if (ref($currrules) eq 'HASH') {	if (ref($currrules) eq 'HASH') {
$current = $currrules->{$type};	$current = $currrules->{$type};
}	}
if (($type eq '_LC_external') \|\| ($type eq '_LC_internetdom')) {	if (($type eq '_LC_external') \|\| ($type eq '_LC_internetdom') \|\| ($type eq '_LC_ipchange')) {
if ($dom ne &Apache::lonnet::host_domain($lonhost)) {	if ($dom ne &Apache::lonnet::host_domain($lonhost)) {
$current = '';	$current = '';
}	}
Line 3137 sub loadbalancing_titles {	Line 3198 sub loadbalancing_titles {
'_LC_author' => &mt('Users from [_1] with author role',$dom),	'_LC_author' => &mt('Users from [_1] with author role',$dom),
'_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom),	'_LC_internetdom' => &mt('Users not from [_1], but from [_2]',$dom,$intdom),
'_LC_external' => &mt('Users not from [_1]',$intdom),	'_LC_external' => &mt('Users not from [_1]',$intdom),
	'_LC_ipchangesso' => &mt('SSO users from [_1], with IP mismatch',$dom),
	'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'),
);	);
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external');	my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
if (ref($types) eq 'ARRAY') {	if (ref($types) eq 'ARRAY') {
unshift(@alltypes,@{$types},'default');	unshift(@alltypes,@{$types},'default');
}	}
Line 3163 sub loadbalancing_titles {	Line 3226 sub loadbalancing_titles {
sub loadbalance_rule_row {	sub loadbalance_rule_row {
my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom,	my ($type,$title,$current,$servers,$currbalancer,$lonhost,$dom,
$targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_;	$targets_div_style,$homedom_div_style,$css_class,$balnum,$num,$islast) = @_;
my @rulenames = ('default','homeserver');	my @rulenames;
my %ruletitles = &offloadtype_text();	my %ruletitles = &offloadtype_text();
if ($type eq '_LC_external') {	if (($type eq '_LC_ipchangesso') \|\| ($type eq '_LC_ipchange')) {
push(@rulenames,'externalbalancer');	@rulenames = ('balancer','offloadedto');
} else {	} else {
push(@rulenames,'specific');	@rulenames = ('default','homeserver');
	if ($type eq '_LC_external') {
	push(@rulenames,'externalbalancer');
	} else {
	push(@rulenames,'specific');
	}
	push(@rulenames,'none');
}	}
push(@rulenames,'none');
my $style = $targets_div_style;	my $style = $targets_div_style;
if (($type eq '_LC_external') \|\| ($type eq '_LC_internetdom')) {	if (($type eq '_LC_external') \|\| ($type eq '_LC_internetdom') \|\| ($type eq '_LC_ipchange')) {
$style = $homedom_div_style;	$style = $homedom_div_style;
}	}
my $space;	my $space;
if ($islast && $num == 1) {	if ($islast && $num == 1) {
$space = '<div display="inline-block"> </div>';	$space = '<div display="inline-block"> </div>';
}	}
my $output =	my $output =
'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space.	'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td valign="top">'.$space.
'<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".	'<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
'<td valaign="top">'.$space.	'<td valaign="top">'.$space.
Line 3199 sub loadbalance_rule_row {	Line 3267 sub loadbalance_rule_row {
unless ($checked) {	unless ($checked) {
$default = ' selected="selected"';	$default = ' selected="selected"';
}	}
$extra =	$extra =
': <select name="loadbalancing_singleserver_'.$balnum.'_'.$type.	': <select name="loadbalancing_singleserver_'.$balnum.'_'.$type.
'" id="loadbalancing_singleserver_'.$balnum.'_'.$type.	'" id="loadbalancing_singleserver_'.$balnum.'_'.$type.
'" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n".	'" onchange="singleServerToggle('."'$balnum','$type'".')">'."\n".
Line 3237 sub offloadtype_text {	Line 3305 sub offloadtype_text {
'externalbalancer' => "Offloads to Load Balancer in user's domain",	'externalbalancer' => "Offloads to Load Balancer in user's domain",
'specific' => 'Offloads to specific server',	'specific' => 'Offloads to specific server',
'none' => 'No offload',	'none' => 'No offload',
	'balancer' => 'Session hosted on Load Balancer, after re-authentication',
	'offloadedto' => 'Session hosted on offload server, after re-authentication',
);	);
return %ruletitles;	return %ruletitles;
}	}
Line 3259 sub contact_titles {	Line 3329 sub contact_titles {
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',	'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
'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',
);	);
my %short_titles = &Apache::lonlocal::texthash (	my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',	adminemail => 'Admin E-mail address',
Line 3301 sub authorrequest_titles {	Line 3372 sub authorrequest_titles {
automatic => 'Automatic approval',	automatic => 'Automatic approval',
);	);
return %titles;	return %titles;
}	}

sub courserequest_conditions {	sub courserequest_conditions {
my %conditions = &Apache::lonlocal::texthash (	my %conditions = &Apache::lonlocal::texthash (
Line 3540 sub captcha_choice {	Line 3611 sub captcha_choice {
#	#
# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit:	# Note: If reCAPTCHA is to be used for LON-CAPA servers in a domain, a domain coordinator should visit:
# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple	# https://www.google.com/recaptcha and generate a Public and Private key. For domains with multiple
# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu)	# servers a single key pair will be used for all servers, so the internet domain (e.g., yourcollege.edu)
# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.	# specified for use with the key should be broad enough to accommodate all servers in the LON-CAPA domain.
#	#
$output .= '</td></tr>'."\n".	$output .= '</td></tr>'."\n".
'<tr><td>'."\n".	'<tr><td>'."\n".
'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n".	'<span class="LC_nobreak"><span id="'.$context.'_recaptchapubtxt">'.$pubtext.'</span> '."\n".
Line 3689 sub print_usermodification {	Line 3760 sub print_usermodification {
}	}

sub print_defaults {	sub print_defaults {
my ($dom,$rowtotal) = @_;	my ($dom,$settings,$rowtotal) = @_;
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',	my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
'datelocale_def','portal_def');	'datelocale_def','portal_def');
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %defaults;
	if (ref($settings) eq 'HASH') {
	%defaults = %{$settings};
	} else {
	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
	foreach my $item (@items) {
	$defaults{$item} = $domdefaults{$item};
	}
	}
my $titles = &defaults_titles($dom);	my $titles = &defaults_titles($dom);
my $rownum = 0;	my $rownum = 0;
my ($datatable,$css_class);	my ($datatable,$css_class);
Line 3716 sub print_defaults {	Line 3795 sub print_defaults {
my %authnames = &authtype_names();	my %authnames = &authtype_names();
foreach my $auth (@authtypes) {	foreach my $auth (@authtypes) {
my $checked = ' ';	my $checked = ' ';
if ($domdefaults{$item} eq $auth) {	if ($defaults{$item} eq $auth) {
$checked = ' checked="checked" ';	$checked = ' checked="checked" ';
}	}
$datatable .= '<label><input type="radio" name="'.$item.	$datatable .= '<label><input type="radio" name="'.$item.
Line 3725 sub print_defaults {	Line 3804 sub print_defaults {
}	}
} elsif ($item eq 'timezone_def') {	} elsif ($item eq 'timezone_def') {
my $includeempty = 1;	my $includeempty = 1;
$datatable .= &Apache::loncommon::select_timezone($item,$domdefaults{$item},undef,$includeempty);	$datatable .= &Apache::loncommon::select_timezone($item,$defaults{$item},undef,$includeempty);
} elsif ($item eq 'datelocale_def') {	} elsif ($item eq 'datelocale_def') {
my $includeempty = 1;	my $includeempty = 1;
$datatable .= &Apache::loncommon::select_datelocale($item,$domdefaults{$item},undef,$includeempty);	$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty);
} elsif ($item eq 'lang_def') {	} elsif ($item eq 'lang_def') {
my %langchoices = &get_languages_hash();	my %langchoices = &get_languages_hash();
$langchoices{''} = 'No language preference';	$langchoices{''} = 'No language preference';
%langchoices = &Apache::lonlocal::texthash(%langchoices);	%langchoices = &Apache::lonlocal::texthash(%langchoices);
$datatable .= &Apache::loncommon::select_form($domdefaults{$item},$item,	$datatable .= &Apache::loncommon::select_form($defaults{$item},$item,
\%langchoices);	\%langchoices);
} else {	} else {
my $size;	my $size;
Line 3741 sub print_defaults {	Line 3820 sub print_defaults {
$size = ' size="25"';	$size = ' size="25"';
}	}
$datatable .= '<input type="text" name="'.$item.'" value="'.	$datatable .= '<input type="text" name="'.$item.'" value="'.
$domdefaults{$item}.'"'.$size.' />';	$defaults{$item}.'"'.$size.' />';
}	}
$datatable .= '</td></tr>';	$datatable .= '</td></tr>';
$rownum ++;	$rownum ++;
Line 3893 sub print_scantronformat {	Line 3972 sub print_scantronformat {
$datatable .= '<td>'.&mt('Default in use:').'<br />'.	$datatable .= '<td>'.&mt('Default in use:').'<br />'.
'<span class="LC_nobreak">';	'<span class="LC_nobreak">';
if ($scantronurl) {	if ($scantronurl) {
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'.	$datatable .= &Apache::loncommon::modal_link($scantronurl,&mt('Default bubblesheet format file'),600,500,
&mt('Default bubblesheet format file').'</a>';	undef,undef,undef,undef,'background-color:#ffffff');
} else {	} else {
$datatable = &mt('File unavailable for display');	$datatable = &mt('File unavailable for display');
}	}
Line 3919 sub print_scantronformat {	Line 3998 sub print_scantronformat {
}	}
$datatable .= '<td>'.$errorstr.'</td><td> ';	$datatable .= '<td>'.$errorstr.'</td><td> ';
} elsif ($scantronurl) {	} elsif ($scantronurl) {
	my $link = &Apache::loncommon::modal_link($scantronurl,&mt('Custom bubblesheet format file'),600,500,
	undef,undef,undef,undef,'background-color:#ffffff');
$datatable .= '<td><span class="LC_nobreak">'.	$datatable .= '<td><span class="LC_nobreak">'.
'<a href="'.$scantronurl.'" target="_blank">'.	$link.
&mt('Custom bubblesheet format file').'</a><label>'.	'<label><input type="checkbox" name="scantronformat_del"'.
'<input type="checkbox" name="scantronformat_del"'.	' value="1" />'.&mt('Delete?').'</label></span></td>'.
'" value="1" />'.&mt('Delete?').'</label></span></td>'.
'<td><span class="LC_nobreak"> '.	'<td><span class="LC_nobreak"> '.
&mt('Replace:').'</span><br />';	&mt('Replace:').'</span><br />';
}	}
Line 4077 sub print_coursecategories {	Line 4157 sub print_coursecategories {
}	}
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';	$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>';
}	}
$datatable .= '</select></td><td>';	$datatable .= '</select></span></td><td>';
if ($parent eq 'instcode' \|\| $parent eq 'communities') {	if ($parent eq 'instcode' \|\| $parent eq 'communities') {
$datatable .= '<span class="LC_nobreak">'	$datatable .= '<span class="LC_nobreak">'
.$default_names{$parent}.'</span>';	.$default_names{$parent}.'</span>';
Line 4107 sub print_coursecategories {	Line 4187 sub print_coursecategories {
$datatable .= '</td>';	$datatable .= '</td>';
} else {	} else {
$datatable .= $parent	$datatable .= $parent
.' <label><input type="checkbox" name="deletecategory" '	.' <span class="LC_nobreak"><label>'
	.'<input type="checkbox" name="deletecategory" '
.'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';	.'value="'.$item.'" />'.&mt('Delete').'</label></span></td>';
}	}
my $depth = 1;	my $depth = 1;
Line 4379 sub build_category_rows {	Line 4460 sub build_category_rows {
if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {	if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
my $numchildren = @{$cats->[$depth]{$parent}};	my $numchildren = @{$cats->[$depth]{$parent}};
my $css_class = $itemcount%2?' class="LC_odd_row"':'';	my $css_class = $itemcount%2?' class="LC_odd_row"':'';
$text .= '<td><table class="LC_datatable">';	$text .= '<td><table class="LC_data_table">';
my ($idxnum,$parent_name,$parent_item);	my ($idxnum,$parent_name,$parent_item);
my $higher = $depth - 1;	my $higher = $depth - 1;
if ($higher == 0) {	if ($higher == 0) {
Line 4671 sub usertype_update_row {	Line 4752 sub usertype_update_row {
}	}

sub modify_login {	sub modify_login {
my ($r,$dom,$confname,%domconfig) = @_;	my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,	my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl,
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);	%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon);
%title = ( coursecatalog => 'Display course catalog',	%title = ( coursecatalog => 'Display course catalog',
Line 4851 sub modify_login {	Line 4932 sub modify_login {
} else {	} else {
my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result);	my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$newfile{$lang},$result);
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';	$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>';
if ((grep(/^\Q$lang\E$/,@currlangs)) &&	if ((grep(/^\Q$lang\E$/,@currlangs)) &&
(!grep(/^\Q$lang\E$/,@delurls))) {	(!grep(/^\Q$lang\E$/,@delurls))) {

$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};	$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang};
Line 4909 sub modify_login {	Line 4990 sub modify_login {
}	}
if (keys(%changes) > 0 \|\| $colchgtext) {	if (keys(%changes) > 0 \|\| $colchgtext) {
&Apache::loncommon::devalidate_domconfig_cache($dom);	&Apache::loncommon::devalidate_domconfig_cache($dom);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domainconfig'} = 1;
	}
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
foreach my $item (sort(keys(%changes))) {	foreach my $item (sort(keys(%changes))) {
if ($item eq 'loginvia') {	if ($item eq 'loginvia') {
Line 4968 sub modify_login {	Line 5052 sub modify_login {
}	}
} elsif ($item eq 'captcha') {	} elsif ($item eq 'captcha') {
if (ref($loginhash{'login'}) eq 'HASH') {	if (ref($loginhash{'login'}) eq 'HASH') {
my $chgtxt;	my $chgtxt;
if ($loginhash{'login'}{$item} eq 'notused') {	if ($loginhash{'login'}{$item} eq 'notused') {
$chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');	$chgtxt .= &mt('No CAPTCHA validation in use for helpdesk form.');
} else {	} else {
Line 5029 sub color_font_choices {	Line 5113 sub color_font_choices {
links => "Link colors",	links => "Link colors",
images => "Images",	images => "Images",
font => "Font color",	font => "Font color",
fontmenu => "Font Menu",	fontmenu => "Font menu",
pgbg => "Page",	pgbg => "Page",
tabbg => "Header",	tabbg => "Header",
sidebg => "Border",	sidebg => "Border",
Line 5041 sub color_font_choices {	Line 5125 sub color_font_choices {
}	}

sub modify_rolecolors {	sub modify_rolecolors {
my ($r,$dom,$confname,$roles,%domconfig) = @_;	my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_;
my ($resulttext,%rolehash);	my ($resulttext,%rolehash);
$rolehash{'rolecolors'} = {};	$rolehash{'rolecolors'} = {};
if (ref($domconfig{'rolecolors'}) ne 'HASH') {	if (ref($domconfig{'rolecolors'}) ne 'HASH') {
Line 5056 sub modify_rolecolors {	Line 5140 sub modify_rolecolors {
if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
&Apache::loncommon::devalidate_domconfig_cache($dom);	&Apache::loncommon::devalidate_domconfig_cache($dom);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domainconfig'} = 1;
	}
$resulttext = &display_colorchgs($dom,\%changes,$roles,	$resulttext = &display_colorchgs($dom,\%changes,$roles,
$rolehash{'rolecolors'});	$rolehash{'rolecolors'});
} else {	} else {
Line 5081 sub modify_colors {	Line 5168 sub modify_colors {
my @images;	my @images;
my $servadm = $r->dir_config('lonAdmEMail');	my $servadm = $r->dir_config('lonAdmEMail');
my $errors;	my $errors;
	my %defaults;
foreach my $role (@{$roles}) {	foreach my $role (@{$roles}) {
if ($role eq 'login') {	if ($role eq 'login') {
%choices = &login_choices();	%choices = &login_choices();
@logintext = ('textcol','bgcol');	@logintext = ('textcol','bgcol');
} else {	} else {
%choices = &color_font_choices();	%choices = &color_font_choices();
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
}	}
if ($role eq 'login') {	if ($role eq 'login') {
@images = ('img','logo','domlogo','login');	@images = ('img','logo','domlogo','login');
@bgs = ('pgbg','mainbg','sidebg');	@bgs = ('pgbg','mainbg','sidebg');
} else {	} else {
@images = ('img');	@images = ('img');
@bgs = ('pgbg','tabbg','sidebg');	@bgs = ('pgbg','tabbg','sidebg');
	}
	my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
	unless ($env{'form.'.$role.'_font'} eq $defaults{'font'}) {
	$confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
	}
	if ($role eq 'login') {
	foreach my $item (@logintext) {
	unless ($env{'form.'.$role.'_'.$item} eq $defaults{'logintext'}{$item}) {
	$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
	}
	}
	} else {
	unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
	$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
	}
	}
	foreach my $item (@bgs) {
	unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
	$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
	}
}	}
$confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};	foreach my $item (@links) {
foreach my $item (@bgs,@links,@logintext) {	unless ($env{'form.'.$role.'_'.$item} eq $defaults{'links'}{$item}) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};	$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
	}
}	}
my ($configuserok,$author_ok,$switchserver) =	my ($configuserok,$author_ok,$switchserver) =
&config_check($dom,$confname,$servadm);	&config_check($dom,$confname,$servadm);
Line 5446 sub publishlogo {	Line 5554 sub publishlogo {
# See if there is anything left	# See if there is anything left
unless ($fname) { return ('error: no uploaded file'); }	unless ($fname) { return ('error: no uploaded file'); }
$fname="$subdir/$fname";	$fname="$subdir/$fname";
my $docroot=$r->dir_config('lonDocRoot');	my $docroot=$r->dir_config('lonDocRoot');
my $filepath="$docroot/priv";	my $filepath="$docroot/priv";
my $relpath = "$dom/$confname";	my $relpath = "$dom/$confname";
my ($fnamepath,$file,$fetchthumb);	my ($fnamepath,$file,$fetchthumb);
Line 5466 sub publishlogo {	Line 5574 sub publishlogo {
if ($file=~/\.(\w+)$/ &&	if ($file=~/\.(\w+)$/ &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {	(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
$output =	$output =
&mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1);	&mt('Invalid file extension ([_1]) - reserved for internal use.',$1);
} elsif ($file=~/\.(\w+)$/ &&	} elsif ($file=~/\.(\w+)$/ &&
!defined(&Apache::loncommon::fileembstyle($1))) {	!defined(&Apache::loncommon::fileembstyle($1))) {
$output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);	$output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
Line 5715 sub check_switchserver {	Line 5823 sub check_switchserver {
}	}

sub modify_quotas {	sub modify_quotas {
my ($dom,$action,%domconfig) = @_;	my ($dom,$action,$lastactref,%domconfig) = @_;
my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,	my ($context,@usertools,@options,%validations,%titles,%confhash,%toolshash,
%limithash,$toolregexp,%conditions,$resulttext,%changes);	%limithash,$toolregexp,%conditions,$resulttext,%changes);
if ($action eq 'quotas') {	if ($action eq 'quotas') {
Line 5737 sub modify_quotas {	Line 5845 sub modify_quotas {
@usertools = ('aboutme','blog','webdav','portfolio');	@usertools = ('aboutme','blog','webdav','portfolio');
%titles = &tool_titles();	%titles = &tool_titles();
}	}
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
if ($context eq 'requestcourses') {	if ($context eq 'requestcourses') {
Line 5936 sub modify_quotas {	Line 6044 sub modify_quotas {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
my $cachetime = 246060;	my $cachetime = 246060;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);	&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domdefaults'} = 1;
	}
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
unless (($context eq 'requestcourses') \|\|	unless (($context eq 'requestcourses') \|\|
($context eq 'requestauthor')) {	($context eq 'requestauthor')) {
if (ref($changes{'defaultquota'}) eq 'HASH') {	if (ref($changes{'defaultquota'}) eq 'HASH') {
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';	$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
Line 5948 sub modify_quotas {	Line 6058 sub modify_quotas {
if ($type eq 'default') {	if ($type eq 'default') {
$typetitle = $othertitle;	$typetitle = $othertitle;
}	}
$resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'defaultquota'}{$type}).'</li>';
}	}
}	}
$resulttext .= '</ul></li>';	$resulttext .= '</ul></li>';
Line 5961 sub modify_quotas {	Line 6071 sub modify_quotas {
if ($type eq 'default') {	if ($type eq 'default') {
$typetitle = $othertitle;	$typetitle = $othertitle;
}	}
$resulttext .= '<li>'.&mt('[_1] set to [_2] Mb',$typetitle,$confhash{'authorquota'}{$type}).'</li>';	$resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'authorquota'}{$type}).'</li>';
}	}
}	}
$resulttext .= '</ul></li>';	$resulttext .= '</ul></li>';
Line 5972 sub modify_quotas {	Line 6082 sub modify_quotas {
my (%haschgs,%inconf);	my (%haschgs,%inconf);
if ($context eq 'requestauthor') {	if ($context eq 'requestauthor') {
%haschgs = %changes;	%haschgs = %changes;
%inconf = %confhash;	%inconf = %confhash;
} else {	} else {
if (ref($changes{$item}) eq 'HASH') {	if (ref($changes{$item}) eq 'HASH') {
%haschgs = %{$changes{$item}};	%haschgs = %{$changes{$item}};
Line 5986 sub modify_quotas {	Line 6096 sub modify_quotas {
&Apache::lonnet::usertools_access($env{'user.name'},	&Apache::lonnet::usertools_access($env{'user.name'},
$env{'user.domain'},	$env{'user.domain'},
$item,'reload',$context);	$item,'reload',$context);
if (($context eq 'requestcourses') \|\|	if (($context eq 'requestcourses') \|\|
($context eq 'requestauthor')) {	($context eq 'requestauthor')) {
if ($env{'environment.canrequest.'.$item} ne $newacc) {	if ($env{'environment.canrequest.'.$item} ne $newacc) {
$newenv{'environment.canrequest.'.$item} = $newacc;	$newenv{'environment.canrequest.'.$item} = $newacc;
Line 6079 sub modify_quotas {	Line 6189 sub modify_quotas {
}	}

sub modify_autoenroll {	sub modify_autoenroll {
my ($dom,%domconfig) = @_;	my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,%changes);	my ($resulttext,%changes);
my %currautoenroll;	my %currautoenroll;
if (ref($domconfig{'autoenroll'}) eq 'HASH') {	if (ref($domconfig{'autoenroll'}) eq 'HASH') {
Line 6147 sub modify_autoenroll {	Line 6257 sub modify_autoenroll {
if ($changes{'coowners'}) {	if ($changes{'coowners'}) {
$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';	$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>';
&Apache::loncommon::devalidate_domconfig_cache($dom);	&Apache::loncommon::devalidate_domconfig_cache($dom);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domainconfig'} = 1;
	}
}	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
} else {	} else {
Line 6552 sub modify_directorysrch {	Line 6665 sub modify_directorysrch {
} else {	} else {
$chgtext =~ s/\; $//;	$chgtext =~ s/\; $//;
}	}
$resulttext .=	$resulttext .=
'<li>'.	'<li>'.
&mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",	&mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]",
'<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext).	'<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext).
Line 6598 sub modify_directorysrch {	Line 6711 sub modify_directorysrch {
}	}

sub modify_contacts {	sub modify_contacts {
my ($dom,%domconfig) = @_;	my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash);	my ($resulttext,%currsetting,%newsetting,%changes,%contacts_hash);
if (ref($domconfig{'contacts'}) eq 'HASH') {	if (ref($domconfig{'contacts'}) eq 'HASH') {
foreach my $key (keys(%{$domconfig{'contacts'}})) {	foreach my $key (keys(%{$domconfig{'contacts'}})) {
Line 6608 sub modify_contacts {	Line 6721 sub modify_contacts {
my (%others,%to,%bcc);	my (%others,%to,%bcc);
my @contacts = ('supportemail','adminemail');	my @contacts = ('supportemail','adminemail');
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',	my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
'requestsmail','updatesmail');	'requestsmail','updatesmail','idconflictsmail');
	my @toggles = ('reporterrors','reportupdates');
foreach my $type (@mailings) {	foreach my $type (@mailings) {
@{$newsetting{$type}} =	@{$newsetting{$type}} =
&Apache::loncommon::get_env_multiple('form.'.$type);	&Apache::loncommon::get_env_multiple('form.'.$type);
Line 6630 sub modify_contacts {	Line 6744 sub modify_contacts {
$to{$item} = $env{'form.'.$item};	$to{$item} = $env{'form.'.$item};
$contacts_hash{'contacts'}{$item} = $to{$item};	$contacts_hash{'contacts'}{$item} = $to{$item};
}	}
	foreach my $item (@toggles) {
	if ($env{'form.'.$item} =~ /^(0\|1)$/) {
	$contacts_hash{'contacts'}{$item} = $env{'form.'.$item};
	}
	}
if (keys(%currsetting) > 0) {	if (keys(%currsetting) > 0) {
foreach my $item (@contacts) {	foreach my $item (@contacts) {
if ($to{$item} ne $currsetting{$item}) {	if ($to{$item} ne $currsetting{$item}) {
Line 6668 sub modify_contacts {	Line 6787 sub modify_contacts {
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;
}	}
}	}
foreach my $type (@mailings) {	foreach my $type (@mailings) {
if ((@{$newsetting{$type}} != 1) \|\| ($newsetting{$type}[0] ne $default{$type})) {	if ((@{$newsetting{$type}} != 1) \|\| ($newsetting{$type}[0] ne $default{$type})) {
Line 6685 sub modify_contacts {	Line 6804 sub modify_contacts {
}	}
}	}
}	}
	foreach my $item (@toggles) {
	if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) {
	$changes{$item} = 1;
	} elsif ((!$env{'form.'.$item}) &&
	(($currsetting{$item} eq '') \|\| ($currsetting{$item} == 1))) {
	$changes{$item} = 1;
	}
	}
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,	my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
$dom);	$dom);
if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
	&Apache::loncommon::devalidate_domconfig_cache($dom);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domainconfig'} = 1;
	}
my ($titles,$short_titles) = &contact_titles();	my ($titles,$short_titles) = &contact_titles();
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
foreach my $item (@contacts) {	foreach my $item (@contacts) {
Line 6719 sub modify_contacts {	Line 6850 sub modify_contacts {
$resulttext .= '</li>';	$resulttext .= '</li>';
}	}
}	}
	my @offon = ('off','on');
	if ($changes{'reporterrors'}) {
	$resulttext .= '<li>'.
	&mt('E-mail error reports to [_1] set to "'.
	$offon[$env{'form.reporterrors'}].'".',
	&Apache::loncommon::modal_link('http://loncapa.org/core.html',
	&mt('LON-CAPA core group - MSU'),600,500)).
	'</li>';
	}
	if ($changes{'reportupdates'}) {
	$resulttext .= '<li>'.
	&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'.
	$offon[$env{'form.reportupdates'}].'".',
	&Apache::loncommon::modal_link('http://loncapa.org/core.html',
	&mt('LON-CAPA core group - MSU'),600,500)).
	'</li>';
	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
} else {	} else {
$resulttext = &mt('No changes made to contact information');	$resulttext = &mt('No changes made to contact information');
Line 6746 sub modify_usercreation {	Line 6894 sub modify_usercreation {
foreach my $item(@contexts) {	foreach my $item(@contexts) {
if ($item eq 'selfcreate') {	if ($item eq 'selfcreate') {
@{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);	@{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) \|\| ($domdefaults{'auth_def'} eq 'localauth'))) {	if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) \|\| ($domdefaults{'auth_def'} eq 'localauth'))) {
if (ref($cancreate{$item}) eq 'ARRAY') {	if (ref($cancreate{$item}) eq 'ARRAY') {
if (grep(/^login$/,@{$cancreate{$item}})) {	if (grep(/^login$/,@{$cancreate{$item}})) {
Line 7019 sub modify_usercreation {	Line 7167 sub modify_usercreation {
if ($captchas{$cancreate{$type}}) {	if ($captchas{$cancreate{$type}}) {
$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}.");	$chgtext .= &mt("Validation for self-creation screen set to $captchas{$cancreate{$type}}.");
} else {	} else {
$chgtext .= &mt('Validation for self-creation screen set to unknown type.');	$chgtext .= &mt('Validation for self-creation screen set to unknown type.');
}	}
}	}
} elsif ($type eq 'recaptchakeys') {	} elsif ($type eq 'recaptchakeys') {
Line 7147 sub process_captcha {	Line 7295 sub process_captcha {
$newsettings->{'captcha'} = 'original';	$newsettings->{'captcha'} = 'original';
}	}
if ($current->{'captcha'} ne $newsettings->{'captcha'}) {	if ($current->{'captcha'} ne $newsettings->{'captcha'}) {
if ($container eq 'cancreate') {	if ($container eq 'cancreate') {
if (ref($changes->{'cancreate'}) eq 'ARRAY') {	if (ref($changes->{'cancreate'}) eq 'ARRAY') {
push(@{$changes->{'cancreate'}},'captcha');	push(@{$changes->{'cancreate'}},'captcha');
} elsif (!defined($changes->{'cancreate'})) {	} elsif (!defined($changes->{'cancreate'})) {
Line 7186 sub process_captcha {	Line 7334 sub process_captcha {
$changes->{'cancreate'} = ['recaptchakeys'];	$changes->{'cancreate'} = ['recaptchakeys'];
}	}
} else {	} else {
$changes->{'recaptchakeys'} = 1;	$changes->{'recaptchakeys'} = 1;
}	}
}	}
return;	return;
Line 7313 sub modify_usermodification {	Line 7461 sub modify_usermodification {
}	}

sub modify_defaults {	sub modify_defaults {
my ($dom,$r) = @_;	my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);	my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors);
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');	my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def');
my @authtypes = ('internal','krb4','krb5','localauth');	my @authtypes = ('internal','krb4','krb5','localauth');
foreach my $item (@items) {	foreach my $item (@items) {
Line 7375 sub modify_defaults {	Line 7523 sub modify_defaults {
if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
my $version = $r->dir_config('lonVersion');	my $version = &Apache::lonnet::get_server_loncaparev($dom);
my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";	my $mailmsgtext = "Changes made to domain settings in a LON-CAPA installation - domain: $dom (running version: $version) - dns_domain.tab needs to be updated with the following changes, to support legacy 2.4, 2.5 and 2.6 versions of LON-CAPA.\n\n";
foreach my $item (sort(keys(%changes))) {	foreach my $item (sort(keys(%changes))) {
my $value = $env{'form.'.$item};	my $value = $env{'form.'.$item};
Line 7398 sub modify_defaults {	Line 7546 sub modify_defaults {
$mailmsgtext .= "\n";	$mailmsgtext .= "\n";
my $cachetime = 246060;	my $cachetime = 246060;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);	&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domdefaults'} = 1;
	}
if ($changes{'auth_def'} \|\| $changes{'auth_arg_def'} \|\| $changes{'lang_def'} \|\| $changes{'datelocale_def'}) {	if ($changes{'auth_def'} \|\| $changes{'auth_arg_def'} \|\| $changes{'lang_def'} \|\| $changes{'datelocale_def'}) {
my $sysmail = $r->dir_config('lonSysEMail');	my $notify = 1;
&Apache::lonmsg::sendemail($sysmail,"LON-CAPA Domain Settings Change - $dom",$mailmsgtext);	if (ref($domconfig{'contacts'}) eq 'HASH') {
	if ($domconfig{'contacts'}{'reportupdates'} == 0) {
	$notify = 0;
	}
	}
	if ($notify) {
	&Apache::lonmsg::sendemail('installrecord@loncapa.org',
	"LON-CAPA Domain Settings Change - $dom",
	$mailmsgtext);
	}
}	}
} else {	} else {
$resulttext = &mt('No changes made to default authentication/language/timezone settings');	$resulttext = &mt('No changes made to default authentication/language/timezone settings');
Line 7420 sub modify_defaults {	Line 7580 sub modify_defaults {
}	}

sub modify_scantron {	sub modify_scantron {
my ($r,$dom,$confname,%domconfig) = @_;	my ($r,$dom,$confname,$lastactref,%domconfig) = @_;
my ($resulttext,%confhash,%changes,$errors);	my ($resulttext,%confhash,%changes,$errors);
my $custom = 'custom.tab';	my $custom = 'custom.tab';
my $default = 'default.tab';	my $default = 'default.tab';
Line 7481 sub modify_scantron {	Line 7641 sub modify_scantron {
}	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
&Apache::loncommon::devalidate_domconfig_cache($dom);	&Apache::loncommon::devalidate_domconfig_cache($dom);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domainconfig'} = 1;
	}
} else {	} else {
$resulttext = &mt('No changes made to bubblesheet format file');	$resulttext = &mt('No changes made to bubblesheet format file');
}	}
Line 7871 sub modify_helpsettings {	Line 8034 sub modify_helpsettings {
$changes{$item} = 1;	$changes{$item} = 1;
}	}
}	}
if (($env{'form.'.$item} eq '0') \|\| ($env{'form.'.$item} eq '1')) {	if (($env{'form.'.$item} eq '0') \|\| ($env{'form.'.$item} eq '1')) {
$helphash{'helpsettings'}{$item} = $env{'form.'.$item};	$helphash{'helpsettings'}{$item} = $env{'form.'.$item};
}	}
}	}
Line 7904 sub modify_helpsettings {	Line 8067 sub modify_helpsettings {
}	}

sub modify_coursedefaults {	sub modify_coursedefaults {
my ($dom,%domconfig) = @_;	my ($dom,$lastactref,%domconfig) = @_;
my ($resulttext,$errors,%changes,%defaultshash);	my ($resulttext,$errors,%changes,%defaultshash);
my %defaultchecked = ('canuse_pdfforms' => 'off');	my %defaultchecked = ('canuse_pdfforms' => 'off');
my @toggles = ('canuse_pdfforms');	my @toggles = ('canuse_pdfforms');
	my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial',
	'uploadquota_community');
	my @types = ('official','unofficial','community');
	my %staticdefaults = (
	anonsurvey_threshold => 10,
	uploadquota => 500,
	);

$defaultshash{'coursedefaults'} = {};	$defaultshash{'coursedefaults'} = {};

Line 7936 sub modify_coursedefaults {	Line 8106 sub modify_coursedefaults {
}	}
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};	$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item};
}	}
my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'};	foreach my $item (@numbers) {
my $newdefresponder = $env{'form.anonsurvey_threshold'};	my ($currdef,$newdef);
$newdefresponder =~ s/\D//g;	$newdef = $env{'form.'.$item};
if ($newdefresponder eq '' \|\| $newdefresponder < 1) {	if ($item eq 'anonsurvey_threshold') {
$newdefresponder = 1;	$currdef = $domconfig{'coursedefaults'}{$item};
}	$newdef =~ s/\D//g;
$defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder;	if ($newdef eq '' \|\| $newdef < 1) {
if ($currdefresponder ne $newdefresponder) {	$newdef = 1;
unless ($currdefresponder eq '' && $newdefresponder == 10) {	}
$changes{'anonsurvey_threshold'} = 1;	$defaultshash{'coursedefaults'}{$item} = $newdef;
	} else {
	my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/);
	if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
	$currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
	}
	$newdef =~ s/[^\w.\-]//g;
	$defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef;
	}
	if ($currdef ne $newdef) {
	my $staticdef;
	if ($item eq 'anonsurvey_threshold') {
	unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) {
	$changes{$item} = 1;
	}
	} else {
	unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) {
	$changes{'uploadquota'} = 1;
	}
	}
}	}
}	}
my $officialcreds = $env{'form.official_credits'};	my $officialcreds = $env{'form.official_credits'};
Line 7969 sub modify_coursedefaults {	Line 8158 sub modify_coursedefaults {
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,	my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash,
$dom);	$dom);
if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
my %domdefaults;
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
if (($changes{'canuse_pdfforms'}) \|\| ($changes{'coursecredits'})) {	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
%domdefaults = &Apache::lonnet::get_domain_defaults($dom);	if (($changes{'canuse_pdfforms'}) \|\| ($changes{'coursecredits'}) \|\| ($changes{'uploadquota'})) {
if ($changes{'canuse_pdfforms'}) {	if ($changes{'canuse_pdfforms'}) {
$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};	$domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'};
}	}
Line 7984 sub modify_coursedefaults {	Line 8172 sub modify_coursedefaults {
$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};	$defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'};
}	}
}	}
	if ($changes{'uploadquota'}) {
	if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
	foreach my $type (@types) {
	$domdefaults{$type.'quota'}=$defaultshash{'coursedefaults'}{'uploadquota'}{$type};
	}
	}
	}
my $cachetime = 246060;	my $cachetime = 246060;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);	&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domdefaults'} = 1;
	}
}	}
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
foreach my $item (sort(keys(%changes))) {	foreach my $item (sort(keys(%changes))) {
Line 7997 sub modify_coursedefaults {	Line 8195 sub modify_coursedefaults {
}	}
} 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') {
	if (ref($defaultshash{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
	$resulttext .= '<li>'.&mt('Default quota for content uploaded to a course/community via Course Editor set as follows:').'<ul>'.
	'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'.
	'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'.
	'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'.
	'</ul>'.
	'</li>';
	} else {
	$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>';
	}
} elsif ($item eq 'coursecredits') {	} elsif ($item eq 'coursecredits') {
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {	if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
if (($domdefaults{'officialcredits'} eq '') &&	if (($domdefaults{'officialcredits'} eq '') &&
Line 8026 sub modify_coursedefaults {	Line 8235 sub modify_coursedefaults {
}	}

sub modify_usersessions {	sub modify_usersessions {
my ($dom,%domconfig) = @_;	my ($dom,$lastactref,%domconfig) = @_;
my @hostingtypes = ('version','excludedomain','includedomain');	my @hostingtypes = ('version','excludedomain','includedomain');
my @offloadtypes = ('primary','default');	my @offloadtypes = ('primary','default');
my %types = (	my %types = (
Line 8043 sub modify_usersessions {	Line 8252 sub modify_usersessions {
foreach my $prefix (@prefixes) {	foreach my $prefix (@prefixes) {
$defaultshash{'usersessions'}{$prefix} = {};	$defaultshash{'usersessions'}{$prefix} = {};
}	}
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
my $resulttext;	my $resulttext;
my %iphost = &Apache::lonnet::get_iphost();	my %iphost = &Apache::lonnet::get_iphost();
foreach my $prefix (@prefixes) {	foreach my $prefix (@prefixes) {
Line 8219 sub modify_usersessions {	Line 8428 sub modify_usersessions {
}	}
my $cachetime = 246060;	my $cachetime = 246060;
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);	&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);
	if (ref($lastactref) eq 'HASH') {
	$lastactref->{'domdefaults'} = 1;
	}
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
my %lt = &usersession_titles();	my %lt = &usersession_titles();
$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
Line 8230 sub modify_usersessions {	Line 8442 sub modify_usersessions {
foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) {	foreach my $lonhost (sort(keys(%{$changes{$prefix}}))) {
$resulttext .= '<li><b>'.$lonhost.'</b> ';	$resulttext .= '<li><b>'.$lonhost.'</b> ';
my $lonhostdom = &Apache::lonnet::host_domain($lonhost);	my $lonhostdom = &Apache::lonnet::host_domain($lonhost);
&Apache::lonnet::remote_devalidate_cache($lonhost,'spares',$lonhostdom);	my $cachekey = &escape('spares').':'.&escape($lonhostdom);
	&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]);
if (ref($changes{$prefix}{$lonhost}) eq 'HASH') {	if (ref($changes{$prefix}{$lonhost}) eq 'HASH') {
foreach my $type (@{$types{$prefix}}) {	foreach my $type (@{$types{$prefix}}) {
if ($changes{$prefix}{$lonhost}{$type}) {	if ($changes{$prefix}{$lonhost}{$type}) {
Line 8320 sub modify_loadbalancing {	Line 8533 sub modify_loadbalancing {
if ($balancer eq '') {	if ($balancer eq '') {
next;	next;
}	}
if (!exists($servers{$balancer})) {	if (!exists($servers{$balancer})) {
if (exists($currbalancer{$balancer})) {	if (exists($currbalancer{$balancer})) {
push(@{$changes{'delete'}},$balancer);	push(@{$changes{'delete'}},$balancer);
}	}
Line 8371 sub modify_loadbalancing {	Line 8584 sub modify_loadbalancing {
}	}
} else {	} else {
if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') {	if (ref($defaultshash{'loadbalancing'}{$balancer}) eq 'HASH') {
foreach my $sparetype (@sparestypes) {	foreach my $sparetype (@sparestypes) {
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {	if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') {
if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {	if (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}} > 0) {
$changes{'curr'}{$balancer}{'targets'} = 1;	$changes{'curr'}{$balancer}{'targets'} = 1;
}	}
}	}
}	}
}	}
}	}
my $ishomedom;	my $ishomedom;
if (&Apache::lonnet::host_domain($balancer) eq $dom) {	if (&Apache::lonnet::host_domain($balancer) eq $dom) {
Line 8387 sub modify_loadbalancing {	Line 8600 sub modify_loadbalancing {
if (ref($alltypes) eq 'ARRAY') {	if (ref($alltypes) eq 'ARRAY') {
foreach my $type (@{$alltypes}) {	foreach my $type (@{$alltypes}) {
my $rule;	my $rule;
unless ((($type eq '_LC_external') \|\| ($type eq '_LC_internetdom')) &&	unless ((($type eq '_LC_external') \|\| ($type eq '_LC_internetdom')) &&
(!$ishomedom)) {	(!$ishomedom)) {
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};	$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type};
}	}
Line 8412 sub modify_loadbalancing {	Line 8625 sub modify_loadbalancing {
}	}
my $putresult = &Apache::lonnet::put_dom('configuration',	my $putresult = &Apache::lonnet::put_dom('configuration',
\%defaultshash,$dom);	\%defaultshash,$dom);

if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
if (ref($changes{'delete'}) eq 'ARRAY') {	if (ref($changes{'delete'}) eq 'ARRAY') {
foreach my $balancer (sort(@{$changes{'delete'}})) {	foreach my $balancer (sort(@{$changes{'delete'}})) {
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';	$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>';
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);	my $cachekey = &escape('loadbalancing').':'.&escape($dom);
	&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
}	}
}	}
if (ref($changes{'add'}) eq 'ARRAY') {	if (ref($changes{'add'}) eq 'ARRAY') {
foreach my $balancer (sort(@{$changes{'add'}})) {	foreach my $balancer (sort(@{$changes{'add'}})) {
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);	$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer);
}	}
}	}
Line 8463 sub modify_loadbalancing {	Line 8676 sub modify_loadbalancing {
my $balancetext;	my $balancetext;
if ($rule eq '') {	if ($rule eq '') {
$balancetext = $ruletitles{'default'};	$balancetext = $ruletitles{'default'};
} elsif (($rule eq 'homeserver') \|\| ($rule eq 'externalbalancer')) {	} elsif (($rule eq 'homeserver') \|\| ($rule eq 'externalbalancer') \|\|
	($rule eq 'balancer') \|\| ($rule eq 'offloadedto')) {
$balancetext = $ruletitles{$rule};	$balancetext = $ruletitles{$rule};
} else {	} else {
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});	$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type});
}	}
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';	$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- balancing for [_2] set to - "[_3]"',$balancer,$titles->{$type},$balancetext).'</li>';
}	}
}	}
}	}
}	}
&Apache::lonnet::remote_devalidate_cache($balancer,'loadbalancing',$dom);	my $cachekey = &escape('loadbalancing').':'.&escape($dom);
	&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]);
}	}
}	}
if ($resulttext ne '') {	if ($resulttext ne '') {
Line 8561 sub active_dc_picker {	Line 8776 sub active_dc_picker {
}	}
}	}
@domcoord = sort(@domcoord);	@domcoord = sort(@domcoord);
my $numdcs = scalar(@domcoord);	my $numdcs = scalar(@domcoord);
my $rows = 0;	my $rows = 0;
my $table;	my $table;
if ($numdcs > 1) {	if ($numdcs > 1) {
Line 8695 sub lonbalance_targets_js {	Line 8910 sub lonbalance_targets_js {
}	}
&get_loadbalancers_config($servers,\%existing,\%currbalancer,	&get_loadbalancers_config($servers,\%existing,\%currbalancer,
\%currtargets,\%currrules);	\%currtargets,\%currrules);
my $balancers = join("','",sort(keys(%currbalancer)));	my $balancers = join("','",sort(keys(%currbalancer)));
return <<"END";	return <<"END";

<script type="text/javascript">	<script type="text/javascript">
Line 8766 function showSpares(balancer,ishomedom,b	Line 8981 function showSpares(balancer,ishomedom,b
} else {	} else {
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';	document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='none';
document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';	document.getElementById('balancerule_'+balnum+'_'+insttypes[k]).style.display='none';

}	}
} else {	} else {
document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';	document.getElementById('balanceruletitle_'+balnum+'_'+insttypes[k]).style.display='block';
Line 8778 function showSpares(balancer,ishomedom,b	Line 8992 function showSpares(balancer,ishomedom,b
var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]);	var item = document.getElementById('loadbalancing_singleserver_'+balnum+'_'+insttypes[k]);
item.options.length = 0;	item.options.length = 0;
item.options[0] = new Option("","",true,true);	item.options[0] = new Option("","",true,true);
var idx = 0;	var idx = 0;
for (var m=0; m<alltargets.length; m++) {	for (var m=0; m<alltargets.length; m++) {
if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {	if ((currBalancers.indexOf(alltargets[m]) == -1) && (alltargets[m] != balancer)) {
idx ++;	idx ++;
item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);	item.options[idx] = new Option(alltargets[m],alltargets[m],false,false);

}	}
}	}
}	}
Line 9196 sub captcha_phrases {	Line 9409 sub captcha_phrases {
);	);
}	}

	sub devalidate_remote_domconfs {
	my ($dom,$cachekeys) = @_;
	return unless (ref($cachekeys) eq 'HASH');
	my %servers = &Apache::lonnet::internet_dom_servers($dom);
	my %thismachine;
	map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
	my @posscached = ('domainconfig','domdefaults');
	if (keys(%servers) > 1) {
	foreach my $server (keys(%servers)) {
	next if ($thismachine{$server});
	my @cached;
	foreach my $name (@posscached) {
	if ($cachekeys->{$name}) {
	push(@cached,&escape($name).':'.&escape($dom));
	}
	}
	if (@cached) {
	&Apache::lonnet::remote_devalidate_cache($server,\@cached);
	}
	}
	}
	return;
	}

1;	1;

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

Removed from v.1.197
changed lines
	Added in v.1.215