version 1.290, 2017/01/28 03:48:44
|
version 1.295, 2017/03/20 03:19:43
|
Line 265 sub handler {
|
Line 265 sub handler {
|
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
col2 => 'Value'}, |
|
{col1 => 'Internal Authentication', |
|
col2 => 'Value'}, |
{col1 => 'Institutional user types', |
{col1 => 'Institutional user types', |
col2 => 'Assignable to e-mail usernames'}], |
col2 => 'Assignable to e-mail usernames'}], |
print => \&print_defaults, |
print => \&print_defaults, |
Line 499 sub handler {
|
Line 501 sub handler {
|
col2 => 'Certificate Status'}, |
col2 => 'Certificate Status'}, |
{col1 => 'Connections to other servers', |
{col1 => 'Connections to other servers', |
col2 => 'Rules'}, |
col2 => 'Rules'}, |
|
{col1 => 'Connections from other servers', |
|
col2 => 'Rules'}, |
{col1 => "Replicating domain's published content", |
{col1 => "Replicating domain's published content", |
col2 => 'Rules'}], |
col2 => 'Rules'}], |
print => \&print_ssl, |
print => \&print_ssl, |
Line 673 sub process_changes {
|
Line 677 sub process_changes {
|
} elsif ($action eq 'autocreate') { |
} elsif ($action eq 'autocreate') { |
$output = &modify_autocreate($dom,%domconfig); |
$output = &modify_autocreate($dom,%domconfig); |
} elsif ($action eq 'directorysrch') { |
} elsif ($action eq 'directorysrch') { |
$output = &modify_directorysrch($dom,%domconfig); |
$output = &modify_directorysrch($dom,$lastactref,%domconfig); |
} elsif ($action eq 'usercreation') { |
} elsif ($action eq 'usercreation') { |
$output = &modify_usercreation($dom,%domconfig); |
$output = &modify_usercreation($dom,%domconfig); |
} elsif ($action eq 'selfcreation') { |
} elsif ($action eq 'selfcreation') { |
Line 806 sub print_config_box {
|
Line 810 sub print_config_box {
|
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 'trust') || ($action eq 'contacts')) { |
($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults')) { |
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"'; |
Line 866 sub print_config_box {
|
Line 870 sub print_config_box {
|
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'helpsettings')) { |
($action eq 'helpsettings')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'ssl') { |
|
$output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('connfrom',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
|
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 4) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
Line 3250 sub print_helpsettings {
|
Line 3276 sub print_helpsettings {
|
my $context = 'domprefs'; |
my $context = 'domprefs'; |
my $crstype = 'Course'; |
my $crstype = 'Course'; |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none'); |
my @accesstypes = ('all','dh','da','none'); |
my ($numstatustypes,@jsarray); |
my ($numstatustypes,@jsarray); |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
if (@{$types} > 0) { |
if (@{$types} > 0) { |
Line 3468 function helpdeskAccess(num) {
|
Line 3494 function helpdeskAccess(num) {
|
shown = Array('notinc'); |
shown = Array('notinc'); |
hidden = Array('notexc','bystatus'); |
hidden = Array('notexc','bystatus'); |
} |
} |
if (curraccess == 'all') { |
if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) { |
hidden = Array('notinc','notexc','bystatus'); |
hidden = Array('notinc','notexc','bystatus'); |
} |
} |
} |
} |
Line 3525 sub helpdeskroles_access {
|
Line 3551 sub helpdeskroles_access {
|
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
'rou' => 'Role usage', |
'rou' => 'Role usage', |
'whi' => 'Which helpdesk personnel may use this role?', |
'whi' => 'Which helpdesk personnel may use this role?', |
'all' => 'All', |
'all' => 'All with domain helpdesk or helpdesk assistant role', |
|
'dh' => 'All with domain helpdesk role', |
|
'da' => 'All with domain helpdesk assistant role', |
'none' => 'None', |
'none' => 'None', |
'status' => 'Determined based on institutional status', |
'status' => 'Determined based on institutional status', |
'inc' => 'Include all, but exclude specific personnel', |
'inc' => 'Include all, but exclude specific personnel', |
Line 4233 sub print_coursedefaults {
|
Line 4261 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
'<input type="text" name="mysqltables_'.$type.'"'. |
' value="'.$currmysql{$type}.'" size="5" /></td>'; |
' value="'.$currmysql{$type}.'" size="8" /></td>'; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 4655 sub print_ssl {
|
Line 4683 sub print_ssl {
|
my @domservers = &Apache::lonnet::get_servers($dom); |
my @domservers = &Apache::lonnet::get_servers($dom); |
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); |
if ($position eq 'middle') { |
if (($position eq 'connto') || ($position eq 'connfrom')) { |
|
my $legacy; |
|
unless (ref($settings) eq 'HASH') { |
|
my $name; |
|
if ($position eq 'connto') { |
|
$name = 'loncAllowInsecure'; |
|
} else { |
|
$name = 'londAllowInsecure'; |
|
} |
|
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
if (($primarylibserv ne '') && (!grep(/^\Q$primarylibserv\E$/,@ids))) { |
|
my %what = ( |
|
$name => 1, |
|
); |
|
my ($result,$returnhash) = |
|
&Apache::lonnet::get_remote_globals($primarylibserv,\%what); |
|
if ($result eq 'ok') { |
|
if (ref($returnhash) eq 'HASH') { |
|
$legacy = $returnhash->{$name}; |
|
} |
|
} |
|
} else { |
|
$legacy = $Apache::lonnet::perlvar{$name}; |
|
} |
|
} |
foreach my $type ('dom','intdom','other') { |
foreach my $type ('dom','intdom','other') { |
my %checked; |
my %checked; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
Line 4682 sub print_ssl {
|
Line 4735 sub print_ssl {
|
unless ($skip) { |
unless ($skip) { |
$checked{'yes'} = ' checked="checked"'; |
$checked{'yes'} = ' checked="checked"'; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'connect'}) eq 'HASH') { |
if (ref($settings->{$position}) eq 'HASH') { |
if ($settings->{'connect'}->{$type} =~ /^(no|req)$/) { |
if ($settings->{$position}->{$type} =~ /^(no|req)$/) { |
$checked{$1} = $checked{'yes'}; |
$checked{$1} = $checked{'yes'}; |
delete($checked{'yes'}); |
delete($checked{'yes'}); |
} |
} |
} |
} |
|
} else { |
|
if ($legacy == 0) { |
|
$checked{'req'} = $checked{'yes'}; |
|
delete($checked{'yes'}); |
|
} |
} |
} |
foreach my $option ('no','yes','req') { |
foreach my $option ('no','yes','req') { |
$datatable .= '<span class="LC_nobreak"><label>'. |
$datatable .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="connect_'.$type.'" '. |
'<input type="radio" name="'.$position.'_'.$type.'" '. |
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
'</label></span>'.(' 'x2); |
'</label></span>'.(' 'x2); |
} |
} |
Line 4722 sub ssl_titles {
|
Line 4780 sub ssl_titles {
|
dom => 'LON-CAPA servers/VMs from same domain', |
dom => 'LON-CAPA servers/VMs from same domain', |
intdom => 'LON-CAPA servers/VMs from same "internet" domain', |
intdom => 'LON-CAPA servers/VMs from same "internet" domain', |
other => 'External LON-CAPA servers/VMs', |
other => 'External LON-CAPA servers/VMs', |
connect => 'Connections to other servers', |
connto => 'Connections to other servers', |
|
connfrom => 'Connections from other servers', |
replication => 'Replicating content to other institutions', |
replication => 'Replicating content to other institutions', |
certreq => 'Client certificate required, but specific domains exempt', |
certreq => 'Client certificate required, but specific domains exempt', |
nocertreq => 'No client certificate required, except for specific domains', |
nocertreq => 'No client certificate required, except for specific domains', |
Line 6074 sub print_usermodification {
|
Line 6133 sub print_usermodification {
|
sub print_defaults { |
sub print_defaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $rownum = 0; |
my $rownum = 0; |
my ($datatable,$css_class); |
my ($datatable,$css_class,$titles); |
|
unless ($position eq 'bottom') { |
|
$titles = &defaults_titles($dom); |
|
} |
if ($position eq 'top') { |
if ($position eq 'top') { |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def', |
'datelocale_def','portal_def'); |
'datelocale_def','portal_def'); |
Line 6087 sub print_defaults {
|
Line 6149 sub print_defaults {
|
$defaults{$item} = $domdefaults{$item}; |
$defaults{$item} = $domdefaults{$item}; |
} |
} |
} |
} |
my $titles = &defaults_titles($dom); |
|
foreach my $item (@items) { |
foreach my $item (@items) { |
if ($rownum%2) { |
if ($rownum%2) { |
$css_class = ''; |
$css_class = ''; |
Line 6135 sub print_defaults {
|
Line 6196 sub print_defaults {
|
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
|
} elsif ($position eq 'middle') { |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($settings) eq 'HASH') { |
|
%defaults = %{$settings}; |
|
if ($defaults{'intauth_cost'} !~ /^\d+$/) { |
|
$defaults{'intauth_cost'} = 10; |
|
} |
|
if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_check'} = 0; |
|
} |
|
if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_switch'} = 0; |
|
} |
|
} else { |
|
%defaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
} |
|
foreach my $item (@items) { |
|
if ($rownum%2) { |
|
$css_class = ''; |
|
} else { |
|
$css_class = ' class="LC_odd_row" '; |
|
} |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles->{$item}. |
|
'</span></td><td class="LC_left_item" colspan="3">'; |
|
if ($item eq 'intauth_switch') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
$datatable .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} elsif ($item eq 'intauth_check') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
$datatable .= '<table wisth="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
my $onclick; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option == 2) { |
|
$onclick = ' onclick="javascript:warnIntAuth(this);"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.$onclick.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} else { |
|
$datatable .= '<input type="text" name="'.$item.'" value="'. |
|
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$rownum ++; |
|
} |
} else { |
} else { |
my (%defaults); |
my %defaults; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') && |
(ref($settings->{'inststatusguest'}) eq 'ARRAY')) { |
(ref($settings->{'inststatusguest'}) eq 'ARRAY')) { |
Line 6231 sub defaults_titles {
|
Line 6371 sub defaults_titles {
|
'timezone_def' => 'Default timezone', |
'timezone_def' => 'Default timezone', |
'datelocale_def' => 'Default locale for dates', |
'datelocale_def' => 'Default locale for dates', |
'portal_def' => 'Portal/Default URL', |
'portal_def' => 'Portal/Default URL', |
|
'intauth_cost' => 'Encryption cost for bcrypt (positive integer)', |
|
'intauth_check' => 'Check bcrypt cost if authenticated', |
|
'intauth_switch' => 'Existing crypt-based switched to bcrypt on authentication', |
); |
); |
if ($dom) { |
if ($dom) { |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
my $uprimary_id = &Apache::lonnet::domain($dom,'primary'); |
Line 6766 sub serverstatus_pages {
|
Line 6909 sub serverstatus_pages {
|
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
return unless (ref($settings) eq 'HASH'); |
my $intauthcheck = &mt('Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.'); |
|
my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.'); |
|
&js_escape(\$intauthcheck); |
|
&js_escape(\$intauthcost); |
|
my $intauthjs = <<"ENDSCRIPT"; |
|
|
|
function warnIntAuth(field) { |
|
if (field.name == 'intauth_check') { |
|
if (field.value == '2') { |
|
alert('$intauthcheck'); |
|
} |
|
} |
|
if (field.name == 'intauth_cost') { |
|
field.value.replace(/\s/g,''); |
|
if (field.value != '') { |
|
var regexdigit=/^\\d+\$/; |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intauthcost'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
ENDSCRIPT |
|
|
|
if (ref($settings) ne 'HASH') { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
|
} |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
Line 6820 $jstext
|
Line 6991 $jstext
|
return; |
return; |
} |
} |
|
|
|
$intauthjs |
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
ENDSCRIPT |
ENDSCRIPT |
|
} else { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
} |
} |
} |
} |
|
|
Line 10158 sub modify_autocreate {
|
Line 10333 sub modify_autocreate {
|
} |
} |
|
|
sub modify_directorysrch { |
sub modify_directorysrch { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
my %currdirsrch; |
my %currdirsrch; |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
Line 10352 sub modify_directorysrch {
|
Line 10527 sub modify_directorysrch {
|
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
&Apache::lonnet::do_cache_new('directorysrch',$dom,$dirsrch_hash{'directorysrch'},3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'directorysrch'} = 1; |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to directory search settings'); |
$resulttext = &mt('No changes made to directory search settings'); |
} |
} |
Line 11677 sub modify_defaults {
|
Line 11856 sub modify_defaults {
|
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def','portal_def'); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def', |
|
'portal_def','intauth_cost','intauth_check','intauth_switch'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
my @authtypes = ('internal','krb4','krb5','localauth'); |
foreach my $item (@items) { |
foreach my $item (@items) { |
$newvalues{$item} = $env{'form.'.$item}; |
$newvalues{$item} = $env{'form.'.$item}; |
Line 11719 sub modify_defaults {
|
Line 11899 sub modify_defaults {
|
push(@errors,$item); |
push(@errors,$item); |
} |
} |
} |
} |
|
} elsif ($item eq 'intauth_cost') { |
|
if ($newvalues{$item} ne '') { |
|
if ($newvalues{$item} =~ /\D/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_switch') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
} |
} |
if (grep(/^\Q$item\E$/,@errors)) { |
if (grep(/^\Q$item\E$/,@errors)) { |
$newvalues{$item} = $domdefaults{$item}; |
$newvalues{$item} = $domdefaults{$item}; |
Line 11873 sub modify_defaults {
|
Line 12071 sub modify_defaults {
|
localauth => 'loc', |
localauth => 'loc', |
); |
); |
$value = $authnames{$shortauth{$value}}; |
$value = $authnames{$shortauth{$value}}; |
|
} elsif ($item eq 'intauth_switch') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
} |
} |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
Line 12457 sub modify_helpsettings {
|
Line 12677 sub modify_helpsettings {
|
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my (@allpos,%newsettings,%changedprivs,$newrole); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @accesstypes = ('all','none','status','inc','exc'); |
my @accesstypes = ('all','dh','da','none','status','inc','exc'); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); |
my %lt = &Apache::lonlocal::texthash( |
my %lt = &Apache::lonlocal::texthash( |
s => 'system', |
s => 'system', |
d => 'domain', |
d => 'domain', |
order => 'Display order', |
order => 'Display order', |
access => 'Role usage', |
access => 'Role usage', |
all => 'All', |
all => 'All with domain helpdesk or helpdesk assistant role', |
|
dh => 'All with domain helpdesk role', |
|
da => 'All with domain helpdesk assistant role', |
none => 'None', |
none => 'None', |
status => 'Determined based on institutional status', |
status => 'Determined based on institutional status', |
inc => 'Include all, but exclude specific personnel', |
inc => 'Include all, but exclude specific personnel', |
Line 13588 sub modify_usersessions {
|
Line 13810 sub modify_usersessions {
|
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
&Apache::lonnet::do_cache_new('usersessions',$dom,$defaultshash{'usersessions'},3600); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domdefaults'} = 1; |
$lastactref->{'domdefaults'} = 1; |
|
$lastactref->{'usersessions'} = 1; |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %lt = &usersession_titles(); |
my %lt = &usersession_titles(); |
Line 13690 sub modify_ssl {
|
Line 13914 sub modify_ssl {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%defaultshash,%changes); |
my (%defaultshash,%changes); |
my $action = 'ssl'; |
my $action = 'ssl'; |
my @prefixes = ('connect','replication'); |
my @prefixes = ('connto','connfrom','replication'); |
foreach my $prefix (@prefixes) { |
foreach my $prefix (@prefixes) { |
$defaultshash{$action}{$prefix} = {}; |
$defaultshash{$action}{$prefix} = {}; |
} |
} |
Line 13700 sub modify_ssl {
|
Line 13924 sub modify_ssl {
|
my @reptypes = ('certreq','nocertreq'); |
my @reptypes = ('certreq','nocertreq'); |
my @connecttypes = ('dom','intdom','other'); |
my @connecttypes = ('dom','intdom','other'); |
my %types = ( |
my %types = ( |
connect => \@connecttypes, |
connto => \@connecttypes, |
replication => \@reptypes, |
connfrom => \@connecttypes, |
|
replication => \@reptypes, |
); |
); |
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 'connto') || ($prefix eq 'connfrom')) { |
my $value = 'yes'; |
my $value = 'yes'; |
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
$value = $env{'form.'.$prefix.'_'.$type}; |
$value = $env{'form.'.$prefix.'_'.$type}; |
Line 13794 sub modify_ssl {
|
Line 14019 sub modify_ssl {
|
if (ref($defaultshash{$action}{'replication'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'replication'}) eq 'HASH') { |
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
} |
} |
if (ref($defaultshash{$action}{'connect'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'connto'}) eq 'HASH') { |
$domdefaults{'connect'} = $domconfig{$action}{'connect'}; |
$domdefaults{'connto'} = $domconfig{$action}{'connto'}; |
|
} |
|
if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') { |
|
$domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'}; |
} |
} |
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
Line 13814 sub modify_ssl {
|
Line 14042 sub modify_ssl {
|
my $newvalue; |
my $newvalue; |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}{$prefix})) { |
if (ref($defaultshash{$action}{$prefix})) { |
if ($prefix eq 'connect') { |
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
Line 14961 sub devalidate_remote_domconfs {
|
Line 15189 sub devalidate_remote_domconfs {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %thismachine; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults','ltitools'); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions','directorysrch'); |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |