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.75 and 1.96

version 1.75, 2008/12/11 11:02:25	version 1.96, 2009/05/19 20:00:24
Line 37 use Apache::loncommon();	Line 37 use Apache::loncommon();
use Apache::lonhtmlcommon();	use Apache::lonhtmlcommon();
use Apache::lonlocal;	use Apache::lonlocal;
use Apache::lonmsg();	use Apache::lonmsg();
	use Apache::lonconfigsettings;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
use LONCAPA::Enrollment;	use LONCAPA::Enrollment;
use LONCAPA::loncgi();	use LONCAPA::lonauthcgi();
use File::Copy;	use File::Copy;
use Locale::Language;	use Locale::Language;
use DateTime::TimeZone;	use DateTime::TimeZone;
Line 53 sub handler {	Line 54 sub handler {
return OK;	return OK;
}	}

	my $context = 'domain';
my $dom = $env{'request.role.domain'};	my $dom = $env{'request.role.domain'};
my $domdesc = &Apache::lonnet::domain($dom,'description');	my $domdesc = &Apache::lonnet::domain($dom,'description');
if (&Apache::lonnet::allowed('mau',$dom)) {	if (&Apache::lonnet::allowed('mau',$dom)) {
Line 74 sub handler {	Line 76 sub handler {
&Apache::lonnet::get_dom('configuration',['login','rolecolors',	&Apache::lonnet::get_dom('configuration',['login','rolecolors',
'quotas','autoenroll','autoupdate','directorysrch',	'quotas','autoenroll','autoupdate','directorysrch',
'usercreation','usermodification','contacts','defaults',	'usercreation','usermodification','contacts','defaults',
'scantron','coursecategories','serverstatuses'],$dom);	'scantron','coursecategories','serverstatuses',
	'requestcourses'],$dom);
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',	my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll',
'autoupdate','directorysrch','contacts',	'autoupdate','directorysrch','contacts',
'usercreation','usermodification','scantron',	'usercreation','usermodification','scantron',
'coursecategories','serverstatuses');	'requestcourses','coursecategories','serverstatuses');
my %prefs = (	my %prefs = (
'rolecolors' =>	'rolecolors' =>
{ text => 'Default color schemes',	{ text => 'Default color schemes',
Line 105 sub handler {	Line 108 sub handler {
col2 => 'Value'}],	col2 => 'Value'}],
},	},
'quotas' =>	'quotas' =>
{ text => 'User blogs, home pages and portfolios',	{ text => 'User blogs, personal information pages and portfolios',
help => 'Domain_Configuration_Quotas',	help => 'Domain_Configuration_Quotas',
header => [{col1 => 'User type',	header => [{col1 => 'User affiliation',
col2 => 'Available tools',	col2 => 'Available tools',
col3 => 'Portfolio quota',}],	col3 => 'Portfolio quota',}],
},	},
Line 159 sub handler {	Line 162 sub handler {
col2 => 'Information settable when self-creating account (if directory data blank)'}],	col2 => 'Information settable when self-creating account (if directory data blank)'}],
},	},
'scantron' =>	'scantron' =>
{ text => 'Scantron format file',	{ text => 'Bubblesheet format file',
help => 'Domain_Configuration_Scantron_Format',	help => 'Domain_Configuration_Scantron_Format',
header => [ {col1 => 'Item',	header => [ {col1 => 'Item',
col2 => '',	col2 => '',
}],	}],
},	},
	'requestcourses' =>
	{text => 'Request creation of courses',
	help => 'Domain_Configuration_Request_Courses',
	header => [{col1 => 'User affiliation',
	col2 => 'Requestable course types',}],
	},
