version 1.277, 2016/09/05 01:46:07
|
version 1.284, 2016/12/05 00:51:53
|
Line 218 sub handler {
|
Line 218 sub handler {
|
'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','helpsettings', |
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','ssl'],$dom); |
'ltitools','ssl','trust'],$dom); |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','selfcreation','usermodification','scantron', |
'usercreation','selfcreation','usermodification','scantron', |
'requestcourses','requestauthor','coursecategories', |
'requestcourses','requestauthor','coursecategories', |
'serverstatuses','helpsettings','coursedefaults', |
'serverstatuses','helpsettings','coursedefaults', |
'ltitools','selfenrollment','usersessions','ssl'); |
'ltitools','selfenrollment','usersessions','ssl','trust'); |
my %existing; |
my %existing; |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
Line 417 sub handler {
|
Line 417 sub handler {
|
modify => \&modify_serverstatuses, |
modify => \&modify_serverstatuses, |
}, |
}, |
'helpsettings' => |
'helpsettings' => |
{text => 'Help page settings', |
{text => 'Support settings', |
help => 'Domain_Configuration_Help_Settings', |
help => 'Domain_Configuration_Help_Settings', |
header => [{col1 => 'Help Settings (logged-in users)', |
header => [{col1 => 'Help Page Settings (logged-in users)', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'Helpdesk Roles', |
|
col2 => 'Settings'},], |
print => \&print_helpsettings, |
print => \&print_helpsettings, |
modify => \&modify_helpsettings, |
modify => \&modify_helpsettings, |
}, |
}, |
Line 466 sub handler {
|
Line 468 sub handler {
|
print => \&print_usersessions, |
print => \&print_usersessions, |
modify => \&modify_usersessions, |
modify => \&modify_usersessions, |
}, |
}, |
'loadbalancing' => |
'loadbalancing' => |
{text => 'Dedicated Load Balancer(s)', |
{text => 'Dedicated Load Balancer(s)', |
help => 'Domain_Configuration_Load_Balancing', |
help => 'Domain_Configuration_Load_Balancing', |
header => [{col1 => 'Balancers', |
header => [{col1 => 'Balancers', |
Line 477 sub handler {
|
Line 479 sub handler {
|
print => \&print_loadbalancing, |
print => \&print_loadbalancing, |
modify => \&modify_loadbalancing, |
modify => \&modify_loadbalancing, |
}, |
}, |
'ltitools' => |
'ltitools' => |
{text => 'External Tools (LTI)', |
{text => 'External Tools (LTI)', |
help => 'Domain_configuration_LTI_Tools', |
help => 'Domain_configuration_LTI_Tools', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
Line 485 sub handler {
|
Line 487 sub handler {
|
print => \&print_ltitools, |
print => \&print_ltitools, |
modify => \&modify_ltitools, |
modify => \&modify_ltitools, |
}, |
}, |
'ssl' => |
'ssl' => |
{text => 'LON-CAPA Network (SSL)', |
{text => 'LON-CAPA Network (SSL)', |
help => 'Domain_Configuration_Network_SSL', |
help => 'Domain_Configuration_Network_SSL', |
header => [{col1 => 'Server', |
header => [{col1 => 'Server', |
Line 497 sub handler {
|
Line 499 sub handler {
|
print => \&print_ssl, |
print => \&print_ssl, |
modify => \&modify_ssl, |
modify => \&modify_ssl, |
}, |
}, |
|
'trust' => |
|
{text => 'Trust Settings', |
|
help => 'Domain_Configuration_Trust', |
|
header => [{col1 => "Access to this domain's content by others", |
|
col2 => 'Rules'}, |
|
{col1 => "Access to other domain's content by this domain", |
|
col2 => 'Rules'}, |
|
{col1 => "Enrollment in this domain's courses by others", |
|
col2 => 'Rules',}, |
|
{col1 => "Co-author roles in this domain for others", |
|
col2 => 'Rules',}, |
|
{col1 => "Co-author roles for this domain's users elsewhere", |
|
col2 => 'Rules',}, |
|
{col1 => "Domain roles in this domain assignable to others", |
|
col2 => 'Rules'}, |
|
{col1 => "Course catalog for this domain displayed elsewhere", |
|
col2 => 'Rules'}, |
|
{col1 => "Requests for creation of courses in this domain by others", |
|
col2 => 'Rules'}, |
|
{col1 => "Users in other domains can send messages to this domain", |
|
col2 => 'Rules'},], |
|
print => \&print_trust, |
|
modify => \&modify_trust, |
|
}, |
); |
); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
$prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
Line 674 sub process_changes {
|
Line 700 sub process_changes {
|
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
} elsif ($action eq 'ssl') { |
} elsif ($action eq 'ssl') { |
$output = &modify_ssl($dom,$lastactref,%domconfig); |
$output = &modify_ssl($dom,$lastactref,%domconfig); |
|
} elsif ($action eq 'trust') { |
|
$output = &modify_trust($dom,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 686 sub print_config_box {
|
Line 714 sub print_config_box {
|
$output = &coursecategories_javascript($settings); |
$output = &coursecategories_javascript($settings); |
} elsif ($action eq 'defaults') { |
} elsif ($action eq 'defaults') { |
$output = &defaults_javascript($settings); |
$output = &defaults_javascript($settings); |
|
} elsif ($action eq 'helpsettings') { |
|
my (%privs,%levelscurrent); |
|
my %full=(); |
|
my %levels=( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
my $context = 'domain'; |
|
my $crstype = 'Course'; |
|
my $formname = 'display'; |
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
$output = |
|
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
|
\@templateroles); |
} |
} |
$output .= |
$output .= |
'<table class="LC_nested_outer"> |
'<table class="LC_nested_outer"> |
Line 699 sub print_config_box {
|
Line 743 sub print_config_box {
|
if (ref($item->{'header'}) eq 'ARRAY') { |
if (ref($item->{'header'}) eq 'ARRAY') { |
$numheaders = scalar(@{$item->{'header'}}); |
$numheaders = scalar(@{$item->{'header'}}); |
} |
} |
print STDERR "$action num ||$numheaders||\n"; |
|
if ($numheaders > 1) { |
if ($numheaders > 1) { |
my $colspan = ''; |
my $colspan = ''; |
my $rightcolspan = ''; |
my $rightcolspan = ''; |
Line 723 print STDERR "$action num ||$numheaders|
|
Line 766 print STDERR "$action num ||$numheaders|
|
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'directorysrch')) { |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
Line 754 print STDERR "$action num ||$numheaders|
|
Line 797 print STDERR "$action num ||$numheaders|
|
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'ssl')) { |
($action eq 'ssl') || ($action eq 'trust')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
|
} elsif ($action eq 'trust') { |
|
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} |
} |
$output .= ' |
if ($action eq 'trust') { |
|
$output .= ' |
|
</table> |
|
</td> |
|
</tr>'; |
|
my @trusthdrs = qw(2 3 4 5 6 7); |
|
my @prefixes = qw(enroll othcoau coaurem domroles catalog reqcrs); |
|
for (my $i=0; $i<@trusthdrs; $i++) { |
|
$output .= ' |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[$trusthdrs[$i]]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->($prefixes[$i],$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr>'; |
|
} |
|
$output .= ' |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} else { |
|
$output .= ' |
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 772 print STDERR "$action num ||$numheaders|
|
Line 846 print STDERR "$action num ||$numheaders|
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
</tr>'."\n"; |
</tr>'."\n"; |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
($action eq 'defaults') || ($action eq 'directorysrch')) { |
($action eq 'defaults') || ($action eq 'directorysrch') || |
|
($action eq 'helpsettings')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 4) { |
Line 942 print STDERR "$action num ||$numheaders|
|
Line 1018 print STDERR "$action num ||$numheaders|
|
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($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 'helpsettings') { |
|
$output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal); |
|
} |
} |
} |
} |
$output .= ' |
$output .= ' |
Line 2969 sub print_contacts {
|
Line 3043 sub print_contacts {
|
} |
} |
|
|
sub print_helpsettings { |
sub print_helpsettings { |
my ($dom,$confname,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my $confname = $dom.'-domainconfig'; |
my ($datatable,$itemcount); |
my ($datatable,$itemcount); |
$itemcount = 1; |
if ($position eq 'top') { |
my (%choices,%defaultchecked,@toggles); |
$itemcount = 1; |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
my (%choices,%defaultchecked,@toggles); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
$choices{'submitbugs'} = &mt('Display link to: [_1]?', |
&mt('LON-CAPA bug tracker'),600,500)); |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
%defaultchecked = ('submitbugs' => 'on'); |
&mt('LON-CAPA bug tracker'),600,500)); |
@toggles = ('submitbugs',); |
%defaultchecked = ('submitbugs' => 'on'); |
|
@toggles = ('submitbugs'); |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
|
$$rowtotal ++; |
|
} else { |
|
my $css_class; |
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
|
my %customroles; |
|
foreach my $key (keys(%existing)) { |
|
if ($key=~/^rolesdef\_(\w+)$/) { |
|
my $rolename = $1; |
|
my %privs; |
|
($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key}); |
|
$customroles{$rolename} = \%privs; |
|
} |
|
} |
|
my $count = 0; |
|
my $context = 'domprefs'; |
|
my $crstype = 'Course'; |
|
foreach my $role (sort(keys(%customroles))) { |
|
my $prefix = 'custhelp'.$count; |
|
my %full=(); |
|
my %levels= ( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
my %levelscurrent=( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
&Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr '.$css_class.'><td><label>'. |
|
'<input type="checkbox" name="modifycusthelp" value="'.$count.'" />'. |
|
'<input type="hidden" name="custhelprole'.$count.'" value="'.$role.'" />'. |
|
&mt('Modify').'</label></td>'. |
|
'<td>'.&mt('Existing helpdesk role:').' '. |
|
'<b>'.$role.'</b><br />'. |
|
&Apache::lonuserutils::custom_role_header($context,$crstype, |
|
\@templateroles,$prefix). |
|
&Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels, |
|
\%levelscurrent,$prefix). |
|
'<br /></td>'; |
|
$count ++; |
|
$itemcount ++; |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $newcust = 'custhelp'.$count; |
|
my (%privs,%levelscurrent); |
|
my %full=(); |
|
my %levels= ( |
|
course => {}, |
|
domain => {}, |
|
system => {}, |
|
); |
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
|
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="newcusthelp" value="'.$count.'" />'. &mt('Add'). |
|
'</label></span></td>'. |
|
'<td><span class="LC_nobreak">'. |
|
'<b>'.&mt('Name of new helpdesk role:').'</b> '. |
|
'<input type="text" size="20" name="newcusthelpname" value="" />'. |
|
'</span><br />'. |
|
&Apache::lonuserutils::custom_role_header($context,$crstype, |
|
\@templateroles,$newcust). |
|
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
|
\%levelscurrent,$newcust). |
|
'<br /><br />'. |
|
'</td></tr>'; |
|
$count ++; |
|
$$rowtotal += $count; |
|
} |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 3620 sub print_coursedefaults {
|
Line 3768 sub print_coursedefaults {
|
$additional .= '</tr></table></div>'."\n"; |
$additional .= '</tr></table></div>'."\n"; |
%defaultchecked = ('postsubmit' => 'on'); |
%defaultchecked = ('postsubmit' => 'on'); |
@toggles = ('postsubmit'); |
@toggles = ('postsubmit'); |
my $current = { |
$current = { |
'postsubmit' => $postsubmitclient, |
'postsubmit' => $postsubmitclient, |
}; |
}; |
($table,$itemcount) = |
($table,$itemcount) = |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick,$additional,'left'); |
\%choices,$itemcount,$onclick,$additional,'left'); |
Line 3873 sub print_validation_rows {
|
Line 4021 sub print_validation_rows {
|
|
|
sub print_usersessions { |
sub print_usersessions { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,%checked,%choices); |
my ($css_class,$datatable,$itemcount,%checked,%choices); |
my (%by_ip,%by_location,@intdoms,@instdoms); |
my (%by_ip,%by_location,@intdoms,@instdoms); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
|
Line 3881 sub print_usersessions {
|
Line 4029 sub print_usersessions {
|
my %serverhomes = %Apache::lonnet::serverhomeIDs; |
my %serverhomes = %Apache::lonnet::serverhomeIDs; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %altids = &id_for_thisdom(%servers); |
my %altids = &id_for_thisdom(%servers); |
my $itemcount = 1; |
|
if ($position eq 'top') { |
if ($position eq 'top') { |
if (keys(%serverhomes) > 1) { |
if (keys(%serverhomes) > 1) { |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
Line 3894 sub print_usersessions {
|
Line 4041 sub print_usersessions {
|
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
} else { |
} else { |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'). |
|
'</td></tr>'; |
} |
} |
} else { |
} else { |
if (keys(%by_location) == 0) { |
my %titles = &usersession_titles(); |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
my ($prefix,@types); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.'); |
if ($position eq 'bottom') { |
|
$prefix = 'remote'; |
|
@types = ('version','excludedomain','includedomain'); |
} else { |
} else { |
my %lt = &usersession_titles(); |
$prefix = 'hosted'; |
my $numinrow = 5; |
@types = ('excludedomain','includedomain'); |
my $prefix; |
} |
my @types; |
($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles); |
if ($position eq 'bottom') { |
} |
$prefix = 'remote'; |
$$rowtotal += $itemcount; |
@types = ('version','excludedomain','includedomain'); |
return $datatable; |
} else { |
} |
$prefix = 'hosted'; |
|
@types = ('excludedomain','includedomain'); |
sub rules_by_location { |
} |
my ($settings,$prefix,$by_location,$by_ip,$types,$titles) = @_; |
my (%current,%checkedon,%checkedoff); |
my ($datatable,$itemcount,$css_class); |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
if (keys(%{$by_location}) == 0) { |
my @locations = sort(keys(%by_location)); |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
foreach my $type (@types) { |
$datatable = '<tr'.$css_class.'><td colspan="2">'. |
$checkedon{$type} = ''; |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.'). |
$checkedoff{$type} = ' checked="checked"'; |
'</td></tr>'; |
} |
$itemcount = 1; |
if (ref($settings) eq 'HASH') { |
} else { |
if (ref($settings->{$prefix}) eq 'HASH') { |
$itemcount = 0; |
foreach my $key (keys(%{$settings->{$prefix}})) { |
my $numinrow = 5; |
$current{$key} = $settings->{$prefix}{$key}; |
my (%current,%checkedon,%checkedoff); |
if ($key eq 'version') { |
my @locations = sort(keys(%{$by_location})); |
if ($current{$key} ne '') { |
foreach my $type (@{$types}) { |
$checkedon{$key} = ' checked="checked"'; |
$checkedon{$type} = ''; |
$checkedoff{$key} = ''; |
$checkedoff{$type} = ' checked="checked"'; |
} |
} |
} elsif (ref($current{$key}) eq 'ARRAY') { |
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$prefix}) eq 'HASH') { |
|
foreach my $key (keys(%{$settings->{$prefix}})) { |
|
$current{$key} = $settings->{$prefix}{$key}; |
|
if ($key eq 'version') { |
|
if ($current{$key} ne '') { |
$checkedon{$key} = ' checked="checked"'; |
$checkedon{$key} = ' checked="checked"'; |
$checkedoff{$key} = ''; |
$checkedoff{$key} = ''; |
} |
} |
|
} elsif (ref($current{$key}) eq 'ARRAY') { |
|
$checkedon{$key} = ' checked="checked"'; |
|
$checkedoff{$key} = ''; |
} |
} |
} |
} |
} |
} |
foreach my $type (@types) { |
} |
next if ($type ne 'version' && !@locations); |
foreach my $type (@{$types}) { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
next if ($type ne 'version' && !@locations); |
$datatable .= '<tr'.$css_class.'> |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
<td><span class="LC_nobreak">'.$lt{$type}.'</span><br /> |
$datatable .= '<tr'.$css_class.'> |
<span class="LC_nobreak"> |
<td><span class="LC_nobreak">'.$titles->{$type}.'</span><br /> |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
<span class="LC_nobreak"> |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
if ($type eq 'version') { |
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td>'; |
my $selector = '<select name="'.$prefix.'_version">'; |
if ($type eq 'version') { |
foreach my $version (@lcversions) { |
my @lcversions = &Apache::lonnet::all_loncaparevs(); |
my $selected = ''; |
my $selector = '<select name="'.$prefix.'_version">'; |
if ($current{'version'} eq $version) { |
foreach my $version (@lcversions) { |
$selected = ' selected="selected"'; |
my $selected = ''; |
} |
if ($current{'version'} eq $version) { |
$selector .= ' <option value="'.$version.'"'. |
$selected = ' selected="selected"'; |
$selected.'>'.$version.'</option>'; |
|
} |
} |
$selector .= '</select> '; |
$selector .= ' <option value="'.$version.'"'. |
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
$selected.'>'.$version.'</option>'; |
} else { |
} |
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
$selector .= '</select> '; |
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
$datatable .= &mt('remote server must be version: [_1] or later',$selector); |
' />'.(' 'x2). |
} else { |
'<input type="button" value="'.&mt('uncheck all').'" '. |
$datatable.= '<div><input type="button" value="'.&mt('check all').'" '. |
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
"\n". |
' />'.(' 'x2). |
'</div><div><table>'; |
'<input type="button" value="'.&mt('uncheck all').'" '. |
my $rem; |
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
for (my $i=0; $i<@locations; $i++) { |
"\n". |
my ($showloc,$value,$checkedtype); |
'</div><div><table>'; |
if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
my $rem; |
my $ip = $by_location{$locations[$i]}->[0]; |
for (my $i=0; $i<@locations; $i++) { |
if (ref($by_ip{$ip}) eq 'ARRAY') { |
my ($showloc,$value,$checkedtype); |
$value = join(':',@{$by_ip{$ip}}); |
if (ref($by_location->{$locations[$i]}) eq 'ARRAY') { |
$showloc = join(', ',@{$by_ip{$ip}}); |
my $ip = $by_location->{$locations[$i]}->[0]; |
if (ref($current{$type}) eq 'ARRAY') { |
if (ref($by_ip->{$ip}) eq 'ARRAY') { |
foreach my $loc (@{$by_ip{$ip}}) { |
$value = join(':',@{$by_ip->{$ip}}); |
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
$showloc = join(', ',@{$by_ip->{$ip}}); |
$checkedtype = ' checked="checked"'; |
if (ref($current{$type}) eq 'ARRAY') { |
last; |
foreach my $loc (@{$by_ip->{$ip}}) { |
} |
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
|
$checkedtype = ' checked="checked"'; |
|
last; |
} |
} |
} |
} |
} |
} |
} |
} |
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$prefix.'_'.$type. |
|
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
'</label></span></td>'; |
|
} |
} |
$rem = @locations%($numinrow); |
$rem = $i%($numinrow); |
my $colsleft = $numinrow - $rem; |
if ($rem == 0) { |
if ($colsleft > 1 ) { |
if ($i > 0) { |
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
$datatable .= '</tr>'; |
' </td>'; |
} |
} elsif ($colsleft == 1) { |
$datatable .= '<tr>'; |
$datatable .= '<td class="LC_left_item"> </td>'; |
} |
} |
$datatable .= '<td class="LC_left_item">'. |
$datatable .= '</tr></table>'; |
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$prefix.'_'.$type. |
|
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
'</label></span></td>'; |
} |
} |
$datatable .= '</td></tr>'; |
$rem = @locations%($numinrow); |
$itemcount ++; |
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
} |
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
} |
} |
} |
} |
$$rowtotal += $itemcount; |
return ($datatable,$itemcount); |
return $datatable; |
|
} |
} |
|
|
sub print_ssl { |
sub print_ssl { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my $lonhost = ''; |
|
my $itemcount = 1; |
my $itemcount = 1; |
if ($position eq 'top') { |
if ($position eq 'top') { |
my %domservers = &Apache::lonnet::get_servers($dom); |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
my $same_institution; |
|
if ($intdom ne '') { |
|
my $internet_names = &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
|
if (ref($internet_names) eq 'ARRAY') { |
|
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
|
$same_institution = 1; |
|
} |
|
} |
|
} |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable = '<tr'.$css_class.'><td colspan="2">'; |
&LONCAPA::SSL::print_certstatus(\%domservers,'web','domprefs'). |
if ($same_institution) { |
'</td></tr>'; |
my %domservers = &Apache::lonnet::get_servers($dom); |
|
$datatable .= &LONCAPA::SSL::print_certstatus(\%domservers,'web','domprefs'); |
|
} else { |
|
$datatable .= &mt("You need to be logged into one of your own domain's servers to display information about the status of LON-CAPA SSL certificates."); |
|
} |
|
$datatable .= '</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} else { |
} else { |
my %titles = &ssl_titles(); |
my %titles = &ssl_titles(); |
Line 4079 sub print_ssl {
|
Line 4251 sub print_ssl {
|
$itemcount ++; |
$itemcount ++; |
} |
} |
} else { |
} else { |
my $numinrow = 5; |
|
my $prefix = 'replication'; |
my $prefix = 'replication'; |
my @types = ('certreq','nocertreq'); |
my @types = ('certreq','nocertreq'); |
my (%current,%checkedon,%checkedoff); |
if (keys(%by_location) == 0) { |
my @locations = sort(keys(%by_location)); |
$datatable .= '<tr'.$css_class.'><td>'. |
foreach my $type (@types) { |
&mt('Nothing to set here, as there are no other institutions'). |
$checkedon{$type} = ''; |
'</td></tr>'; |
$checkedoff{$type} = ' checked="checked"'; |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$prefix}) eq 'HASH') { |
|
foreach my $key (keys(%{$settings->{$prefix}})) { |
|
$current{$key} = $settings->{$prefix}{$key}; |
|
if (ref($current{$key}) eq 'ARRAY') { |
|
$checkedon{$key} = ' checked="checked"'; |
|
$checkedoff{$key} = ''; |
|
} |
|
} |
|
} |
|
} |
|
if (@locations > 0) { |
|
foreach my $type (@types) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'> |
|
<td><span class="LC_nobreak LC_right_item">'.$titles{$type}.'</span><br /> |
|
<span class="LC_nobreak"> |
|
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedoff{$type}.' value="0" />'.&mt('Not in use').'</label> |
|
<label><input type="radio" name="'.$prefix.'_'.$type.'_inuse" '.$checkedon{$type}.' value="1" />'.&mt('In use').'</label></span></td><td> |
|
<div><input type="button" value="'.&mt('check all').'" '. |
|
'onclick="javascript:checkAll(document.display.'.$prefix.'_'.$type.')"'. |
|
' />'.(' 'x2)."\n". |
|
'<input type="button" value="'.&mt('uncheck all').'" '. |
|
'onclick="javascript:uncheckAll(document.display.'.$prefix.'_'.$type.')" />'. |
|
"\n". |
|
'</div><div><table>'; |
|
my $rem; |
|
for (my $i=0; $i<@locations; $i++) { |
|
my ($showloc,$value,$checkedtype); |
|
if (ref($by_location{$locations[$i]}) eq 'ARRAY') { |
|
my $ip = $by_location{$locations[$i]}->[0]; |
|
if (ref($by_ip{$ip}) eq 'ARRAY') { |
|
$value = join(':',@{$by_ip{$ip}}); |
|
$showloc = join(', ',@{$by_ip{$ip}}); |
|
if (ref($current{$type}) eq 'ARRAY') { |
|
foreach my $loc (@{$by_ip{$ip}}) { |
|
if (grep(/^\Q$loc\E$/,@{$current{$type}})) { |
|
$checkedtype = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$prefix.'_'.$type. |
|
'" value="'.$value.'"'.$checkedtype.' />'.$showloc. |
|
'</label></span></td>'; |
|
} |
|
$rem = @locations%($numinrow); |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'; |
|
$itemcount ++; |
|
} |
|
} else { |
|
$datatable .= '<tr'.$css_class.'><td>'.&mt('Nothing to set here, as there are no other institutions').'</td></tr>'; |
|
$itemcount ++; |
$itemcount ++; |
|
} else { |
|
($datatable,$itemcount) = |
|
&rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles); |
} |
} |
} |
} |
} |
} |
Line 4179 sub ssl_titles {
|
Line 4281 sub ssl_titles {
|
yes => 'SSL Optional (used if available)', |
yes => 'SSL Optional (used if available)', |
req => 'SSL Required', |
req => 'SSL Required', |
); |
); |
|
} |
|
|
|
sub print_trust { |
|
my ($prefix,$dom,$settings,$rowtotal) = @_; |
|
my ($css_class,$datatable,%checked,%choices); |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
my $itemcount = 1; |
|
my %titles = &trust_titles(); |
|
my @types = ('exc','inc'); |
|
if ($prefix eq 'top') { |
|
$prefix = 'content'; |
|
} elsif ($prefix eq 'bottom') { |
|
$prefix = 'msg'; |
|
} |
|
($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles); |
|
$$rowtotal += $itemcount; |
|
return $datatable; |
|
} |
|
|
|
sub trust_titles { |
|
return &Apache::lonlocal::texthash( |
|
content => "Access to this domain's content by others", |
|
shared => "Access to other domain's content by this domain", |
|
enroll => "Enrollment in this domain's courses by others", |
|
othcoau => "Co-author roles in this domain for others", |
|
coaurem => "Co-author roles for this domain's users elsewhere", |
|
domroles => "Domain roles in this domain assignable to others", |
|
catalog => "Course Catalog for this domain displayed elsewhere", |
|
reqcrs => "Requests for creation of courses in this domain by others", |
|
msg => "Users in other domains can send messages to this domain", |
|
exc => "Allow all, but exclude specific domains", |
|
inc => "Deny all, but include specific domains", |
|
); |
} |
} |
|
|
sub build_location_hashes { |
sub build_location_hashes { |
Line 4554 sub print_loadbalancing {
|
Line 4690 sub print_loadbalancing {
|
my ($numspares,@spares) = &count_servers($lonhost,%servers); |
my ($numspares,@spares) = &count_servers($lonhost,%servers); |
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
|
my %hostherechecked = ( |
|
no => ' checked="checked"', |
|
); |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
my $targettable; |
my $targettable; |
for (my $i=0; $i<$numspares; $i++) { |
for (my $i=0; $i<$numspares; $i++) { |
Line 4599 sub print_loadbalancing {
|
Line 4738 sub print_loadbalancing {
|
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
$datatable .= '<i>'.$typetitles{$sparetype}.'</i><br />'. |
'<table><tr>'.$targettable.'</tr></table><br />'; |
'<table><tr>'.$targettable.'</tr></table><br />'; |
} |
} |
|
$hostherechecked{$sparetype} = ''; |
|
if (ref($currtargets{$lonhost}) eq 'HASH') { |
|
if (ref($currtargets{$lonhost}{$sparetype}) eq 'ARRAY') { |
|
if (grep(/^\Q$lonhost\E$/,@{$currtargets{$lonhost}{$sparetype}})) { |
|
$hostherechecked{$sparetype} = ' checked="checked"'; |
|
$hostherechecked{'no'} = ''; |
|
} |
|
} |
|
} |
|
} |
|
$datatable .= &mt('Hosting on balancer itself').'<br />'. |
|
'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'. |
|
$hostherechecked{'no'}.' />'.&mt('No').'</label><br />'; |
|
foreach my $sparetype (@sparestypes) { |
|
$datatable .= '<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" '. |
|
'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}. |
|
'</i></label><br />'; |
} |
} |
$datatable .= '</div></td></tr>'. |
$datatable .= '</div></td></tr>'. |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
Line 11659 sub modify_helpsettings {
|
Line 11815 sub modify_helpsettings {
|
my %defaultchecked = ('submitbugs' => 'on'); |
my %defaultchecked = ('submitbugs' => 'on'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my @toggles = ('submitbugs'); |
my @toggles = ('submitbugs'); |
|
my %current = ('submitbugs' => ''); |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
foreach my $item (@toggles) { |
%current = %{$domconfig{'helpsettings'}}; |
if ($defaultchecked{$item} eq 'on') { |
} |
if ($domconfig{'helpsettings'}{$item} eq '') { |
foreach my $item (@toggles) { |
if ($env{'form.'.$item} eq '0') { |
if ($defaultchecked{$item} eq 'on') { |
$changes{$item} = 1; |
if ($current{$item} eq '') { |
} |
if ($env{'form.'.$item} eq '0') { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
|
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($defaultchecked{$item} eq 'off') { |
} elsif ($current{$item} ne $env{'form.'.$item}) { |
if ($domconfig{'helpsettings'}{$item} eq '') { |
$changes{$item} = 1; |
if ($env{'form.'.$item} eq '1') { |
} |
$changes{$item} = 1; |
} elsif ($defaultchecked{$item} eq 'off') { |
} |
if ($current{$item} eq '') { |
} elsif ($domconfig{'helpsettings'}{$item} ne $env{'form.'.$item}) { |
if ($env{'form.'.$item} eq '1') { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
|
} elsif ($current{$item} ne $env{'form.'.$item}) { |
|
$changes{$item} = 1; |
} |
} |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
} |
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
if (($env{'form.'.$item} eq '0') || ($env{'form.'.$item} eq '1')) { |
|
$helphash{'helpsettings'}{$item} = $env{'form.'.$item}; |
|
} |
|
} |
|
|
|
my @modify = &Apache::loncommon::get_env_multiple('form.modifycusthelp'); |
|
my $confname = $dom.'-domainconfig'; |
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
|
if (@modify) { |
|
foreach my $num (@modify) { |
|
my $rolename = $env{'form.custhelprole'.$num}; |
|
if ($rolename ne '') { |
|
if (exists($existing{'rolesdef_'.$rolename})) { |
|
my $prefix = 'custhelp'.$num; |
|
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix); |
|
my %currprivs; |
|
($currprivs{'s'},$currprivs{'d'},$currprivs{'c'}) = |
|
split(/\_/,$existing{'rolesdef_'.$rolename}); |
|
foreach my $level ('c','d','s') { |
|
if ($newprivs{$level} ne $currprivs{$level}) { |
|
$changes{'customrole'}{$rolename} = 1; |
|
my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, |
|
$newprivs{'c'},$confname,$dom); |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($env{'form.newcusthelp'} ne '') { |
|
my $prefix = 'custhelp'.$env{'form.newcusthelp'}; |
|
my $rolename = $env{'form.newcusthelpname'}; |
|
$rolename=~s/[^A-Za-z0-9]//gs; |
|
if ($rolename ne '') { |
|
unless(exists($existing{'rolesdef_'.$rolename})) { |
|
my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix); |
|
my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, |
|
$newprivs{'c'},$confname,$dom); |
|
if ($result eq 'ok') { |
|
$changes{'newcustomrole'} = $rolename; |
|
} else { |
|
$errors .= '<li><span class="LC_error">'. |
|
&mt('An error occurred storing the new custom role: [_1]', |
|
$result).'</span></li>'; |
|
} |
} |
} |
} |
} |
} |
} |
|
|
my $putresult; |
my $putresult; |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
Line 11693 sub modify_helpsettings {
|
Line 11897 sub modify_helpsettings {
|
$resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".', |
$resulttext .= '<li>'.&mt('Display link to: [_1] set to "'.$offon[$env{'form.'.$item}].'".', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&Apache::loncommon::modal_link('http://bugs.loncapa.org', |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
&mt('LON-CAPA bug tracker'),600,500)).'</li>'; |
|
} elsif ($item eq 'customrole') { |
|
if (ref($changes{'customrole'}) eq 'HASH') { |
|
foreach my $role (sort(keys(%{$changes{'customrole'}}))) { |
|
$resulttext .= '<li>'.&mt('Existing custom role modified: [_1]', |
|
$role).'</li>'; |
|
} |
|
} |
|
} elsif ($item eq 'newcustomrole') { |
|
$resulttext .= '<li>'.&mt('New custom role added: [_1]', |
|
$changes{'newcustomrole'}).'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 12673 sub modify_ssl {
|
Line 12887 sub modify_ssl {
|
connect => \@connecttypes, |
connect => \@connecttypes, |
replication => \@reptypes, |
replication => \@reptypes, |
); |
); |
my $action = 'ssl'; |
|
foreach my $prefix (sort(keys(%types))) { |
foreach my $prefix (sort(keys(%types))) { |
foreach my $type (@{$types{$prefix}}) { |
foreach my $type (@{$types{$prefix}}) { |
if ($prefix eq 'connect') { |
if ($prefix eq 'connect') { |
Line 12817 sub modify_ssl {
|
Line 13030 sub modify_ssl {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_trust { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
my @locations = sort(keys(%by_location)); |
|
my @prefixes = qw(content shared enroll othcoau coaurem domroles catalog reqcrs msg); |
|
my @types = ('exc','inc'); |
|
my (%defaultshash,%changes); |
|
foreach my $prefix (@prefixes) { |
|
$defaultshash{'trust'}{$prefix} = {}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my $resulttext; |
|
foreach my $prefix (@prefixes) { |
|
foreach my $type (@types) { |
|
my $inuse = $env{'form.'.$prefix.'_'.$type.'_inuse'}; |
|
my @vals = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$type); |
|
my @okvals; |
|
foreach my $val (@vals) { |
|
if ($val =~ /:/) { |
|
my @items = split(/:/,$val); |
|
foreach my $item (@items) { |
|
if (ref($by_location{$item}) eq 'ARRAY') { |
|
push(@okvals,$item); |
|
} |
|
} |
|
} else { |
|
if (ref($by_location{$val}) eq 'ARRAY') { |
|
push(@okvals,$val); |
|
} |
|
} |
|
} |
|
@okvals = sort(@okvals); |
|
if (ref($domconfig{'trust'}) eq 'HASH') { |
|
if (ref($domconfig{'trust'}{$prefix}) eq 'HASH') { |
|
if (ref($domconfig{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
|
if ($inuse == 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} else { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
my @changed = &Apache::loncommon::compare_arrays($domconfig{'trust'}{$prefix}{$type},$defaultshash{'trust'}{$prefix}{$type}); |
|
if (@changed > 0) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} else { |
|
if ($inuse == 1) { |
|
$defaultshash{'trust'}{$prefix}{$type} = \@okvals; |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my $nochgmsg = &mt('No changes made to trust settings.'); |
|
if (keys(%changes) > 0) { |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
if (ref($defaultshash{'trust'}) eq 'HASH') { |
|
foreach my $prefix (@prefixes) { |
|
if (ref($defaultshash{'trust'}{$prefix}) eq 'HASH') { |
|
$domdefaults{'trust'.$prefix} = $defaultshash{'trust'}{$prefix}; |
|
} |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
if (keys(%changes) > 0) { |
|
my %lt = &trust_titles(); |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
foreach my $prefix (@prefixes) { |
|
if (ref($changes{$prefix}) eq 'HASH') { |
|
$resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
|
foreach my $type (@types) { |
|
if (defined($changes{$prefix}{$type})) { |
|
my $newvalue; |
|
if (ref($defaultshash{'trust'}) eq 'HASH') { |
|
if (ref($defaultshash{'trust'}{$prefix})) { |
|
if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
|
if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}}); |
|
} |
|
} |
|
} |
|
} |
|
if ($newvalue eq '') { |
|
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} else { |
|
$resulttext = $nochgmsg; |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_loadbalancing { |
sub modify_loadbalancing { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
Line 12877 sub modify_loadbalancing {
|
Line 13214 sub modify_loadbalancing {
|
push(@offloadto,$target); |
push(@offloadto,$target); |
} |
} |
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
|
} |
} |
|
if ($env{'form.loadbalancing_target_'.$i.'_hosthere'} eq $sparetype) { |
|
unless(grep(/^\Q$balancer\E$/,@offloadto)) { |
|
push(@offloadto,$balancer); |
|
} |
|
} |
|
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
} |
} |
if (ref($currtargets{$balancer}) eq 'HASH') { |
if (ref($currtargets{$balancer}) eq 'HASH') { |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |