version 1.383, 2021/05/28 01:26:02
|
version 1.390, 2021/11/22 22:19:58
|
Line 223 sub handler {
|
Line 223 sub handler {
|
'ltitools','ssl','trust','lti','privacy','passwords', |
'ltitools','ssl','trust','lti','privacy','passwords', |
'proctoring','wafproxy'],$dom); |
'proctoring','wafproxy'],$dom); |
my %encconfig = |
my %encconfig = |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom); |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring'],$dom,undef,1); |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
Line 297 sub handler {
|
Line 297 sub handler {
|
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Custom HTML in document head', |
{col1 => 'Custom HTML in document head', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}, |
}, |
Line 632 sub handler {
|
Line 635 sub handler {
|
{col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Custom HTML in document head', |
{col1 => 'Custom HTML in document head', |
col2 => 'Value'}], |
col2 => 'Value'}, |
|
{col1 => 'SSO', |
|
col2 => 'Dual login: SSO and non-SSO options'}, |
|
], |
print => \&print_login, |
print => \&print_login, |
modify => \&modify_login, |
modify => \&modify_login, |
}; |
}; |
Line 857 sub print_config_box {
|
Line 863 sub print_config_box {
|
$output .= &proctoring_javascript($settings); |
$output .= &proctoring_javascript($settings); |
} elsif ($action eq 'wafproxy') { |
} elsif ($action eq 'wafproxy') { |
$output .= &wafproxy_javascript($dom); |
$output .= &wafproxy_javascript($dom); |
|
} elsif ($action eq 'autoupdate') { |
|
$output .= &autoupdate_javascript(); |
|
} elsif ($action eq 'login') { |
|
$output .= &saml_javascript(); |
} |
} |
$output .= |
$output .= |
'<table class="LC_nested_outer"> |
'<table class="LC_nested_outer"> |
Line 876 sub print_config_box {
|
Line 886 sub print_config_box {
|
my $leftnobr = ''; |
my $leftnobr = ''; |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
($action eq 'directorysrch') || |
($action eq 'directorysrch') || |
(($action eq 'login') && ($numheaders < 4))) { |
(($action eq 'login') && ($numheaders < 5))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
Line 907 sub print_config_box {
|
Line 917 sub print_config_box {
|
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->($r,'top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
} else { |
} else { |
Line 1048 sub print_config_box {
|
Line 1058 sub print_config_box {
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'. |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
Line 1072 sub print_config_box {
|
Line 1082 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row">'; |
<tr class="LC_info_row">'; |
if ($numheaders == 4) { |
if ($numheaders == 5) { |
$output .= ' |
$output .= ' |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
Line 1084 sub print_config_box {
|
Line 1094 sub print_config_box {
|
</tr>'; |
</tr>'; |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row">'; |
|
if ($numheaders == 5) { |
|
$output .= ' |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
|
</tr>'; |
|
} else { |
|
$output .= ' |
|
<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>'; |
|
} |
|
$rowtotal ++; |
|
$output .= &print_login('saml',$dom,$confname,$phase,$settings,\$rowtotal); |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$rowtotal ++; |
$rowtotal ++; |
Line 1219 sub print_config_box {
|
Line 1249 sub print_config_box {
|
|
|
sub print_login { |
sub print_login { |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($caller,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable,$switchserver,%lt); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
|
if (($caller eq 'help') || ($caller eq 'headtag') || ($caller eq 'saml')) { |
|
%lt = &login_file_options(); |
|
$switchserver = &check_switchserver($dom,$confname); |
|
} |
if ($caller eq 'service') { |
if ($caller eq 'service') { |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
Line 1415 sub print_login {
|
Line 1448 sub print_login {
|
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext); |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
} elsif ($caller eq 'help') { |
} elsif ($caller eq 'help') { |
my ($defaulturl,$defaulttype,%url,%type,%lt,%langchoices); |
my ($defaulturl,$defaulttype,%url,%type,%langchoices); |
my $switchserver = &check_switchserver($dom,$confname); |
|
my $itemcount = 1; |
my $itemcount = 1; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulturl = '/adm/loginproblems.html'; |
$defaulttype = 'default'; |
$defaulttype = 'default'; |
%lt = &Apache::lonlocal::texthash ( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
default => 'Default', |
|
custom => 'Custom', |
|
); |
|
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
%langchoices = &Apache::lonlocal::texthash(&get_languages_hash()); |
my @currlangs; |
my @currlangs; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 1523 sub print_login {
|
Line 1548 sub print_login {
|
} |
} |
} |
} |
} |
} |
my %lt = &Apache::lonlocal::texthash( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
curr => 'View contents', |
|
none => 'None', |
|
); |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
foreach my $lonhost (sort(keys(%domservers))) { |
foreach my $lonhost (sort(keys(%domservers))) { |
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
Line 1554 sub print_login {
|
Line 1571 sub print_login {
|
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
|
} elsif ($caller eq 'saml') { |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
$datatable .= '<tr><td colspan="3" style="text-align: left">'. |
|
'<table><tr><th>'.$choices{'hostid'}.'</th>'. |
|
'<th>'.$choices{'samllanding'}.'</th>'. |
|
'<th>'.$choices{'samloptions'}.'</th></tr>'."\n"; |
|
my (%saml,%samltext,%samlimg,%samlalt,%samlurl,%samltitle,%samlnotsso,%styleon,%styleoff); |
|
foreach my $lonhost (keys(%domservers)) { |
|
$samlurl{$lonhost} = '/adm/sso'; |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$settings->{'saml'}})) { |
|
if (ref($settings->{'saml'}{$lonhost}) eq 'HASH') { |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $settings->{'saml'}{$lonhost}{'text'}; |
|
$samlimg{$lonhost} = $settings->{'saml'}{$lonhost}{'img'}; |
|
$samlalt{$lonhost} = $settings->{'saml'}{$lonhost}{'alt'}; |
|
$samlurl{$lonhost} = $settings->{'saml'}{$lonhost}{'url'}; |
|
$samltitle{$lonhost} = $settings->{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $settings->{'saml'}{$lonhost}{'notsso'}; |
|
$styleon{$lonhost} = ''; |
|
$styleoff{$lonhost} = 'display:none'; |
|
} else { |
|
$styleon{$lonhost} = 'display:none'; |
|
$styleoff{$lonhost} = ''; |
|
} |
|
} |
|
} |
|
my $itemcount = 1; |
|
foreach my $lonhost (sort(keys(%domservers))) { |
|
my $samlon = ' '; |
|
my $samloff = ' checked="checked" '; |
|
if ($saml{$lonhost}) { |
|
$samlon = $samloff; |
|
$samloff = ' '; |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$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. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="0" />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="saml_'.$lonhost.'"'.$samlon. |
|
'onclick="toggleSamlOptions(this.form,'."'$lonhost'".');" value="1" />'. |
|
&mt('Yes').'</label></span></td>'. |
|
'<td id="samloptionson_'.$lonhost.'" style="'.$styleon{$lonhost}.'" width="100%">'. |
|
'<table><tr><th colspan="5" align="center">'.&mt('SSO').'</th><th align="center">'. |
|
'<span class="LC_nobreak">'.&mt('Non-SSO').'</span></th></tr>'. |
|
'<tr><th>'.&mt('Text').'</th><th>'.&mt('Image').'</th>'. |
|
'<th>'.&mt('Alt Text').'</th><th>'.&mt('URL').'</th>'. |
|
'<th>'.&mt('Tool Tip').'</th><th>'.&mt('Text').'</th></tr>'. |
|
'<tr'.$css_class.'><td><input type="text" name="saml_text_'.$lonhost.'" size="8" value="'. |
|
$samltext{$lonhost}.'" /></td><td>'; |
|
if ($samlimg{$lonhost}) { |
|
$datatable .= '<img src="'.$samlimg{$lonhost}.'" /><br />'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="saml_img_del" value="'.$lonhost.'" />'. |
|
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
|
} else { |
|
$datatable .= $lt{'upl'}; |
|
} |
|
$datatable .='<br />'; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="saml_img_'.$lonhost.'" />'; |
|
} |
|
$datatable .= '</td>'. |
|
'<td><input type="text" name="saml_alt_'.$lonhost.'" size="20" '. |
|
'value="'.$samlalt{$lonhost}.'" /></td>'. |
|
'<td><input type="text" name="saml_url_'.$lonhost.'" size="8" '. |
|
'value="'.$samlurl{$lonhost}.'" /></td>'. |
|
'<td><textarea name="saml_title_'.$lonhost.'" rows="3" cols="15">'. |
|
$samltitle{$lonhost}.'</textarea></td>'. |
|
'<td><input type="text" name="saml_notsso_'.$lonhost.'" size="8" '. |
|
'value="'.$samlnotsso{$lonhost}.'" /></td></tr>'. |
|
'</table></td>'. |
|
'<td id="samloptionsoff_'.$lonhost.'" style="'.$styleoff{$lonhost}.'" width="100%"> </td></tr>'; |
|
$itemcount ++; |
|
} |
|
$datatable .= '</table></td></tr>'; |
} |
} |
return $datatable; |
return $datatable; |
} |
} |
Line 1590 sub login_choices {
|
Line 1689 sub login_choices {
|
headtag => "Custom markup", |
headtag => "Custom markup", |
action => "Action", |
action => "Action", |
current => "Current", |
current => "Current", |
|
samllanding => "Dual login?", |
|
samloptions => "Options", |
); |
); |
return %choices; |
return %choices; |
} |
} |
|
|
|
sub login_file_options { |
|
return &Apache::lonlocal::texthash( |
|
del => 'Delete?', |
|
rep => 'Replace:', |
|
upl => 'Upload:', |
|
curr => 'View contents', |
|
default => 'Default', |
|
custom => 'Custom', |
|
none => 'None', |
|
); |
|
} |
|
|
sub print_rolecolors { |
sub print_rolecolors { |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my ($phase,$role,$dom,$confname,$settings,$rowtotal) = @_; |
my %choices = &color_font_choices(); |
my %choices = &color_font_choices(); |
Line 3064 sub lti_javascript {
|
Line 3177 sub lti_javascript {
|
return $togglejs; |
return $togglejs; |
} |
} |
my (%ordered,$total,%jstext); |
my (%ordered,$total,%jstext); |
$total = 0; |
$total = scalar(keys(%{$settings})); |
foreach my $item (keys(%{$settings})) { |
foreach my $item (keys(%{$settings})) { |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
my $num = $settings->{$item}{'order'}; |
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = $total - 1; |
|
} |
$ordered{$num} = $item; |
$ordered{$num} = $item; |
} |
} |
} |
} |
$total = scalar(keys(%{$settings})); |
|
my @jsarray = (); |
my @jsarray = (); |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
push(@jsarray,$ordered{$item}); |
push(@jsarray,$ordered{$item}); |
Line 3311 function toggleLTI(form,setting,item) {
|
Line 3426 function toggleLTI(form,setting,item) {
|
ENDSCRIPT |
ENDSCRIPT |
} |
} |
|
|
|
sub autoupdate_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleLastActiveDays(form) { |
|
var radioname = 'lastactive'; |
|
var divid = 'lastactive_div'; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub saml_javascript { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function toggleSamlOptions(form,hostid) { |
|
var radioname = 'saml_'+hostid; |
|
var tablecellon = 'samloptionson_'+hostid; |
|
var tablecelloff = 'samloptionsoff_'+hostid; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display=''; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display='none'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(tablecellon)) { |
|
document.getElementById(tablecellon).style.display='none'; |
|
} |
|
if (document.getElementById(tablecelloff)) { |
|
document.getElementById(tablecelloff).style.display=''; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
Line 3397 sub print_autoenroll {
|
Line 3589 sub print_autoenroll {
|
|
|
sub print_autoupdate { |
sub print_autoupdate { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $datatable; |
my ($enable,$datatable); |
if ($position eq 'top') { |
if ($position eq 'top') { |
|
my %choices = &Apache::lonlocal::texthash ( |
|
run => 'Auto-update active?', |
|
classlists => 'Update information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
|
); |
|
my $itemcount = 0; |
my $updateon = ' '; |
my $updateon = ' '; |
my $updateoff = ' checked="checked" '; |
my $updateoff = ' checked="checked" '; |
my $classlistson = ' '; |
|
my $classlistsoff = ' checked="checked" '; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'run'} eq '1') { |
if ($settings->{'run'} eq '1') { |
$updateon = $updateoff; |
$updateon = $updateoff; |
$updateoff = ' '; |
$updateoff = ' '; |
} |
} |
if ($settings->{'classlists'} eq '1') { |
|
$classlistson = $classlistsoff; |
|
$classlistsoff = ' '; |
|
} |
|
} |
} |
my %title = ( |
$enable = '<tr class="LC_odd_row">'. |
run => 'Auto-update active?', |
'<td>'.$choices{'run'}.'</td>'. |
classlists => 'Update information in classlists?', |
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
); |
|
$datatable = '<tr class="LC_odd_row">'. |
|
'<td>'.&mt($title{'run'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autoupdate_run"'. |
'<input type="radio" name="autoupdate_run"'. |
$updateon.' value="1" />'.&mt('Yes').'</label> '. |
$updateoff.' value="0" />'.&mt('No').'</label> '. |
'<label><input type="radio" name="autoupdate_run"'. |
'<label><input type="radio" name="autoupdate_run"'. |
$updateoff.'value="0" />'.&mt('No').'</label></span></td>'. |
$updateon.'value="1" />'.&mt('Yes').'</label></span></td>'. |
'</tr><tr>'. |
|
'<td>'.&mt($title{'classlists'}).'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistson.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="classlists"'. |
|
$classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
my @toggles = ('classlists','unexpired'); |
|
my %defaultchecked = ('classlists' => 'off', |
|
'unexpired' => 'off' |
|
); |
|
$$rowtotal ++; |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,'','','left','no'); |
|
$datatable = $enable.$datatable; |
|
$$rowtotal += $itemcount; |
|
my $lastactiveon = ' '; |
|
my $lastactiveoff = ' checked="checked" '; |
|
my $lastactivestyle = 'none'; |
|
my $lastactivedays; |
|
my $onclick = ' onclick="javascript:toggleLastActiveDays(this.form);"'; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'lastactive'} =~ /^\d+$/) { |
|
$lastactiveon = $lastactiveoff; |
|
$lastactiveoff = ' '; |
|
$lastactivestyle = 'inline-block'; |
|
$lastactivedays = $settings->{'lastactive'}; |
|
} |
|
} |
|
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.$choices{'lastactive'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveoff.'value="0"'.$onclick.' />'.&mt('No').'</label>'. |
|
' <label>'. |
|
'<input type="radio" name="lastactive"'. |
|
$lastactiveon.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'. |
|
'<div id="lastactive_div" style="display:'.$lastactivestyle.';">'. |
|
': '.&mt('inactive = no activity in last [_1] days', |
|
'<input type="text" size="5" name="lastactivedays" value="'. |
|
$lastactivedays.'" />'). |
|
'</span></td>'. |
|
'</tr>'; |
|
$$rowtotal ++; |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my $numinrow = 3; |
my $numinrow = 3; |
Line 4561 sub helpdeskroles_access {
|
Line 4780 sub helpdeskroles_access {
|
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
$additional,$align) = @_; |
$additional,$align,$firstval) = @_; |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
(ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
|
|
Line 4601 sub radiobutton_prefs {
|
Line 4820 sub radiobutton_prefs {
|
} else { |
} else { |
$datatable .= '<td class="LC_right_item">'; |
$datatable .= '<td class="LC_right_item">'; |
} |
} |
$datatable .= |
$datatable .= '<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'. |
if ($firstval eq 'no') { |
'<label><input type="radio" name="'. |
$datatable .= |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
'<label><input type="radio" name="'. |
'</label> <label><input type="radio" name="'.$item.'" '. |
$item.'" '.$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No'). |
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'. |
'</label> <label><input type="radio" name="'.$item.'" '. |
'</span>'.$additional. |
$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes').'</label>'; |
'</td>'. |
} else { |
'</tr>'; |
$datatable .= |
|
'<label><input type="radio" name="'. |
|
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
|
'</label> <label><input type="radio" name="'.$item.'" '. |
|
$checkedoff{$item}.' value="0"'.$onclick.' />'.&mt('No').'</label>'; |
|
} |
|
$datatable .= '</span>'.$additional.'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
return ($datatable,$itemcount); |
return ($datatable,$itemcount); |
Line 5714 sub print_lti {
|
Line 5939 sub print_lti {
|
foreach my $item (keys(%{$settings})) { |
foreach my $item (keys(%{$settings})) { |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
my $num = $settings->{$item}{'order'}; |
my $num = $settings->{$item}{'order'}; |
|
if ($num eq '') { |
|
$num = scalar(keys(%{$settings})); |
|
} |
$ordered{$num} = $item; |
$ordered{$num} = $item; |
} |
} |
} |
} |
Line 7295 sub print_wafproxy {
|
Line 7523 sub print_wafproxy {
|
my $itemcount = 0; |
my $itemcount = 0; |
my $datatable; |
my $datatable; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%othercontrol,%otherdoms,%aliases,%values,$setdom,$showdom); |
my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom); |
my %lt = &wafproxy_titles(); |
my %lt = &wafproxy_titles(); |
foreach my $server (sort(keys(%servers))) { |
foreach my $server (sort(keys(%servers))) { |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
Line 7320 sub print_wafproxy {
|
Line 7548 sub print_wafproxy {
|
$showdom = 1; |
$showdom = 1; |
} |
} |
} |
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
$saml{$dom} = $settings->{'saml'}; |
|
} |
} |
} |
} |
} |
} |
} |
Line 7339 sub print_wafproxy {
|
Line 7570 sub print_wafproxy {
|
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
if (ref($config{'wafproxy'}) eq 'HASH') { |
if (ref($config{'wafproxy'}) eq 'HASH') { |
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
|
if (exists($config{'wafproxy'}{'saml'})) { |
|
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
|
} |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
$values{$domain}{$item} = $config{'wafproxy'}{$item}; |
$values{$domain}{$item} = $config{'wafproxy'}{$item}; |
} |
} |
Line 7357 sub print_wafproxy {
|
Line 7591 sub print_wafproxy {
|
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
if ($othercontrol{$server}) { |
if ($othercontrol{$server}) { |
$dom_in_effect = $othercontrol{$server}; |
$dom_in_effect = $othercontrol{$server}; |
my $current; |
my ($current,$forsaml); |
if (ref($aliases{$dom_in_effect}) eq 'HASH') { |
if (ref($aliases{$dom_in_effect}) eq 'HASH') { |
$current = $aliases{$dom_in_effect}{$server}; |
$current = $aliases{$dom_in_effect}{$server}; |
} |
} |
|
if (ref($saml{$dom_in_effect}) eq 'HASH') { |
|
if ($saml{$dom_in_effect}{$server}) { |
|
$forsaml = 1; |
|
} |
|
} |
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
&mt('Alias').': '; |
&mt('Alias').': '; |
if ($current) { |
if ($current) { |
$aliasrows .= $current; |
$aliasrows .= $current; |
|
if ($forsaml) { |
|
$aliasrows .= ' ('.&mt('also for Shibboleth').')'; |
|
} |
} else { |
} else { |
$aliasrows .= &mt('None'); |
$aliasrows .= &mt('None'); |
} |
} |
Line 7373 sub print_wafproxy {
|
Line 7615 sub print_wafproxy {
|
'<b>'.$dom_in_effect.'</b>').')</span></td>'; |
'<b>'.$dom_in_effect.'</b>').')</span></td>'; |
} else { |
} else { |
$dom_in_effect = $dom; |
$dom_in_effect = $dom; |
my $current; |
my ($current,$samlon,$samloff); |
|
$samloff = ' checked="checked"'; |
if (ref($aliases{$dom}) eq 'HASH') { |
if (ref($aliases{$dom}) eq 'HASH') { |
if ($aliases{$dom}{$server}) { |
if ($aliases{$dom}{$server}) { |
$current = $aliases{$dom}{$server}; |
$current = $aliases{$dom}{$server}; |
} |
} |
} |
} |
|
if (ref($saml{$dom}) eq 'HASH') { |
|
if ($saml{$dom}{$server}) { |
|
$samlon = $samloff; |
|
undef($samloff); |
|
} |
|
} |
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
$aliasrows .= '<td class="LC_left_item" style="vertical-align: baseline;">'. |
&mt('Alias').': '. |
&mt('Alias').': '. |
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
'value="'.$current.'" size="30" /></td>'; |
'value="'.$current.'" size="30" />'. |
|
(' 'x2).'<span class="LC_nobreak">'. |
|
&mt('Alias used for Shibboleth').': <label>'. |
|
'<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('No').'</label> <label>'. |
|
'<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'. |
|
&mt('Yes').'</label></span>'. |
|
'</td>'; |
} |
} |
$aliasrows .= '</tr>'; |
$aliasrows .= '</tr>'; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
Line 11181 sub usertype_update_row {
|
Line 11437 sub usertype_update_row {
|
sub modify_login { |
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); |
%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', |
newuser => 'Link for visitors to create a user account', |
newuser => 'Link for visitors to create a user account', |
loginheader => 'Log-in box header'); |
loginheader => 'Log-in box header', |
|
saml => 'Dual SSO and non-SSO login'); |
@offon = ('off','on'); |
@offon = ('off','on'); |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
Line 11194 sub modify_login {
|
Line 11452 sub modify_login {
|
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
$curr_loginvia{$lonhost} = $domconfig{login}{loginvia}{$lonhost}; |
} |
} |
} |
} |
|
if (ref($domconfig{login}{'saml'}) eq 'HASH') { |
|
foreach my $lonhost (keys(%{$domconfig{login}{'saml'}})) { |
|
if (ref($domconfig{login}{'saml'}{$lonhost}) eq 'HASH') { |
|
$currsaml{$lonhost} = $domconfig{login}{'saml'}{$lonhost}; |
|
$saml{$lonhost} = 1; |
|
$samltext{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'text'}; |
|
$samlurl{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'url'}; |
|
$samlalt{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'alt'}; |
|
$samlimg{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'img'}; |
|
$samltitle{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'title'}; |
|
$samlnotsso{$lonhost} = $domconfig{login}{'saml'}{$lonhost}{'notsso'}; |
|
} |
|
} |
|
} |
} |
} |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'], |
\%domconfig,\%loginhash); |
\%domconfig,\%loginhash); |
Line 11440 sub modify_login {
|
Line 11712 sub modify_login {
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
} |
} |
} |
|
my @delsamlimg = &Apache::loncommon::get_env_multiple('form.saml_img_del'); |
|
my @newsamlimgs; |
|
foreach my $lonhost (keys(%domservers)) { |
|
if ($env{'form.saml_'.$lonhost}) { |
|
if ($env{'form.saml_img_'.$lonhost.'.filename'}) { |
|
push(@newsamlimgs,$lonhost); |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$env{'form.saml_'.$item.'_'.$lonhost} =~ s/^\s+|\s+$//g; |
|
} |
|
if ($saml{$lonhost}) { |
|
if (grep(/^\Q$lonhost\E$/,@delsamlimg)) { |
|
#FIXME Need to obsolete published image |
|
delete($currsaml{$lonhost}{'img'}); |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_alt_'.$lonhost} ne $samlalt{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_text_'.$lonhost} ne $samltext{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_url_'.$lonhost} ne $samlurl{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_title_'.$lonhost} ne $samltitle{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
if ($env{'form.saml_notsso_'.$lonhost} ne $samlnotsso{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
} else { |
|
$changes{'saml'}{$lonhost} = 1; |
|
} |
|
foreach my $item ('text','alt','url','title','notsso') { |
|
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
|
} |
|
} else { |
|
if ($saml{$lonhost}) { |
|
$changes{'saml'}{$lonhost} = 1; |
|
delete($currsaml{$lonhost}); |
|
} |
|
} |
|
} |
|
foreach my $posshost (keys(%currsaml)) { |
|
unless (exists($domservers{$posshost})) { |
|
delete($currsaml{$posshost}); |
|
} |
|
} |
|
%{$loginhash{'login'}{'saml'}} = %currsaml; |
|
if (@newsamlimgs) { |
|
my $error; |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of SSO Button Image is not permitted to this server: [_1].",$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
foreach my $lonhost (@newsamlimgs) { |
|
my $formelem = 'saml_img_'.$lonhost; |
|
my ($result,$imgurl) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
|
"login/saml/$lonhost",'','', |
|
$env{'form.saml_img_'.$lonhost.'.filename'}); |
|
if ($result eq 'ok') { |
|
$currsaml{$lonhost}{'img'} = $imgurl; |
|
$loginhash{'login'}{'saml'}{$lonhost}{'img'} = $imgurl; |
|
$changes{'saml'}{$lonhost} = 1; |
|
} else { |
|
my $puberror = &mt("Upload of SSO button image failed for [_1] because an error occurred publishing the file in RES space. Error was: [_2].", |
|
$lonhost,$result); |
|
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
|
} |
|
} |
|
} else { |
|
$error = &mt("Upload of SSO button image file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of SSO button image file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
|
|
my $defaulthelpfile = '/adm/loginproblems.html'; |
my $defaulthelpfile = '/adm/loginproblems.html'; |
Line 11480 sub modify_login {
|
Line 11835 sub modify_login {
|
} |
} |
if (keys(%changes) > 0 || $colchgtext) { |
if (keys(%changes) > 0 || $colchgtext) { |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
if (exists($changes{'saml'})) { |
|
my $hostid_in_use; |
|
my @hosts = &Apache::lonnet::current_machine_ids(); |
|
if (@hosts > 1) { |
|
foreach my $hostid (@hosts) { |
|
if (&Apache::lonnet::host_domain($hostid) eq $dom) { |
|
$hostid_in_use = $hostid; |
|
last; |
|
} |
|
} |
|
} else { |
|
$hostid_in_use = $r->dir_config('lonHostID'); |
|
} |
|
if (($hostid_in_use) && |
|
(&Apache::lonnet::host_domain($hostid_in_use) eq $dom)) { |
|
&Apache::lonnet::devalidate_cache_new('samllanding',$hostid_in_use); |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
if (ref($changes{'saml'}) eq 'HASH') { |
|
my %updates; |
|
map { $updates{$_} = 1; } keys(%{$changes{'saml'}}); |
|
$lastactref->{'samllanding'} = \%updates; |
|
} |
|
} |
|
} |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
Line 11559 sub modify_login {
|
Line 11939 sub modify_login {
|
} |
} |
} |
} |
} |
} |
|
} elsif ($item eq 'saml') { |
|
if (ref($changes{$item}) eq 'HASH') { |
|
my %notlt = ( |
|
text => 'Text for log-in by SSO', |
|
img => 'SSO button image', |
|
alt => 'Alt text for button image', |
|
url => 'SSO URL', |
|
title => 'Tooltip for SSO link', |
|
notsso => 'Text for non-SSO log-in', |
|
); |
|
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
|
if (ref($currsaml{$lonhost}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt("$title{$item} in use for [_1]","<b>$lonhost</b>"). |
|
'<ul>'; |
|
foreach my $key ('text','img','alt','url','title','notsso') { |
|
if ($currsaml{$lonhost}{$key} eq '') { |
|
$resulttext .= '<li>'.&mt("$notlt{$key} not in use").'</li>'; |
|
} else { |
|
my $value = "'$currsaml{$lonhost}{$key}'"; |
|
if ($key eq 'img') { |
|
$value = '<img src="'.$currsaml{$lonhost}{$key}.'" />'; |
|
} |
|
$resulttext .= '<li>'.&mt("$notlt{$key} set to: [_1]", |
|
$value).'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt("$title{$item} not in use for [_1]",$lonhost).'</li>'; |
|
} |
|
} |
|
} |
} elsif ($item eq 'captcha') { |
} elsif ($item eq 'captcha') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
my $chgtxt; |
my $chgtxt; |
Line 13527 sub modify_ltitools {
|
Line 13939 sub modify_ltitools {
|
my %ltienchash = ( |
my %ltienchash = ( |
$action => { %encconfig } |
$action => { %encconfig } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
my %ltiall = %confhash; |
Line 14101 sub modify_proctoring {
|
Line 14513 sub modify_proctoring {
|
my %proc_enchash = ( |
my %proc_enchash = ( |
$action => { %encconfhash } |
$action => { %encconfhash } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %procall = %confhash; |
my %procall = %confhash; |
Line 14340 sub modify_lti {
|
Line 14752 sub modify_lti {
|
map { $deletions{$_} = 1; } @todelete; |
map { $deletions{$_} = 1; } @todelete; |
} |
} |
my $maxnum = $env{'form.lti_maxnum'}; |
my $maxnum = $env{'form.lti_maxnum'}; |
for (my $i=0; $i<=$maxnum; $i++) { |
for (my $i=0; $i<$maxnum; $i++) { |
my $itemid = $env{'form.lti_id_'.$i}; |
my $itemid = $env{'form.lti_id_'.$i}; |
$itemid =~ s/\D+//g; |
$itemid =~ s/\D+//g; |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
if ($deletions{$itemid}) { |
if ($deletions{$itemid}) { |
$changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'}; |
$changes{$itemid} = $domconfig{$action}{$itemid}{'consumer'}; |
} else { |
} else { |
push(@items,$i); |
push(@items,$i); |
$itemids{$i} = $itemid; |
$itemids{$i} = $itemid; |
} |
} |
} |
} |
} |
} |
Line 14356 sub modify_lti {
|
Line 14768 sub modify_lti {
|
foreach my $idx (@items) { |
foreach my $idx (@items) { |
my $itemid = $itemids{$idx}; |
my $itemid = $itemids{$idx}; |
next unless ($itemid); |
next unless ($itemid); |
my $position = $env{'form.lti_pos_'.$idx}; |
my $position = $env{'form.lti_pos_'.$itemid}; |
$position =~ s/\D+//g; |
$position =~ s/\D+//g; |
if ($position ne '') { |
if ($position ne '') { |
$allpos[$position] = $itemid; |
$allpos[$position] = $itemid; |
Line 14593 sub modify_lti {
|
Line 15005 sub modify_lti {
|
my %ltienchash = ( |
my %ltienchash = ( |
$action => { %encconfig } |
$action => { %encconfig } |
); |
); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
my %ltiall = %confhash; |
Line 14619 sub modify_lti {
|
Line 15031 sub modify_lti {
|
if (ref($confhash{$itemid}) ne 'HASH') { |
if (ref($confhash{$itemid}) ne 'HASH') { |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
} else { |
} else { |
$resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b></li><ul>'; |
$resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><ul>'; |
my $position = $pos + 1; |
my $position = $pos + 1; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
foreach my $item ('version','lifetime') { |
foreach my $item ('version','lifetime') { |
Line 14935 sub modify_autoupdate {
|
Line 15347 sub modify_autoupdate {
|
} |
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my %title = &Apache::lonlocal::texthash ( |
my %title = &Apache::lonlocal::texthash ( |
run => 'Auto-update:', |
run => 'Auto-update:', |
classlists => 'Updates to user information in classlists?' |
classlists => 'Updates to user information in classlists?', |
|
unexpired => 'Skip updates for users without active or future roles?', |
|
lastactive => 'Skip updates for inactive users?', |
); |
); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
Line 14980 sub modify_autoupdate {
|
Line 15394 sub modify_autoupdate {
|
my %updatehash = ( |
my %updatehash = ( |
autoupdate => { run => $env{'form.autoupdate_run'}, |
autoupdate => { run => $env{'form.autoupdate_run'}, |
classlists => $env{'form.classlists'}, |
classlists => $env{'form.classlists'}, |
|
unexpired => $env{'form.unexpired'}, |
fields => {%fields}, |
fields => {%fields}, |
lockablenames => \@lockablenames, |
lockablenames => \@lockablenames, |
} |
} |
); |
); |
|
my $lastactivedays; |
|
if ($env{'form.lastactive'}) { |
|
$lastactivedays = $env{'form.lastactivedays'}; |
|
$lastactivedays =~ s/^\s+|\s+$//g; |
|
unless ($lastactivedays =~ /^\d+$/) { |
|
undef($lastactivedays); |
|
$env{'form.lastactive'} = 0; |
|
} |
|
} |
|
$updatehash{'autoupdate'}{'lastactive'} = $lastactivedays; |
foreach my $key (keys(%currautoupdate)) { |
foreach my $key (keys(%currautoupdate)) { |
if (($key eq 'run') || ($key eq 'classlists')) { |
if (($key eq 'run') || ($key eq 'classlists') || ($key eq 'unexpired') || ($key eq 'lastactive')) { |
if (exists($updatehash{autoupdate}{$key})) { |
if (exists($updatehash{autoupdate}{$key})) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
if ($currautoupdate{$key} ne $updatehash{autoupdate}{$key}) { |
$changes{$key} = 1; |
$changes{$key} = 1; |
Line 15031 sub modify_autoupdate {
|
Line 15456 sub modify_autoupdate {
|
$changes{'lockablenames'} = 1; |
$changes{'lockablenames'} = 1; |
} |
} |
} |
} |
|
unless (grep(/^unexpired$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'unexpired'}) { |
|
$changes{'unexpired'} = 1; |
|
} |
|
} |
|
unless (grep(/^lastactive$/,keys(%currautoupdate))) { |
|
if ($updatehash{'autoupdate'}{'lastactive'} ne '') { |
|
$changes{'lastactive'} = 1; |
|
} |
|
} |
foreach my $item (@{$types},'default') { |
foreach my $item (@{$types},'default') { |
if (defined($fields{$item})) { |
if (defined($fields{$item})) { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
Line 15093 sub modify_autoupdate {
|
Line 15528 sub modify_autoupdate {
|
my $newvalue; |
my $newvalue; |
if ($key eq 'run') { |
if ($key eq 'run') { |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
$newvalue = $offon[$env{'form.autoupdate_run'}]; |
|
} elsif ($key eq 'lastactive') { |
|
$newvalue = $offon[$env{'form.lastactive'}]; |
|
unless ($lastactivedays eq '') { |
|
$newvalue .= '; '.&mt('inactive = no activity in last [quant,_1,day]',$lastactivedays); |
|
} |
} else { |
} else { |
$newvalue = $offon[$env{'form.'.$key}]; |
$newvalue = $offon[$env{'form.'.$key}]; |
} |
} |
Line 19832 sub modify_selfenrollment {
|
Line 20272 sub modify_selfenrollment {
|
sub modify_wafproxy { |
sub modify_wafproxy { |
my ($dom,$action,$lastactref,%domconfig) = @_; |
my ($dom,$action,$lastactref,%domconfig) = @_; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%othercontrol,%canset,%values,%curralias,%currvalue,@warnings,%wafproxy, |
my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings, |
%changes,%expirecache); |
%wafproxy,%changes,%expirecache,%expiresaml); |
foreach my $server (sort(keys(%servers))) { |
foreach my $server (sort(keys(%servers))) { |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
if ($serverhome eq $server) { |
if ($serverhome eq $server) { |
Line 19848 sub modify_wafproxy {
|
Line 20288 sub modify_wafproxy {
|
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
} |
} |
|
if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') { |
|
%currsaml = %{$domconfig{'wafproxy'}{'saml'}}; |
|
} |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
} |
} |
Line 19855 sub modify_wafproxy {
|
Line 20298 sub modify_wafproxy {
|
my $output; |
my $output; |
if (keys(%canset)) { |
if (keys(%canset)) { |
%{$wafproxy{'alias'}} = (); |
%{$wafproxy{'alias'}} = (); |
|
%{$wafproxy{'saml'}} = (); |
foreach my $key (sort(keys(%canset))) { |
foreach my $key (sort(keys(%canset))) { |
if ($env{'form.wafproxy_'.$dom}) { |
if ($env{'form.wafproxy_'.$dom}) { |
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
Line 19862 sub modify_wafproxy {
|
Line 20306 sub modify_wafproxy {
|
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
} |
} |
|
if ($env{'form.wafproxy_alias_saml_'.$key}) { |
|
$wafproxy{'saml'}{$key} = 1; |
|
} |
|
if ($wafproxy{'saml'}{$key} ne $currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
} else { |
} else { |
$wafproxy{'alias'}{$key} = ''; |
$wafproxy{'alias'}{$key} = ''; |
|
$wafproxy{'saml'}{$key} = ''; |
if ($curralias{$key}) { |
if ($curralias{$key}) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
} |
} |
|
if ($currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
} |
} |
if ($wafproxy{'alias'}{$key} eq '') { |
if ($wafproxy{'alias'}{$key} eq '') { |
if ($curralias{$key}) { |
if ($curralias{$key}) { |
Line 19874 sub modify_wafproxy {
|
Line 20328 sub modify_wafproxy {
|
} |
} |
delete($wafproxy{'alias'}{$key}); |
delete($wafproxy{'alias'}{$key}); |
} |
} |
|
if ($wafproxy{'saml'}{$key} eq '') { |
|
if ($currsaml{$key}) { |
|
$expiresaml{$key} = 1; |
|
} |
|
delete($wafproxy{'saml'}{$key}); |
|
} |
} |
} |
unless (keys(%{$wafproxy{'alias'}})) { |
unless (keys(%{$wafproxy{'alias'}})) { |
delete($wafproxy{'alias'}); |
delete($wafproxy{'alias'}); |
} |
} |
# Localization for values in %warn occus in &mt() calls separately. |
unless (keys(%{$wafproxy{'saml'}})) { |
|
delete($wafproxy{'saml'}); |
|
} |
|
# Localization for values in %warn occurs in &mt() calls separately. |
my %warn = ( |
my %warn = ( |
trusted => 'trusted IP range(s)', |
trusted => 'trusted IP range(s)', |
vpnint => 'internal IP range(s) for VPN sessions(s)', |
vpnint => 'internal IP range(s) for VPN sessions(s)', |
Line 19946 sub modify_wafproxy {
|
Line 20409 sub modify_wafproxy {
|
} else { |
} else { |
if (keys(%curralias)) { |
if (keys(%curralias)) { |
$changes{'alias'} = 1; |
$changes{'alias'} = 1; |
|
} |
|
if (keys(%currsaml)) { |
|
$changes{'saml'} = 1; |
} |
} |
if (keys(%currvalue)) { |
if (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
Line 19998 sub modify_wafproxy {
|
Line 20464 sub modify_wafproxy {
|
$lastactref->{'proxyalias'} = \%updates; |
$lastactref->{'proxyalias'} = \%updates; |
} |
} |
} |
} |
|
if ((exists($wafproxy{'saml'})) || (keys(%expiresaml))) { |
|
my %samlupdates = %expiresaml; |
|
foreach my $key (keys(%expiresaml)) { |
|
&Apache::lonnet::devalidate_cache_new('proxysaml',$key); |
|
} |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
my $cachetime = 24*60*60; |
|
foreach my $key (keys(%{$wafproxy{'saml'}})) { |
|
$samlupdates{$key} = 1; |
|
&Apache::lonnet::do_cache_new('proxysaml',$key,$wafproxy{'saml'}{$key}, |
|
$cachetime); |
|
} |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'proxysaml'} = \%samlupdates; |
|
} |
|
} |
$output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>'; |
$output = &mt('Changes were made to Web Application Firewall/Reverse Proxy').'<ul>'; |
foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
Line 20021 sub modify_wafproxy {
|
Line 20504 sub modify_wafproxy {
|
unless ($numaliased) { |
unless ($numaliased) { |
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
} |
} |
|
} elsif ($item eq 'saml') { |
|
my $shown; |
|
if (ref($wafproxy{'saml'}) eq 'HASH') { |
|
if (keys(%{$wafproxy{'saml'}})) { |
|
$shown = join(', ',sort(keys(%{$wafproxy{'saml'}}))); |
|
} |
|
} |
|
if ($shown) { |
|
$output .= '<li>'.&mt('Alias used by Shibboleth for: [_1]', |
|
$shown).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('No alias used for Shibboleth').'</li>'; |
|
} |
} else { |
} else { |
if ($item eq 'remoteip') { |
if ($item eq 'remoteip') { |
my %ip_methods = &remoteip_methods(); |
my %ip_methods = &remoteip_methods(); |
Line 21033 sub modify_loadbalancing {
|
Line 21529 sub modify_loadbalancing {
|
} |
} |
} |
} |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
if ($currcookies{$balancer}) { |
$balancer).'</li>'; |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled', |
|
$balancer).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
|
$balancer).'</li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 21814 sub devalidate_remote_domconfs {
|
Line 22315 sub devalidate_remote_domconfs {
|
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','usersessions', |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
'directorysrch','passwdconf','cats','proxyalias'); |
'directorysrch','passwdconf','cats','proxyalias','proxysaml'); |
|
my %cache_by_lonhost; |
|
if (exists($cachekeys->{'samllanding'})) { |
|
if (ref($cachekeys->{'samllanding'}) eq 'HASH') { |
|
my %landing = %{$cachekeys->{'samllanding'}}; |
|
my %domservers = &Apache::lonnet::get_servers($dom); |
|
if (keys(%domservers)) { |
|
foreach my $server (keys(%domservers)) { |
|
my @cached; |
|
next if ($thismachine{$server}); |
|
if ($landing{$server}) { |
|
push(@cached,&escape('samllanding').':'.&escape($server)); |
|
} |
|
if (@cached) { |
|
$cache_by_lonhost{$server} = \@cached; |
|
} |
|
} |
|
} |
|
} |
|
} |
if (keys(%servers)) { |
if (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
my @cached; |
my @cached; |
foreach my $name (@posscached) { |
foreach my $name (@posscached) { |
if ($cachekeys->{$name}) { |
if ($cachekeys->{$name}) { |
if ($name eq 'proxyalias') { |
if (($name eq 'proxyalias') || ($name eq 'proxysaml')) { |
if (ref($cachekeys->{$name}) eq 'HASH') { |
if (ref($cachekeys->{$name}) eq 'HASH') { |
foreach my $key (keys(%{$cachekeys->{$name}})) { |
foreach my $key (keys(%{$cachekeys->{$name}})) { |
push(@cached,&escape($name).':'.&escape($key)); |
push(@cached,&escape($name).':'.&escape($key)); |
} |
} |
Line 21832 sub devalidate_remote_domconfs {
|
Line 22352 sub devalidate_remote_domconfs {
|
} |
} |
} |
} |
} |
} |
|
if ((exists($cache_by_lonhost{$server})) && |
|
(ref($cache_by_lonhost{$server}) eq 'ARRAY')) { |
|
push(@cached,@{$cache_by_lonhost{$server}}); |
|
} |
if (@cached) { |
if (@cached) { |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
&Apache::lonnet::remote_devalidate_cache($server,\@cached); |
} |
} |