version 1.369, 2020/02/05 23:46:01
|
version 1.393, 2021/11/28 18:43:37
|
Line 176 use Locale::Language;
|
Line 176 use Locale::Language;
|
use DateTime::TimeZone; |
use DateTime::TimeZone; |
use DateTime::Locale; |
use DateTime::Locale; |
use Time::HiRes qw( sleep ); |
use Time::HiRes qw( sleep ); |
|
use Net::CIDR; |
|
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
Line 219 sub handler {
|
Line 220 sub handler {
|
'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','helpsettings', |
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','ssl','trust','lti','privacy','passwords'],$dom); |
'ltitools','ssl','trust','lti','privacy','passwords', |
|
'proctoring','wafproxy'],$dom); |
my %encconfig = |
my %encconfig = |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti'],$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 246 sub handler {
|
Line 248 sub handler {
|
} |
} |
} |
} |
} |
} |
my @prefs_order = ('rolecolors','login','defaults','passwords','quotas','autoenroll', |
if (ref($domconfig{'proctoring'}) eq 'HASH') { |
'autoupdate','autocreate','directorysrch','contacts','privacy', |
if (ref($encconfig{'proctoring'}) eq 'HASH') { |
'usercreation','selfcreation','usermodification','scantron', |
foreach my $provider (keys(%{$domconfig{'proctoring'}})) { |
'requestcourses','requestauthor','coursecategories', |
if ((ref($domconfig{'proctoring'}{$provider}) eq 'HASH') && |
'serverstatuses','helpsettings','coursedefaults', |
(ref($encconfig{'proctoring'}{$provider}) eq 'HASH')) { |
'ltitools','selfenrollment','usersessions','ssl','trust','lti'); |
foreach my $item ('key','secret') { |
|
$domconfig{'proctoring'}{$provider}{$item} = $encconfig{'proctoring'}{$provider}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my @prefs_order = ('rolecolors','login','defaults','wafproxy','passwords','quotas', |
|
'autoenroll','autoupdate','autocreate','directorysrch', |
|
'contacts','privacy','usercreation','selfcreation', |
|
'usermodification','scantron','requestcourses','requestauthor', |
|
'coursecategories','serverstatuses','helpsettings','coursedefaults', |
|
'ltitools','proctoring','selfenrollment','usersessions','ssl', |
|
'trust','lti'); |
my %existing; |
my %existing; |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
Line 282 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 296 sub handler {
|
Line 314 sub handler {
|
print => \&print_defaults, |
print => \&print_defaults, |
modify => \&modify_defaults, |
modify => \&modify_defaults, |
}, |
}, |
|
'wafproxy' => |
|
{ text => 'Web Application Firewall/Reverse Proxy', |
|
help => 'Domain_Configuration_WAF_Proxy', |
|
header => [{col1 => 'Domain(s)', |
|
col2 => 'Servers and WAF/Reverse Proxy alias(es)', |
|
}, |
|
{col1 => 'Domain(s)', |
|
col2 => 'WAF Configuration',}], |
|
print => \&print_wafproxy, |
|
modify => \&modify_wafproxy, |
|
}, |
'passwords' => |
'passwords' => |
{ text => 'Passwords (Internal authentication)', |
{ text => 'Passwords (Internal authentication)', |
help => 'Domain_Configuration_Passwords', |
help => 'Domain_Configuration_Passwords', |
Line 541 sub handler {
|
Line 570 sub handler {
|
print => \&print_ltitools, |
print => \&print_ltitools, |
modify => \&modify_ltitools, |
modify => \&modify_ltitools, |
}, |
}, |
|
'proctoring' => |
|
{text => 'Remote Proctoring Integration', |
|
help => 'Domain_Configuration_Proctoring', |
|
header => [{col1 => 'Name', |
|
col2 => 'Configuration'}], |
|
print => \&print_proctoring, |
|
modify => \&modify_proctoring, |
|
}, |
'ssl' => |
'ssl' => |
{text => 'LON-CAPA Network (SSL)', |
{text => 'LON-CAPA Network (SSL)', |
help => 'Domain_Configuration_Network_SSL', |
help => 'Domain_Configuration_Network_SSL', |
Line 598 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 771 sub process_changes {
|
Line 811 sub process_changes {
|
$output = &modify_loadbalancing($dom,%domconfig); |
$output = &modify_loadbalancing($dom,%domconfig); |
} elsif ($action eq 'ltitools') { |
} elsif ($action eq 'ltitools') { |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'proctoring') { |
|
$output = &modify_proctoring($r,$dom,$action,$lastactref,%domconfig); |
} elsif ($action eq 'ssl') { |
} elsif ($action eq 'ssl') { |
$output = &modify_ssl($dom,$lastactref,%domconfig); |
$output = &modify_ssl($dom,$lastactref,%domconfig); |
} elsif ($action eq 'trust') { |
} elsif ($action eq 'trust') { |
Line 781 sub process_changes {
|
Line 823 sub process_changes {
|
$output = &modify_privacy($dom,%domconfig); |
$output = &modify_privacy($dom,%domconfig); |
} elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
|
} elsif ($action eq 'wafproxy') { |
|
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 815 sub print_config_box {
|
Line 859 sub print_config_box {
|
$output .= <itools_javascript($settings); |
$output .= <itools_javascript($settings); |
} elsif ($action eq 'lti') { |
} elsif ($action eq 'lti') { |
$output .= <i_javascript($settings); |
$output .= <i_javascript($settings); |
|
} elsif ($action eq 'proctoring') { |
|
$output .= &proctoring_javascript($settings); |
|
} elsif ($action eq 'wafproxy') { |
|
$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 834 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 856 sub print_config_box {
|
Line 908 sub print_config_box {
|
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
($action eq 'contacts') || ($action eq 'privacy')) { |
($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
Line 865 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 893 sub print_config_box {
|
Line 945 sub print_config_box {
|
($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 'privacy') || ($action eq 'passwords')) { |
($action eq 'privacy') || ($action eq 'passwords')) { |
my $leftnobr = ' LC_nobreak'; |
|
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 980 sub print_config_box {
|
Line 1031 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 'defaults') || ($action eq 'directorysrch') || |
($action eq 'helpsettings')) { |
($action eq 'helpsettings') || ($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 1007 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 1031 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 1043 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 1163 sub print_config_box {
|
Line 1234 sub print_config_box {
|
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
($action eq 'ltitools') || ($action eq 'lti')) { |
($action eq 'ltitools') || ($action eq 'lti') || |
|
($action eq 'proctoring')) { |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
} |
} |
} |
} |
Line 1177 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 1373 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 1481 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 1512 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 1548 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 2804 function toggleLTITools(form,setting,ite
|
Line 2959 function toggleLTITools(form,setting,ite
|
ENDSCRIPT |
ENDSCRIPT |
} |
} |
|
|
|
sub wafproxy_javascript { |
|
my ($dom) = @_; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function updateWAF() { |
|
if (document.getElementById('wafproxy_remoteip')) { |
|
var wafremote = 0; |
|
if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value == 'h') { |
|
wafremote = 1; |
|
} |
|
var fields = new Array('header','trust'); |
|
for (var i=0; i<fields.length; i++) { |
|
if (document.getElementById('wafproxy_'+fields[i])) { |
|
if (wafremote == 1) { |
|
document.getElementById('wafproxy_'+fields[i]).style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_'+fields[i]).style.display = 'none'; |
|
} |
|
} |
|
} |
|
if (document.getElementById('wafproxyranges_$dom')) { |
|
if (wafremote == 1) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'inline-block'; |
|
} else { |
|
for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) { |
|
if (document.display.wafproxy_vpnaccess[i].checked) { |
|
if (document.display.wafproxy_vpnaccess[i].value == 0) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function checkWAF() { |
|
if (document.getElementById('wafproxy_remoteip')) { |
|
var wafvpn = 0; |
|
for (var i=0; i<document.display.wafproxy_vpnaccess.length; i++) { |
|
if (document.display.wafproxy_vpnaccess[i].checked) { |
|
if (document.display.wafproxy_vpnaccess[i].value == 1) { |
|
wafvpn = 1; |
|
} |
|
break; |
|
} |
|
} |
|
var vpn = new Array('vpnint','vpnext'); |
|
for (var i=0; i<vpn.length; i++) { |
|
if (document.getElementById('wafproxy_show_'+vpn[i])) { |
|
if (wafvpn == 1) { |
|
document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_show_'+vpn[i]).style.display = 'none'; |
|
} |
|
} |
|
} |
|
if (document.getElementById('wafproxyranges_$dom')) { |
|
if (wafvpn == 1) { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'inline-block'; |
|
} |
|
else if (document.display.wafproxy_remoteip.options[document.display.wafproxy_remoteip.selectedIndex].value != 'h') { |
|
document.getElementById('wafproxyranges_$dom').style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleWAF() { |
|
if (document.getElementById('wafproxy_table')) { |
|
var wafproxy = 0; |
|
for (var i=0; i<document.display.wafproxy_${dom}.length; i++) { |
|
if (document.display.wafproxy_${dom}[i].checked) { |
|
if (document.display.wafproxy_${dom}[i].value == 1) { |
|
wafproxy = 1; |
|
break; |
|
} |
|
} |
|
} |
|
if (wafproxy == 1) { |
|
document.getElementById('wafproxy_table').style.display='inline'; |
|
} |
|
else { |
|
document.getElementById('wafproxy_table').style.display='none'; |
|
} |
|
if (document.getElementById('wafproxyrow_${dom}')) { |
|
if (wafproxy == 1) { |
|
document.getElementById('wafproxyrow_${dom}').style.display = 'table-row'; |
|
} |
|
else { |
|
document.getElementById('wafproxyrow_${dom}').style.display = 'none'; |
|
} |
|
} |
|
if (document.getElementById('nowafproxyrow_$dom')) { |
|
if (wafproxy == 1) { |
|
document.getElementById('nowafproxyrow_${dom}').style.display = 'none'; |
|
} |
|
else { |
|
document.getElementById('nowafproxyrow_${dom}').style.display = 'table-row'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub proctoring_javascript { |
|
my ($settings) = @_; |
|
my (%ordered,$total,%jstext); |
|
$total = 0; |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
$total = scalar(keys(%{$settings})); |
|
} else { |
|
%ordered = ( |
|
0 => 'proctorio', |
|
1 => 'examity', |
|
); |
|
$total = 2; |
|
} |
|
my @jsarray = (); |
|
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
|
push(@jsarray,$ordered{$item}); |
|
} |
|
my $jstext = ' var proctors = Array('."'".join("','",@jsarray)."'".');'."\n"; |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function reorderProctoring(form,item) { |
|
var changedVal; |
|
$jstext |
|
var maxh = $total; |
|
var current = new Array; |
|
var changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
|
for (var i=0; i<proctors.length; i++) { |
|
var elementName = 'proctoring_pos_'+proctors[i]; |
|
if (elementName != item) { |
|
if (form.elements[elementName]) { |
|
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
|
current[currVal] = elementName; |
|
} |
|
} |
|
} |
|
var oldVal; |
|
for (var j=0; j<maxh; j++) { |
|
if (current[j] == undefined) { |
|
oldVal = j; |
|
} |
|
} |
|
if (oldVal < changedVal) { |
|
for (var k=oldVal+1; k<=changedVal ; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; |
|
} |
|
} else { |
|
for (var k=changedVal; k<oldVal; k++) { |
|
var elementName = current[k]; |
|
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function toggleProctoring(form,item) { |
|
var fieldsets = document.getElementsByClassName('proctoring_'+item); |
|
if (fieldsets.length) { |
|
var radioname = 'proctoring_available_'+item; |
|
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') { |
|
setvis = 1; |
|
break; |
|
} |
|
} |
|
} |
|
for (var j=0; j<fieldsets.length; j++) { |
|
if (setvis) { |
|
fieldsets[j].style.display = 'block'; |
|
} else { |
|
fieldsets[j].style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
|
sub lti_javascript { |
sub lti_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
my $togglejs = <i_toggle_js(); |
my $togglejs = <i_toggle_js(); |
Line 2811 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 2881 sub lti_toggle_js {
|
Line 3249 sub lti_toggle_js {
|
localauth => 'Local auth argument', |
localauth => 'Local auth argument', |
krb => 'Kerberos domain', |
krb => 'Kerberos domain', |
); |
); |
|
my $crsincalert = &mt('"User\'s identity sent" needs to be set to "Yes" first,[_1] before setting "Course\'s identity sent" to "Yes"',"\n"); |
|
&js_escape(\$crsincalert); |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
|
|
function toggleLTI(form,setting,item) { |
function toggleLTI(form,setting,item) { |
if (setting == 'requser') { |
if ((setting == 'requser') || (setting == 'crsinc')) { |
var fieldsets = document.getElementsByClassName('ltioption_'+item); |
var usrfieldsets = document.getElementsByClassName('ltioption_usr_'+item); |
if (fieldsets.length) { |
var setvis = ''; |
var radioname = 'lti_'+setting+'_'+item; |
var radioname = 'lti_requser_'+item; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
setvis = 1; |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
if (usrfieldsets.length) { |
|
for (var j=0; j<usrfieldsets.length; j++) { |
|
if (setvis) { |
|
usrfieldsets[j].style.display = 'block'; |
|
} else { |
|
usrfieldsets[j].style.display = 'none'; |
|
} |
|
} |
|
} |
|
var crsfieldsets = document.getElementsByClassName('ltioption_crs_'+item); |
|
if (crsfieldsets.length) { |
|
radioname = 'lti_crsinc_'+item; |
var num = form.elements[radioname].length; |
var num = form.elements[radioname].length; |
if (num) { |
if (num) { |
var setvis = ''; |
var crsvis = ''; |
for (var i=0; i<num; i++) { |
for (var i=0; i<num; i++) { |
if (form.elements[radioname][i].checked) { |
if (form.elements[radioname][i].checked) { |
if (form.elements[radioname][i].value == '1') { |
if (form.elements[radioname][i].value == '1') { |
setvis = 1; |
if (setvis == '') { |
break; |
if (setting == 'crsinc'){ |
|
alert("$crsincalert"); |
|
form.elements[radioname][0].checked = true; |
|
} |
|
} else { |
|
crsvis = 1; |
|
} |
|
break; |
} |
} |
} |
} |
} |
} |
for (var j=0; j<fieldsets.length; j++) { |
setvis = crsvis; |
if (setvis) { |
} |
fieldsets[j].style.display = 'block'; |
for (var j=0; j<crsfieldsets.length; j++) { |
} else { |
if (setvis) { |
fieldsets[j].style.display = 'none'; |
crsfieldsets[j].style.display = 'block'; |
} |
} else { |
|
crsfieldsets[j].style.display = 'none'; |
} |
} |
} |
} |
} |
} |
Line 3058 function toggleLTI(form,setting,item) {
|
Line 3459 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 3144 sub print_autoenroll {
|
Line 3622 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 3645 sub print_contacts {
|
Line 4150 sub print_contacts {
|
\%choices,$rownum); |
\%choices,$rownum); |
$datatable .= $reports; |
$datatable .= $reports; |
} elsif ($position eq 'lower') { |
} elsif ($position eq 'lower') { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
my (%current,%excluded,%weights); |
my ($threshold,$sysmail,%excluded,%weights); |
|
my ($defaults,$names) = &Apache::loncommon::lon_status_items(); |
my ($defaults,$names) = &Apache::loncommon::lon_status_items(); |
if ($lonstatus{'threshold'} =~ /^\d+$/) { |
if ($lonstatus{'threshold'} =~ /^\d+$/) { |
$threshold = $lonstatus{'threshold'}; |
$current{'errorthreshold'} = $lonstatus{'threshold'}; |
} else { |
} else { |
$threshold = $defaults->{'threshold'}; |
$current{'errorthreshold'} = $defaults->{'threshold'}; |
} |
} |
if ($lonstatus{'sysmail'} =~ /^\d+$/) { |
if ($lonstatus{'sysmail'} =~ /^\d+$/) { |
$sysmail = $lonstatus{'sysmail'}; |
$current{'errorsysmail'} = $lonstatus{'sysmail'}; |
} else { |
} else { |
$sysmail = $defaults->{'sysmail'}; |
$current{'errorsysmail'} = $defaults->{'sysmail'}; |
} |
} |
if (ref($lonstatus{'weights'}) eq 'HASH') { |
if (ref($lonstatus{'weights'}) eq 'HASH') { |
foreach my $type ('E','W','N','U') { |
foreach my $type ('E','W','N','U') { |
Line 3676 sub print_contacts {
|
Line 4180 sub print_contacts {
|
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
} |
} |
} |
} |
$datatable .= '<tr'.$css_class.'>'. |
foreach my $item ('errorthreshold','errorsysmail') { |
'<td class="LC_left_item"><span class="LC_nobreak">'. |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$titles->{'errorthreshold'}. |
$datatable .= '<tr'.$css_class.'>'. |
'</span></td><td class="LC_left_item">'. |
'<td class="LC_left_item"><span class="LC_nobreak">'. |
'<input type="text" name="errorthreshold" value="'. |
$titles->{$item}. |
$threshold.'" size="5" /></td></tr>'; |
'</span></td><td class="LC_left_item">'. |
$rownum ++; |
'<input type="text" name="'.$item.'" value="'. |
|
$current{$item}.'" size="5" /></td></tr>'; |
|
$rownum ++; |
|
} |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'. |
'<td class="LC_left_item">'. |
Line 3728 sub print_contacts {
|
Line 4235 sub print_contacts {
|
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
$rownum ++; |
$rownum ++; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
$titles->{'errorsysmail'}. |
|
'</span></td><td class="LC_left_item">'. |
|
'<input type="text" name="errorsysmail" value="'. |
|
$sysmail.'" size="5" /></td></tr>'; |
|
$rownum ++; |
|
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my (@posstypes,%usertypeshash); |
my (@posstypes,%usertypeshash); |
Line 4314 sub helpdeskroles_access {
|
Line 4813 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 4354 sub radiobutton_prefs {
|
Line 4853 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 4621 sub print_ltitools {
|
Line 5126 sub print_ltitools {
|
} |
} |
$datatable .= '<label>'. |
$datatable .= '<label>'. |
'<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'. |
'<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'. |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
$lt{'crs'.$item}.'</label> '."\n"; |
} |
} |
$datatable .= '</span></fieldset>'. |
$datatable .= '</span></fieldset>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
Line 4823 sub ltitools_names {
|
Line 5328 sub ltitools_names {
|
return %lt; |
return %lt; |
} |
} |
|
|
|
sub print_proctoring { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my $itemcount = 1; |
|
my (%ordered,%providernames,%current,%currentdef); |
|
my $confname = $dom.'-domainconfig'; |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (keys(%{$settings})) { |
|
if (ref($settings->{$item}) eq 'HASH') { |
|
my $num = $settings->{$item}{'order'}; |
|
$ordered{$num} = $item; |
|
} |
|
} |
|
} else { |
|
%ordered = ( |
|
1 => 'proctorio', |
|
2 => 'examity', |
|
); |
|
} |
|
%providernames = &proctoring_providernames(); |
|
my $maxnum = scalar(keys(%ordered)); |
|
my (%requserfields,%optuserfields,%defaults,%extended,%crsconf,@courseroles,@ltiroles); |
|
my ($requref,$opturef,$defref,$extref,$crsref,$rolesref,$ltiref) = &proctoring_data(); |
|
if (ref($requref) eq 'HASH') { |
|
%requserfields = %{$requref}; |
|
} |
|
if (ref($opturef) eq 'HASH') { |
|
%optuserfields = %{$opturef}; |
|
} |
|
if (ref($defref) eq 'HASH') { |
|
%defaults = %{$defref}; |
|
} |
|
if (ref($extref) eq 'HASH') { |
|
%extended = %{$extref}; |
|
} |
|
if (ref($crsref) eq 'HASH') { |
|
%crsconf = %{$crsref}; |
|
} |
|
if (ref($rolesref) eq 'ARRAY') { |
|
@courseroles = @{$rolesref}; |
|
} |
|
if (ref($ltiref) eq 'ARRAY') { |
|
@ltiroles = @{$ltiref}; |
|
} |
|
my $datatable; |
|
my $css_class; |
|
if (keys(%ordered)) { |
|
my @items = sort { $a <=> $b } keys(%ordered); |
|
for (my $i=0; $i<@items; $i++) { |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $provider = $ordered{$items[$i]}; |
|
my $optionsty = 'none'; |
|
my ($available,$version,$lifetime,$imgsrc,$userincdom,$showroles, |
|
%checkedfields,%rolemaps,%inuse,%crsconfig,%current); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$provider}) eq 'HASH') { |
|
%current = %{$settings->{$provider}}; |
|
if ($current{'available'}) { |
|
$optionsty = 'block'; |
|
$available = 1; |
|
} |
|
if ($current{'lifetime'} =~ /^\d+$/) { |
|
$lifetime = $current{'lifetime'}; |
|
} |
|
if ($current{'version'} =~ /^\d+\.\d+$/) { |
|
$version = $current{'version'}; |
|
} |
|
if ($current{'image'} ne '') { |
|
$imgsrc = '<img src="'.$current{'image'}.'" alt="'.&mt('Proctoring service icon').'" />'; |
|
} |
|
if (ref($current{'fields'}) eq 'ARRAY') { |
|
map { $checkedfields{$_} = 1; } @{$current{'fields'}}; |
|
} |
|
$userincdom = $current{'incdom'}; |
|
if (ref($current{'roles'}) eq 'HASH') { |
|
%rolemaps = %{$current{'roles'}}; |
|
$checkedfields{'roles'} = 1; |
|
} |
|
if (ref($current{'defaults'}) eq 'ARRAY') { |
|
foreach my $val (@{$current{'defaults'}}) { |
|
if (grep(/^\Q$val\E$/,@{$defaults{$provider}})) { |
|
$inuse{$val} = 1; |
|
} else { |
|
foreach my $poss (keys(%{$extended{$provider}})) { |
|
if (ref($extended{$provider}{$poss}) eq 'ARRAY') { |
|
if (grep(/^\Q$val\E$/,@{$extended{$provider}{$poss}})) { |
|
$inuse{$poss} = $val; |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} elsif (ref($current{'defaults'}) eq 'HASH') { |
|
foreach my $key (keys(%{$current{'defaults'}})) { |
|
my $currval = $current{'defaults'}{$key}; |
|
if (grep(/^\Q$key\E$/,@{$defaults{$provider}})) { |
|
$inuse{$key} = 1; |
|
} else { |
|
my $match; |
|
foreach my $poss (keys(%{$extended{$provider}})) { |
|
if (ref($extended{$provider}{$poss}) eq 'ARRAY') { |
|
if (grep(/^\Q$key\E$/,@{$extended{$provider}{$poss}})) { |
|
$inuse{$poss} = $key; |
|
last; |
|
} |
|
} elsif (ref($extended{$provider}{$poss}) eq 'HASH') { |
|
foreach my $inner (sort(keys(%{$extended{$provider}{$poss}}))) { |
|
if (ref($extended{$provider}{$poss}{$inner}) eq 'ARRAY') { |
|
if (grep(/^\Q$currval\E$/,@{$extended{$provider}{$poss}{$inner}})) { |
|
$currentdef{$inner} = $currval; |
|
$match = 1; |
|
last; |
|
} |
|
} elsif ($inner eq $key) { |
|
$currentdef{$key} = $currval; |
|
$match = 1; |
|
last; |
|
} |
|
} |
|
} |
|
last if ($match); |
|
} |
|
} |
|
} |
|
} |
|
if (ref($current{'crsconf'}) eq 'ARRAY') { |
|
map { $crsconfig{$_} = 1; } @{$current{'crsconf'}}; |
|
} |
|
} |
|
} |
|
my %lt = &proctoring_titles($provider); |
|
my %fieldtitles = &proctoring_fieldtitles($provider); |
|
my $onclickavailable = ' onclick="toggleProctoring(this.form,'."'$provider'".');"'; |
|
my %checkedavailable = ( |
|
yes => '', |
|
no => ' checked="checked"', |
|
); |
|
if ($available) { |
|
$checkedavailable{'yes'} = $checkedavailable{'no'}; |
|
$checkedavailable{'no'} = ''; |
|
} |
|
my $chgstr = ' onchange="javascript:reorderProctoring(this.form,'."'proctoring_pos_".$provider."'".');"'; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
|
.'<select name="proctoring_pos_'.$provider.'"'.$chgstr.'>'; |
|
for (my $k=0; $k<$maxnum; $k++) { |
|
my $vpos = $k+1; |
|
my $selstr; |
|
if ($k == $i) { |
|
$selstr = ' selected="selected" '; |
|
} |
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
|
} |
|
if ($version eq '') { |
|
if ($provider eq 'proctorio') { |
|
$version = '1.0'; |
|
} elsif ($provider eq 'examity') { |
|
$version = '1.1'; |
|
} |
|
} |
|
if ($lifetime eq '') { |
|
$lifetime = '300'; |
|
} |
|
$datatable .= |
|
'</select>'.(' 'x2).'<b>'.$providernames{$provider}.'</b></span><br />'. |
|
'<span class="LC_nobreak">'.$lt{'avai'}.' '. |
|
'<label><input type="radio" name="proctoring_available_'.$provider.'" value="1"'.$onclickavailable.$checkedavailable{yes}.' />'.&mt('Yes').'</label> '."\n". |
|
'<label><input type="radio" name="proctoring_available_'.$provider.'" value="0"'.$onclickavailable.$checkedavailable{no}.' />'.&mt('No').'</label></span>'."\n". |
|
'</td>'. |
|
'<td colspan="2">'. |
|
'<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'base'}.'</legend>'. |
|
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="proctoring_'.$provider.'_version">'. |
|
'<option value="'.$version.'" selected="selected">'.$version.'</option></select></span> '."\n". |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'sigmethod'}.':<select name="proctoring_'.$provider.'_sigmethod">'. |
|
'<option value="HMAC-SHA1" selected="selected">HMAC-SHA1</option>'. |
|
'<option value="HMAC-SHA256">HMAC-SHA256</option></select></span>'. |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="proctoring_'.$provider.'_lifetime" value="'.$lifetime.'" /></span> '."\n". |
|
'<br />'. |
|
'<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="40" name="proctoring_'.$provider.'_url" value="'.$current{'url'}.'" /></span> '."\n". |
|
'<br />'. |
|
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="proctoring_'.$provider.'_key" value="'.$current{'key'}.'" /></span> '."\n". |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="proctoring_'.$provider.'_secret" value="'.$current{'secret'}.'" />'. |
|
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.proctoring_'.$provider.'_secret.type='."'text'".' } else { this.form.proctoring_'.$provider.'_secret.type='."'password'".' }" />'.$lt{'visible'}.'</label></span><br />'."\n"; |
|
$datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.': '; |
|
if ($imgsrc) { |
|
$datatable .= $imgsrc. |
|
'<label><input type="checkbox" name="proctoring_image_del"'. |
|
' value="'.$provider.'" />'.&mt('Delete?').'</label></span> '. |
|
'<span class="LC_nobreak"> '.&mt('Replace:'); |
|
} |
|
$datatable .= ' '; |
|
if ($switchserver) { |
|
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="proctoring_image_'.$provider.'" value="" />'; |
|
} |
|
unless ($imgsrc) { |
|
$datatable .= '<br />('.&mt('if larger than 21x21 pixels, image will be scaled').')'; |
|
} |
|
$datatable .= '</fieldset>'."\n"; |
|
if (ref($requserfields{$provider}) eq 'ARRAY') { |
|
if (@{$requserfields{$provider}} > 0) { |
|
$datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'requ'}.'</legend>'; |
|
foreach my $field (@{$requserfields{$provider}}) { |
|
$datatable .= '<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="proctoring_reqd_'.$provider.'" value="'.$field.'" checked="checked" disabled="disabled" />'. |
|
$lt{$field}.'</label>'; |
|
if ($field eq 'user') { |
|
my $seluserdom = ''; |
|
my $unseluserdom = ' selected="selected"'; |
|
if ($userincdom) { |
|
$seluserdom = $unseluserdom; |
|
$unseluserdom = ''; |
|
} |
|
$datatable .= ': '. |
|
'<select name="proctoring_userincdom_'.$provider.'">'. |
|
'<option value="0"'.$unseluserdom.'>'.$lt{'username'}.'</option>'. |
|
'<option value="1"'.$seluserdom.'>'.$lt{'uname:dom'}.'</option>'. |
|
'</select> '; |
|
} else { |
|
$datatable .= ' '; |
|
if ($field eq 'roles') { |
|
$showroles = 1; |
|
} |
|
} |
|
$datatable .= '</span> '; |
|
} |
|
} |
|
$datatable .= '</fieldset>'."\n"; |
|
} |
|
if (ref($optuserfields{$provider}) eq 'ARRAY') { |
|
if (@{$optuserfields{$provider}} > 0) { |
|
$datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'optu'}.'</legend>'; |
|
foreach my $field (@{$optuserfields{$provider}}) { |
|
my $checked; |
|
if ($checkedfields{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="proctoring_optional_'.$provider.'" value="'.$field.'"'.$checked.' />'.$lt{$field}.'</label></span> '; |
|
} |
|
$datatable .= '</fieldset>'."\n"; |
|
} |
|
} |
|
if (ref($defaults{$provider}) eq 'ARRAY') { |
|
if (@{$defaults{$provider}}) { |
|
my (%options,@selectboxes); |
|
if (ref($extended{$provider}) eq 'HASH') { |
|
%options = %{$extended{$provider}}; |
|
} |
|
$datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'"><legend>'.$lt{'defa'}.'</legend>'; |
|
my ($rem,$numinrow,$dropdowns); |
|
if ($provider eq 'proctorio') { |
|
$datatable .= '<table>'; |
|
$numinrow = 4; |
|
} |
|
my $i = 0; |
|
foreach my $field (@{$defaults{$provider}}) { |
|
my $checked; |
|
if ($inuse{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($provider eq 'examity') { |
|
if ($field eq 'display') { |
|
$datatable .= '<span class="LC_nobreak">'.&mt('Display target:'); |
|
foreach my $option ('iframe','tab','window') { |
|
my $checkdisp; |
|
if ($currentdef{'target'} eq $option) { |
|
$checkdisp = ' checked="checked"'; |
|
} |
|
$datatable .= '<label><input type="radio" name="proctoring_target_'.$provider.'" value="'.$option.'"'.$checkdisp.' />'. |
|
$fieldtitles{$option}.'</label>'.(' 'x2); |
|
} |
|
$datatable .= (' 'x4); |
|
foreach my $dimen ('width','height') { |
|
$datatable .= '<label>'.$fieldtitles{$dimen}.' '. |
|
'<input type="text" name="proctoring_'.$dimen.'_'.$provider.'" size="5" '. |
|
'value="'.$currentdef{$dimen}.'" /></label>'. |
|
(' 'x2); |
|
} |
|
$datatable .= '</span><br />'. |
|
'<div class="LC_left_float">'.$fieldtitles{'linktext'}.'<br />'. |
|
'<input type="text" name="proctoring_linktext_'.$provider.'" '. |
|
'size="25" value="'.$currentdef{'linktext'}.'" /></div>'. |
|
'<div class="LC_left_float">'.$fieldtitles{'explanation'}.'<br />'. |
|
'<textarea name="proctoring_explanation_'.$provider.'" rows="5" cols="40">'. |
|
$currentdef{'explanation'}. |
|
'</textarea></div><div style=""></div><br />'; |
|
} |
|
} else { |
|
if ((exists($options{$field})) && (ref($options{$field}) eq 'ARRAY')) { |
|
my ($output,$selnone); |
|
unless ($checked) { |
|
$selnone = ' selected="selected"'; |
|
} |
|
$output .= '<span class="LC_nobreak">'.$fieldtitles{$field}.': '. |
|
'<select name="proctoring_defaults_'.$field.'_'.$provider.'">'. |
|
'<option value=""'.$selnone.'>'.&mt('Not in use').'</option>'; |
|
foreach my $option (@{$options{$field}}) { |
|
my $sel; |
|
if ($inuse{$field} eq $option) { |
|
$sel = ' selected="selected"'; |
|
} |
|
$output .= '<option value="'.$option.'"'.$sel.'>'.$fieldtitles{$option}.'</option>'; |
|
} |
|
$output .= '</select></span>'; |
|
push(@selectboxes,$output); |
|
} else { |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="proctoring_defaults_'.$provider.'" value="'.$field.'"'.$checked.' />'. |
|
$fieldtitles{$field}.'</label></span></td>'; |
|
$i++; |
|
} |
|
} |
|
} |
|
if ($provider eq 'proctorio') { |
|
if ($numinrow) { |
|
$rem = $i%$numinrow; |
|
} |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
$datatable .= ' '. |
|
'</td></tr></table>'; |
|
if (@selectboxes) { |
|
$datatable .= '<hr /><table>'; |
|
$numinrow = 2; |
|
for (my $i=0; $i<@selectboxes; $i++) { |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
$selectboxes[$i].'</td>'; |
|
} |
|
if ($numinrow) { |
|
$rem = $i%$numinrow; |
|
} |
|
$colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
$datatable .= ' '. |
|
'</td></tr></table>'; |
|
} |
|
} |
|
$datatable .= '</fieldset>'; |
|
} |
|
if (ref($crsconf{$provider}) eq 'ARRAY') { |
|
$datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'. |
|
'<legend>'.&mt('Configurable in course').'</legend>'; |
|
my ($rem,$numinrow); |
|
if ($provider eq 'proctorio') { |
|
$datatable .= '<table>'; |
|
$numinrow = 4; |
|
} |
|
my $i = 0; |
|
foreach my $item (@{$crsconf{$provider}}) { |
|
my $name; |
|
if ($provider eq 'examity') { |
|
$name = $lt{'crs'.$item}; |
|
} elsif ($provider eq 'proctorio') { |
|
$name = $fieldtitles{$item}; |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td class="LC_left_item>'; |
|
} |
|
my $checked; |
|
if ($crsconfig{$item}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="proctoring_crsconf_'.$provider.'" value="'.$item.'"'.$checked.' />'. |
|
$name.'</label></span>'; |
|
if ($provider eq 'examity') { |
|
$datatable .= ' '; |
|
} |
|
$datatable .= "\n"; |
|
$i++; |
|
} |
|
if ($provider eq 'proctorio') { |
|
if ($numinrow) { |
|
$rem = $i%$numinrow; |
|
} |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
|
} else { |
|
$datatable .= '<td class="LC_left_item">'; |
|
} |
|
$datatable .= ' '. |
|
'</td></tr></table>'; |
|
} |
|
$datatable .= '</fieldset>'; |
|
} |
|
if ($showroles) { |
|
$datatable .= '<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'. |
|
'<legend>'.&mt('Role mapping').'</legend><table><tr>'; |
|
foreach my $role (@courseroles) { |
|
my ($selected,$selectnone); |
|
if (!$rolemaps{$role}) { |
|
$selectnone = ' selected="selected"'; |
|
} |
|
$datatable .= '<td style="text-align: center">'. |
|
&Apache::lonnet::plaintext($role,'Course').'<br />'. |
|
'<select name="proctoring_roles_'.$role.'_'.$provider.'">'. |
|
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
foreach my $ltirole (@ltiroles) { |
|
unless ($selectnone) { |
|
if ($rolemaps{$role} eq $ltirole) { |
|
$selected = ' selected="selected"'; |
|
} else { |
|
$selected = ''; |
|
} |
|
} |
|
$datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>'; |
|
} |
|
$datatable .= '</select></td>'; |
|
} |
|
$datatable .= '</tr></table></fieldset>'. |
|
'<fieldset class="proctoring_'.$provider.'" style="display:'.$optionsty.'">'. |
|
'<legend>'.&mt('Custom items sent on launch').'</legend>'. |
|
'<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'. |
|
'<tr><td></td><td>lms</td>'. |
|
'<td><input type="text" name="proctoring_customval_lms_'.$provider.'"'. |
|
' value="Loncapa" disabled="disabled"/></td></tr>'; |
|
if ((ref($settings) eq 'HASH') && (ref($settings->{$provider}) eq 'HASH') && |
|
(ref($settings->{$provider}->{'custom'}) eq 'HASH')) { |
|
my %custom = %{$settings->{$provider}->{'custom'}}; |
|
if (keys(%custom) > 0) { |
|
foreach my $key (sort(keys(%custom))) { |
|
next if ($key eq 'lms'); |
|
$datatable .= '<tr><td><span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="proctoring_customdel_'.$provider.'" value="'. |
|
$key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'. |
|
'<td><input type="text" name="proctoring_customval_'.$key.'_'.$provider.'"'. |
|
' value="'.$custom{$key}.'" /></td></tr>'; |
|
} |
|
} |
|
} |
|
$datatable .= '<tr><td><span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="proctoring_customadd" value="'.$provider.'" />'. |
|
&mt('Add more').'</label></span></td><td><input type="text" name="proctoring_custom_name_'.$provider.'" />'. |
|
'</td><td><input type="text" name="proctoring_custom_value_'.$provider.'" /></td></tr>'. |
|
'</table></fieldset></td></tr>'."\n"; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
$itemcount ++; |
|
} |
|
} |
|
return $datatable; |
|
} |
|
|
|
sub proctoring_data { |
|
my $requserfields = { |
|
proctorio => ['user'], |
|
examity => ['roles','user'], |
|
}; |
|
my $optuserfields = { |
|
proctorio => ['fullname'], |
|
examity => ['fullname','firstname','lastname','email'], |
|
}; |
|
my $defaults = { |
|
proctorio => ['recordvideo','recordaudio','recordscreen','recordwebtraffic', |
|
'recordroomstart','verifyvideo','verifyaudio','verifydesktop', |
|
'verifyid','verifysignature','fullscreen','clipboard','tabslinks', |
|
'closetabs','onescreen','print','downloads','cache','rightclick', |
|
'reentry','calculator','whiteboard'], |
|
examity => ['display'], |
|
}; |
|
my $extended = { |
|
proctorio => { |
|
verifyid => ['verifyidauto','verifyidlive'], |
|
fullscreen => ['fullscreenlenient','fullscreenmoderate','fullscreensever'], |
|
tabslinks => ['notabs','linksonly'], |
|
reentry => ['noreentry','agentreentry'], |
|
calculator => ['calculatorbasic','calculatorsci'], |
|
}, |
|
examity => { |
|
display => { |
|
target => ['iframe','tab','window'], |
|
width => '', |
|
height => '', |
|
linktext => '', |
|
explanation => '', |
|
}, |
|
}, |
|
}; |
|
my $crsconf = { |
|
proctorio => ['recordvideo','recordaudio','recordscreen','recordwebtraffic', |
|
'recordroomstart','verifyvideo','verifyaudio','verifydesktop', |
|
'verifyid','verifysignature','fullscreen','clipboard','tabslinks', |
|
'closetabs','onescreen','print','downloads','cache','rightclick', |
|
'reentry','calculator','whiteboard'], |
|
examity => ['label','title','target','linktext','explanation','append'], |
|
}; |
|
my $courseroles = ['cc','in','ta','ep','st']; |
|
my $ltiroles = ['Instructor','ContentDeveloper','TeachingAssistant','Learner']; |
|
return ($requserfields,$optuserfields,$defaults,$extended,$crsconf,$courseroles,$ltiroles); |
|
} |
|
|
|
sub proctoring_titles { |
|
my ($item) = @_; |
|
my (%common_lt,%custom_lt); |
|
%common_lt = &Apache::lonlocal::texthash ( |
|
'avai' => 'Available?', |
|
'base' => 'Basic Settings', |
|
'requ' => 'User data required to be sent on launch', |
|
'optu' => 'User data optionally sent on launch', |
|
'udsl' => 'User data sent on launch', |
|
'defa' => 'Defaults for items configurable in course', |
|
'sigmethod' => 'Signature Method', |
|
'key' => 'Key', |
|
'lifetime' => 'Nonce lifetime (s)', |
|
'secret' => 'Secret', |
|
'icon' => 'Icon', |
|
'fullname' => 'Full Name', |
|
'visible' => 'Visible input', |
|
'username' => 'username', |
|
'user' => 'User', |
|
); |
|
if ($item eq 'proctorio') { |
|
%custom_lt = &Apache::lonlocal::texthash ( |
|
'version' => 'OAuth version', |
|
'url' => 'API URL', |
|
'uname:dom' => 'username-domain', |
|
); |
|
} elsif ($item eq 'examity') { |
|
%custom_lt = &Apache::lonlocal::texthash ( |
|
'version' => 'LTI Version', |
|
'url' => 'URL', |
|
'uname:dom' => 'username:domain', |
|
'msgtype' => 'Message Type', |
|
'firstname' => 'First Name', |
|
'lastname' => 'Last Name', |
|
'email' => 'E-mail', |
|
'roles' => 'Role', |
|
'crstarget' => 'Display target', |
|
'crslabel' => 'Course label', |
|
'crstitle' => 'Course title', |
|
'crslinktext' => 'Link Text', |
|
'crsexplanation' => 'Explanation', |
|
'crsappend' => 'Provider URL', |
|
); |
|
} |
|
my %lt = (%common_lt,%custom_lt); |
|
return %lt; |
|
} |
|
|
|
sub proctoring_fieldtitles { |
|
my ($item) = @_; |
|
if ($item eq 'proctorio') { |
|
return &Apache::lonlocal::texthash ( |
|
'recordvideo' => 'Record video', |
|
'recordaudio' => 'Record audio', |
|
'recordscreen' => 'Record screen', |
|
'recordwebtraffic' => 'Record web traffic', |
|
'recordroomstart' => 'Record room scan', |
|
'verifyvideo' => 'Verify webcam', |
|
'verifyaudio' => 'Verify microphone', |
|
'verifydesktop' => 'Verify desktop recording', |
|
'verifyid' => 'Photo ID verification', |
|
'verifysignature' => 'Require signature', |
|
'fullscreen' => 'Fullscreen', |
|
'clipboard' => 'Disable copy/paste', |
|
'tabslinks' => 'New tabs/windows', |
|
'closetabs' => 'Close other tabs', |
|
'onescreen' => 'Limit to single screen', |
|
'print' => 'Disable Printing', |
|
'downloads' => 'Disable Downloads', |
|
'cache' => 'Empty cache after exam', |
|
'rightclick' => 'Disable right click', |
|
'reentry' => 'Re-entry to exam', |
|
'calculator' => 'Onscreen calculator', |
|
'whiteboard' => 'Onscreen whiteboard', |
|
'verifyidauto' => 'Automated verification', |
|
'verifyidlive' => 'Live agent verification', |
|
'fullscreenlenient' => 'Forced, but can navigate away for up to 30s', |
|
'fullscreenmoderate' => 'Forced, but can navigate away for up to 15s', |
|
'fullscreensever' => 'Forced, navigation away ends exam', |
|
'notabs' => 'Disaallowed', |
|
'linksonly' => 'Allowed from links in exam', |
|
'noreentry' => 'Disallowed', |
|
'agentreentry' => 'Agent required for re-entry', |
|
'calculatorbasic' => 'Basic', |
|
'calculatorsci' => 'Scientific', |
|
); |
|
} elsif ($item eq 'examity') { |
|
return &Apache::lonlocal::texthash ( |
|
'target' => 'Display target', |
|
'window' => 'Window', |
|
'tab' => 'Tab', |
|
'iframe' => 'iFrame', |
|
'height' => 'Height (pixels)', |
|
'width' => 'Width (pixels)', |
|
'linktext' => 'Default Link Text', |
|
'explanation' => 'Default Explanation', |
|
'append' => 'Provider URL', |
|
); |
|
} |
|
} |
|
|
|
sub proctoring_providernames { |
|
return ( |
|
proctorio => 'Proctorio', |
|
examity => 'Examity', |
|
); |
|
} |
|
|
sub print_lti { |
sub print_lti { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 4833 sub print_lti {
|
Line 5972 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 4845 sub print_lti {
|
Line 5987 sub print_lti {
|
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $item = $ordered{$items[$i]}; |
my $item = $ordered{$items[$i]}; |
my ($key,$secret,$lifetime,$consumer,$requser,$current); |
my ($key,$secret,$lifetime,$consumer,$requser,$crsinc,$current); |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
$key = $settings->{$item}->{'key'}; |
$key = $settings->{$item}->{'key'}; |
$secret = $settings->{$item}->{'secret'}; |
$secret = $settings->{$item}->{'secret'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$requser = $settings->{$item}->{'requser'}; |
$requser = $settings->{$item}->{'requser'}; |
|
$crsinc = $settings->{$item}->{'crsinc'}; |
$current = $settings->{$item}; |
$current = $settings->{$item}; |
} |
} |
my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"'; |
my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"'; |
Line 4863 sub print_lti {
|
Line 6006 sub print_lti {
|
$checkedrequser{'no'} = $checkedrequser{'yes'}; |
$checkedrequser{'no'} = $checkedrequser{'yes'}; |
$checkedrequser{'yes'} = ''; |
$checkedrequser{'yes'} = ''; |
} |
} |
|
my $onclickcrsinc = ' onclick="toggleLTI(this.form,'."'crsinc','$i'".');"'; |
|
my %checkedcrsinc = ( |
|
yes => ' checked="checked"', |
|
no => '', |
|
); |
|
if (!$crsinc) { |
|
$checkedcrsinc{'no'} = $checkedcrsinc{'yes'}; |
|
$checkedcrsinc{'yes'} = ''; |
|
} |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"'; |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'lti_pos_".$item."'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="lti_pos_'.$item.'"'.$chgstr.'>'; |
.'<select name="lti_pos_'.$item.'"'.$chgstr.'>'; |
Line 4892 sub print_lti {
|
Line 6044 sub print_lti {
|
'<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
'<br /><br />'. |
'<br /><br />'. |
|
'<span class="LC_nobreak">'.$lt{'crsinc'}.':'. |
|
'<label><input type="radio" name="lti_crsinc_'.$i.'" value="1"'.$onclickcrsinc.$checkedcrsinc{yes}.' />'.&mt('Yes').'</label> '."\n". |
|
'<label><input type="radio" name="lti_crsinc_'.$i.'" value="0"'.$onclickcrsinc.$checkedcrsinc{no}.' />'.&mt('No').'</label></span>'."\n". |
|
(' 'x4). |
'<span class="LC_nobreak">'.$lt{'key'}. |
'<span class="LC_nobreak">'.$lt{'key'}. |
':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '. |
':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '. |
(' 'x2). |
(' 'x2). |
Line 4932 sub print_lti {
|
Line 6088 sub print_lti {
|
'<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_add" value="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
'<br /><br />'. |
'<br /><br />'. |
|
'<span class="LC_nobreak">'.$lt{'crsinc'}.':'. |
|
'<label><input type="radio" name="lti_crsinc_add" value="1" onclick="toggleLTI(this.form,'."'crsinc','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
|
'<label><input type="radio" name="lti_crsinc_add" value="0" onclick="toggleLTI(this.form,'."'crsinc','add'".');" />'.&mt('No').'</label></span>'."\n". |
|
(' 'x4). |
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'. |
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'. |
Line 4952 sub lti_names {
|
Line 6112 sub lti_names {
|
'consumer' => 'Consumer', |
'consumer' => 'Consumer', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'requser' => "User's identity sent", |
'requser' => "User's identity sent", |
|
'crsinc' => "Course's identity sent", |
'email' => 'Email address', |
'email' => 'Email address', |
'sourcedid' => 'User ID', |
'sourcedid' => 'User ID', |
'other' => 'Other', |
'other' => 'Other', |
Line 4968 sub lti_options {
|
Line 6129 sub lti_options {
|
my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback); |
my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield,$callback); |
$checked{'mapuser'}{'sourcedid'} = ' checked="checked"'; |
$checked{'mapuser'}{'sourcedid'} = ' checked="checked"'; |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"'; |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ' checked="checked"'; |
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'storecrs'}{'Y'} = ' checked="checked"'; |
|
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'mapcrstype'} = {}; |
$checked{'mapcrstype'} = {}; |
$checked{'makeuser'} = {}; |
$checked{'makeuser'} = {}; |
$checked{'selfenroll'} = {}; |
$checked{'selfenroll'} = {}; |
Line 4986 sub lti_options {
|
Line 6148 sub lti_options {
|
my $callbacksty = 'none'; |
my $callbacksty = 'none'; |
my $passbacksty = 'none'; |
my $passbacksty = 'none'; |
my $optionsty = 'block'; |
my $optionsty = 'block'; |
|
my $crssty = 'block'; |
my $lcauthparm; |
my $lcauthparm; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmtext; |
my $lcauthparmtext; |
Line 4996 sub lti_options {
|
Line 6159 sub lti_options {
|
if (ref($current) eq 'HASH') { |
if (ref($current) eq 'HASH') { |
if (!$current->{'requser'}) { |
if (!$current->{'requser'}) { |
$optionsty = 'none'; |
$optionsty = 'none'; |
|
$crssty = 'none'; |
|
} elsif (!$current->{'crsinc'}) { |
|
$crssty = 'none'; |
} |
} |
if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) { |
if (($current->{'mapuser'} ne '') && ($current->{'mapuser'} ne 'lis_person_sourcedid')) { |
$checked{'mapuser'}{'sourcedid'} = ''; |
$checked{'mapuser'}{'sourcedid'} = ''; |
Line 5022 sub lti_options {
|
Line 6188 sub lti_options {
|
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
} |
} |
} |
} |
|
if (!$current->{'storecrs'}) { |
|
$checked{'storecrs'}{'N'} = $checked{'storecrs'}{'Y'}; |
|
$checked{'storecrs'}{'Y'} = ''; |
|
} |
if ($current->{'makecrs'}) { |
if ($current->{'makecrs'}) { |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
} |
} |
Line 5128 sub lti_options {
|
Line 6298 sub lti_options {
|
my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"'; |
my $onclicksecsrc = ' onclick="toggleLTI(this.form,'."'secsrc','$num'".')"'; |
my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"'; |
my $onclicklcauth = ' onclick="toggleLTI(this.form,'."'lcauth','$num'".')"'; |
my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"'; |
my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"'; |
my $output = '<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'. |
my $output = '<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Logout options').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback to logout LON-CAPA on log out from Consumer').': '. |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="0"'. |
|
$checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="1"'. |
|
$checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Parameter').': '. |
|
'<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'. |
|
'</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'. |
|
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping users').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').': '; |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('LON-CAPA username').': '; |
foreach my $option ('sourcedid','email','other') { |
foreach my $option ('sourcedid','email','other') { |
$output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'. |
$output .= '<label><input type="radio" name="lti_mapuser_'.$num.'" value="'.$option.'"'. |
Line 5138 sub lti_options {
|
Line 6318 sub lti_options {
|
$output .= '</span></div>'. |
$output .= '</span></div>'. |
'<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'. |
'<div class="LC_floatleft" style="display:'.$userfieldsty.';" id="lti_userfield_'.$num.'">'. |
'<input type="text" name="lti_customuser_'.$num.'" '. |
'<input type="text" name="lti_customuser_'.$num.'" '. |
'value="'.$userfield.'" /></div></fieldset>'. |
'value="'.$userfield.'" /></div></fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>'; |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
foreach my $ltirole (@lticourseroles) { |
|
my ($selected,$selectnone); |
|
if ($rolemaps{$ltirole} eq '') { |
|
$selectnone = ' selected="selected"'; |
|
} |
|
$output .= '<td style="text-align: center">'.$ltirole.'<br />'. |
|
'<select name="lti_maprole_'.$ltirole.'_'.$num.'">'. |
|
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
foreach my $role (@courseroles) { |
|
unless ($selectnone) { |
|
if ($rolemaps{$ltirole} eq $role) { |
|
$selected = ' selected="selected"'; |
|
} else { |
|
$selected = ''; |
|
} |
|
} |
|
$output .= '<option value="'.$role.'"'.$selected.'>'. |
|
&Apache::lonnet::plaintext($role,'Course'). |
|
'</option>'; |
|
} |
|
$output .= '</select></td>'; |
|
} |
|
$output .= '</tr></table></fieldset>'. |
|
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
|
foreach my $ltirole (@ltiroles) { |
foreach my $ltirole (@ltiroles) { |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
} |
} |
$output .= '</fieldset>'. |
$output .= '</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
'<table>'. |
'<table>'. |
&modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount). |
&modifiable_userdata_row('lti','instdata_'.$num,$current,$numinrow,$itemcount). |
'</table>'. |
'</table>'. |
Line 5192 sub lti_options {
|
Line 6348 sub lti_options {
|
'<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'. |
'<span id="lti_lcauth_parmtext_'.$num.'">'.$lcauthparmtext.'</span>'. |
'<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'. |
'<input type="text" name="lti_lcauthparm_'.$num.'" value="" /></span></td></tr>'. |
'</table></fieldset>'. |
'</table></fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Mapping courses').'</legend>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'. |
|
&mt('LON-CAPA menu items (Course Coordinator can override)').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.': '. |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'. |
|
$checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'. |
|
$checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.': '. |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'. |
|
$checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'. |
|
$checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'; |
|
$output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Menu items').': '; |
|
foreach my $type ('fullname','coursetitle','role','logout','grades') { |
|
$output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'. |
|
$checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'. |
|
(' 'x2); |
|
} |
|
$output .= '</span></div></fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping courses').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'. |
&mt('Unique course identifier').': '; |
&mt('Unique course identifier').': '; |
foreach my $option ('course_offering_sourcedid','context_id','other') { |
foreach my $option ('course_offering_sourcedid','context_id','other') { |
Line 5209 sub lti_options {
|
Line 6387 sub lti_options {
|
$checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'. |
$checked{'mapcrstype'}{$type}.' />'.$coursetypetitles{$type}.'</label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$output .= '</span></fieldset>'. |
$output .= '</span><br /><br />'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Creating courses').'</legend>'. |
'<span class="LC_nobreak">'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '. |
|
'<label><input type="radio" name="lti_storecrs_'.$num.'" value="0"'. |
|
$checked{'storecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_storecrs_'.$num.'" value="1"'. |
|
$checked{'storecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
|
'</fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Mapping course roles').'</legend><table><tr>'; |
|
foreach my $ltirole (@lticourseroles) { |
|
my ($selected,$selectnone); |
|
if ($rolemaps{$ltirole} eq '') { |
|
$selectnone = ' selected="selected"'; |
|
} |
|
$output .= '<td style="text-align: center">'.$ltirole.'<br />'. |
|
'<select name="lti_maprole_'.$ltirole.'_'.$num.'">'. |
|
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
|
foreach my $role (@courseroles) { |
|
unless ($selectnone) { |
|
if ($rolemaps{$ltirole} eq $role) { |
|
$selected = ' selected="selected"'; |
|
} else { |
|
$selected = ''; |
|
} |
|
} |
|
$output .= '<option value="'.$role.'"'.$selected.'>'. |
|
&Apache::lonnet::plaintext($role,'Course'). |
|
'</option>'; |
|
} |
|
$output .= '</select></td>'; |
|
} |
|
$output .= '</tr></table></fieldset>'. |
|
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Creating courses').'</legend>'. |
'<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').': '. |
'<span class="LC_nobreak">'.&mt('Course created (if absent) on Instructor access').': '. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="0"'. |
$checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
$checked{'makecrs'}{'N'}.' />'.&mt('No').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'. |
'<label><input type="radio" name="lti_makecrs_'.$num.'" value="1"'. |
$checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
$checked{'makecrs'}{'Y'}.' />'.&mt('Yes').'</label></span>'. |
'</fieldset>'. |
'</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>'; |
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Roles which may self-enroll').'</legend>'; |
foreach my $lticrsrole (@lticourseroles) { |
foreach my $lticrsrole (@lticourseroles) { |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'. |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_selfenroll_'.$num.'" value="'.$lticrsrole.'"'. |
$checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label> </span> '; |
$checked{'selfenroll'}{$lticrsrole}.' />'.$lticrsrole.'</label> </span> '; |
} |
} |
$output .= '</fieldset>'. |
$output .= '</fieldset>'. |
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course options').'</legend>'. |
'<fieldset class="ltioption_crs_'.$num.'" style="display:'.$crssty.'"><legend>'.&mt('Course options').'</legend>'. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').': '. |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Assign users to sections').': '. |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'. |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="0"'. |
$checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.(' 'x2). |
$checked{'crssec'}{'N'}.$onclicksec.' />'.&mt('No').'</label>'.(' 'x2). |
Line 5275 sub lti_options {
|
Line 6483 sub lti_options {
|
&mt('Outcomes Service (1.1)').'</label>'.(' 'x2). |
&mt('Outcomes Service (1.1)').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'. |
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'. |
&mt('Outcomes Extension (1.0)').'</label></span></div>'. |
&mt('Outcomes Extension (1.0)').'</label></span></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'; |
'<div class="LC_floatleft"><span class="LC_nobreak">'.&mt('Callback on logout').': '. |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="0"'. |
|
$checked{'callback'}{'N'}.$onclickcallback.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_callback_'.$num.'" value="1"'. |
|
$checked{'callback'}{'Y'}.$onclickcallback.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:'.$callbacksty.';" id="lti_callbackfield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Parameter').': '. |
|
'<input type="text" name="lti_callbackparam_'.$num.'" value="'.$callback.'" /></span>'. |
|
'</div><div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'. |
|
'<fieldset class="ltioption_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Course defaults (Course Coordinator can override)').'</legend>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'topmenu'}.': '. |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="0"'. |
|
$checked{'topmenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_topmenu_'.$num.'" value="1"'. |
|
$checked{'topmenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{'inlinemenu'}.': '. |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="0"'. |
|
$checked{'inlinemenu'}{'N'}.$onclickmenu.' />'.&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_inlinemenu_'.$num.'" value="1"'. |
|
$checked{'inlinemenu'}{'Y'}.$onclickmenu.' />'.&mt('Yes').'</label></span></div>'; |
|
$output .='<div style="padding:0;clear:both;margin:0;border:0"></div>'. |
|
'<div class="LC_floatleft" style="display:'.$menusty.';" id="lti_menufield_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Menu items').': '; |
|
foreach my $type ('fullname','coursetitle','role','logout','grades') { |
|
$output .= '<label><input type="checkbox" name="lti_menuitem_'.$num.'" value="'.$type.'"'. |
|
$checked{'menuitem'}{$type}.' />'.$menutitles{$type}.'</label>'. |
|
(' 'x2); |
|
} |
|
$output .= '</span></div></fieldset>'; |
$output .= '</span></div></fieldset>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# |
# |
Line 5391 sub print_coursedefaults {
|
Line 6570 sub print_coursedefaults {
|
my $currcanclone = 'none'; |
my $currcanclone = 'none'; |
my $onclick; |
my $onclick; |
my @cloneoptions = ('none','domain'); |
my @cloneoptions = ('none','domain'); |
my %clonetitles = ( |
my %clonetitles = &Apache::lonlocal::texthash ( |
none => 'No additional course requesters', |
none => 'No additional course requesters', |
domain => "Any course requester in course's domain", |
domain => "Any course requester in course's domain", |
instcode => 'Course requests for official courses ...', |
instcode => 'Course requests for official courses ...', |
Line 6408 sub print_passwords {
|
Line 7587 sub print_passwords {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub print_wafproxy { |
|
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my $css_class; |
|
my $itemcount = 0; |
|
my $datatable; |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my (%othercontrol,%otherdoms,%aliases,%saml,%values,$setdom,$showdom); |
|
my %lt = &wafproxy_titles(); |
|
foreach my $server (sort(keys(%servers))) { |
|
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
|
next if ($serverhome eq ''); |
|
my $serverdom; |
|
if ($serverhome ne $server) { |
|
$serverdom = &Apache::lonnet::host_domain($serverhome); |
|
if (($serverdom ne '') && (&Apache::lonnet::domain($serverdom) ne '')) { |
|
$othercontrol{$server} = $serverdom; |
|
} |
|
} else { |
|
$serverdom = &Apache::lonnet::host_domain($server); |
|
next if (($serverdom eq '') || (&Apache::lonnet::domain($serverdom) eq '')); |
|
if ($serverdom ne $dom) { |
|
$othercontrol{$server} = $serverdom; |
|
} else { |
|
$setdom = 1; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'alias'}) eq 'HASH') { |
|
$aliases{$dom} = $settings->{'alias'}; |
|
if ($aliases{$dom} ne '') { |
|
$showdom = 1; |
|
} |
|
} |
|
if (ref($settings->{'saml'}) eq 'HASH') { |
|
$saml{$dom} = $settings->{'saml'}; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if ($setdom) { |
|
%{$values{$dom}} = (); |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
|
$values{$dom}{$item} = $settings->{$item}; |
|
} |
|
} |
|
} |
|
if (keys(%othercontrol)) { |
|
%otherdoms = reverse(%othercontrol); |
|
foreach my $domain (keys(%otherdoms)) { |
|
%{$values{$domain}} = (); |
|
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
|
if (ref($config{'wafproxy'}) eq 'HASH') { |
|
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
|
if (exists($config{'wafproxy'}{'saml'})) { |
|
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
|
} |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
|
$values{$domain}{$item} = $config{'wafproxy'}{$item}; |
|
} |
|
} |
|
} |
|
} |
|
if ($position eq 'top') { |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my %aliasinfo; |
|
foreach my $server (sort(keys(%servers))) { |
|
$itemcount ++; |
|
my $dom_in_effect; |
|
my $aliasrows = '<tr>'. |
|
'<td class="LC_left_item" style="vertical-align: baseline;">'. |
|
&mt('Hostname').': '. |
|
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
|
if ($othercontrol{$server}) { |
|
$dom_in_effect = $othercontrol{$server}; |
|
my ($current,$forsaml); |
|
if (ref($aliases{$dom_in_effect}) eq 'HASH') { |
|
$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;">'. |
|
&mt('Alias').': '; |
|
if ($current) { |
|
$aliasrows .= $current; |
|
if ($forsaml) { |
|
$aliasrows .= ' ('.&mt('also for Shibboleth').')'; |
|
} |
|
} else { |
|
$aliasrows .= &mt('None'); |
|
} |
|
$aliasrows .= ' <span class="LC_small">('. |
|
&mt('controlled by domain: [_1]', |
|
'<b>'.$dom_in_effect.'</b>').')</span></td>'; |
|
} else { |
|
$dom_in_effect = $dom; |
|
my ($current,$samlon,$samloff); |
|
$samloff = ' checked="checked"'; |
|
if (ref($aliases{$dom}) eq 'HASH') { |
|
if ($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;">'. |
|
&mt('Alias').': '. |
|
'<input type="text" name="wafproxy_alias_'.$server.'" '. |
|
'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>'; |
|
$aliasinfo{$dom_in_effect} .= $aliasrows; |
|
} |
|
if ($aliasinfo{$dom}) { |
|
my ($onclick,$wafon,$wafoff,$showtable); |
|
$onclick = ' onclick="javascript:toggleWAF();"'; |
|
$wafoff = ' checked="checked"'; |
|
$showtable = ' style="display:none";'; |
|
if ($showdom) { |
|
$wafon = $wafoff; |
|
$wafoff = ''; |
|
$showtable = ' style="display:inline;"'; |
|
} |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable = '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br />'. |
|
'<span class="LC_nobreak">'.&mt('WAF in use?').' <label>'. |
|
'<input type="radio" name="wafproxy_'.$dom.'" value="1"'.$wafon.$onclick.' />'. |
|
&mt('Yes').'</label>'.(' 'x2).'<label>'. |
|
'<input type="radio" name="wafproxy_'.$dom.'" value="0"'.$wafoff.$onclick.' />'. |
|
&mt('No').'</label></span></td>'. |
|
'<td class="LC_left_item">'. |
|
'<table id="wafproxy_table"'.$showtable.'>'.$aliasinfo{$dom}. |
|
'</table></td></tr>'; |
|
$itemcount++; |
|
} |
|
if (keys(%otherdoms)) { |
|
foreach my $key (sort(keys(%otherdoms))) { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$key.'</b>').'</td>'. |
|
'<td class="LC_left_item"><table>'.$aliasinfo{$key}. |
|
'</table></td></tr>'; |
|
$itemcount++; |
|
} |
|
} |
|
} else { |
|
my %ip_methods = &remoteip_methods(); |
|
if ($setdom) { |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
my ($nowafstyle,$wafstyle,$curr_remotip,$currwafdisplay,$vpndircheck,$vpnaliascheck, |
|
$currwafvpn,$wafrangestyle,$alltossl,$ssltossl); |
|
$wafstyle = ' style="display:none;"'; |
|
$nowafstyle = ' style="display:table-row;"'; |
|
$currwafdisplay = ' style="display: none"'; |
|
$wafrangestyle = ' style="display: none"'; |
|
$curr_remotip = 'n'; |
|
$ssltossl = ' checked="checked"'; |
|
if ($showdom) { |
|
$wafstyle = ' style="display:table-row;"'; |
|
$nowafstyle = ' style="display:none;"'; |
|
if (keys(%{$values{$dom}})) { |
|
if ($values{$dom}{remoteip} =~ /^[nmh]$/) { |
|
$curr_remotip = $values{$dom}{remoteip}; |
|
} |
|
if ($curr_remotip eq 'h') { |
|
$currwafdisplay = ' style="display:table-row"'; |
|
$wafrangestyle = ' style="display:inline-block;"'; |
|
} |
|
if ($values{$dom}{'sslopt'}) { |
|
$alltossl = ' checked="checked"'; |
|
$ssltossl = ''; |
|
} |
|
} |
|
if (($values{$dom}{'vpnint'} ne '') || ($values{$dom}{'vpnext'} ne '')) { |
|
$vpndircheck = ' checked="checked"'; |
|
$currwafvpn = ' style="display:table-row;"'; |
|
$wafrangestyle = ' style="display:inline-block;"'; |
|
} else { |
|
$vpnaliascheck = ' checked="checked"'; |
|
$currwafvpn = ' style="display:none;"'; |
|
} |
|
} |
|
$datatable .= '<tr'.$css_class.' id="nowafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'</td>'. |
|
'<td class="LC_right_item">'.&mt('WAF not in use, nothing to set').'</td>'. |
|
'</tr>'. |
|
'<tr'.$css_class.' id="wafproxyrow_'.$dom.'"'.$wafstyle.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$dom.'</b>').'<br /><br />'. |
|
'<div id="wafproxyranges_'.$dom.'">'.&mt('Format for comma separated IP ranges').':<br />'. |
|
&mt('A.B.C.D/N or A.B.C.D-E.F.G.H').'<br />'. |
|
&mt('Range(s) stored in CIDR notation').'</div></td>'. |
|
'<td class="LC_left_item"><table>'. |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'remoteip'}.': '. |
|
'<select name="wafproxy_remoteip" id="wafproxy_remoteip" onchange="javascript:updateWAF();">'; |
|
foreach my $option ('m','h','n') { |
|
my $sel; |
|
if ($option eq $curr_remotip) { |
|
$sel = ' selected="selected"'; |
|
} |
|
$datatable .= '<option value="'.$option.'"'.$sel.'>'. |
|
$ip_methods{$option}.'</option>'; |
|
} |
|
$datatable .= '</select></td></tr>'."\n". |
|
'<tr id="wafproxy_header"'.$currwafdisplay.'><td>'. |
|
$lt{'ipheader'}.': '. |
|
'<input type="text" value="'.$values{$dom}{'ipheader'}.'" '. |
|
'name="wafproxy_ipheader" />'. |
|
'</td></tr>'."\n". |
|
'<tr id="wafproxy_trust"'.$currwafdisplay.'><td>'. |
|
$lt{'trusted'}.':<br />'. |
|
'<textarea name="wafproxy_trusted" rows="3" cols="80">'. |
|
$values{$dom}{'trusted'}.'</textarea>'. |
|
'</td></tr>'."\n". |
|
'<tr><td><hr /></td></tr>'."\n". |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'vpnaccess'}.':<br /><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="wafproxy_vpnaccess"'.$vpndircheck.' value="1" onclick="javascript:checkWAF();" />'. |
|
$lt{'vpndirect'}.'</label>'.(' 'x2). |
|
'<label><input type="radio" name="wafproxy_vpnaccess"'.$vpnaliascheck.' value="0" onclick="javascript:checkWAF();" />'. |
|
$lt{'vpnaliased'}.'</label></span></td></tr>'; |
|
foreach my $item ('vpnint','vpnext') { |
|
$datatable .= '<tr id="wafproxy_show_'.$item.'"'.$currwafvpn.'>'. |
|
'<td valign="top">'.$lt{$item}.':<br />'. |
|
'<textarea name="wafproxy_'.$item.'" rows="3" cols="80">'. |
|
$values{$dom}{$item}.'</textarea>'. |
|
'</td></tr>'."\n"; |
|
} |
|
$datatable .= '<tr><td><hr /></td></tr>'."\n". |
|
'<tr>'. |
|
'<td valign="top">'.$lt{'sslopt'}.':<br /><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="wafproxy_sslopt"'.$alltossl.' value="1" />'. |
|
$lt{'alltossl'}.'</label>'.(' 'x2). |
|
'<label><input type="radio" name="wafproxy_sslopt"'.$ssltossl.' value="0" />'. |
|
$lt{'ssltossl'}.'</label></span></td></tr>'."\n". |
|
'</table></td></tr>'; |
|
} |
|
if (keys(%otherdoms)) { |
|
foreach my $domain (sort(keys(%otherdoms))) { |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Domain: [_1]','<b>'.$domain.'</b>').'</td>'. |
|
'<td class="LC_left_item"><table>'; |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
my $showval = &mt('None'); |
|
if ($item eq 'ssl') { |
|
$showval = $lt{'ssltossl'}; |
|
} |
|
if ($values{$domain}{$item}) { |
|
$showval = $values{$domain}{$item}; |
|
if ($item eq 'ssl') { |
|
$showval = $lt{'alltossl'}; |
|
} elsif ($item eq 'remoteip') { |
|
$showval = $ip_methods{$values{$domain}{$item}}; |
|
} |
|
} |
|
$datatable .= '<tr>'. |
|
'<td>'.$lt{$item}.': '.$showval.'</td></tr>'; |
|
} |
|
$datatable .= '</table></td></tr>'; |
|
} |
|
} |
|
} |
|
$$rowtotal += $itemcount; |
|
return $datatable; |
|
} |
|
|
|
sub wafproxy_titles { |
|
return &Apache::lonlocal::texthash( |
|
remoteip => "Method for determining user's IP", |
|
ipheader => 'Request header containing remote IP', |
|
trusted => 'Trusted IP range(s)', |
|
vpnaccess => 'Access from institutional VPN', |
|
vpndirect => 'via regular hostname (no WAF)', |
|
vpnaliased => 'via aliased hostname (WAF)', |
|
vpnint => 'Internal IP Range(s) for VPN sessions', |
|
vpnext => 'IP Range(s) for backend WAF connections', |
|
sslopt => 'Forwarding http/https', |
|
alltossl => 'WAF forwards both http and https requests to https', |
|
ssltossl => 'WAF forwards http requests to http and https to https', |
|
); |
|
} |
|
|
|
sub remoteip_methods { |
|
return &Apache::lonlocal::texthash( |
|
m => 'Use Apache mod_remoteip', |
|
h => 'Use headers parsed by LON-CAPA', |
|
n => 'Not in use', |
|
); |
|
} |
|
|
sub print_usersessions { |
sub print_usersessions { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,$itemcount,%checked,%choices); |
my ($css_class,$datatable,$itemcount,%checked,%choices); |
Line 6421 sub print_usersessions {
|
Line 7907 sub print_usersessions {
|
if ($position eq 'top') { |
if ($position eq 'top') { |
if (keys(%serverhomes) > 1) { |
if (keys(%serverhomes) > 1) { |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my $curroffloadnow; |
my ($curroffloadnow,$curroffloadoth); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'offloadnow'}) eq 'HASH') { |
if (ref($settings->{'offloadnow'}) eq 'HASH') { |
$curroffloadnow = $settings->{'offloadnow'}; |
$curroffloadnow = $settings->{'offloadnow'}; |
} |
} |
|
if (ref($settings->{'offloadoth'}) eq 'HASH') { |
|
$curroffloadoth = $settings->{'offloadoth'}; |
|
} |
} |
} |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
my $other_insts = scalar(keys(%by_location)); |
|
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids, |
|
$other_insts,$curroffloadnow,$curroffloadoth,$rowtotal); |
} else { |
} else { |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'). |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'). |
Line 6871 sub current_offloads_to {
|
Line 8362 sub current_offloads_to {
|
} |
} |
|
|
sub spares_row { |
sub spares_row { |
my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_; |
my ($dom,$servers,$spareid,$serverhomes,$altids,$other_insts, |
|
$curroffloadnow,$curroffloadoth,$rowtotal) = @_; |
my $css_class; |
my $css_class; |
my $numinrow = 4; |
my $numinrow = 4; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 6891 sub spares_row {
|
Line 8383 sub spares_row {
|
} |
} |
} |
} |
next unless (ref($spareid->{$server}) eq 'HASH'); |
next unless (ref($spareid->{$server}) eq 'HASH'); |
my $checkednow; |
my ($checkednow,$checkedoth); |
if (ref($curroffloadnow) eq 'HASH') { |
if (ref($curroffloadnow) eq 'HASH') { |
if ($curroffloadnow->{$server}) { |
if ($curroffloadnow->{$server}) { |
$checkednow = ' checked="checked"'; |
$checkednow = ' checked="checked"'; |
} |
} |
} |
} |
|
if (ref($curroffloadoth) eq 'HASH') { |
|
if ($curroffloadoth->{$server}) { |
|
$checkedoth = ' checked="checked"'; |
|
} |
|
} |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '<tr'.$css_class.'> |
$datatable .= '<tr'.$css_class.'> |
<td rowspan="2"> |
<td rowspan="2"> |
Line 6905 sub spares_row {
|
Line 8402 sub spares_row {
|
,'<b>'.$server.'</b>').'</span><br />'. |
,'<b>'.$server.'</b>').'</span><br />'. |
'<span class="LC_nobreak">'."\n". |
'<span class="LC_nobreak">'."\n". |
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
' '.&mt('Switch active users on next access').'</label></span>'. |
' '.&mt('Switch any active user on next access').'</label></span>'. |
"\n"; |
"\n"; |
|
if ($other_insts) { |
|
$datatable .= '<br />'. |
|
'<span class="LC_nobreak">'."\n". |
|
'<label><input type="checkbox" name="offloadoth" value="'.$server.'"'.$checkedoth.' />'. |
|
' '.&mt('Switch other institutions on next access').'</label></span>'. |
|
"\n"; |
|
} |
my (%current,%canselect); |
my (%current,%canselect); |
my @choices = |
my @choices = |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids); |
Line 7425 sub contact_titles {
|
Line 8929 sub contact_titles {
|
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID', |
'hostipmail' => 'E-mail from nightly check of hostname/IP network changes', |
'hostipmail' => 'E-mail from nightly check of hostname/IP network changes', |
'errorthreshold' => 'Error/warning threshold for status e-mail', |
'errorthreshold' => 'Error count threshold for status e-mail to admin(s)', |
'errorsysmail' => 'Error threshold for e-mail to core group', |
'errorsysmail' => 'Error count threshold for e-mail to developer group', |
'errorweights' => 'Weights used to compute error count', |
'errorweights' => 'Weights used to compute error count', |
'errorexcluded' => 'Servers with unsent updates excluded from count', |
'errorexcluded' => 'Servers with unsent updates excluded from count', |
); |
); |
Line 8476 sub print_defaults {
|
Line 9980 sub print_defaults {
|
$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '. |
$datatable .= '</select> '.&mt('Internal ID:').' <b>'.$item.'</b> '. |
'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'. |
'<input type="checkbox" name="inststatus_delete" value="'.$item.'" />'. |
&mt('delete').'</span></td>'. |
&mt('delete').'</span></td>'. |
'<td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.&mt('Name displayed:'). |
'<td class="LC_left_item" colspan="2"><span class="LC_nobreak">'.&mt('Name displayed').':'. |
'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'. |
'<input type="text" size="20" name="inststatus_title_'.$item.'" value="'.$title.'" />'. |
'</span></td></tr>'; |
'</span></td></tr>'; |
} |
} |
Line 8496 sub print_defaults {
|
Line 10000 sub print_defaults {
|
'<input type="text" size="10" name="addinststatus" value="" />'. |
'<input type="text" size="10" name="addinststatus" value="" />'. |
' '.&mt('(new)'). |
' '.&mt('(new)'). |
'</span></td><td class="LC_left_item" colspan="2"><span class="LC_nobreak">'. |
'</span></td><td class="LC_left_item" colspan="2"><span class="LC_nobreak">'. |
&mt('Name displayed:'). |
&mt('Name displayed').':'. |
'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'. |
'<input type="text" size="20" name="addinststatus_title" value="" /></span></td>'. |
'</tr>'."\n"; |
'</tr>'."\n"; |
$rownum ++; |
$rownum ++; |
Line 9378 function warnIntPass(field) {
|
Line 10882 function warnIntPass(field) {
|
alert('$intalert{passnum}'); |
alert('$intalert{passnum}'); |
} |
} |
} |
} |
|
field.value = ''; |
} |
} |
field.value = ''; |
|
} |
} |
} |
} |
} |
} |
Line 9505 ENDSCRIPT
|
Line 11009 ENDSCRIPT
|
sub initialize_categories { |
sub initialize_categories { |
my ($itemcount) = @_; |
my ($itemcount) = @_; |
my ($datatable,$css_class,$chgstr); |
my ($datatable,$css_class,$chgstr); |
my %default_names = ( |
my %default_names = &Apache::lonlocal::texthash ( |
instcode => 'Official courses (with institutional codes)', |
instcode => 'Official courses (with institutional codes)', |
communities => 'Communities', |
communities => 'Communities', |
placement => 'Placement Tests', |
placement => 'Placement Tests', |
Line 10004 sub usertype_update_row {
|
Line 11508 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 10017 sub modify_login {
|
Line 11523 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 10263 sub modify_login {
|
Line 11783 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 10303 sub modify_login {
|
Line 11906 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 10382 sub modify_login {
|
Line 12010 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 12350 sub modify_ltitools {
|
Line 14010 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 12410 sub modify_ltitools {
|
Line 14070 sub modify_ltitools {
|
} |
} |
} |
} |
if (!$numconfig) { |
if (!$numconfig) { |
$resulttext .= &mt('None'); |
$resulttext .= ' '.&mt('None'); |
} |
} |
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
foreach my $item ('passback','roster') { |
foreach my $item ('passback','roster') { |
Line 12589 sub get_ltitools_id {
|
Line 14249 sub get_ltitools_id {
|
return ($id,$error); |
return ($id,$error); |
} |
} |
|
|
|
sub modify_proctoring { |
|
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my (@allpos,%changes,%confhash,%encconfhash,$errors,$resulttext,%imgdeletions); |
|
my $confname = $dom.'-domainconfig'; |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
|
my %providernames = &proctoring_providernames(); |
|
my $maxnum = scalar(keys(%providernames)); |
|
|
|
my (%requserfields,%optuserfields,%defaults,%extended,%crsconf,@courseroles,@ltiroles); |
|
my ($requref,$opturef,$defref,$extref,$crsref,$rolesref,$ltiref) = &proctoring_data(); |
|
if (ref($requref) eq 'HASH') { |
|
%requserfields = %{$requref}; |
|
} |
|
if (ref($opturef) eq 'HASH') { |
|
%optuserfields = %{$opturef}; |
|
} |
|
if (ref($defref) eq 'HASH') { |
|
%defaults = %{$defref}; |
|
} |
|
if (ref($extref) eq 'HASH') { |
|
%extended = %{$extref}; |
|
} |
|
if (ref($crsref) eq 'HASH') { |
|
%crsconf = %{$crsref}; |
|
} |
|
if (ref($rolesref) eq 'ARRAY') { |
|
@courseroles = @{$rolesref}; |
|
} |
|
if (ref($ltiref) eq 'ARRAY') { |
|
@ltiroles = @{$ltiref}; |
|
} |
|
|
|
if (ref($domconfig{$action}) eq 'HASH') { |
|
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.proctoring_image_del'); |
|
if (@todeleteimages) { |
|
map { $imgdeletions{$_} = 1; } @todeleteimages; |
|
} |
|
} |
|
my %customadds; |
|
my @newcustom = &Apache::loncommon::get_env_multiple('form.proctoring_customadd'); |
|
if (@newcustom) { |
|
map { $customadds{$_} = 1; } @newcustom; |
|
} |
|
foreach my $provider (sort(keys(%providernames))) { |
|
$confhash{$provider} = {}; |
|
my $pos = $env{'form.proctoring_pos_'.$provider}; |
|
$pos =~ s/\D+//g; |
|
$allpos[$pos] = $provider; |
|
my (%current,%currentenc); |
|
my $showroles = 0; |
|
if (ref($domconfig{$action}) eq 'HASH') { |
|
if (ref($domconfig{$action}{$provider}) eq 'HASH') { |
|
%current = %{$domconfig{$action}{$provider}}; |
|
foreach my $item ('key','secret') { |
|
$currentenc{$item} = $current{$item}; |
|
delete($current{$item}); |
|
} |
|
} |
|
} |
|
if ($env{'form.proctoring_available_'.$provider}) { |
|
$confhash{$provider}{'available'} = 1; |
|
unless ($current{'available'}) { |
|
$changes{$provider} = 1; |
|
} |
|
} else { |
|
%{$confhash{$provider}} = %current; |
|
%{$encconfhash{$provider}} = %currentenc; |
|
$confhash{$provider}{'available'} = 0; |
|
if ($current{'available'}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
if ($confhash{$provider}{'available'}) { |
|
foreach my $field ('lifetime','version','sigmethod','url','key','secret') { |
|
my $possval = $env{'form.proctoring_'.$provider.'_'.$field}; |
|
if ($field eq 'lifetime') { |
|
if ($possval =~ /^\d+$/) { |
|
$confhash{$provider}{$field} = $possval; |
|
} |
|
} elsif ($field eq 'version') { |
|
if ($possval =~ /^\d+\.\d+$/) { |
|
$confhash{$provider}{$field} = $possval; |
|
} |
|
} elsif ($field eq 'sigmethod') { |
|
if ($possval =~ /^\QHMAC-SHA\E(1|256)$/) { |
|
$confhash{$provider}{$field} = $possval; |
|
} |
|
} elsif ($field eq 'url') { |
|
$confhash{$provider}{$field} = $possval; |
|
} elsif (($field eq 'key') || ($field eq 'secret')) { |
|
$encconfhash{$provider}{$field} = $possval; |
|
unless ($currentenc{$field} eq $possval) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
unless (($field eq 'key') || ($field eq 'secret')) { |
|
unless ($current{$field} eq $confhash{$provider}{$field}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
if ($imgdeletions{$provider}) { |
|
$changes{$provider} = 1; |
|
} elsif ($env{'form.proctoring_image_'.$provider.'.filename'} ne '') { |
|
my ($imageurl,$error) = |
|
&process_proctoring_image($r,$dom,$confname,'proctoring_image_'.$provider,$provider, |
|
$configuserok,$switchserver,$author_ok); |
|
if ($imageurl) { |
|
$confhash{$provider}{'image'} = $imageurl; |
|
$changes{$provider} = 1; |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} elsif (exists($current{'image'})) { |
|
$confhash{$provider}{'image'} = $current{'image'}; |
|
} |
|
if (ref($requserfields{$provider}) eq 'ARRAY') { |
|
if (@{$requserfields{$provider}} > 0) { |
|
if (grep(/^user$/,@{$requserfields{$provider}})) { |
|
if ($env{'form.proctoring_userincdom_'.$provider}) { |
|
$confhash{$provider}{'incdom'} = 1; |
|
} |
|
unless ($current{'incdom'} eq $confhash{$provider}{'incdom'}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
if (grep(/^roles$/,@{$requserfields{$provider}})) { |
|
$showroles = 1; |
|
} |
|
} |
|
} |
|
$confhash{$provider}{'fields'} = []; |
|
if (ref($optuserfields{$provider}) eq 'ARRAY') { |
|
if (@{$optuserfields{$provider}} > 0) { |
|
my @optfields = &Apache::loncommon::get_env_multiple('form.proctoring_optional_'.$provider); |
|
foreach my $field (@{$optuserfields{$provider}}) { |
|
if (grep(/^\Q$field\E$/,@optfields)) { |
|
push(@{$confhash{$provider}{'fields'}},$field); |
|
} |
|
} |
|
} |
|
if (ref($current{'fields'}) eq 'ARRAY') { |
|
unless ($changes{$provider}) { |
|
my @new = sort(@{$confhash{$provider}{'fields'}}); |
|
my @old = sort(@{$current{'fields'}}); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old); |
|
if (@diffs) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} elsif (@{$confhash{$provider}{'fields'}}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
if (ref($defaults{$provider}) eq 'ARRAY') { |
|
if (@{$defaults{$provider}} > 0) { |
|
my %options; |
|
if (ref($extended{$provider}) eq 'HASH') { |
|
%options = %{$extended{$provider}}; |
|
} |
|
my @checked = &Apache::loncommon::get_env_multiple('form.proctoring_defaults_'.$provider); |
|
foreach my $field (@{$defaults{$provider}}) { |
|
if ((exists($options{$field})) && (ref($options{$field}) eq 'ARRAY')) { |
|
my $poss = $env{'form.proctoring_defaults_'.$field.'_'.$provider}; |
|
if (grep(/^\Q$poss\E$/,@{$options{$field}})) { |
|
push(@{$confhash{$provider}{'defaults'}},$poss); |
|
} |
|
} elsif ((exists($options{$field})) && (ref($options{$field}) eq 'HASH')) { |
|
foreach my $inner (keys(%{$options{$field}})) { |
|
if (ref($options{$field}{$inner}) eq 'ARRAY') { |
|
my $poss = $env{'form.proctoring_'.$inner.'_'.$provider}; |
|
if (grep(/^\Q$poss\E$/,@{$options{$field}{$inner}})) { |
|
$confhash{$provider}{'defaults'}{$inner} = $poss; |
|
} |
|
} else { |
|
$confhash{$provider}{'defaults'}{$inner} = $env{'form.proctoring_'.$inner.'_'.$provider}; |
|
} |
|
} |
|
} else { |
|
if (grep(/^\Q$field\E$/,@checked)) { |
|
push(@{$confhash{$provider}{'defaults'}},$field); |
|
} |
|
} |
|
} |
|
if (ref($confhash{$provider}{'defaults'}) eq 'ARRAY') { |
|
if (ref($current{'defaults'}) eq 'ARRAY') { |
|
unless ($changes{$provider}) { |
|
my @new = sort(@{$confhash{$provider}{'defaults'}}); |
|
my @old = sort(@{$current{'defaults'}}); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old); |
|
if (@diffs) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} elsif (ref($current{'defaults'}) eq 'ARRAY') { |
|
if (@{$current{'defaults'}}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} elsif (ref($confhash{$provider}{'defaults'}) eq 'HASH') { |
|
if (ref($current{'defaults'}) eq 'HASH') { |
|
unless ($changes{$provider}) { |
|
foreach my $key (keys(%{$confhash{$provider}{'defaults'}})) { |
|
unless ($confhash{$provider}{'defaults'}{$key} eq $current{'defaults'}{$key}) { |
|
$changes{$provider} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
unless ($changes{$provider}) { |
|
foreach my $key (keys(%{$current{'defaults'}})) { |
|
unless ($current{'defaults'}{$key} eq $confhash{$provider}{'defaults'}{$key}) { |
|
$changes{$provider} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (keys(%{$confhash{$provider}{'defaults'}})) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if (ref($crsconf{$provider}) eq 'ARRAY') { |
|
if (@{$crsconf{$provider}} > 0) { |
|
$confhash{$provider}{'crsconf'} = []; |
|
my @checked = &Apache::loncommon::get_env_multiple('form.proctoring_crsconf_'.$provider); |
|
foreach my $crsfield (@{$crsconf{$provider}}) { |
|
if (grep(/^\Q$crsfield\E$/,@checked)) { |
|
push(@{$confhash{$provider}{'crsconf'}},$crsfield); |
|
} |
|
} |
|
if (ref($current{'crsconf'}) eq 'ARRAY') { |
|
unless ($changes{$provider}) { |
|
my @new = sort(@{$confhash{$provider}{'crsconf'}}); |
|
my @old = sort(@{$current{'crsconf'}}); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@new,\@old); |
|
if (@diffs) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} elsif (@{$confhash{$provider}{'crsconf'}}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
if ($showroles) { |
|
$confhash{$provider}{'roles'} = {}; |
|
foreach my $role (@courseroles) { |
|
my $poss = $env{'form.proctoring_roles_'.$role.'_'.$provider}; |
|
if (grep(/^\Q$poss\E$/,@ltiroles)) { |
|
$confhash{$provider}{'roles'}{$role} = $poss; |
|
} |
|
} |
|
unless ($changes{$provider}) { |
|
if (ref($current{'roles'}) eq 'HASH') { |
|
foreach my $role (keys(%{$current{'roles'}})) { |
|
unless ($current{'roles'}{$role} eq $confhash{$provider}{'roles'}{$role}) { |
|
$changes{$provider} = 1; |
|
last |
|
} |
|
} |
|
unless ($changes{$provider}) { |
|
foreach my $role (keys(%{$confhash{$provider}{'roles'}})) { |
|
unless ($confhash{$provider}{'roles'}{$role} eq $current{'roles'}{$role}) { |
|
$changes{$provider} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (keys(%{$confhash{$provider}{'roles'}})) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
if (ref($current{'custom'}) eq 'HASH') { |
|
my @customdels = &Apache::loncommon::get_env_multiple('form.proctoring_customdel_'.$provider); |
|
foreach my $key (keys(%{$current{'custom'}})) { |
|
if (grep(/^\Q$key\E$/,@customdels)) { |
|
$changes{$provider} = 1; |
|
} else { |
|
$confhash{$provider}{'custom'}{$key} = $env{'form.proctoring_customval_'.$key.'_'.$provider}; |
|
if ($confhash{$provider}{'custom'}{$key} ne $current{'custom'}{$key}) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if ($customadds{$provider}) { |
|
my $name = $env{'form.proctoring_custom_name_'.$provider}; |
|
$name =~ s/(`)/'/g; |
|
$name =~ s/^\s+//; |
|
$name =~ s/\s+$//; |
|
my $value = $env{'form.proctoring_custom_value_'.$provider}; |
|
$value =~ s/(`)/'/g; |
|
$value =~ s/^\s+//; |
|
$value =~ s/\s+$//; |
|
if ($name ne '') { |
|
$confhash{$provider}{'custom'}{$name} = $value; |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if (@allpos > 0) { |
|
my $idx = 0; |
|
foreach my $provider (@allpos) { |
|
if ($provider ne '') { |
|
$confhash{$provider}{'order'} = $idx; |
|
unless ($changes{$provider}) { |
|
if (ref($domconfig{$action}) eq 'HASH') { |
|
if (ref($domconfig{$action}{$provider}) eq 'HASH') { |
|
if ($domconfig{$action}{$provider}{'order'} ne $idx) { |
|
$changes{$provider} = 1; |
|
} |
|
} |
|
} |
|
} |
|
$idx ++; |
|
} |
|
} |
|
} |
|
my %proc_hash = ( |
|
$action => { %confhash } |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%proc_hash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my %proc_enchash = ( |
|
$action => { %encconfhash } |
|
); |
|
&Apache::lonnet::put_dom('encconfig',\%proc_enchash,$dom,undef,1); |
|
if (keys(%changes) > 0) { |
|
my $cachetime = 24*60*60; |
|
my %procall = %confhash; |
|
foreach my $provider (keys(%procall)) { |
|
if (ref($encconfhash{$provider}) eq 'HASH') { |
|
foreach my $key ('key','secret') { |
|
$procall{$provider}{$key} = $encconfhash{$provider}{$key}; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::do_cache_new('proctoring',$dom,\%procall,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'proctoring'} = 1; |
|
} |
|
$resulttext = &mt('Configuration for Provider(s) with changes:').'<ul>'; |
|
my %bynum; |
|
foreach my $provider (sort(keys(%changes))) { |
|
my $position = $confhash{$provider}{'order'}; |
|
$bynum{$position} = $provider; |
|
} |
|
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
|
my $provider = $bynum{$pos}; |
|
my %lt = &proctoring_titles($provider); |
|
my %fieldtitles = &proctoring_fieldtitles($provider); |
|
if (!$confhash{$provider}{'available'}) { |
|
$resulttext .= '<li>'.&mt('Proctoring integration unavailable for: [_1]','<b>'.$providernames{$provider}.'</b>').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Proctoring integration available for: [_1]','<b>'.$providernames{$provider}.'</b>'); |
|
if ($confhash{$provider}{'image'}) { |
|
$resulttext .= ' '. |
|
'<img src="'.$confhash{$provider}{'image'}.'"'. |
|
' alt="'.&mt('Proctoring icon').'" />'; |
|
} |
|
$resulttext .= '<ul>'; |
|
my $position = $pos + 1; |
|
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
|
foreach my $key ('version','sigmethod','url','lifetime') { |
|
if ($confhash{$provider}{$key} ne '') { |
|
$resulttext .= '<li>'.$lt{$key}.': '.$confhash{$provider}{$key}.'</li>'; |
|
} |
|
} |
|
if ($encconfhash{$provider}{'key'} ne '') { |
|
$resulttext .= '<li>'.$lt{'key'}.': '.$encconfhash{$provider}{'key'}.'</li>'; |
|
} |
|
if ($encconfhash{$provider}{'secret'} ne '') { |
|
$resulttext .= '<li>'.$lt{'secret'}.': '; |
|
my $num = length($encconfhash{$provider}{'secret'}); |
|
$resulttext .= ('*'x$num).'</li>'; |
|
} |
|
my (@fields,$showroles); |
|
if (ref($requserfields{$provider}) eq 'ARRAY') { |
|
push(@fields,@{$requserfields{$provider}}); |
|
} |
|
if (ref($confhash{$provider}{'fields'}) eq 'ARRAY') { |
|
push(@fields,@{$confhash{$provider}{'fields'}}); |
|
} elsif (ref($confhash{$provider}{'fields'}) eq 'HASH') { |
|
push(@fields,(keys(%{$confhash{$provider}{'fields'}}))); |
|
} |
|
if (@fields) { |
|
if (grep(/^roles$/,@fields)) { |
|
$showroles = 1; |
|
} |
|
$resulttext .= '<li>'.$lt{'udsl'}.': "'. |
|
join('", "', map { $lt{$_}; } @fields).'"</li>'; |
|
} |
|
if (ref($requserfields{$provider}) eq 'ARRAY') { |
|
if (grep(/^user$/,@{$requserfields{$provider}})) { |
|
if ($confhash{$provider}{'incdom'}) { |
|
$resulttext .= '<li>'.&mt('[_1] sent as [_2]',$lt{'user'},$lt{'uname:dom'}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] sent as [_2]',$lt{'user'},$lt{'username'}).'</li>'; |
|
} |
|
} |
|
} |
|
if (ref($confhash{$provider}{'defaults'}) eq 'ARRAY') { |
|
if (@{$confhash{$provider}{'defaults'}} > 0) { |
|
$resulttext .= '<li>'.$lt{'defa'}; |
|
foreach my $field (@{$confhash{$provider}{'defaults'}}) { |
|
$resulttext .= ' "'.$fieldtitles{$field}.'",'; |
|
} |
|
$resulttext =~ s/,$//; |
|
$resulttext .= '</li>'; |
|
} |
|
} elsif (ref($confhash{$provider}{'defaults'}) eq 'HASH') { |
|
if (keys(%{$confhash{$provider}{'defaults'}})) { |
|
$resulttext .= '<li>'.$lt{'defa'}.': <ul>'; |
|
foreach my $key (sort(keys(%{$confhash{$provider}{'defaults'}}))) { |
|
if ($confhash{$provider}{'defaults'}{$key} ne '') { |
|
$resulttext .= '<li>'.$fieldtitles{$key}.' = '.$confhash{$provider}{'defaults'}{$key}.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
if (ref($crsconf{$provider}) eq 'ARRAY') { |
|
if (@{$crsconf{$provider}} > 0) { |
|
$resulttext .= '<li>'.&mt('Configurable in course:'); |
|
my $numconfig = 0; |
|
if (ref($confhash{$provider}{'crsconf'}) eq 'ARRAY') { |
|
if (@{$confhash{$provider}{'crsconf'}} > 0) { |
|
foreach my $field (@{$confhash{$provider}{'crsconf'}}) { |
|
$numconfig ++; |
|
if ($provider eq 'examity') { |
|
$resulttext .= ' "'.$lt{'crs'.$field}.'",'; |
|
} else { |
|
$resulttext .= ' "'.$fieldtitles{$field}.'",'; |
|
} |
|
} |
|
$resulttext =~ s/,$//; |
|
} |
|
} |
|
if (!$numconfig) { |
|
$resulttext .= ' '.&mt('None'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
if ($showroles) { |
|
if (ref($confhash{$provider}{'roles'}) eq 'HASH') { |
|
my $rolemaps; |
|
foreach my $role (@courseroles) { |
|
if ($confhash{$provider}{'roles'}{$role}) { |
|
$rolemaps .= (' 'x2).&Apache::lonnet::plaintext($role,'Course').'='. |
|
$confhash{$provider}{'roles'}{$role}.','; |
|
} |
|
} |
|
if ($rolemaps) { |
|
$rolemaps =~ s/,$//; |
|
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
} |
|
} |
|
} |
|
if (ref($confhash{$provider}{'custom'}) eq 'HASH') { |
|
my $customlist; |
|
if (keys(%{$confhash{$provider}{'custom'}})) { |
|
foreach my $key (sort(keys(%{$confhash{$provider}{'custom'}}))) { |
|
$customlist .= $key.'='.$confhash{$provider}{'custom'}{$key}.', '; |
|
} |
|
$customlist =~ s/,$//; |
|
} |
|
if ($customlist) { |
|
$resulttext .= '<li>'.&mt('Custom items').': '.$customlist.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made.'); |
|
} |
|
} else { |
|
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
|
} |
|
if ($errors) { |
|
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
|
$errors.'</ul>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
|
sub process_proctoring_image { |
|
my ($r,$dom,$confname,$caller,$provider,$configuserok,$switchserver,$author_ok) = @_; |
|
my $filename = $env{'form.'.$caller.'.filename'}; |
|
my ($error,$url); |
|
my ($width,$height) = (21,21); |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt('Upload of Remote Proctoring Provider icon is not permitted to this server: [_1]', |
|
$switchserver); |
|
} elsif ($author_ok eq 'ok') { |
|
my ($result,$imageurl,$madethumb) = |
|
&publishlogo($r,'upload',$caller,$dom,$confname, |
|
"proctoring/$provider/icon",$width,$height); |
|
if ($result eq 'ok') { |
|
if ($madethumb) { |
|
my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$}); |
|
my $imagethumb = "$path/tn-".$imagefile; |
|
$url = $imagethumb; |
|
} else { |
|
$url = $imageurl; |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$author_ok); |
|
} |
|
} else { |
|
$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$configuserok); |
|
} |
|
return ($url,$error); |
|
} |
|
|
sub modify_lti { |
sub modify_lti { |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
Line 12597 sub modify_lti {
|
Line 14787 sub modify_lti {
|
my @courseroles = ('cc','in','ta','ep','st'); |
my @courseroles = ('cc','in','ta','ep','st'); |
my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator); |
my @ltiroles = qw(Learner Instructor ContentDeveloper TeachingAssistant Mentor Member Manager Administrator); |
my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner); |
my @lticourseroles = qw(Instructor TeachingAssistant Mentor Learner); |
my @coursetypes = ('official','unofficial','community','textbook','placement'); |
my @coursetypes = ('official','unofficial','community','textbook','placement','lti'); |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
official => 'Official', |
official => 'Official', |
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Community', |
community => 'Community', |
textbook => 'Textbook', |
textbook => 'Textbook', |
placement => 'Placement Test', |
placement => 'Placement Test', |
|
lti => 'LTI Provider', |
); |
); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %lt = <i_names(); |
my %lt = <i_names(); |
Line 12633 sub modify_lti {
|
Line 14824 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 12649 sub modify_lti {
|
Line 14840 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; |
} |
} |
foreach my $item ('consumer','key','secret','lifetime','requser') { |
foreach my $item ('consumer','key','secret','lifetime','requser','crsinc') { |
my $formitem = 'form.lti_'.$item.'_'.$idx; |
my $formitem = 'form.lti_'.$item.'_'.$idx; |
$env{$formitem} =~ s/(`)/'/g; |
$env{$formitem} =~ s/(`)/'/g; |
if ($item eq 'lifetime') { |
if ($item eq 'lifetime') { |
Line 12687 sub modify_lti {
|
Line 14878 sub modify_lti {
|
$mapuser =~ s/^\s+|\s+$//g; |
$mapuser =~ s/^\s+|\s+$//g; |
$confhash{$itemid}{'mapuser'} = $mapuser; |
$confhash{$itemid}{'mapuser'} = $mapuser; |
} |
} |
foreach my $ltirole (@lticourseroles) { |
|
my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx}; |
|
if (grep(/^\Q$possrole\E$/,@courseroles)) { |
|
$confhash{$itemid}{'maproles'}{$ltirole} = $possrole; |
|
} |
|
} |
|
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
my @makeuser; |
my @makeuser; |
foreach my $ltirole (sort(@possmakeuser)) { |
foreach my $ltirole (sort(@possmakeuser)) { |
Line 12725 sub modify_lti {
|
Line 14910 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') || |
|
($env{'form.lti_mapcrs_'.$idx} eq 'context_id')) { |
|
$confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx}; |
|
} elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') { |
|
my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; |
|
$mapcrs =~ s/(`)/'/g; |
|
$mapcrs =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'mapcrs'} = $mapcrs; |
|
} |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx); |
|
my @crstypes; |
|
foreach my $type (sort(@posstypes)) { |
|
if ($posscrstype{$type}) { |
|
push(@crstypes,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'mapcrstype'} = \@crstypes; |
|
if ($env{'form.lti_makecrs_'.$idx}) { |
|
$confhash{$itemid}{'makecrs'} = 1; |
|
} |
|
my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx); |
|
my @selfenroll; |
|
foreach my $type (sort(@possenroll)) { |
|
if ($posslticrs{$type}) { |
|
push(@selfenroll,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'selfenroll'} = \@selfenroll; |
|
if ($env{'form.lti_crssec_'.$idx}) { |
|
if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') { |
|
$confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx}; |
|
} elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') { |
|
my $section = $env{'form.lti_customsection_'.$idx}; |
|
$section =~ s/(`)/'/g; |
|
$section =~ s/^\s+|\s+$//g; |
|
if ($section ne '') { |
|
$confhash{$itemid}{'section'} = $section; |
|
} |
|
} |
|
} |
|
if ($env{'form.lti_callback_'.$idx}) { |
if ($env{'form.lti_callback_'.$idx}) { |
if ($env{'form.lti_callbackparam_'.$idx}) { |
if ($env{'form.lti_callbackparam_'.$idx}) { |
my $callback = $env{'form.lti_callbackparam_'.$idx}; |
my $callback = $env{'form.lti_callbackparam_'.$idx}; |
Line 12772 sub modify_lti {
|
Line 14917 sub modify_lti {
|
$confhash{$itemid}{'callback'} = $callback; |
$confhash{$itemid}{'callback'} = $callback; |
} |
} |
} |
} |
foreach my $field ('passback','roster','topmenu','inlinemenu') { |
foreach my $field ('topmenu','inlinemenu') { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
$confhash{$itemid}{$field} = 1; |
$confhash{$itemid}{$field} = 1; |
} |
} |
} |
} |
if ($env{'form.lti_passback_'.$idx}) { |
|
if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') { |
|
$confhash{$itemid}{'passbackformat'} = '1.0'; |
|
} else { |
|
$confhash{$itemid}{'passbackformat'} = '1.1'; |
|
} |
|
} |
|
if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) { |
if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) { |
$confhash{$itemid}{lcmenu} = []; |
$confhash{$itemid}{lcmenu} = []; |
my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx); |
my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx); |
Line 12796 sub modify_lti {
|
Line 14934 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
unless (($idx eq 'add') || ($changes{$itemid})) { |
if ($confhash{$itemid}{'crsinc'}) { |
foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
if (($env{'form.lti_mapcrs_'.$idx} eq 'course_offering_sourcedid') || |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
($env{'form.lti_mapcrs_'.$idx} eq 'context_id')) { |
$changes{$itemid} = 1; |
$confhash{$itemid}{'mapcrs'} = $env{'form.lti_mapcrs_'.$idx}; |
|
} elsif ($env{'form.lti_mapcrs_'.$idx} eq 'other') { |
|
my $mapcrs = $env{'form.lti_mapcrsfield_'.$idx}; |
|
$mapcrs =~ s/(`)/'/g; |
|
$mapcrs =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'mapcrs'} = $mapcrs; |
|
} |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.lti_mapcrstype_'.$idx); |
|
my @crstypes; |
|
foreach my $type (sort(@posstypes)) { |
|
if ($posscrstype{$type}) { |
|
push(@crstypes,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'mapcrstype'} = \@crstypes; |
|
if ($env{'form.lti_storecrs_'.$idx}) { |
|
$confhash{$itemid}{'storecrs'} = 1; |
|
} |
|
if ($env{'form.lti_makecrs_'.$idx}) { |
|
$confhash{$itemid}{'makecrs'} = 1; |
|
} |
|
foreach my $ltirole (@lticourseroles) { |
|
my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx}; |
|
if (grep(/^\Q$possrole\E$/,@courseroles)) { |
|
$confhash{$itemid}{'maproles'}{$ltirole} = $possrole; |
|
} |
|
} |
|
my @possenroll = &Apache::loncommon::get_env_multiple('form.lti_selfenroll_'.$idx); |
|
my @selfenroll; |
|
foreach my $type (sort(@possenroll)) { |
|
if ($posslticrs{$type}) { |
|
push(@selfenroll,$type); |
|
} |
|
} |
|
$confhash{$itemid}{'selfenroll'} = \@selfenroll; |
|
if ($env{'form.lti_crssec_'.$idx}) { |
|
if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') { |
|
$confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx}; |
|
} elsif ($env{'form.lti_crssecsrc_'.$idx} eq 'other') { |
|
my $section = $env{'form.lti_customsection_'.$idx}; |
|
$section =~ s/(`)/'/g; |
|
$section =~ s/^\s+|\s+$//g; |
|
if ($section ne '') { |
|
$confhash{$itemid}{'section'} = $section; |
|
} |
} |
} |
} |
} |
unless ($changes{$itemid}) { |
foreach my $field ('passback','roster') { |
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
$confhash{$itemid}{$field} = 1; |
|
} |
|
} |
|
if ($env{'form.lti_passback_'.$idx}) { |
|
if ($env{'form.lti_passbackformat_'.$idx} eq '1.0') { |
|
$confhash{$itemid}{'passbackformat'} = '1.0'; |
|
} else { |
|
$confhash{$itemid}{'passbackformat'} = '1.1'; |
|
} |
|
} |
|
} |
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if ($confhash{$itemid}{'crsinc'}) { |
|
foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') { |
|
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
} |
|
foreach my $field ('makeuser','mapcrstype','selfenroll','instdata','lcmenu') { |
|
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
|
$confhash{$itemid}{$field}); |
|
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
} |
} |
} |
foreach my $field ('mapcrstype','selfenroll') { |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
$confhash{$itemid}{$field}); |
$confhash{$itemid}{'maproles'}{$ltirole}) { |
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
|
} |
} |
} |
} |
unless ($changes{$itemid}) { |
} |
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
} |
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
unless ($changes{$itemid}) { |
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
|
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
|
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
|
$confhash{$itemid}{'maproles'}{$ltirole}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
last; |
} |
} |
} |
} |
|
unless ($changes{$itemid}) { |
|
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
|
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
|
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
|
$changes{$itemid} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
unless ($changes{$itemid}) { |
|
if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
} |
|
} |
|
} |
|
unless ($changes{$itemid}) { |
|
foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
|
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) { |
foreach my $field ('makeuser','lcmenu') { |
$changes{$itemid} = 1; |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
|
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
|
$confhash{$itemid}{$field}); |
|
if (@diffs) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} |
} |
} |
} |
Line 12886 sub modify_lti {
|
Line 15115 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 12912 sub modify_lti {
|
Line 15141 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 12929 sub modify_lti {
|
Line 15158 sub modify_lti {
|
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
if ($confhash{$itemid}{'requser'}) { |
if ($confhash{$itemid}{'requser'}) { |
|
if ($confhash{$itemid}{'callback'}) { |
|
$resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Callback to logout LON-CAPA on log out from Consumer').'</li>'; |
|
} |
if ($confhash{$itemid}{'mapuser'}) { |
if ($confhash{$itemid}{'mapuser'}) { |
my $shownmapuser; |
my $shownmapuser; |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
Line 12940 sub modify_lti {
|
Line 15174 sub modify_lti {
|
} |
} |
$resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>'; |
$resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>'; |
} |
} |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
my $rolemaps; |
|
foreach my $role (@ltiroles) { |
|
if ($confhash{$itemid}{'maproles'}{$role}) { |
|
$rolemaps .= (' 'x2).$role.'='. |
|
&Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role}, |
|
'Course').','; |
|
} |
|
} |
|
if ($rolemaps) { |
|
$rolemaps =~ s/,$//; |
|
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
} |
|
} |
|
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
Line 12986 sub modify_lti {
|
Line 15206 sub modify_lti {
|
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
} |
} |
} |
} |
if ($confhash{$itemid}{'mapcrs'}) { |
foreach my $item ('topmenu','inlinemenu') { |
$resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'mapcrstype'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]', |
|
join(', ',map { $coursetypetitles{$_}; } @coursetypes)). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'makecrs'}) { |
|
$resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'selfenroll'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]', |
|
join(', ',@{$confhash{$itemid}{'selfenroll'}})). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'section'}) { |
|
if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') { |
|
$resulttext .= '<li>'.&mt('User section from standard field:'). |
|
' (course_section_sourcedid)'.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User section from:').' '. |
|
$confhash{$itemid}{'section'}.'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No section assignment').'</li>'; |
|
} |
|
if ($confhash{$itemid}{'callback'}) { |
|
$resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No callback to logout LON-CAPA session when user logs out of Comsumer'); |
|
} |
|
foreach my $item ('passback','roster','topmenu','inlinemenu') { |
|
$resulttext .= '<li>'.$lt{$item}.': '; |
$resulttext .= '<li>'.$lt{$item}.': '; |
if ($confhash{$itemid}{$item}) { |
if ($confhash{$itemid}{$item}) { |
$resulttext .= &mt('Yes'); |
$resulttext .= &mt('Yes'); |
if ($item eq 'passback') { |
|
if ($confhash{$itemid}{'passbackformat'} eq '1.0') { |
|
$resulttext .= ' ('.&mt('Outcomes Extension (1.0)').')'; |
|
} elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') { |
|
$resulttext .= ' ('.&mt('Outcomes Service (1.1)').')'; |
|
} |
|
} |
|
} else { |
} else { |
$resulttext .= &mt('No'); |
$resulttext .= &mt('No'); |
} |
} |
Line 13047 sub modify_lti {
|
Line 15218 sub modify_lti {
|
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
$resulttext .= '<li>'.&mt('Menu items:').' '. |
$resulttext .= '<li>'.&mt('Menu items:').' '. |
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'crsinc'}) { |
|
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
my $rolemaps; |
|
foreach my $role (@ltiroles) { |
|
if ($confhash{$itemid}{'maproles'}{$role}) { |
|
$rolemaps .= (' 'x2).$role.'='. |
|
&Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role}, |
|
'Course').','; |
|
} |
|
} |
|
if ($rolemaps) { |
|
$rolemaps =~ s/,$//; |
|
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'mapcrs'}) { |
|
$resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'mapcrstype'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Mapping for the following LON-CAPA course types: [_1]', |
|
join(', ',map { $coursetypetitles{$_}; } @coursetypes)). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No mapping to LON-CAPA courses').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'storecrs'}) { |
|
$resulttext .= '<li>'.&mt('Store mapping of course identifier to LON-CAPA CourseID').': '.$confhash{$itemid}{'storecrs'}.'</li>'; |
|
} |
|
if ($confhash{$itemid}{'makecrs'}) { |
|
$resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'selfenroll'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]', |
|
join(', ',@{$confhash{$itemid}{'selfenroll'}})). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>'; |
|
} |
|
} |
|
if ($confhash{$itemid}{'section'}) { |
|
if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') { |
|
$resulttext .= '<li>'.&mt('User section from standard field:'). |
|
' (course_section_sourcedid)'.'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User section from:').' '. |
|
$confhash{$itemid}{'section'}.'</li>'; |
|
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
$resulttext .= '<li>'.&mt('No section assignment').'</li>'; |
|
} |
|
foreach my $item ('passback','roster','topmenu','inlinemenu') { |
|
$resulttext .= '<li>'.$lt{$item}.': '; |
|
if ($confhash{$itemid}{$item}) { |
|
$resulttext .= &mt('Yes'); |
|
if ($item eq 'passback') { |
|
if ($confhash{$itemid}{'passbackformat'} eq '1.0') { |
|
$resulttext .= ' ('.&mt('Outcomes Extension (1.0)').')'; |
|
} elsif ($confhash{$itemid}{'passbackformat'} eq '1.1') { |
|
$resulttext .= ' ('.&mt('Outcomes Service (1.1)').')'; |
|
} |
|
} |
|
} else { |
|
$resulttext .= &mt('No'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Menu items:').' '. |
|
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 13228 sub modify_autoupdate {
|
Line 15479 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 13273 sub modify_autoupdate {
|
Line 15526 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 13324 sub modify_autoupdate {
|
Line 15588 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 13386 sub modify_autoupdate {
|
Line 15660 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 13750 sub modify_contacts {
|
Line 16029 sub modify_contacts {
|
$contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded; |
$contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded; |
} |
} |
} elsif ($item eq 'weights') { |
} elsif ($item eq 'weights') { |
foreach my $type ('E','W','N') { |
foreach my $type ('E','W','N','U') { |
$env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g; |
$env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g; |
if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) { |
if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) { |
unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) { |
unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) { |
Line 14763 sub modify_passwords {
|
Line 17042 sub modify_passwords {
|
if ($staticdefaults{$rule} ne $newvalues{$rule}) { |
if ($staticdefaults{$rule} ne $newvalues{$rule}) { |
$changes{'rules'} = 1; |
$changes{'rules'} = 1; |
} |
} |
|
} else { |
|
$changes{'rules'} = 1; |
} |
} |
} elsif (exists($current{$rule})) { |
} elsif (exists($current{$rule})) { |
$changes{'rules'} = 1; |
$changes{'rules'} = 1; |
Line 14915 sub modify_passwords {
|
Line 17196 sub modify_passwords {
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
} |
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA usedfor verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
} |
} |
if ($confighash{'passwords'}{'resetremove'}) { |
if ($confighash{'passwords'}{'resetremove'}) { |
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>'; |
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>'; |
Line 14972 sub modify_passwords {
|
Line 17253 sub modify_passwords {
|
$resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to [_2]',$titles{$rule},$confighash{'passwords'}{$rule}).'</li>'; |
} |
} |
} |
} |
|
if (ref($confighash{'passwords'}{'chars'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'chars'}} > 0) { |
|
my %rulenames = &Apache::lonlocal::texthash( |
|
uc => 'At least one upper case letter', |
|
lc => 'At least one lower case letter', |
|
num => 'At least one number', |
|
spec => 'At least one non-alphanumeric', |
|
); |
|
my $needed = '<ul><li>'. |
|
join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}). |
|
'</li></ul>'; |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
|
} |
} elsif ($key eq 'crsownerchg') { |
} elsif ($key eq 'crsownerchg') { |
if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') { |
if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') { |
if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) || |
if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) || |
Line 18102 sub modify_selfenrollment {
|
Line 20401 sub modify_selfenrollment {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_wafproxy { |
|
my ($dom,$action,$lastactref,%domconfig) = @_; |
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
|
my (%othercontrol,%canset,%values,%curralias,%currsaml,%currvalue,@warnings, |
|
%wafproxy,%changes,%expirecache,%expiresaml); |
|
foreach my $server (sort(keys(%servers))) { |
|
my $serverhome = &Apache::lonnet::get_server_homeID($servers{$server}); |
|
if ($serverhome eq $server) { |
|
my $serverdom = &Apache::lonnet::host_domain($server); |
|
if ($serverdom eq $dom) { |
|
$canset{$server} = 1; |
|
} |
|
} |
|
} |
|
if (ref($domconfig{'wafproxy'}) eq 'HASH') { |
|
%{$values{$dom}} = (); |
|
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
|
%curralias = %{$domconfig{'wafproxy'}{'alias'}}; |
|
} |
|
if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') { |
|
%currsaml = %{$domconfig{'wafproxy'}{'saml'}}; |
|
} |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
$currvalue{$item} = $domconfig{'wafproxy'}{$item}; |
|
} |
|
} |
|
my $output; |
|
if (keys(%canset)) { |
|
%{$wafproxy{'alias'}} = (); |
|
%{$wafproxy{'saml'}} = (); |
|
foreach my $key (sort(keys(%canset))) { |
|
if ($env{'form.wafproxy_'.$dom}) { |
|
$wafproxy{'alias'}{$key} = $env{'form.wafproxy_alias_'.$key}; |
|
$wafproxy{'alias'}{$key} =~ s/^\s+|\s+$//g; |
|
if ($wafproxy{'alias'}{$key} ne $curralias{$key}) { |
|
$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 { |
|
$wafproxy{'alias'}{$key} = ''; |
|
$wafproxy{'saml'}{$key} = ''; |
|
if ($curralias{$key}) { |
|
$changes{'alias'} = 1; |
|
} |
|
if ($currsaml{$key}) { |
|
$changes{'saml'} = 1; |
|
} |
|
} |
|
if ($wafproxy{'alias'}{$key} eq '') { |
|
if ($curralias{$key}) { |
|
$expirecache{$key} = 1; |
|
} |
|
delete($wafproxy{'alias'}{$key}); |
|
} |
|
if ($wafproxy{'saml'}{$key} eq '') { |
|
if ($currsaml{$key}) { |
|
$expiresaml{$key} = 1; |
|
} |
|
delete($wafproxy{'saml'}{$key}); |
|
} |
|
} |
|
unless (keys(%{$wafproxy{'alias'}})) { |
|
delete($wafproxy{'alias'}); |
|
} |
|
unless (keys(%{$wafproxy{'saml'}})) { |
|
delete($wafproxy{'saml'}); |
|
} |
|
# Localization for values in %warn occurs in &mt() calls separately. |
|
my %warn = ( |
|
trusted => 'trusted IP range(s)', |
|
vpnint => 'internal IP range(s) for VPN sessions(s)', |
|
vpnext => 'IP range(s) for backend WAF connections', |
|
); |
|
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
my $possible = $env{'form.wafproxy_'.$item}; |
|
$possible =~ s/^\s+|\s+$//g; |
|
if ($possible ne '') { |
|
if ($item eq 'remoteip') { |
|
if ($possible =~ /^[mhn]$/) { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} elsif ($item eq 'ipheader') { |
|
if ($wafproxy{'remoteip'} eq 'h') { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} elsif ($item eq 'sslopt') { |
|
if ($possible =~ /^0|1$/) { |
|
$wafproxy{$item} = $possible; |
|
} |
|
} else { |
|
my (@ok,$count); |
|
if (($item eq 'vpnint') || ($item eq 'vpnext')) { |
|
unless ($env{'form.wafproxy_vpnaccess'}) { |
|
$possible = ''; |
|
} |
|
} elsif ($item eq 'trusted') { |
|
unless ($wafproxy{'remoteip'} eq 'h') { |
|
$possible = ''; |
|
} |
|
} |
|
unless ($possible eq '') { |
|
$possible =~ s/[\r\n]+/\s/g; |
|
$possible =~ s/\s*-\s*/-/g; |
|
$possible =~ s/\s+/,/g; |
|
$possible =~ s/,+/,/g; |
|
} |
|
$count = 0; |
|
if ($possible ne '') { |
|
foreach my $poss (split(/\,/,$possible)) { |
|
$count ++; |
|
$poss = &validate_ip_pattern($poss); |
|
if ($poss ne '') { |
|
push(@ok,$poss); |
|
} |
|
} |
|
my $diff = $count - scalar(@ok); |
|
if ($diff) { |
|
push(@warnings,'<li>'. |
|
&mt('[quant,_1,IP] invalid and excluded from saved value for [_2]', |
|
$diff,$warn{$item}). |
|
'</li>'); |
|
} |
|
if (@ok) { |
|
my @cidr_list; |
|
foreach my $item (@ok) { |
|
@cidr_list = &Net::CIDR::cidradd($item,@cidr_list); |
|
} |
|
$wafproxy{$item} = join(',',@cidr_list); |
|
} |
|
} |
|
} |
|
if ($wafproxy{$item} ne $currvalue{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} elsif ($currvalue{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
} else { |
|
if (keys(%curralias)) { |
|
$changes{'alias'} = 1; |
|
} |
|
if (keys(%currsaml)) { |
|
$changes{'saml'} = 1; |
|
} |
|
if (keys(%currvalue)) { |
|
foreach my $key (keys(%currvalue)) { |
|
$changes{$key} = 1; |
|
} |
|
} |
|
} |
|
if (keys(%changes)) { |
|
my %defaultshash = ( |
|
wafproxy => \%wafproxy, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my $cachetime = 24*60*60; |
|
my (%domdefaults,$updatedomdefs); |
|
foreach my $item ('ipheader','trusted','vpnint','vpnext','sslopt') { |
|
if ($changes{$item}) { |
|
unless ($updatedomdefs) { |
|
%domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
$updatedomdefs = 1; |
|
} |
|
if ($wafproxy{$item}) { |
|
$domdefaults{'waf_'.$item} = $wafproxy{$item}; |
|
} elsif (exists($domdefaults{'waf_'.$item})) { |
|
delete($domdefaults{'waf_'.$item}); |
|
} |
|
} |
|
} |
|
if ($updatedomdefs) { |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
if ((exists($wafproxy{'alias'})) || (keys(%expirecache))) { |
|
my %updates = %expirecache; |
|
foreach my $key (keys(%expirecache)) { |
|
&Apache::lonnet::devalidate_cache_new('proxyalias',$key); |
|
} |
|
if (ref($wafproxy{'alias'}) eq 'HASH') { |
|
my $cachetime = 24*60*60; |
|
foreach my $key (keys(%{$wafproxy{'alias'}})) { |
|
$updates{$key} = 1; |
|
&Apache::lonnet::do_cache_new('proxyalias',$key,$wafproxy{'alias'}{$key}, |
|
$cachetime); |
|
} |
|
} |
|
if (ref($lastactref) eq 'HASH') { |
|
$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>'; |
|
foreach my $item ('alias','remoteip','ipheader','trusted','vpnint','vpnext','sslopt') { |
|
if ($changes{$item}) { |
|
if ($item eq 'alias') { |
|
my $numaliased = 0; |
|
if (ref($wafproxy{'alias'}) eq 'HASH') { |
|
my $shown; |
|
if (keys(%{$wafproxy{'alias'}})) { |
|
foreach my $server (sort(keys(%{$wafproxy{'alias'}}))) { |
|
$shown .= '<li>'.&mt('[_1] aliased by [_2]', |
|
&Apache::lonnet::hostname($server), |
|
$wafproxy{'alias'}{$server}).'</li>'; |
|
$numaliased ++; |
|
} |
|
if ($numaliased) { |
|
$output .= '<li>'.&mt('Aliases for hostnames set to: [_1]', |
|
'<ul>'.$shown.'</ul>').'</li>'; |
|
} |
|
} |
|
} |
|
unless ($numaliased) { |
|
$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 { |
|
if ($item eq 'remoteip') { |
|
my %ip_methods = &remoteip_methods(); |
|
if ($wafproxy{$item} =~ /^[mh]$/) { |
|
$output .= '<li>'.&mt("Method for determining user's IP set to: [_1]", |
|
$ip_methods{$wafproxy{$item}}).'</li>'; |
|
} else { |
|
if (($env{'form.wafproxy_'.$dom}) && (ref($wafproxy{'alias'}) eq 'HASH')) { |
|
$output .= '<li>'.&mt("No method in use to get user's real IP (will report IP used by WAF)."). |
|
'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy not in use').'</li>'; |
|
} |
|
} |
|
} elsif ($item eq 'ipheader') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Request header with remote IP set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Request header with remote IP deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'trusted') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Trusted IP range(s) set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Trusted IP range(s) deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'vpnint') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('Internal IP Range(s) for VPN sessions deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'vpnext') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('IP Range(s) for backend WAF connections set to: [_1]', |
|
$wafproxy{$item}).'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('IP Range(s) for backend WAF connections deleted').'</li>'; |
|
} |
|
} elsif ($item eq 'sslopt') { |
|
if ($wafproxy{$item}) { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy expected to forward requests to https on LON-CAPA node, regardless of original protocol in web browser (http or https).').'</li>'; |
|
} else { |
|
$output .= '<li>'.&mt('WAF/Reverse Proxy expected to preserve original protocol in web browser (either http or https) when forwarding to LON-CAPA node.').'</li>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$output = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
} elsif (keys(%canset)) { |
|
$output = &mt('No changes made to Web Application Firewall/Reverse Proxy settings'); |
|
} |
|
if (@warnings) { |
|
$output .= '<br />'.&mt('Warnings:').'<ul>'. |
|
join("\n",@warnings).'</ul>'; |
|
} |
|
return $output; |
|
} |
|
|
|
sub validate_ip_pattern { |
|
my ($pattern) = @_; |
|
if ($pattern =~ /^([^-]+)\-([^-]+)$/) { |
|
my ($start,$end) = ($1,$2); |
|
if ((&Net::CIDR::cidrvalidate($start)) && (&Net::CIDR::cidrvalidate($end))) { |
|
if (($start !~ m{/}) && ($end !~ m{/})) { |
|
return $start.'-'.$end; |
|
} |
|
} |
|
} elsif ($pattern ne '') { |
|
$pattern = &Net::CIDR::cidrvalidate($pattern); |
|
if ($pattern ne '') { |
|
return $pattern; |
|
} |
|
} |
|
return; |
|
} |
|
|
sub modify_usersessions { |
sub modify_usersessions { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my @hostingtypes = ('version','excludedomain','includedomain'); |
my @hostingtypes = ('version','excludedomain','includedomain'); |
Line 18269 sub modify_usersessions {
|
Line 20906 sub modify_usersessions {
|
} |
} |
} |
} |
$defaultshash{'usersessions'}{'offloadnow'} = {}; |
$defaultshash{'usersessions'}{'offloadnow'} = {}; |
|
$defaultshash{'usersessions'}{'offloadoth'} = {}; |
my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow'); |
my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow'); |
my @okoffload; |
my @okoffload; |
if (@offloadnow) { |
if (@offloadnow) { |
Line 18285 sub modify_usersessions {
|
Line 20923 sub modify_usersessions {
|
} |
} |
} |
} |
} |
} |
|
my @offloadoth = &Apache::loncommon::get_env_multiple('form.offloadoth'); |
|
my @okoffloadoth; |
|
if (@offloadoth) { |
|
foreach my $server (@offloadoth) { |
|
if (&Apache::lonnet::hostname($server) ne '') { |
|
unless (grep(/^\Q$server\E$/,@okoffloadoth)) { |
|
push(@okoffloadoth,$server); |
|
} |
|
} |
|
} |
|
if (@okoffloadoth) { |
|
foreach my $lonhost (@okoffloadoth) { |
|
$defaultshash{'usersessions'}{'offloadoth'}{$lonhost} = 1; |
|
} |
|
} |
|
} |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
if (ref($changes{'spares'}) eq 'HASH') { |
if (ref($changes{'spares'}) eq 'HASH') { |
Line 18295 sub modify_usersessions {
|
Line 20949 sub modify_usersessions {
|
} else { |
} else { |
$savespares = 1; |
$savespares = 1; |
} |
} |
if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') { |
foreach my $offload ('offloadnow','offloadoth') { |
foreach my $lonhost (keys(%{$domconfig{'usersessions'}{'offloadnow'}})) { |
if (ref($domconfig{'usersessions'}{$offload}) eq 'HASH') { |
unless ($defaultshash{'usersessions'}{'offloadnow'}{$lonhost}) { |
foreach my $lonhost (keys(%{$domconfig{'usersessions'}{$offload}})) { |
$changes{'offloadnow'} = 1; |
unless ($defaultshash{'usersessions'}{$offload}{$lonhost}) { |
last; |
$changes{$offload} = 1; |
} |
|
} |
|
unless ($changes{'offloadnow'}) { |
|
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { |
|
unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) { |
|
$changes{'offloadnow'} = 1; |
|
last; |
last; |
} |
} |
} |
} |
} |
unless ($changes{$offload}) { |
} elsif (@okoffload) { |
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{$offload}})) { |
|
unless ($domconfig{'usersessions'}{$offload}{$lonhost}) { |
|
$changes{$offload} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} else { |
|
if (($offload eq 'offloadnow') && (@okoffload)) { |
|
$changes{'offloadnow'} = 1; |
|
} |
|
if (($offload eq 'offloadoth') && (@okoffloadoth)) { |
|
$changes{'offloadoth'} = 1; |
|
} |
|
} |
|
} |
|
} else { |
|
if (@okoffload) { |
$changes{'offloadnow'} = 1; |
$changes{'offloadnow'} = 1; |
} |
} |
} elsif (@okoffload) { |
if (@okoffloadoth) { |
$changes{'offloadnow'} = 1; |
$changes{'offloadoth'} = 1; |
|
} |
} |
} |
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
if ((keys(%changes) > 0) || ($savespares)) { |
if ((keys(%changes) > 0) || ($savespares)) { |
Line 18331 sub modify_usersessions {
|
Line 20997 sub modify_usersessions {
|
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
$domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'}; |
$domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'}; |
} |
} |
|
if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') { |
|
$domdefaults{'offloadoth'} = $defaultshash{'usersessions'}{'offloadoth'}; |
|
} |
} |
} |
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); |
Line 18410 sub modify_usersessions {
|
Line 21079 sub modify_usersessions {
|
if ($changes{'offloadnow'}) { |
if ($changes{'offloadnow'}) { |
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) { |
if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) { |
$resulttext .= '<li>'.&mt('Switch active users on next access, for server(s):').'<ul>'; |
$resulttext .= '<li>'.&mt('Switch any active user on next access, for server(s):').'<ul>'; |
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) { |
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) { |
$resulttext .= '<li>'.$lonhost.'</li>'; |
$resulttext .= '<li>'.$lonhost.'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.'); |
$resulttext .= '<li>'.&mt('No servers now set to switch any active user on next access.'); |
} |
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.').'</li>'; |
$resulttext .= '<li>'.&mt('No servers now set to switch any active user on next access.').'</li>'; |
|
} |
|
} |
|
if ($changes{'offloadoth'}) { |
|
if (ref($defaultshash{'usersessions'}{'offloadoth'}) eq 'HASH') { |
|
if (keys(%{$defaultshash{'usersessions'}{'offloadoth'}}) > 0) { |
|
$resulttext .= '<li>'.&mt('Switch other institutions on next access, for server(s):').'<ul>'; |
|
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadoth'}}))) { |
|
$resulttext .= '<li>'.$lonhost.'</li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch other institutions on next access.'); |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No servers now set to switch other institutions on next access.').'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 18988 sub modify_loadbalancing {
|
Line 21672 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>'; |
|
} |
} |
} |
if (keys(%toupdate)) { |
} |
my %thismachine; |
} |
my $updatedhere; |
if (keys(%toupdate)) { |
my $cachetime = 60*60*24; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my $updatedhere; |
foreach my $lonhost (keys(%toupdate)) { |
my $cachetime = 60*60*24; |
if ($thismachine{$lonhost}) { |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
unless ($updatedhere) { |
foreach my $lonhost (keys(%toupdate)) { |
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
if ($thismachine{$lonhost}) { |
$defaultshash{'loadbalancing'}, |
unless ($updatedhere) { |
$cachetime); |
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
$updatedhere = 1; |
$defaultshash{'loadbalancing'}, |
} |
$cachetime); |
} else { |
$updatedhere = 1; |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
|
} |
|
} |
} |
|
} else { |
|
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
} |
} |
} |
} |
} |
} |
Line 19505 function balancerChange(balnum,baltotal,
|
Line 22194 function balancerChange(balnum,baltotal,
|
END |
END |
} |
} |
|
|
|
|
sub new_spares_js { |
sub new_spares_js { |
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my $types = join("','",@sparestypes); |
my $types = join("','",@sparestypes); |
Line 19578 function updateNewSpares(formname,lonhos
|
Line 22268 function updateNewSpares(formname,lonhos
|
function checkNewSpares(lonhost,type) { |
function checkNewSpares(lonhost,type) { |
var newSpare = document.getElementById('newspare_'+type+'_'+lonhost); |
var newSpare = document.getElementById('newspare_'+type+'_'+lonhost); |
var chosen = newSpare.options[newSpare.selectedIndex].value; |
var chosen = newSpare.options[newSpare.selectedIndex].value; |
if (chosen != '') { |
if (chosen != '') { |
var othertype; |
var othertype; |
var othernewSpare; |
var othernewSpare; |
if (type == 'primary') { |
if (type == 'primary') { |
Line 19712 function toggleDisplay(domForm,caller) {
|
Line 22402 function toggleDisplay(domForm,caller) {
|
var dispval = 'block'; |
var dispval = 'block'; |
var selfcreateRegExp = /^cancreate_emailverified/; |
var selfcreateRegExp = /^cancreate_emailverified/; |
if (caller == 'emailoptions') { |
if (caller == 'emailoptions') { |
optionsElement = domForm.cancreate_email; |
optionsElement = domForm.cancreate_email; |
} |
} |
if (caller == 'studentsubmission') { |
if (caller == 'studentsubmission') { |
optionsElement = domForm.postsubmit; |
optionsElement = domForm.postsubmit; |
Line 19768 sub devalidate_remote_domconfs {
|
Line 22458 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'); |
'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}) { |
push(@cached,&escape($name).':'.&escape($dom)); |
if (($name eq 'proxyalias') || ($name eq 'proxysaml')) { |
|
if (ref($cachekeys->{$name}) eq 'HASH') { |
|
foreach my $key (keys(%{$cachekeys->{$name}})) { |
|
push(@cached,&escape($name).':'.&escape($key)); |
|
} |
|
} |
|
} else { |
|
push(@cached,&escape($name).':'.&escape($dom)); |
|
} |
} |
} |
} |
} |
|
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); |
} |
} |