version 1.408, 2022/02/18 13:39:22
|
version 1.412, 2022/08/24 20:58:50
|
Line 327 sub handler {
|
Line 327 sub handler {
|
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Institutional user types', |
{col1 => 'Institutional user types', |
col2 => 'Name displayed'}], |
col2 => 'Name displayed'}, |
|
{col1 => 'Mapping for missing usernames via standard log-in', |
|
col2 => 'Rules in use'}], |
print => \&print_defaults, |
print => \&print_defaults, |
modify => \&modify_defaults, |
modify => \&modify_defaults, |
}, |
}, |
Line 983 sub print_config_box {
|
Line 985 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 'trust') || ($action eq 'contacts') || |
($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults') || |
($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti')) { |
($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
Line 1071 sub print_config_box {
|
Line 1073 sub print_config_box {
|
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
($action eq 'defaults') || ($action eq 'directorysrch') || |
($action eq 'directorysrch') || ($action eq 'helpsettings') || |
($action eq 'helpsettings') || ($action eq 'wafproxy')) { |
($action eq 'wafproxy')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal); |
Line 1626 sub print_login {
|
Line 1628 sub print_login {
|
'<table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<th>'.$choices{'samllanding'}.'</th>'. |
'<th>'.$choices{'samllanding'}.'</th>'. |
'<th>'.$choices{'samloptions'}.'</th></tr>'."\n"; |
'<th>'.$choices{'samloptions'}.'</th></tr>'."\n"; |
my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff); |
my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlwindow,%samlnotsso,%styleon,%styleoff); |
foreach my $lonhost (keys(%domservers)) { |
foreach my $lonhost (keys(%domservers)) { |
$samlurl{$lonhost} = '/adm/sso'; |
$samlurl{$lonhost} = '/adm/sso'; |
$styleon{$lonhost} = 'display:none'; |
$styleon{$lonhost} = 'display:none'; |
$styleoff{$lonhost} = ''; |
$styleoff{$lonhost} = ''; |
} |
} |
if (ref($settings->{'saml'}) eq 'HASH') { |
if ((ref($settings) eq 'HASH') && (ref($settings->{'saml'}) eq 'HASH')) { |
foreach my $lonhost (keys(%{$settings->{'saml'}})) { |
foreach my $lonhost (keys(%{$settings->{'saml'}})) { |
if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { |
if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { |
$saml{$lonhost} = 1; |
$saml{$lonhost} = 1; |
Line 1641 sub print_login {
|
Line 1643 sub print_login {
|
$samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'}; |
$samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'}; |
$samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'}; |
$samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'}; |
$samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'}; |
$samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'}; |
|
$samlwindow{$lonhost} = $settings->{'saml'}{$lonhost}{'window'}; |
$samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'}; |
$samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'}; |
$styleon{$lonhost} = ''; |
$styleon{$lonhost} = ''; |
$styleoff{$lonhost} = 'display:none'; |
$styleoff{$lonhost} = 'display:none'; |
Line 1658 sub print_login {
|
Line 1661 sub print_login {
|
$samlon = $samloff; |
$samlon = $samloff; |
$samloff = ' '; |
$samloff = ' '; |
} |
} |
|
my $samlwinon = ''; |
|
my $samlwinoff = ' checked="checked"'; |
|
if ($samlwindow{$lonhost}) { |
|
$samlwinon = $samlwinoff; |
|
$samlwinoff = ''; |
|
} |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'. |
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.$domservers{$lonhost}.'</span></td>'. |
'<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff. |
'<td><span class="LC_nobreak"><label><input type="radio" name="saml_'.$lonhost.'"'.$samloff. |
Line 1667 sub print_login {
|
Line 1676 sub print_login {
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'. |
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'. |
&mt('Yes').'</label></span></td>'. |
&mt('Yes').'</label></span></td>'. |
'<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'. |
'<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'. |
'<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'. |
'<table width="100%"><tr><th colspan="3" align="center">'.&mt('SSO').'</th></tr>'. |
'<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'. |
|
'<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'. |
'<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'. |
'<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'. |
'<th>'.&mt('Alt Text').'</th></tr>'. |
'<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'. |
'<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="20" value="'. |
'<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'. |
|
$samltext{$lonhost}.'" /></td><td>'; |
$samltext{$lonhost}.'" /></td><td>'; |
if ($samlimg{$lonhost}) { |
if ($samlimg{$lonhost}) { |
$datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'. |
$datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'. |
Line 1689 sub print_login {
|
Line 1696 sub print_login {
|
$datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />'; |
$datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />'; |
} |
} |
$datatable .= '</td>'. |
$datatable .= '</td>'. |
'<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '. |
'<td><input type="text" name="saml_alt_'.$lonhost.'" size="25" '. |
'value="'.$samlalt{$lonhost}.'" /></td>'. |
'value="'.$samlalt{$lonhost}.'" /></td></tr></table><br />'. |
'<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '. |
'<table width="100%"><tr><th colspan="3" align="center">'.&mt('SSO').'</th><th align="center">'. |
|
'<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'. |
|
'<tr><th>'.&mt('URL').'</th><th>'.&mt('Tool Tip').'</th>'. |
|
'<th>'.&mt('Pop-up if iframe').'</th><th>'.&mt('Text').'</th></tr>'. |
|
'<tr'.$css_class.'>'. |
|
'<td><input type="text" name="saml_url_'.$lonhost.'" size="30" '. |
'value="'.$samlurl{$lonhost}.'" /></td>'. |
'value="'.$samlurl{$lonhost}.'" /></td>'. |
'<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'. |
'<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="20">'. |
$samltitle{$lonhost}.'</textarea></td>'. |
$samltitle{$lonhost}.'</textarea></td>'. |
'<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '. |
'<td><label><input type="radio" name="saml_window_'.$lonhost.'" value=""'.$samlwinoff.'>'. |
|
&mt('No').'</label>'.(' 'x2).'<label><input type="radio" '. |
|
'name="saml_window_'.$lonhost.'" value="1"'.$samlwinon.'>'.&mt('Yes').'</label></td>'. |
|
'<td><input type="text" name="saml_notsso_'.$lonhost.'" size="12" '. |
'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'. |
'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'. |
'</table></td>'. |
'</table></td>'. |
'<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%"> </td></tr>'; |
'<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%"> </td></tr>'; |
Line 10467 sub user_formats_row {
|
Line 10482 sub user_formats_row {
|
'username' => 'new usernames', |
'username' => 'new usernames', |
'id' => 'IDs', |
'id' => 'IDs', |
); |
); |
unless ($type eq 'email') { |
unless (($type eq 'email') || ($type eq 'unamemap')) { |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
$output = '<tr '.$css_class.'>'. |
$output = '<tr '.$css_class.'>'. |
'<td><span class="LC_nobreak">'. |
'<td><span class="LC_nobreak">'. |
Line 10522 sub user_formats_row {
|
Line 10537 sub user_formats_row {
|
} elsif ($colsleft == 1) { |
} elsif ($colsleft == 1) { |
$output .= '<td class="LC_left_item"> </td>'; |
$output .= '<td class="LC_left_item"> </td>'; |
} |
} |
$output .= '</tr></table>'; |
$output .= '</tr>'; |
unless ($type eq 'email') { |
unless (($type eq 'email') || ($type eq 'unamemap')) { |
$output .= '</td></tr>'; |
$output .= '</table></td></tr>'; |
} |
} |
return $output; |
return $output; |
} |
} |
Line 10667 sub print_defaults {
|
Line 10682 sub print_defaults {
|
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
} else { |
} elsif ($position eq 'middle') { |
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')) { |
Line 10717 sub print_defaults {
|
Line 10732 sub print_defaults {
|
$rownum ++; |
$rownum ++; |
} |
} |
} |
} |
|
} else { |
|
my ($unamemaprules,$ruleorder) = |
|
&Apache::lonnet::inst_userrules($dom,'unamemap'); |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) { |
|
my $numinrow = 2; |
|
$datatable .= '<tr'.$css_class.'><td>'.&mt('Available conversions').'</td><td><table>'. |
|
&user_formats_row('unamemap',$settings,$unamemaprules, |
|
$ruleorder,$numinrow). |
|
'</table></td></tr>'; |
|
} |
|
if ($datatable eq '') { |
|
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
|
&mt('No rules set for domain in customized localenroll.pm'). |
|
'</td></tr>'; |
|
} |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 12236 sub modify_login {
|
Line 12267 sub modify_login {
|
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
my ($resulttext,$errors,$colchgtext,%changes,%colchanges,%newfile,%newurl, |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon, |
%curr_loginvia,%loginhash,@currlangs,@newlangs,$addedfile,%title,@offon, |
%currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso); |
%currsaml,%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlwindow,%samlnotsso); |
%title = ( coursecatalog => 'Display course catalog', |
%title = ( coursecatalog => 'Display course catalog', |
adminmail => 'Display administrator E-mail address', |
adminmail => 'Display administrator E-mail address', |
helpdesk => 'Display "Contact Helpdesk" link', |
helpdesk => 'Display "Contact Helpdesk" link', |
Line 12260 sub modify_login {
|
Line 12291 sub modify_login {
|
$samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'}; |
$samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'}; |
$samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'}; |
$samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'}; |
$samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'}; |
$samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'}; |
|
$samlwindow{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'window'}; |
$samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'}; |
$samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'}; |
} |
} |
} |
} |
Line 12517 sub modify_login {
|
Line 12549 sub modify_login {
|
if ($env{'form.saml_img_'.$lonhost.'.filename'}) { |
if ($env{'form.saml_img_'.$lonhost.'.filename'}) { |
push(@newsamlimgs,$lonhost); |
push(@newsamlimgs,$lonhost); |
} |
} |
foreach my $item ('text','alt','url','title','notsso') { |
foreach my $item ('text','alt','url','title','window','notsso') { |
$env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g; |
$env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g; |
} |
} |
if ($saml{$lonhost}) { |
if ($saml{$lonhost}) { |
|
if ($env{'form.saml_window_'.$lonhost} ne '1') { |
|
$env{'form.saml_window_'.$lonhost} = ''; |
|
} |
if (grep(/^\Q$lonhost\E$/,@delsamlimg)) { |
if (grep(/^\Q$lonhost\E$/,@delsamlimg)) { |
#FIXME Need to obsolete published image |
#FIXME Need to obsolete published image |
delete($currsaml{$lonhost}{'img'}); |
delete($currsaml{$lonhost}{'img'}); |
Line 12538 sub modify_login {
|
Line 12573 sub modify_login {
|
if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) { |
if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) { |
$changes{'saml'}{$lonhost} = 1; |
$changes{'saml'}{$lonhost} = 1; |
} |
} |
|
if ($env{'form.saml_window_'.$lonhost} ne $samlwindow{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) { |
if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) { |
$changes{'saml'}{$lonhost} = 1; |
$changes{'saml'}{$lonhost} = 1; |
} |
} |
} else { |
} else { |
$changes{'saml'}{$lonhost} = 1; |
$changes{'saml'}{$lonhost} = 1; |
} |
} |
foreach my $item ('text','alt','url','title','notsso') { |
foreach my $item ('text','alt','url','title','window','notsso') { |
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
} |
} |
} else { |
} else { |
Line 12745 sub modify_login {
|
Line 12783 sub modify_login {
|
alt => 'Alt text for button image', |
alt => 'Alt text for button image', |
url => 'SSO URL', |
url => 'SSO URL', |
title => 'Tooltip for SSO link', |
title => 'Tooltip for SSO link', |
|
window => 'Pop-up window if iframe', |
notsso => 'Text for non-SSO log-in', |
notsso => 'Text for non-SSO log-in', |
); |
); |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
if (ref($currsaml{$lonhost}) eq 'HASH') { |
if (ref($currsaml{$lonhost}) eq 'HASH') { |
$resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>"). |
$resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>"). |
'<ul>'; |
'<ul>'; |
foreach my $key ('text','img','alt','url','title','notsso') { |
foreach my $key ('text','img','alt','url','title','window','notsso') { |
if ($currsaml{$lonhost}{$key} eq '') { |
if ($currsaml{$lonhost}{$key} eq '') { |
$resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>'; |
$resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>'; |
} else { |
} else { |
my $value = "'$currsaml{$lonhost}{$key}'"; |
my $value = "'$currsaml{$lonhost}{$key}'"; |
if ($key eq 'img') { |
if ($key eq 'img') { |
$value = '<img src="'.$currsaml{$lonhost}{$key}.'" />'; |
$value = '<img src="'.$currsaml{$lonhost}{$key}.'" />'; |
|
} elsif ($key eq 'window') { |
|
$value = 'On'; |
} |
} |
$resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]", |
$resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]", |
$value).'</li>'; |
$value).'</li>'; |
Line 19972 sub modify_defaults {
|
Line 20013 sub modify_defaults {
|
$newvalues{$item} = $staticdefaults{$item}; |
$newvalues{$item} = $staticdefaults{$item}; |
} |
} |
} |
} |
|
my ($unamemaprules,$ruleorder); |
|
my @possunamemaprules = &Apache::loncommon::get_env_multiple('form.unamemap_rule'); |
|
if (@possunamemaprules) { |
|
($unamemaprules,$ruleorder) = |
|
&Apache::lonnet::inst_userrules($dom,'unamemap'); |
|
if ((ref($unamemaprules) eq 'HASH') && (ref($ruleorder) eq 'ARRAY')) { |
|
if (@{$ruleorder} > 0) { |
|
my %possrules; |
|
map { $possrules{$_} = 1; } @possunamemaprules; |
|
foreach my $rule (@{$ruleorder}) { |
|
if ($possrules{$rule}) { |
|
push(@{$newvalues{'unamemap_rule'}},$rule); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if (ref($domdefaults{'unamemap_rule'}) eq 'ARRAY') { |
|
if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') { |
|
my @rulediffs = &Apache::loncommon::compare_arrays($domdefaults{'unamemap_rule'}, |
|
$newvalues{'unamemap_rule'}); |
|
if (@rulediffs) { |
|
$changes{'unamemap_rule'} = 1; |
|
$domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'}; |
|
} |
|
} elsif (@{$domdefaults{'unamemap_rule'}} > 0) { |
|
$changes{'unamemap_rule'} = 1; |
|
delete($domdefaults{'unamemap_rule'}); |
|
} |
|
} elsif (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') { |
|
if (@{$newvalues{'unamemap_rule'}} > 0) { |
|
$changes{'unamemap_rule'} = 1; |
|
$domdefaults{'unamemap_rule'} = $newvalues{'unamemap_rule'}; |
|
} |
|
} |
my %defaults_hash = ( |
my %defaults_hash = ( |
defaults => \%newvalues, |
defaults => \%newvalues, |
); |
); |
Line 20086 sub modify_defaults {
|
Line 20162 sub modify_defaults {
|
$resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; |
$resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; |
} |
} |
} |
} |
|
} elsif ($item eq 'unamemap_rule') { |
|
if (ref($newvalues{'unamemap_rule'}) eq 'ARRAY') { |
|
my @rulenames; |
|
if (ref($unamemaprules) eq 'HASH') { |
|
foreach my $rule (@{$newvalues{'unamemap_rule'}}) { |
|
if (ref($unamemaprules->{$rule}) eq 'HASH') { |
|
push(@rulenames,$unamemaprules->{$rule}->{'name'}); |
|
} |
|
} |
|
} |
|
if (@rulenames) { |
|
$resulttext .= '<li>'.&mt('Mapping for missing usernames includes: [_1]', |
|
'<ul><li>'.join('</li><li>',@rulenames).'</li></ul>'). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No mapping for missing usernames via standard log-in').'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Mapping for missing usernames via standard log-in deleted').'</li>'; |
|
} |
} else { |
} else { |
my $value = $env{'form.'.$item}; |
my $value = $env{'form.'.$item}; |
if ($value eq '') { |
if ($value eq '') { |
Line 22711 sub modify_trust {
|
Line 22807 sub modify_trust {
|
} |
} |
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('trust',$dom,$defaultshash{'trust'},3600); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domdefaults'} = 1; |
$lastactref->{'domdefaults'} = 1; |
|
$lastactref->{'trust'} = 1; |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my %lt = &trust_titles(); |
my %lt = &trust_titles(); |
Line 23781 sub devalidate_remote_domconfs {
|
Line 23879 sub devalidate_remote_domconfs {
|
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
'directorysrch','passwdconf','cats','proxyalias','proxysaml', |
'directorysrch','passwdconf','cats','proxyalias','proxysaml', |
'ipaccess'); |
'ipaccess','trust'); |
my %cache_by_lonhost; |
my %cache_by_lonhost; |
if (exists($cachekeys->{'samllanding'})) { |
if (exists($cachekeys->{'samllanding'})) { |
if (ref($cachekeys->{'samllanding'}) eq 'HASH') { |
if (ref($cachekeys->{'samllanding'}) eq 'HASH') { |