'coursecategories' =>	'coursecategories' =>
{ text => 'Cataloging of courses',	{ text => 'Cataloging of courses',
help => 'Domain_Configuration_Cataloging_Courses',	help => 'Domain_Configuration_Cataloging_Courses',
Line 175 sub handler {	Line 184 sub handler {
}],	}],
},	},
'serverstatuses' =>	'serverstatuses' =>
{text => 'Access to Server Status Pages',	{text => 'Access to server status pages',
help => 'Domain_Configuration_Server_Status',	help => 'Domain_Configuration_Server_Status',
header => [{col1 => 'Status Page',	header => [{col1 => 'Status Page',
col2 => 'Other named users',	col2 => 'Other named users',
Line 190 sub handler {	Line 199 sub handler {
text=>"Pick functionality"});	text=>"Pick functionality"});
my $confname = $dom.'-domainconfig';	my $confname = $dom.'-domainconfig';
if ($phase eq 'process') {	if ($phase eq 'process') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
({href=>"javascript:changePage(document.$phase,'display')",
text=>"Domain Configuration"},
{href=>"javascript:changePage(document.$phase,'$phase')",
text=>"Updated"});
&print_header($r,$phase);
foreach my $item (@prefs_order) {
if (grep(/^\Q$item\E$/,@actions)) {
$r->print('<h3>'.&mt($prefs{$item}{'text'}).'</h3>'.
&process_changes($r,$dom,$confname,$item,
\@roles,%domconfig));
}
}
$r->print('<p>');
&print_footer($r,$phase,'display','Back to configuration display',
\@actions);
$r->print('</p>');
} elsif ($phase eq 'display') {	} elsif ($phase eq 'display') {
&Apache::lonhtmlcommon::add_breadcrumb	&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
({href=>"javascript:changePage(document.$phase,'display')",
text=>"Domain Configuration"});
&print_header($r,$phase);
if (@actions > 0) {
my $rowsum = 0;
my (%output,%rowtotal,@items);
my $halfway = @actions/2;
foreach my $item (@prefs_order) {
if (grep(/^\Q$item\E$/,@actions)) {
push(@items,$item);
($output{$item},$rowtotal{$item}) =
&print_config_box($r,$dom,$confname,$phase,
$item,$prefs{$item},
$domconfig{$item});
$rowsum += $rowtotal{$item};
}
}
my $colend;
my $halfway = $rowsum/2;
my $aggregate = 0;
my $sumleft = 0;
my $sumright = 0;
my $crossover;
for (my $i=0; $i<@items; $i++) {
$aggregate += $rowtotal{$items[$i]};
if ($aggregate > $halfway) {
$crossover = $i;
last;
}
}
for (my $i=0; $i<$crossover; $i++) {
$sumleft += $rowtotal{$items[$i]};
}
for (my $i=$crossover+1; $i<@items; $i++) {
$sumright += $rowtotal{$items[$i]};
}
if ((@items > 1) && ($env{'form.numcols'} == 2)) {
my $sumdiff = $sumright - $sumleft;
if ($sumdiff > 0) {
$colend = $crossover + 1;
} else {
$colend = $crossover;
}
} else {
$colend = @items;
}
$r->print('<p><table class="LC_double_column"><tr><td class="LC_left_col">');
for (my $i=0; $i<$colend; $i++) {
$r->print($output{$items[$i]});
}
$r->print('</td><td></td><td class="LC_right_col">');
if ($colend < @items) {
for (my $i=$colend; $i<@items; $i++) {
$r->print($output{$items[$i]});
}
}
$r->print('</td></tr></table></p>');
$r->print(&print_footer($r,$phase,'process','Save',\@actions));
} else {
$r->print('<input type="hidden" name="phase" value="" />'.
'<input type="hidden" name="numcols" value="'.
$env{'form.numcols'}.'" />'."\n".
'<span class="LC_error">'.&mt('No settings chosen').
'</span>');
}
$r->print('</form>');
$r->print(&Apache::loncommon::end_page());
} else {	} else {
if ($phase eq '') {
$phase = 'pickactions';
}
my %helphash;
&print_header($r,$phase);
if (keys(%domconfig) == 0) {	if (keys(%domconfig) == 0) {
my $primarylibserv = &Apache::lonnet::domain($dom,'primary');	my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
my @ids=&Apache::lonnet::current_machine_ids();	my @ids=&Apache::lonnet::current_machine_ids();
Line 300 sub handler {	Line 221 sub handler {
}	}
}	}
if ($custom_img_count > 0) {	if ($custom_img_count > 0) {
	&Apache::lonconfigsettings::print_header($r,$phase,$context);
my $switch_server = &check_switchserver($dom,$confname);	my $switch_server = &check_switchserver($dom,$confname);
$r->print(	$r->print(
&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.	&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.
Line 309 sub handler {	Line 231 sub handler {
if ($switch_server) {	if ($switch_server) {
$r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));	$r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
}	}
	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}
}	}
}	}
$r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');	&Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
$r->print('<script type="text/javascript">'."\n".
&Apache::loncommon::check_uncheck_jscript()."\n".
'</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
'onclick="javascript:checkAll(document.pickactions.actions)"'.
' />  '.
'<input type="button" value="'.&mt('uncheck all').'" '.
'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
' /></p><div class="LC_left_float">');
my ($numitems,$midpoint,$seconddiv,$count);
$numitems = @prefs_order;
$midpoint = int($numitems/2);
if ($numitems%2) {
$midpoint ++;
}
$count = 0;
foreach my $item (@prefs_order) {
$r->print('<h4>'.
&Apache::loncommon::help_open_topic($prefs{$item}->{'help'}).
'<label><input type="checkbox" name="actions" value="'.$item.
'" /> '.&mt($prefs{$item}->{'text'}).'</label></h4>');
$count ++;
if ((!$seconddiv) && ($count >= $midpoint)) {
$r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
$seconddiv = 1;
}
}
$r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
&mt('Display options').'</h3>'."\n".
'<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
'<label><input type="radio" name="numcols" value="1" />'.
&mt('one column').'</label>  <label>'.
'<input type="radio" name="numcols" value="2" />'.
&mt('two columns').'</label></span></p>');
$r->print(&print_footer($r,$phase,'display','Go'));
$r->print('</form>');
$r->print(&Apache::loncommon::end_page());
}	}
return OK;	return OK;
}	}

sub process_changes {	sub process_changes {
my ($r,$dom,$confname,$action,$roles,%domconfig) = @_;	my ($r,$dom,$confname,$action,$roles,$values) = @_;
	my %domconfig;
	if (ref($values) eq 'HASH') {
	%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,%domconfig);
Line 363 sub process_changes {	Line 254 sub process_changes {
$output = &modify_rolecolors($r,$dom,$confname,$roles,	$output = &modify_rolecolors($r,$dom,$confname,$roles,
%domconfig);	%domconfig);
} elsif ($action eq 'quotas') {	} elsif ($action eq 'quotas') {
$output = &modify_quotas($dom,%domconfig);	$output = &modify_quotas($dom,$action,%domconfig);
} elsif ($action eq 'autoenroll') {	} elsif ($action eq 'autoenroll') {
$output = &modify_autoenroll($dom,%domconfig);	$output = &modify_autoenroll($dom,%domconfig);
} elsif ($action eq 'autoupdate') {	} elsif ($action eq 'autoupdate') {
Line 384 sub process_changes {	Line 275 sub process_changes {
$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') {
	$output = &modify_quotas($dom,$action,%domconfig);
}	}
return $output;	return $output;
}	}
Line 394 sub print_config_box {	Line 287 sub print_config_box {
my $output;	my $output;
if ($action eq 'coursecategories') {	if ($action eq 'coursecategories') {
$output = &coursecategories_javascript($settings);	$output = &coursecategories_javascript($settings);
}	}
$output .=	$output .=
'<table class="LC_nested_outer">	'<table class="LC_nested_outer">
<tr>	<tr>
Line 544 sub print_config_box {	Line 437 sub print_config_box {
if ($action eq 'login') {	if ($action eq 'login') {
$output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);	$output .= &print_login($dom,$confname,$phase,$settings,\$rowtotal);
} elsif ($action eq 'quotas') {	} elsif ($action eq 'quotas') {
$output .= &print_quotas($dom,$settings,\$rowtotal);	$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
} elsif ($action eq 'autoenroll') {	} elsif ($action eq 'autoenroll') {
$output .= &print_autoenroll($dom,$settings,\$rowtotal);	$output .= &print_autoenroll($dom,$settings,\$rowtotal);
} elsif ($action eq 'directorysrch') {	} elsif ($action eq 'directorysrch') {
Line 557 sub print_config_box {	Line 450 sub print_config_box {
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);	$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
} elsif ($action eq 'serverstatuses') {	} elsif ($action eq 'serverstatuses') {
$output .= &print_serverstatuses($dom,$settings,\$rowtotal);	$output .= &print_serverstatuses($dom,$settings,\$rowtotal);
	} elsif ($action eq 'requestcourses') {
	$output .= &print_quotas($dom,$settings,\$rowtotal,$action);
}	}
}	}
$output .= '	$output .= '
Line 567 sub print_config_box {	Line 462 sub print_config_box {
return ($output,$rowtotal);	return ($output,$rowtotal);
}	}

sub print_header {
my ($r,$phase) = @_;
my $alert = &mt('You must select at least one functionality type to display.');
my $js = '
<script type="text/javascript">
function changePage(formname,newphase) {
formname.phase.value = newphase;
numchecked = 0;
if (formname == document.pickactions) {
if (formname.actions.length > 0) {
for (var i = 0; i<formname.actions.length; i++) {
if (formname.actions[i].checked) {
numchecked ++;
}
}
} else {
if (formname.actions.checked) {
numchecked ++;
}
}
if (numchecked > 0) {
formname.submit();
} else {
alert("'.$alert.'");
return;
}
}
formname.submit();
}'."\n";
if ($phase eq 'pickactions') {
$js .=
&Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n".
&javascript_set_colnums();
} elsif ($phase eq 'display') {
$js .= &color_pick_js()."\n";
}
$js .= &Apache::loncommon::viewport_size_js().'
</script>
';
my $additem;
if ($phase eq 'pickactions') {
my %loaditems = (
'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);",
);
$additem = {'add_entries' => \%loaditems,};
} else {
my %loaditems = (
'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);",
);
$additem = {'add_entries' => \%loaditems,};
}
$r->print(&Apache::loncommon::start_page('View/Modify Domain Settings',
$js,$additem));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings'));
$r->print('
<form name="parmform" action="">
<input type="hidden" name="pres_marker" />
<input type="hidden" name="pres_type" />
<input type="hidden" name="pres_value" />
</form>
');
$r->print('<form method="post" name="'.$phase.'" action="/adm/domainprefs"'.
' enctype="multipart/form-data">');
return;
}

sub print_footer {
my ($r,$phase,$newphase,$button_text,$actions) = @_;
$button_text = &mt($button_text);
$r->print('<input type="hidden" name="phase" value="" />'.
'<input type="hidden" name="width" value="'.
$env{'form.width'}.'" />'.
'<input type="hidden" name="height" value="'.
$env{'form.height'}.'" />');
if (($phase eq 'display') \|\| ($phase eq 'process')) {
if (ref($actions) eq 'ARRAY') {
foreach my $item (@{$actions}) {
$r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
}
}
$r->print('<input type="hidden" name="numcols" value="'.$env{'form.numcols'}.'" />');
}
my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
if ($phase eq 'process') {
$r->print('<p><a href='.$dest.'>'.$button_text.'</a></p>');
} else {
my $onclick;
if ($phase eq 'display') {
$onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
} else {
$onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
}
$r->print('<p><input type="button" name="store" value="'.
$button_text.'" onclick='.$onclick.' /></p>');
}
if ($phase eq 'process') {
$r->print('</form>'.&Apache::loncommon::end_page());
}
return;
}

sub print_login {	sub print_login {
my ($dom,$confname,$phase,$settings,$rowtotal) = @_;	my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
my %choices = &login_choices();	my %choices = &login_choices();
Line 1189 sub color_pick {	Line 983 sub color_pick {
return $link;	return $link;
}	}

sub color_pick_js {
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $output = <<"ENDCOL";
function pclose() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no");
parmwin.close();
}

$pjump_def

function psub() {
pclose();
if (document.parmform.pres_marker.value!='') {
if (document.parmform.pres_type.value!='') {
eval('document.display.'+
document.parmform.pres_marker.value+
'.value=document.parmform.pres_value.value;');
}
} else {
document.parmform.pres_value.value='';
document.parmform.pres_marker.value='';
}
}

function get_id (span_id) {
if (document.getElementById) {
return document.getElementById(span_id);
}
if (document.all) {
return document.all[span_id];
}
return false;
}

function colchg_span (span_id_str,new_color_item) {
var span_ref = get_id(span_id_str);
if (span_ref.style) { span_ref = span_ref.style; }
span_ref.background = new_color_item.value;
span_ref.backgroundColor = new_color_item.value;
span_ref.bgColor = new_color_item.value;
}

ENDCOL
return $output;
}

sub print_quotas {	sub print_quotas {
my ($dom,$settings,$rowtotal) = @_;	my ($dom,$settings,$rowtotal,$action) = @_;
my $datatable;	my $context;
	if ($action eq 'quotas') {
	$context = 'tools';
	} else {
	$context = $action;
	}
	my ($datatable,$defaultquota,@usertools);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my $typecount = 0;	my $typecount = 0;
my $css_class;	my $css_class;
my @usertools = ('aboutme','blog','portfolio');	if ($context eq 'requestcourses') {
	@usertools = ('official','unofficial');
	} else {
	@usertools = ('aboutme','blog','portfolio');
	}
my %titles = &tool_titles();	my %titles = &tool_titles();
if (ref($types) eq 'ARRAY') {	if (ref($types) eq 'ARRAY') {
foreach my $type (@{$types}) {	foreach my $type (@{$types}) {
my $currdefquota;	my $currdefquota;
if (ref($settings->{defaultquota}) eq 'HASH') {	unless ($context eq 'requestcourses') {
$currdefquota = $settings->{defaultquota}->{$type};	if (ref($settings) eq 'HASH') {
} else {	if (ref($settings->{defaultquota}) eq 'HASH') {
$currdefquota = $settings->{$type};	$currdefquota = $settings->{defaultquota}->{$type};
	} else {
	$currdefquota = $settings->{$type};
	}
	}
}	}
if (defined($usertypes->{$type})) {	if (defined($usertypes->{$type})) {
$typecount ++;	$typecount ++;
Line 1258 sub print_quotas {	Line 1020 sub print_quotas {
'<td>'.$usertypes->{$type}.'</td>'.	'<td>'.$usertypes->{$type}.'</td>'.
'<td class="LC_left_item">';	'<td class="LC_left_item">';
foreach my $item (@usertools) {	foreach my $item (@usertools) {
my $checked = 'checked="checked" ';	my $checked;
if (ref($settings->{$item}) eq 'HASH') {	unless ($context eq 'requestcourses') {
if ($settings->{$item}->{$type} == 0) {	$checked = 'checked="checked" ';
$checked = '';	}
	if (ref($settings) eq 'HASH') {
	if (ref($settings->{$item}) eq 'HASH') {
	if ($settings->{$item}->{$type} == 0) {
	$checked = '';
	} elsif ($settings->{$item}->{$type} == 1) {
	$checked = 'checked="checked" ';
	}
}	}
}	}
$datatable .= '<span class="LC_nobreak"><label>'.	$datatable .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="tools_'.$item.	'<input type="checkbox" name="'.$context.'_'.$item.
'" value="'.$type.'" '.$checked.'/>'.$titles{$item}.	'" value="'.$type.'" '.$checked.'/>'.$titles{$item}.
'</label></span>  ';	'</label></span>  ';
}	}
$datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.	$datatable .= '</td>';
	unless ($context eq 'requestcourses') {
	$datatable .=
	'<td class="LC_right_item"><span class="LC_nobreak">'.
'<input type="text" name="quota_'.$type.	'<input type="text" name="quota_'.$type.
'" value="'.$currdefquota.	'" value="'.$currdefquota.
'" size="5" /> Mb</span></td></tr>';	'" size="5" /> Mb</span></td>';
	}
	$datatable .= '</tr>';
}	}
}	}
}	}
my $defaultquota = '20';	unless ($context eq 'requestcourses') {
if (ref($settings) eq 'HASH') {	$defaultquota = '20';
if (ref($settings->{'defaultquota'}) eq 'HASH') {	if (ref($settings) eq 'HASH') {
$defaultquota = $settings->{'defaultquota'}->{'default'};	if (ref($settings->{'defaultquota'}) eq 'HASH') {
} elsif (defined($settings->{'default'})) {	$defaultquota = $settings->{'defaultquota'}->{'default'};
$defaultquota = $settings->{'default'};	} elsif (defined($settings->{'default'})) {
	$defaultquota = $settings->{'default'};
	}
}	}
}	}
$typecount ++;	$typecount ++;
Line 1290 sub print_quotas {	Line 1066 sub print_quotas {
'<td>'.$othertitle.'</td>'.	'<td>'.$othertitle.'</td>'.
'<td class="LC_left_item">';	'<td class="LC_left_item">';
foreach my $item (@usertools) {	foreach my $item (@usertools) {
my $checked = 'checked="checked" ';	my $checked;
if (ref($settings->{$item}) eq 'HASH') {	unless ($context eq 'requestcourses') {
if ($settings->{$item}->{'default'} == 0) {	$checked = 'checked="checked" ';
$checked = '';	}
	if (ref($settings) eq 'HASH') {
	if (ref($settings->{$item}) eq 'HASH') {
	if ($settings->{$item}->{'default'} == 0) {
	$checked = '';
	} elsif ($settings->{$item}->{'default'} == 1) {
	$checked = 'checked="checked" ';
	}
}	}
}	}
$datatable .= '<span class="LC_nobreak"><label>'.	$datatable .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="tools_'.$item.	'<input type="checkbox" name="'.$context.'_'.$item.
'" value="default" '.$checked.'/>'.$titles{$item}.	'" value="default" '.$checked.'/>'.$titles{$item}.
'</label></span>  ';	'</label></span>  ';
}	}
$datatable .= '</td><td class="LC_right_item"><span class="LC_nobreak">'.	$datatable .= '</td>';
'<input type="text" name="defaultquota" value="'.	unless ($context eq 'requestcourses') {
$defaultquota.'" size="5" /> Mb</span></td></tr>';	$datatable .= '<td class="LC_right_item"><span class="LC_nobreak">'.
	'<input type="text" name="defaultquota" value="'.
	$defaultquota.'" size="5" /> Mb</span></td>';
	}
	$datatable .= '</tr>';
$typecount ++;	$typecount ++;
$css_class = $typecount%2?' class="LC_odd_row"':'';	$css_class = $typecount%2?' class="LC_odd_row"':'';
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.	'<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.
'<td class="LC_left_item" colspan="2"><br />';	'<td class="LC_left_item" colspan="2"><br />';
foreach my $item (@usertools) {	foreach my $item (@usertools) {
my $checked = 'checked="checked" ';	my $checked;
if (ref($settings->{$item}) eq 'HASH') {	unless ($context eq 'requestcourses') {
if ($settings->{$item}->{'_LC_adv'} == 0) {	$checked = 'checked="checked" ';
$checked = '';	}
	if (ref($settings) eq 'HASH') {
	if (ref($settings->{$item}) eq 'HASH') {
	if ($settings->{$item}->{'_LC_adv'} == 0) {
	$checked = '';
	} elsif ($settings->{$item}->{'_LC_adv'} == 1) {
	$checked = 'checked="checked" ';
	}
}	}
}	}
$datatable .= '<span class="LC_nobreak"><label>'.	$datatable .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="tools_'.$item.	'<input type="checkbox" name="'.$context.'_'.$item.
'" value="_LC_adv" '.$checked.'/>'.$titles{$item}.	'" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
'</label></span>  ';	'</label></span>  ';
}	}
$datatable .= '('.&mt('overrides affiliation').')</td></tr>';	$datatable .= '<span class="LC_nobreak">('.&mt('overrides affiliation').
	')</span></td></tr>';
$$rowtotal += $typecount;	$$rowtotal += $typecount;
return $datatable;	return $datatable;
}	}
Line 1504 sub print_directorysrch {	Line 1299 sub print_directorysrch {
$$rowtotal += 2;	$$rowtotal += 2;
if (ref($usertypes) eq 'HASH') {	if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {	if (keys(%{$usertypes}) > 0) {
$datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,	$datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
$numinrow,$othertitle);	$numinrow,$othertitle,'cansearch');
$cansrchrow = 1;	$cansrchrow = 1;
}	}
}	}
Line 1520 sub print_directorysrch {	Line 1315 sub print_directorysrch {
foreach my $title (@{$titleorder}) {	foreach my $title (@{$titleorder}) {
if (defined($searchtitles->{$title})) {	if (defined($searchtitles->{$title})) {
my $check = ' ';	my $check = ' ';
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
if (ref($settings->{'searchby'}) eq 'ARRAY') {	if (ref($settings->{'searchby'}) eq 'ARRAY') {
if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {	if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
$check = ' checked="checked" ';	$check = ' checked="checked" ';
Line 1562 sub print_contacts {	Line 1357 sub print_contacts {
my $datatable;	my $datatable;
my @contacts = ('adminemail','supportemail');	my @contacts = ('adminemail','supportemail');
my (%checked,%to,%otheremails);	my (%checked,%to,%otheremails);
my @mailings = ('errormail','packagesmail','helpdeskmail');	my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail');
foreach my $type (@mailings) {	foreach my $type (@mailings) {
$otheremails{$type} = '';	$otheremails{$type} = '';
}	}
Line 1582 sub print_contacts {	Line 1377 sub print_contacts {
}	}
$otheremails{$type} = $settings->{$type}{'others'};	$otheremails{$type} = $settings->{$type}{'others'};
}	}
	} elsif ($type eq 'lonstatusmail') {
	$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
}	}
}	}
} else {	} else {
Line 1589 sub print_contacts {	Line 1386 sub print_contacts {
$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};	$to{'adminemail'} = $Apache::lonnet::perlvar{'lonAdmEMail'};
$checked{'errormail'}{'adminemail'} = ' checked="checked" ';	$checked{'errormail'}{'adminemail'} = ' checked="checked" ';
$checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';	$checked{'packagesmail'}{'adminemail'} = ' checked="checked" ';
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';	$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" ';
	$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
}	}
my ($titles,$short_titles) = &contact_titles();	my ($titles,$short_titles) = &contact_titles();
my $rownum = 0;	my $rownum = 0;
Line 1633 sub contact_titles {	Line 1431 sub contact_titles {
'adminemail' => 'Default Server Admin E-mail address',	'adminemail' => 'Default Server Admin E-mail address',
'errormail' => 'Error reports to be e-mailed to',	'errormail' => 'Error reports to be e-mailed to',
'packagesmail' => 'Package update alerts to be e-mailed to',	'packagesmail' => 'Package update alerts to be e-mailed to',
'helpdeskmail' => 'Helpdesk requests to be e-mailed to'	'helpdeskmail' => 'Helpdesk requests to be e-mailed to',
	'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
);	);
my %short_titles = &Apache::lonlocal::texthash (	my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',	adminemail => 'Admin E-mail address',
Line 1644 sub contact_titles {	Line 1443 sub contact_titles {

sub tool_titles {	sub tool_titles {
my %titles = &Apache::lonlocal::texthash (	my %titles = &Apache::lonlocal::texthash (
aboutme => 'Personal Home Page',	aboutme => 'Personal Information Page',
blog => 'Blog',	blog => 'Blog',
portfolio => 'Portfolio',	portfolio => 'Portfolio',
);	official => 'Official courses (with institutional codes)',
	unofficial => 'Unofficial courses',
	);
return %titles;	return %titles;
}	}

Line 1769 sub print_usercreation {	Line 1570 sub print_usercreation {
}	}
$datatable .= '</td></tr>';	$datatable .= '</td></tr>';
}	}
	my ($othertitle,$usertypes,$types) =
	&Apache::loncommon::sorted_inst_types($dom);
	if (ref($usertypes) eq 'HASH') {
	if (keys(%{$usertypes}) > 0) {
	$datatable .= &insttypes_row($settings->{cancreate},$types,$usertypes,
	$dom,$numinrow,$othertitle,
	'statustocreate');
	$$rowtotal ++;
	}
	}
} else {	} else {
my @contexts = ('author','course','domain');	my @contexts = ('author','course','domain');
my @authtypes = ('int','krb4','krb5','loc');	my @authtypes = ('int','krb4','krb5','loc');
Line 1885 sub usercreation_types {	Line 1696 sub usercreation_types {
any => 'Any',	any => 'Any',
official => 'Institutional only ',	official => 'Institutional only ',
unofficial => 'Non-institutional only',	unofficial => 'Non-institutional only',
email => 'Email address',	email => 'E-mail address',
login => 'Institutional Login',	login => 'Institutional Login',
sso => 'SSO',	sso => 'SSO',
none => 'None',	none => 'None',
Line 2022 sub print_scantronformat {	Line 1833 sub print_scantronformat {
%confhash);	%confhash);
my $switchserver = &check_switchserver($dom,$confname);	my $switchserver = &check_switchserver($dom,$confname);
my %lt = &Apache::lonlocal::texthash (	my %lt = &Apache::lonlocal::texthash (
default => 'Default scantron format file error',	default => 'Default bubblesheet format file error',
custom => 'Custom scantron format file error',	custom => 'Custom bubblesheet format file error',
);	);
my %scantronfiles = (	my %scantronfiles = (
default => 'default.tab',	default => 'default.tab',
Line 2096 sub print_scantronformat {	Line 1907 sub print_scantronformat {
}	}
}	}
} else {	} else {
$error{'default'} = &mt("Unable to copy default scantron formatfile to domain's RES space: [_1]",$switchserver);	$error{'default'} = &mt("Unable to copy default bubblesheet formatfile to domain's RES space: [_1]",$switchserver);
}	}
}	}
if (ref($settings) eq 'HASH') {	if (ref($settings) eq 'HASH') {
Line 2364 sub print_serverstatuses {	Line 2175 sub print_serverstatuses {
}	}
}	}
}	}
my $titles= &LONCAPA::loncgi::serverstatus_titles();	my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
my $rownum = 0;	my $rownum = 0;
my $css_class;	my $css_class;
foreach my $type (@pages) {	foreach my $type (@pages) {
Line 2659 sub modifiable_userdata_row {	Line 2470 sub modifiable_userdata_row {
return $output;	return $output;
}	}

sub users_cansearch_row {	sub insttypes_row {
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_;	my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context) = @_;
	my %lt = &Apache::lonlocal::texthash (
	cansearch => 'Users allowed to search',
	statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
	);
	my $showdom;
	if ($context eq 'cansearch') {
	$showdom = ' ('.$dom.')';
	}
my $output = '<tr class="LC_odd_row">'.	my $output = '<tr class="LC_odd_row">'.
'<td>'.&mt('Users allowed to search').' ('.$dom.')'.	'<td>'.$lt{$context}.$showdom.
'</td><td class="LC_left_item" colspan="2"><table>';	'</td><td class="LC_left_item" colspan="2"><table>';
my $rem;	my $rem;
if (ref($types) eq 'ARRAY') {	if (ref($types) eq 'ARRAY') {
Line 2676 sub users_cansearch_row {	Line 2495 sub users_cansearch_row {
$output .= '<tr>';	$output .= '<tr>';
}	}
my $check = ' ';	my $check = ' ';
if (ref($settings->{'cansearch'}) eq 'ARRAY') {	if (ref($settings->{$context}) eq 'ARRAY') {
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {	if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
$check = ' checked="checked" ';	$check = ' checked="checked" ';
}	}
	} elsif ($context eq 'statustocreate') {
	$check = ' checked="checked" ';
}	}
$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="cansearch" '.	'<input type="checkbox" name="'.$context.'" '.
'value="'.$types->[$i].'"'.$check.'/>'.	'value="'.$types->[$i].'"'.$check.'/>'.
$usertypes->{$types->[$i]}.'</label></span></td>';	$usertypes->{$types->[$i]}.'</label></span></td>';
}	}
Line 2698 sub users_cansearch_row {	Line 2519 sub users_cansearch_row {
$output .= '<td class="LC_left_item">';	$output .= '<td class="LC_left_item">';
}	}
my $defcheck = ' ';	my $defcheck = ' ';
if (ref($settings->{'cansearch'}) eq 'ARRAY') {	if (ref($settings->{$context}) eq 'ARRAY') {
if (grep(/^default$/,@{$settings->{'cansearch'}})) {	if (grep(/^default$/,@{$settings->{$context}})) {
$defcheck = ' checked="checked" ';	$defcheck = ' checked="checked" ';
}	}
	} elsif ($context eq 'statustocreate') {
	$defcheck = ' checked="checked" ';
}	}
$output .= '<span class="LC_nobreak"><label>'.	$output .= '<span class="LC_nobreak"><label>'.
'<input type="checkbox" name="cansearch" '.	'<input type="checkbox" name="'.$context.'" '.
'value="default"'.$defcheck.'/>'.	'value="default"'.$defcheck.'/>'.
$othertitle.'</label></span></td>'.	$othertitle.'</label></span></td>'.
'</tr></table></td></tr>';	'</tr></table></td></tr>';
Line 2874 sub color_font_choices {	Line 2697 sub color_font_choices {
links => "Link colors",	links => "Link colors",
images => "Images",	images => "Images",
font => "Font color",	font => "Font color",
pgbg => "Header",	pgbg => "Page",
tabbg => "Header",	tabbg => "Header",
sidebg => "Border",	sidebg => "Border",
link => "Link",	link => "Link",
Line 3482 sub check_switchserver {	Line 3305 sub check_switchserver {
return $switchserver;	return $switchserver;
}	}

sub javascript_set_colnums {	sub modify_quotas {
return <<END;	my ($dom,$action,%domconfig) = @_;
function setDisplayColumns() {	my ($context,@usertools);
if (document.pickactions.width.value > 1100) {	if ($action eq 'quotas') {
document.pickactions.numcols[1].checked = true;	$context = 'tools';
	} else {
	$context = $action;
	}
	if ($context eq 'requestcourses') {
	@usertools = ('official','unofficial');
} else {	} else {
document.pickactions.numcols[0].checked = true;	@usertools = ('aboutme','blog','portfolio');
}	}
}
END
}

sub modify_quotas {
my ($dom,%domconfig) = @_;
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
my ($resulttext,%changes);	my ($resulttext,%changes);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);	my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
my @usertools = ('aboutme','blog','portfolio');
my %titles = &tool_titles();	my %titles = &tool_titles();
my (%confhash,%toolshash);	my (%confhash,%toolshash);
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
if ($key =~ /^form\.quota_(.+)$/) {	unless ($context eq 'requestcourses') {
$confhash{'defaultquota'}{$1} = $env{$key};	if ($key =~ /^form\.quota_(.+)$/) {
} elsif ($key =~ /^form\.tools_(.+)$/) {	$confhash{'defaultquota'}{$1} = $env{$key};
	}
	}
	if ($key =~ /^form\.\Q$context\E_(.+)$/) {
@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key);	@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key);
}	}
}	}
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};	unless ($context eq 'requestcourses') {
	$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'};
	}
foreach my $item (@usertools) {	foreach my $item (@usertools) {
foreach my $type (@{$types},'default','_LC_adv') {	foreach my $type (@{$types},'default','_LC_adv') {
if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {	if (grep(/^\Q$type\E$/,@{$toolshash{$item}})) {
Line 3517 sub modify_quotas {	Line 3343 sub modify_quotas {
} else {	} else {
$confhash{$item}{$type} = 0;	$confhash{$item}{$type} = 0;
}	}
if (ref($domconfig{'quotas'}) eq 'HASH') {	if (ref($domconfig{$action}) eq 'HASH') {
if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {	if (ref($domconfig{$action}{$item}) eq 'HASH') {
if ($domconfig{'quotas'}{$item}{$type} ne $confhash{$item}{$type}) {	if ($domconfig{$action}{$item}{$type} ne $confhash{$item}{$type}) {
$changes{$item}{$type} = 1;	$changes{$item}{$type} = 1;
}	}
} else {	} else {
if (!$confhash{$item}{$type}) {	if ($context eq 'requestcourses') {
$changes{$item}{$type} = 1;	if ($confhash{$item}{$type}) {
	$changes{$item}{$type} = 1;
	}
	} else {
	if (!$confhash{$item}{$type}) {
	$changes{$item}{$type} = 1;
	}
}	}
}	}
} else {	} else {
if (!$confhash{$item}{$type}) {	if ($context eq 'requestcourses') {
$changes{$item}{$type} = 1;	if ($confhash{$item}{$type}) {
	$changes{$item}{$type} = 1;
	}
	} else {
	if (!$confhash{$item}{$type}) {
	$changes{$item}{$type} = 1;
	}
}	}
}	}
}	}
}	}
if (ref($domconfig{'quotas'}) eq 'HASH') {	unless ($context eq 'requestcourses') {
if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {	if (ref($domconfig{'quotas'}) eq 'HASH') {
foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {	if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
if (exists($confhash{'defaultquota'}{$key})) {	foreach my $key (keys(%{$domconfig{'quotas'}{'defaultquota'}})) {
if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{'defaultquota'}{$key}) {	if (exists($confhash{'defaultquota'}{$key})) {
$changes{'defaultquota'}{$key} = 1;	if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{'defaultquota'}{$key}) {
	$changes{'defaultquota'}{$key} = 1;
	}
	} else {
	$confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{'defaultquota'}{$key};
}	}
} else {
$confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{'defaultquota'}{$key};
}	}
}	} else {
} else {	foreach my $key (keys(%{$domconfig{'quotas'}})) {
foreach my $key (keys(%{$domconfig{'quotas'}})) {	if (exists($confhash{'defaultquota'}{$key})) {
if (exists($confhash{'defaultquota'}{$key})) {	if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{$key}) {
if ($confhash{'defaultquota'}{$key} ne $domconfig{'quotas'}{$key}) {	$changes{'defaultquota'}{$key} = 1;
$changes{'defaultquota'}{$key} = 1;	}
	} else {
	$confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{$key};
}	}
} else {
$confhash{'defaultquota'}{$key} = $domconfig{'quotas'}{$key};
}	}
}	}
}	}
}	if (ref($confhash{'defaultquota'}) eq 'HASH') {
if (ref($confhash{'defaultquota'}) eq 'HASH') {	foreach my $key (keys(%{$confhash{'defaultquota'}})) {
foreach my $key (keys(%{$confhash{'defaultquota'}})) {	if (ref($domconfig{'quotas'}) eq 'HASH') {
if (ref($domconfig{'quotas'}) eq 'HASH') {	if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {	if (!exists($domconfig{'quotas'}{'defaultquota'}{$key})) {
if (!exists($domconfig{'quotas'}{'defaultquota'}{$key})) {	$changes{'defaultquota'}{$key} = 1;
$changes{'defaultquota'}{$key} = 1;	}
	} else {
	if (!exists($domconfig{'quotas'}{$key})) {
	$changes{'defaultquota'}{$key} = 1;
	}
}	}
} else {	} else {
if (!exists($domconfig{'quotas'}{$key})) {	$changes{'defaultquota'}{$key} = 1;
$changes{'defaultquota'}{$key} = 1;
}
}	}
} else {
$changes{'defaultquota'}{$key} = 1;
}	}
}	}
}	}
Line 3580 sub modify_quotas {	Line 3420 sub modify_quotas {
}	}

my %quotahash = (	my %quotahash = (
quotas => { %confhash }	$action => { %confhash }
);	);
my $putresult = &Apache::lonnet::put_dom('configuration',\%quotahash,	my $putresult = &Apache::lonnet::put_dom('configuration',\%quotahash,
$dom);	$dom);
Line 3590 sub modify_quotas {	Line 3430 sub modify_quotas {
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);	&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime);

$resulttext = &mt('Changes made:').'<ul>';	$resulttext = &mt('Changes made:').'<ul>';
if (ref($changes{'defaultquota'}) eq 'HASH') {	unless ($context eq 'requestcourses') {
$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';	if (ref($changes{'defaultquota'}) eq 'HASH') {
foreach my $type (@{$types},'default') {	$resulttext .= '<li>'.&mt('Portfolio default quotas').'<ul>';
if (defined($changes{'defaultquota'}{$type})) {	foreach my $type (@{$types},'default') {
my $typetitle = $usertypes->{$type};	if (defined($changes{'defaultquota'}{$type})) {
if ($type eq 'default') {	my $typetitle = $usertypes->{$type};
$typetitle = $othertitle;	if ($type eq 'default') {
	$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>';
}	}
	my %newenv;
foreach my $item (@usertools) {	foreach my $item (@usertools) {
if (ref($changes{$item}) eq 'HASH') {	if (ref($changes{$item}) eq 'HASH') {
my $hashid = $env{'user.name'}.':'.$env{'user.domain'};	my $newacc =
&Apache::lonnet::devalidate_cache_new('usertools.'.$item,$hashid);	&Apache::lonnet::usertools_access($env{'user.name'},
	$env{'user.domain'},
	$item,'reload',$context);
	if ($context eq 'requestcourses') {
	if ($env{'environment.canrequest.'.$item} ne $newacc) {
	$newenv{'environment.canrequest.'.$item} = $newacc;
	}
	} else {
	if ($env{'environment.availabletools.'.$item} ne $newacc) {
	$newenv{'environment.availabletools.'.$item} = $newacc;
	}
	}
$resulttext .= '<li>'.$titles{$item}.'<ul>';	$resulttext .= '<li>'.$titles{$item}.'<ul>';
foreach my $type (@{$types},'default','_LC_adv') {	foreach my $type (@{$types},'default','_LC_adv') {
if ($changes{$item}{$type}) {	if ($changes{$item}{$type}) {
Line 3627 sub modify_quotas {	Line 3481 sub modify_quotas {
}	}
}	}
$resulttext .= '</ul>';	$resulttext .= '</ul>';
	if (keys(%newenv)) {
	&Apache::lonnet::appenv(\%newenv);
	}
} else {	} else {
$resulttext = &mt('No changes made to availability of home pages, blogs, portfolios or default quotas');	if ($context eq 'requestcourses') {
	$resulttext = &mt('No changes made to rights to request creation of courses.');
	} else {
	$resulttext = &mt('No changes made to availability of personal information pages, blogs, portfolios or default quotas');
	}
}	}
} else {	} else {
$resulttext = '<span class="LC_error">'.	$resulttext = '<span class="LC_error">'.
Line 4011 sub modify_contacts {	Line 3872 sub modify_contacts {
}	}
my (%others,%to);	my (%others,%to);
my @contacts = ('supportemail','adminemail');	my @contacts = ('supportemail','adminemail');
my @mailings = ('errormail','packagesmail','helpdeskmail');	my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail');
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 4056 sub modify_contacts {	Line 3917 sub modify_contacts {
$default{'errormail'} = 'adminemail';	$default{'errormail'} = 'adminemail';
$default{'packagesmail'} = 'adminemail';	$default{'packagesmail'} = 'adminemail';
$default{'helpdeskmail'} = 'supportemail';	$default{'helpdeskmail'} = 'supportemail';
	$default{'lonstatusmail'} = '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 4138 sub modify_usercreation {	Line 4000 sub modify_usercreation {
$cancreate{$item} = $env{'form.can_createuser_'.$item};	$cancreate{$item} = $env{'form.can_createuser_'.$item};
}	}
}	}
	my ($othertitle,$usertypes,$types) =
	&Apache::loncommon::sorted_inst_types($dom);
	if (ref($types) eq 'ARRAY') {
	if (@{$types} > 0) {
	@{$cancreate{'statustocreate'}} =
	&Apache::loncommon::get_env_multiple('form.statustocreate');
	}
	push(@contexts,'statustocreate');
	}
if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {	if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
foreach my $item (@contexts) {	foreach my $item (@contexts) {
if ($item eq 'selfcreate') {	if (($item eq 'selfcreate') \|\| ($item eq 'statustocreate')) {
if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {	if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {	foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
if (!grep(/^$curr$/,@{$cancreate{$item}})) {	if (!grep(/^$curr$/,@{$cancreate{$item}})) {
if (!grep(/^$item$/,@{$changes{'cancreate'}})) {	if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
Line 4328 sub modify_usercreation {	Line 4199 sub modify_usercreation {
}	}
$chgtext .= '</ul>';	$chgtext .= '</ul>';
}	}
	} elsif ($type eq 'statustocreate') {
	if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
	(ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
	if (@{$cancreate{'selfcreate'}} > 0) {
	if (@{$cancreate{'statustocreate'}} == 0) {
	if (!grep(/^email$/,@{$cancreate{'selfcreate'}})) {
	$chgtext .= &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.");
	}
	} elsif (ref($usertypes) eq 'HASH') {
	if (grep(/^(login\|sso)$/,@{$cancreate{'selfcreate'}})) {
	$chgtext .= &mt('creation of a new account for an institutional user is restricted to the following institutional affiliation(s):').'<ul>';
	foreach my $case (@{$cancreate{$type}}) {
	if ($case eq 'default') {
	$chgtext .= '<li>'.$othertitle.'</li>';
	} else {
	$chgtext .= '<li>'.$usertypes->{$case}.'</li>';
	}
	}
	$chgtext .= '</ul>';
	}
	}
	}
	}
} else {	} else {
if ($cancreate{$type} eq 'none') {	if ($cancreate{$type} eq 'none') {
$chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');	$chgtext .= &mt('creation of new users is not permitted, except by a Domain Coordinator.');
Line 4743 sub modify_coursecategories {	Line 4637 sub modify_coursecategories {
} else {	} else {
$changes{'togglecats'} = 1;	$changes{'togglecats'} = 1;
$changes{'categorize'} = 1;	$changes{'categorize'} = 1;
$domconfig{'coursecategories'}{'togglecats'} = $env{'form.togglecats'};	$domconfig{'coursecategories'} = {
$domconfig{'coursecategories'}{'categorize'} = $env{'form.categorize'};	togglecats => $env{'form.togglecats'},
	categorize => $env{'form.categorize'},
	};
}	}
if (ref($cathash) eq 'HASH') {	if (ref($cathash) eq 'HASH') {
if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) {	if (($domconfig{'coursecategories'}{'cats'}{'instcode::0'} ne '') && ($env{'form.instcode'} == 0)) {
Line 4959 sub modify_serverstatuses {	Line 4855 sub modify_serverstatuses {
my %serverstatushash = (	my %serverstatushash = (
serverstatuses => \%newserverstatus,	serverstatuses => \%newserverstatus,
);	);
my $putresult = &Apache::lonnet::put_dom('configuration',\%serverstatushash,
$dom);
my %changes;	my %changes;
foreach my $type (@pages) {	foreach my $type (@pages) {
if (ref($currserverstatus{$type}) eq 'HASH') {	foreach my $setting ('namedusers','machines') {
my @currnamed = split(/,/,$currserverstatus{$type}{'namedusers'});	my (@current,@new);
my @newusers = split(/,/,$newserverstatus{$type}{'namedusers'});	if (ref($currserverstatus{$type}) eq 'HASH') {
foreach my $item (@currnamed) {	if ($currserverstatus{$type}{$setting} ne '') {
if (!grep(/^\Q$item\E$/,@newusers)) {	@current = split(/,/,$currserverstatus{$type}{$setting});
$changes{$type}{'namedusers'} = 1;
last;
}
}
foreach my $item (@newusers) {
if (!grep(/^\Q$item\E$/,@currnamed)) {
$changes{$type}{'namedusers'} = 1;
last;
}
}
my @currmachines = split(/,/,$currserverstatus{$type}{'machines'});
my @newmachines = split(/,/,$newserverstatus{$type}{'machines'});
foreach my $item (@currmachines) {
if (!grep(/^\Q$item\E$/,@newmachines)) {
$changes{$type}{'machines'} = 1;
last;
}
}
foreach my $item (@newmachines) {
if (!grep(/^\Q$item\E$/,@currmachines)) {
$changes{$type}{'machines'} = 1;
last;
}	}
}	}
	if ($newserverstatus{$type}{$setting} ne '') {
	@new = split(/,/,$newserverstatus{$type}{$setting});
	}
	if (@current > 0) {
	if (@new > 0) {
	foreach my $item (@current) {
	if (!grep(/^\Q$item\E$/,@new)) {
	$changes{$type}{$setting} = 1;
	last;
	}
	}
	foreach my $item (@new) {
	if (!grep(/^\Q$item\E$/,@current)) {
	$changes{$type}{$setting} = 1;
	last;
	}
	}
	} else {
	$changes{$type}{$setting} = 1;
	}
	} elsif (@new > 0) {
	$changes{$type}{$setting} = 1;
	}
}	}
}	}
if (keys(%changes) > 0) {	if (keys(%changes) > 0) {
my $titles= &LONCAPA::loncgi::serverstatus_titles();	my $titles= &LONCAPA::lonauthcgi::serverstatus_titles();
my $putresult = &Apache::lonnet::put_dom('configuration',	my $putresult = &Apache::lonnet::put_dom('configuration',
\%serverstatushash,$dom);	\%serverstatushash,$dom);
if ($putresult eq 'ok') {	if ($putresult eq 'ok') {
$resulttext .= &mt('Changes made:').'<ul>';	$resulttext .= &mt('Changes made:').'<ul>';
foreach my $type (@pages) {	foreach my $type (@pages) {
if (defined($changes{$type})) {	if (ref($changes{$type}) eq 'HASH') {
$resulttext .= '<li>'.$titles->{$type}.'<ul>';	$resulttext .= '<li>'.$titles->{$type}.'<ul>';
if (defined($changes{$type}{'namedusers'})) {	if ($changes{$type}{'namedusers'}) {
if ($newserverstatus{$type}{'namedusers'} eq '') {	if ($newserverstatus{$type}{'namedusers'} eq '') {
$resulttext .= '<li>'.&mt("Access terminated for all specific (named) users").'</li>'."\n";	$resulttext .= '<li>'.&mt("Access terminated for all specific (named) users").'</li>'."\n";
} else {	} else {
$resulttext .= '<li>'.&mt("Access available for the following specified users: ").$newserverstatus{$type}{'namedusers'}.'</li>'."\n";	$resulttext .= '<li>'.&mt("Access available for the following specified users: ").$newserverstatus{$type}{'namedusers'}.'</li>'."\n";
}	}
} elsif (defined($changes{$type}{'machines'})) {	}
	if ($changes{$type}{'machines'}) {
if ($newserverstatus{$type}{'machines'} eq '') {	if ($newserverstatus{$type}{'machines'} eq '') {
$resulttext .= '<li>'.&mt("Access terminated for all specific IP addresses").'</li>'."\n";	$resulttext .= '<li>'.&mt("Access terminated for all specific IP addresses").'</li>'."\n";
} else {	} else {

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

Removed from v.1.75
changed lines
	Added in v.1.96