version 1.325, 2018/03/23 01:01:20
|
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'],$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','quotas','autoenroll', |
if (ref($domconfig{'proctoring'}) eq 'HASH') { |
'autoupdate','autocreate','directorysrch','contacts', |
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 291 sub handler {
|
Line 309 sub handler {
|
help => 'Domain_Configuration_LangTZAuth', |
help => 'Domain_Configuration_LangTZAuth', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value'}, |
col2 => 'Value'}, |
{col1 => 'Internal Authentication', |
|
col2 => 'Value'}, |
|
{col1 => 'Institutional user types', |
{col1 => 'Institutional user types', |
col2 => 'Name displayed'}], |
col2 => 'Name displayed'}], |
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' => |
|
{ text => 'Passwords (Internal authentication)', |
|
help => 'Domain_Configuration_Passwords', |
|
header => [{col1 => 'Resetting Forgotten Password', |
|
col2 => 'Settings'}, |
|
{col1 => 'Encryption of Stored Passwords (Internal Auth)', |
|
col2 => 'Settings'}, |
|
{col1 => 'Rules for LON-CAPA Passwords', |
|
col2 => 'Settings'}, |
|
{col1 => 'Course Owner Changing Student Passwords', |
|
col2 => 'Settings'}], |
|
print => \&print_passwords, |
|
modify => \&modify_passwords, |
|
}, |
'quotas' => |
'quotas' => |
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios', |
{ text => 'Blogs, personal web pages, webDAV/quotas, portfolios', |
help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
Line 352 sub handler {
|
Line 393 sub handler {
|
col2 => 'Value',}, |
col2 => 'Value',}, |
{col1 => 'Recipient(s) for notifications', |
{col1 => 'Recipient(s) for notifications', |
col2 => 'Value',}, |
col2 => 'Value',}, |
|
{col1 => 'Nightly status check e-mail', |
|
col2 => 'Settings',}, |
{col1 => 'Ask helpdesk form settings', |
{col1 => 'Ask helpdesk form settings', |
col2 => 'Value',},], |
col2 => 'Value',},], |
print => \&print_contacts, |
print => \&print_contacts, |
Line 392 sub handler {
|
Line 435 sub handler {
|
modify => \&modify_usermodification, |
modify => \&modify_usermodification, |
}, |
}, |
'scantron' => |
'scantron' => |
{ text => 'Bubblesheet format file', |
{ text => 'Bubblesheet format', |
help => 'Domain_Configuration_Scantron_Format', |
help => 'Domain_Configuration_Scantron_Format', |
header => [ {col1 => 'Item', |
header => [ {col1 => 'Bubblesheet format file', |
col2 => '', |
col2 => ''}, |
}], |
{col1 => 'Bubblesheet data upload formats', |
|
col2 => 'Settings'}], |
print => \&print_scantron, |
print => \&print_scantron, |
modify => \&modify_scantron, |
modify => \&modify_scantron, |
}, |
}, |
Line 482 sub handler {
|
Line 526 sub handler {
|
modify => \&modify_selfenrollment, |
modify => \&modify_selfenrollment, |
}, |
}, |
'privacy' => |
'privacy' => |
{text => 'User Privacy', |
{text => 'Availability of User Information', |
help => 'Domain_Configuration_User_Privacy', |
help => 'Domain_Configuration_User_Privacy', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Role assigned in different domain', |
col2 => 'Value',}], |
col2 => 'Approval options'}, |
|
{col1 => 'Role assigned in different domain to user of type', |
|
col2 => 'User information available in that domain'}, |
|
{col1 => "Role assigned in user's domain", |
|
col2 => 'Information viewable by privileged user'}, |
|
{col1 => "Role assigned in user's domain", |
|
col2 => 'Information viewable by unprivileged user'}], |
print => \&print_privacy, |
print => \&print_privacy, |
modify => \&modify_privacy, |
modify => \&modify_privacy, |
}, |
}, |
Line 520 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 577 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 625 END
|
Line 686 END
|
if (grep(/^contacts$/,@actions)) { |
if (grep(/^contacts$/,@actions)) { |
$js .= &contacts_javascript(); |
$js .= &contacts_javascript(); |
} |
} |
|
if (grep(/^scantron$/,@actions)) { |
|
$js .= &scantron_javascript(); |
|
} |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
} else { |
} else { |
# check if domconfig user exists for the domain. |
# check if domconfig user exists for the domain. |
Line 747 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') { |
$output = &modify_trust($dom,$lastactref,%domconfig); |
$output = &modify_trust($dom,$lastactref,%domconfig); |
} elsif ($action eq 'lti') { |
} elsif ($action eq 'lti') { |
$output = &modify_lti($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_lti($r,$dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'privacy') { |
|
$output = &modify_privacy($dom,%domconfig); |
|
} elsif ($action eq 'passwords') { |
|
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
|
} elsif ($action eq 'wafproxy') { |
|
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 765 sub print_config_box {
|
Line 837 sub print_config_box {
|
$output = &coursecategories_javascript($settings); |
$output = &coursecategories_javascript($settings); |
} elsif ($action eq 'defaults') { |
} elsif ($action eq 'defaults') { |
$output = &defaults_javascript($settings); |
$output = &defaults_javascript($settings); |
|
} elsif ($action eq 'passwords') { |
|
$output = &passwords_javascript(); |
} elsif ($action eq 'helpsettings') { |
} elsif ($action eq 'helpsettings') { |
my (%privs,%levelscurrent); |
my (%privs,%levelscurrent); |
my %full=(); |
my %full=(); |
Line 781 sub print_config_box {
|
Line 855 sub print_config_box {
|
$output = |
$output = |
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,\%full, |
\@templateroles); |
\@templateroles); |
|
} elsif ($action eq 'ltitools') { |
|
$output .= <itools_javascript($settings); |
|
} elsif ($action eq 'lti') { |
|
$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 797 sub print_config_box {
|
Line 883 sub print_config_box {
|
if ($numheaders > 1) { |
if ($numheaders > 1) { |
my $colspan = ''; |
my $colspan = ''; |
my $rightcolspan = ''; |
my $rightcolspan = ''; |
|
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') { |
$rightcolspan = ' colspan="3"'; |
$rightcolspan = ' colspan="3"'; |
} |
} |
|
if ($action eq 'passwords') { |
|
$leftnobr = ' LC_nobreak'; |
|
} |
$output .= ' |
$output .= ' |
<tr> |
<tr> |
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
<td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[0]->{'col1'}).'</td> |
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
<td class="LC_right_item"'.$rightcolspan.'>'.&mt($item->{'header'}->[0]->{'col2'}).'</td> |
</tr>'; |
</tr>'; |
$rowtotal ++; |
$rowtotal ++; |
Line 818 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 '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') { |
|
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
|
} elsif ($action eq 'scantron') { |
|
$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 849 sub print_config_box {
|
Line 943 sub print_config_box {
|
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'selfcreation') || ($action eq 'selfenrollment') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'usersessions') || ($action eq 'coursecategories') || |
($action eq 'trust') || ($action eq 'contacts') || ($action eq 'defaults')) { |
($action eq 'trust') || ($action eq 'contacts') || |
|
($action eq 'privacy') || ($action eq 'passwords')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} elsif ($action eq 'trust') { |
} elsif ($action eq 'trust') { |
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} |
} |
Line 900 sub print_config_box {
|
Line 997 sub print_config_box {
|
</tr>'."\n"; |
</tr>'."\n"; |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('bottom',$dom,$item,$settings,\$rowtotal); |
|
} elsif (($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'passwords')) { |
|
if ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('lower',$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
$output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal); |
|
} |
|
$output .= ' |
|
</tr> |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n"; |
|
if ($action eq 'passwords') { |
|
$output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
|
} |
|
$output .= ' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr>'; |
} else { |
} else { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} |
} |
Line 907 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') { |
|
$output .= $item->{'print'}->($r,'bottom',$dom,$confname,$settings,\$rowtotal); |
} elsif ($action eq 'ssl') { |
} elsif ($action eq 'ssl') { |
$output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).' |
$output .= $item->{'print'}->('connto',$dom,$settings,\$rowtotal).' |
</table> |
</table> |
Line 932 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 956 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 968 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 1088 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); |
} elsif ($action eq 'scantron') { |
|
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
|
} |
} |
} |
} |
$output .= ' |
$output .= ' |
Line 1104 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 1300 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 1408 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 1436 sub print_login {
|
Line 1568 sub print_login {
|
} else { |
} else { |
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
} |
} |
$datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
$datatable .= '</td><td><input type="text" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></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>'; |
$datatable .= '</table></td></tr>'; |
} |
} |
Line 1475 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 1596 sub display_color_options {
|
Line 1824 sub display_color_options {
|
my $datatable = '<tr'.$css_class.'>'. |
my $datatable = '<tr'.$css_class.'>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1605 sub display_color_options {
|
Line 1833 sub display_color_options {
|
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
'<input type="text" class="colorchooser" size="10" name="'.$role.'_font"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
unless ($role eq 'login') { |
unless ($role eq 'login') { |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
'<td>'.$choices->{'fontmenu'}.'</td>'; |
if (!$is_custom->{'fontmenu'}) { |
if (!$is_custom->{'fontmenu'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span class="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>'; |
} else { |
} else { |
$datatable .= '<td> </td>'; |
$datatable .= '<td> </td>'; |
} |
} |
Line 1620 sub display_color_options {
|
Line 1848 sub display_color_options {
|
'<input class="colorchooser" type="text" size="10" name="' |
'<input class="colorchooser" type="text" size="10" name="' |
.$role.'_fontmenu"'. |
.$role.'_fontmenu"'. |
' value="'.$current_color.'" /> '. |
' value="'.$current_color.'" /> '. |
' </td></tr>'; |
' </span></td></tr>'; |
} |
} |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
foreach my $img (@{$images}) { |
foreach my $img (@{$images}) { |
Line 1738 sub display_color_options {
|
Line 1966 sub display_color_options {
|
my $bgs_def; |
my $bgs_def; |
foreach my $item (@{$bgs}) { |
foreach my $item (@{$bgs}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span id="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
$bgs_def .= '<td><span class="LC_nobreak">'.$choices->{$item}.'</span> <span class="css_default_'.$role.'_'.$item.'" style="background-color: '.$defaults->{'bgs'}{$item}.';"> </span><br />'.$defaults->{'bgs'}{$item}.'</td>'; |
} |
} |
} |
} |
if ($bgs_def) { |
if ($bgs_def) { |
Line 1766 sub display_color_options {
|
Line 1994 sub display_color_options {
|
my $links_def; |
my $links_def; |
foreach my $item (@{$links}) { |
foreach my $item (@{$links}) { |
if (!$is_custom->{$item}) { |
if (!$is_custom->{$item}) { |
$links_def .= '<td>'.$choices->{$item}.'<br /><span id="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
$links_def .= '<td>'.$choices->{$item}.'<br /><span class="css_default_'.$role.'_'.$item.'" style="color: '.$defaults->{'links'}{$item}.';">'.$defaults->{'links'}{$item}.'</span></td>'; |
} |
} |
} |
} |
if ($links_def) { |
if ($links_def) { |
Line 1852 sub image_changes {
|
Line 2080 sub image_changes {
|
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_; |
my $output; |
my $output; |
if ($img eq 'login') { |
if ($img eq 'login') { |
# suppress image for Log-in header |
$output = '</td><td>'.$logincolors; # suppress image for Log-in header |
} elsif (!$is_custom) { |
} elsif (!$is_custom) { |
if ($img ne 'domlogo') { |
if ($img ne 'domlogo') { |
$output .= &mt('Default image:').'<br />'; |
$output = &mt('Default image:').'<br />'; |
} else { |
} else { |
$output .= &mt('Default in use:').'<br />'; |
$output = &mt('Default in use:').'<br />'; |
} |
} |
} |
} |
if ($img eq 'login') { # suppress image for Log-in header |
if ($img ne 'login') { |
$output .= '<td>'.$logincolors; |
|
} else { |
|
if ($img_import) { |
if ($img_import) { |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
$output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />'; |
} |
} |
Line 2484 sub print_textbookcourses {
|
Line 2710 sub print_textbookcourses {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</span></td>'."\n". |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
Line 2501 sub print_textbookcourses {
|
Line 2727 sub print_textbookcourses {
|
} else { |
} else { |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
} |
} |
|
$datatable .= '</span>'."\n"; |
} |
} |
$datatable .= '</span>'."\n". |
$datatable .= '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
|
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
&Apache::loncommon::selectcourse_link |
&Apache::loncommon::selectcourse_link |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'); |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'). |
'</span></td>'."\n". |
'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 2733 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 2740 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 2810 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 == 'user') || (setting == 'crs')) { |
if ((setting == 'requser') || (setting == 'crsinc')) { |
|
var usrfieldsets = document.getElementsByClassName('ltioption_usr_'+item); |
|
var setvis = ''; |
|
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; |
|
if (num) { |
|
var crsvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (setvis == '') { |
|
if (setting == 'crsinc'){ |
|
alert("$crsincalert"); |
|
form.elements[radioname][0].checked = true; |
|
} |
|
} else { |
|
crsvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
} |
|
setvis = crsvis; |
|
} |
|
for (var j=0; j<crsfieldsets.length; j++) { |
|
if (setvis) { |
|
crsfieldsets[j].style.display = 'block'; |
|
} else { |
|
crsfieldsets[j].style.display = 'none'; |
|
} |
|
} |
|
} |
|
} else if ((setting == 'user') || (setting == 'crs') || (setting == 'passback') || (setting == 'callback')) { |
var radioname = ''; |
var radioname = ''; |
var divid = ''; |
var divid = ''; |
if (setting == 'user') { |
if (setting == 'user') { |
radioname = 'lti_mapuser_'+item; |
radioname = 'lti_mapuser_'+item; |
divid = 'lti_userfield_'+item; |
divid = 'lti_userfield_'+item; |
} else { |
} else if (setting == 'crs') { |
radioname = 'lti_mapcrs_'+item; |
radioname = 'lti_mapcrs_'+item; |
divid = 'lti_crsfield_'+item; |
divid = 'lti_crsfield_'+item; |
|
} else if (setting == 'callback') { |
|
radioname = 'lti_callback_'+item; |
|
divid = 'lti_callbackfield_'+item; |
|
} else { |
|
radioname = 'lti_passback_'+item; |
|
divid = 'lti_passback_'+item; |
} |
} |
var num = form.elements[radioname].length; |
var num = form.elements[radioname].length; |
if (num) { |
if (num) { |
var setvis = ''; |
var setvis = ''; |
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 == 'other') { |
if ((setting == 'passback') || (setting == 'callback')) { |
if (document.getElementById(divid)) { |
if (form.elements[radioname][i].value == '1') { |
document.getElementById(divid).style.display = 'inline-block'; |
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
break; |
|
} |
|
} else { |
|
if (form.elements[radioname][i].value == 'other') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
break; |
} |
} |
setvis = 1; |
|
break; |
|
} |
} |
} |
} |
} |
} |
Line 2909 function toggleLTI(form,setting,item) {
|
Line 3421 function toggleLTI(form,setting,item) {
|
} |
} |
} |
} |
} |
} |
|
} else if (setting == 'lcmenu') { |
|
var menus = new Array('lti_topmenu_'+item,'lti_inlinemenu_'+item); |
|
var divid = 'lti_menufield_'+item; |
|
var setvis = ''; |
|
for (var i=0; i<menus.length; i++) { |
|
var radioname = menus[i]; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
for (var j=0; j<num; j++) { |
|
if (form.elements[radioname][j].checked) { |
|
if (form.elements[radioname][j].value == '1') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
if (setvis == 1) { |
|
break; |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
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; |
return; |
} |
} |
Line 2997 sub print_autoenroll {
|
Line 3615 sub print_autoenroll {
|
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
'<input type="text" name="autoenroll_failsafe"'. |
'<input type="text" name="autoenroll_failsafe"'. |
' value="'.$failsafe.'" size="4" /></td></tr>'; |
' value="'.$failsafe.'" size="4" /></span></td></tr>'; |
$$rowtotal += 4; |
$$rowtotal += 4; |
return $datatable; |
return $datatable; |
} |
} |
|
|
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 3279 sub print_contacts {
|
Line 3924 sub print_contacts {
|
my $datatable; |
my $datatable; |
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield, |
my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield, |
$maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings); |
$maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions,@mailings,%lonstatus); |
if ($position eq 'top') { |
if ($position eq 'top') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
Line 3290 sub print_contacts {
|
Line 3935 sub print_contacts {
|
} |
} |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
@mailings = ('errormail','packagesmail','lonstatusmail','requestsmail', |
'updatesmail','idconflictsmail'); |
'updatesmail','idconflictsmail','hostipmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
|
} elsif ($position eq 'lower') { |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{'lonstatus'}) eq 'HASH') { |
|
%lonstatus = %{$settings->{'lonstatus'}}; |
|
} |
|
} |
} else { |
} else { |
@mailings = ('helpdeskmail','otherdomsmail'); |
@mailings = ('helpdeskmail','otherdomsmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
Line 3306 sub print_contacts {
|
Line 3957 sub print_contacts {
|
($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
} |
} |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
unless ($position eq 'top') { |
unless (($position eq 'top') || ($position eq 'lower')) { |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
if (exists($settings->{$type})) { |
if (exists($settings->{$type})) { |
if (ref($settings->{$type}) eq 'HASH') { |
if (ref($settings->{$type}) eq 'HASH') { |
Line 3367 sub print_contacts {
|
Line 4018 sub print_contacts {
|
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'requestsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'updatesmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'idconflictsmail'}{'adminemail'} = ' checked="checked" '; |
|
$checked{'hostipmail'}{'adminemail'} = ' checked="checked" '; |
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'helpdeskmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" '; |
$checked{'otherdomsmail'}{'supportemail'} = ' checked="checked" '; |
Line 3427 sub print_contacts {
|
Line 4079 sub print_contacts {
|
if ($currfield{$field} eq 'no') { |
if ($currfield{$field} eq 'no') { |
$display = ' style="display:none"'; |
$display = ' style="display:none"'; |
} |
} |
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.'>'. |
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
} |
} |
Line 3438 sub print_contacts {
|
Line 4090 sub print_contacts {
|
$datatable .= '</td></tr>'."\n"; |
$datatable .= '</td></tr>'."\n"; |
$rownum ++; |
$rownum ++; |
} |
} |
unless ($position eq 'top') { |
unless (($position eq 'top') || ($position eq 'lower')) { |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
Line 3472 sub print_contacts {
|
Line 4124 sub print_contacts {
|
'value="'.$bccemails{$type}.'" /></fieldset>'. |
'value="'.$bccemails{$type}.'" /></fieldset>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
&mt('Text automatically added to e-mail:').' '. |
&mt('Text automatically added to e-mail:').' '. |
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br >'. |
'<input type="text" name="'.$type.'_includestr" value="'.$includestr{$type}.'" /><br />'. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
'<label><input type="radio" name="'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
(' 'x2). |
(' 'x2). |
Line 3485 sub print_contacts {
|
Line 4137 sub print_contacts {
|
} |
} |
if ($position eq 'middle') { |
if ($position eq 'middle') { |
my %choices; |
my %choices; |
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]', |
my $corelink = &core_link_msu(); |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$choices{'reporterrors'} = &mt('E-mail error reports to [_1]',$corelink); |
&mt('LON-CAPA core group - MSU'),600,500)); |
|
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
$choices{'reportupdates'} = &mt('E-mail record of completed LON-CAPA updates to [_1]', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$corelink); |
&mt('LON-CAPA core group - MSU'),600,500)); |
$choices{'reportstatus'} = &mt('E-mail status if errors above threshold to [_1]',$corelink); |
my @toggles = ('reporterrors','reportupdates'); |
my @toggles = ('reporterrors','reportupdates','reportstatus'); |
my %defaultchecked = ('reporterrors' => 'on', |
my %defaultchecked = ('reporterrors' => 'on', |
'reportupdates' => 'on'); |
'reportupdates' => 'on', |
|
'reportstatus' => 'on'); |
(my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
(my $reports,$rownum) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$rownum); |
\%choices,$rownum); |
$datatable .= $reports; |
$datatable .= $reports; |
|
} elsif ($position eq 'lower') { |
|
my (%current,%excluded,%weights); |
|
my ($defaults,$names) = &Apache::loncommon::lon_status_items(); |
|
if ($lonstatus{'threshold'} =~ /^\d+$/) { |
|
$current{'errorthreshold'} = $lonstatus{'threshold'}; |
|
} else { |
|
$current{'errorthreshold'} = $defaults->{'threshold'}; |
|
} |
|
if ($lonstatus{'sysmail'} =~ /^\d+$/) { |
|
$current{'errorsysmail'} = $lonstatus{'sysmail'}; |
|
} else { |
|
$current{'errorsysmail'} = $defaults->{'sysmail'}; |
|
} |
|
if (ref($lonstatus{'weights'}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
if ($lonstatus{'weights'}{$type} =~ /^\d+$/) { |
|
$weights{$type} = $lonstatus{'weights'}{$type}; |
|
} else { |
|
$weights{$type} = $defaults->{$type}; |
|
} |
|
} |
|
} else { |
|
foreach my $type ('E','W','N','U') { |
|
$weights{$type} = $defaults->{$type}; |
|
} |
|
} |
|
if (ref($lonstatus{'excluded'}) eq 'ARRAY') { |
|
if (@{$lonstatus{'excluded'}} > 0) { |
|
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
|
} |
|
} |
|
foreach my $item ('errorthreshold','errorsysmail') { |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
$titles->{$item}. |
|
'</span></td><td class="LC_left_item">'. |
|
'<input type="text" name="'.$item.'" value="'. |
|
$current{$item}.'" size="5" /></td></tr>'; |
|
$rownum ++; |
|
} |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'. |
|
'<span class="LC_nobreak">'.$titles->{'errorweights'}. |
|
'</span></td><td class="LC_left_item"><table><tr>'; |
|
foreach my $type ('E','W','N','U') { |
|
$datatable .= '<td>'.$names->{$type}.'<br />'. |
|
'<input type="text" name="errorweights_'.$type.'" value="'. |
|
$weights{$type}.'" size="5" /></td>'; |
|
} |
|
$datatable .= '</tr></table></tr>'; |
|
$rownum ++; |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td class="LC_left_item">'. |
|
$titles->{'errorexcluded'}.'</td>'. |
|
'<td class="LC_left_item"><table>'; |
|
my $numinrow = 4; |
|
my @ids = sort(values(%Apache::lonnet::serverhomeIDs)); |
|
for (my $i=0; $i<@ids; $i++) { |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $check; |
|
if ($excluded{$ids[$i]}) { |
|
$check = ' checked="checked" '; |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="errorexcluded" '. |
|
'value="'.$ids[$i].'"'.$check.' />'. |
|
$ids[$i].'</label></span></td>'; |
|
} |
|
my $colsleft = $numinrow - @ids%($numinrow); |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'; |
|
$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 3570 sub print_contacts {
|
Line 4308 sub print_contacts {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub core_link_msu { |
|
return &Apache::loncommon::modal_link('http://loncapa.org/core.html', |
|
&mt('LON-CAPA core group - MSU'),600,500); |
|
} |
|
|
sub overridden_helpdesk { |
sub overridden_helpdesk { |
my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid, |
my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid, |
$typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_; |
$typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_; |
Line 3620 sub overridden_helpdesk {
|
Line 4363 sub overridden_helpdesk {
|
'value="'.$bccemails.'" /></fieldset>'. |
'value="'.$bccemails.'" /></fieldset>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
&mt('Text automatically added to e-mail:').' '. |
&mt('Text automatically added to e-mail:').' '. |
'<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br >'. |
'<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br />'. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<span class="LC_nobreak">'.&mt('Location:').' '. |
'<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
'<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
(' 'x2). |
(' 'x2). |
Line 3749 sub print_helpsettings {
|
Line 4492 sub print_helpsettings {
|
push(@jsarray,('notinc','notexc')); |
push(@jsarray,('notinc','notexc')); |
} |
} |
my $hiddenstr = join("','",@jsarray); |
my $hiddenstr = join("','",@jsarray); |
$datatable .= &helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname); |
|
my $context = 'domprefs'; |
my $context = 'domprefs'; |
my $crstype = 'Course'; |
my $crstype = 'Course'; |
my $prefix = 'helproles_'; |
my $prefix = 'helproles_'; |
Line 3852 sub print_helpsettings {
|
Line 4594 sub print_helpsettings {
|
\@templateroles,$newcust). |
\@templateroles,$newcust). |
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
&Apache::lonuserutils::custom_role_table('Course',\%full,\%levels, |
\%levelscurrent,$newcust). |
\%levelscurrent,$newcust). |
'</fieldset></td></tr>'; |
'</fieldset>'. |
|
&helpsettings_javascript(\@roles_by_num,$maxnum,$hiddenstr,$formname). |
|
'</td></tr>'; |
$count ++; |
$count ++; |
$$rowtotal += $count; |
$$rowtotal += $count; |
} |
} |
Line 4069 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 4109 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 4141 sub print_ltitools {
|
Line 4891 sub print_ltitools {
|
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
my $maxnum = scalar(keys(%ordered)); |
my $maxnum = scalar(keys(%ordered)); |
my $datatable = <itools_javascript($settings); |
my $datatable; |
my %lt = <itools_names(); |
my %lt = <itools_names(); |
my @courseroles = ('cc','in','ta','ep','st'); |
my @courseroles = ('cc','in','ta','ep','st'); |
my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
Line 4242 sub print_ltitools {
|
Line 4992 sub print_ltitools {
|
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'. |
$datatable .= '</span><br />'. |
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
'<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></label></div>'. |
'<input type="text" name="ltitools_linktext_'.$i.'" size="25" value="'.$currdisp{'linktext'}.'" /></div>'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
'</textarea></div><div style=""></div><br />'; |
'</textarea></div><div style=""></div><br />'; |
Line 4376 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 4415 sub print_ltitools {
|
Line 5165 sub print_ltitools {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
'<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="20" name="ltitools_add_title" value="" /></span> '."\n". |
Line 4452 sub print_ltitools {
|
Line 5202 sub print_ltitools {
|
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
(' 'x2); |
(' 'x2); |
} |
} |
$datatable .= '<br />'. |
$datatable .= '</span><br />'. |
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'linktext'}.'<br />'. |
'<input type="text" name="ltitools_add_linktext" size="5" /></label></div>'. |
'<input type="text" name="ltitools_add_linktext" size="5" /></div>'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
'<textarea name="ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
'</div><div style=""></div><br />'; |
'</div><div style=""></div><br />'; |
my %units = ( |
my %units = ( |
'passback' => 'days', |
'passback' => 'days', |
Line 4535 sub print_ltitools {
|
Line 5285 sub print_ltitools {
|
'<label><input type="checkbox" name="ltitools_add_custom" value="1" />'. |
'<label><input type="checkbox" name="ltitools_add_custom" value="1" />'. |
&mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'. |
&mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'. |
'</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'. |
'</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'. |
'</table></fieldset></td></tr>'."\n". |
'</table></fieldset>'."\n". |
'</td>'."\n". |
'</td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 4578 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 4588 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; |
} |
} |
} |
} |
} |
} |
my $maxnum = scalar(keys(%ordered)); |
my $maxnum = scalar(keys(%ordered)); |
my $datatable = <i_javascript($settings); |
my $datatable; |
my %lt = <i_names(); |
my %lt = <i_names(); |
if (keys(%ordered)) { |
if (keys(%ordered)) { |
my @items = sort { $a <=> $b } keys(%ordered); |
my @items = sort { $a <=> $b } keys(%ordered); |
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,$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'}; |
|
$crsinc = $settings->{$item}->{'crsinc'}; |
$current = $settings->{$item}; |
$current = $settings->{$item}; |
} |
} |
|
my $onclickrequser = ' onclick="toggleLTI(this.form,'."'requser','$i'".');"'; |
|
my %checkedrequser = ( |
|
yes => ' checked="checked"', |
|
no => '', |
|
); |
|
if (!$requser) { |
|
$checkedrequser{'no'} = $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 4625 sub print_lti {
|
Line 6032 sub print_lti {
|
'<td colspan="2">'. |
'<td colspan="2">'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<span class="LC_nobreak">'.$lt{'consumer'}. |
'<span class="LC_nobreak">'.$lt{'consumer'}. |
':<input type="text" size="20" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '. |
':<input type="text" size="15" name="lti_consumer_'.$i.'" value="'.$consumer.'" /></span> '. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_'.$i.'">'. |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_'.$i.'">'. |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '. |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" name="lti_lifetime_'.$i.'"'. |
'<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" name="lti_lifetime_'.$i.'"'. |
'value="'.$lifetime.'" size="5" /></span>'. |
'value="'.$lifetime.'" size="3" /></span>'. |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'requser'}.':'. |
|
'<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". |
'<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 4658 sub print_lti {
|
Line 6073 sub print_lti {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
'<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="lti_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
'<td colspan="2">'. |
'<td colspan="2">'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
'<span class="LC_nobreak">'.$lt{'consumer'}. |
'<span class="LC_nobreak">'.$lt{'consumer'}. |
':<input type="text" size="20" name="lti_consumer_add" value="" /></span> '."\n". |
':<input type="text" size="15" name="lti_consumer_add" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'. |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="lti_version_add">'. |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n". |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="5" name="lti_lifetime_add" value="300" /></span> '."\n". |
'<span class="LC_nobreak">'.$lt{'lifetime'}.':<input type="text" size="3" name="lti_lifetime_add" value="300" /></span> '."\n". |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'requser'}.':'. |
|
'<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". |
'<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 4686 sub lti_names {
|
Line 6109 sub lti_names {
|
'url' => 'URL', |
'url' => 'URL', |
'key' => 'Key', |
'key' => 'Key', |
'lifetime' => 'Nonce lifetime (s)', |
'lifetime' => 'Nonce lifetime (s)', |
'consumer' => 'LTI Consumer', |
'consumer' => 'Consumer', |
'secret' => 'Secret', |
'secret' => 'Secret', |
|
'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', |
'passback' => 'Can return grades to Consumer:', |
'passback' => 'Can return grades to Consumer:', |
'roster' => 'Can retrieve roster from Consumer:', |
'roster' => 'Can retrieve roster from Consumer:', |
|
'topmenu' => 'Display LON-CAPA page header', |
|
'inlinemenu'=> 'Display LON-CAPA inline menu', |
); |
); |
return %lt; |
return %lt; |
} |
} |
|
|
sub lti_options { |
sub lti_options { |
my ($num,$current,$itemcount,%lt) = @_; |
my ($num,$current,$itemcount,%lt) = @_; |
my (%checked,%rolemaps,$crssecsrc,$userfield,$cidfield); |
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'} = {}; |
$checked{'crssec'} = {}; |
$checked{'crssec'} = {}; |
$checked{'crssecsrc'} = {}; |
$checked{'crssecsrc'} = {}; |
$checked{'lcauth'} = {}; |
$checked{'lcauth'} = {}; |
|
$checked{'menuitem'} = {}; |
if ($num eq 'add') { |
if ($num eq 'add') { |
$checked{'lcauth'}{'lti'} = ' checked="checked"'; |
$checked{'lcauth'}{'lti'} = ' checked="checked"'; |
} |
} |
Line 4716 sub lti_options {
|
Line 6145 sub lti_options {
|
my $crsfieldsty = 'none'; |
my $crsfieldsty = 'none'; |
my $crssecfieldsty = 'none'; |
my $crssecfieldsty = 'none'; |
my $secsrcfieldsty = 'none'; |
my $secsrcfieldsty = 'none'; |
|
my $callbacksty = 'none'; |
|
my $passbacksty = 'none'; |
|
my $optionsty = 'block'; |
|
my $crssty = 'block'; |
my $lcauthparm; |
my $lcauthparm; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmstyle = 'display:none'; |
my $lcauthparmtext; |
my $lcauthparmtext; |
|
my $menusty; |
my $numinrow = 4; |
my $numinrow = 4; |
|
my %menutitles = <imenu_titles(); |
|
|
if (ref($current) eq 'HASH') { |
if (ref($current) eq 'HASH') { |
|
if (!$current->{'requser'}) { |
|
$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'} = ''; |
if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') { |
if ($current->{'mapuser'} eq 'lis_person_contact_email_primary') { |
Line 4747 sub lti_options {
|
Line 6188 sub lti_options {
|
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
$checked{'mapcrstype'}{$type} = ' checked="checked"'; |
} |
} |
} |
} |
if ($current->{'makecrs'}) { |
if (!$current->{'storecrs'}) { |
|
$checked{'storecrs'}{'N'} = $checked{'storecrs'}{'Y'}; |
|
$checked{'storecrs'}{'Y'} = ''; |
|
} |
|
if ($current->{'makecrs'}) { |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
$checked{'makecrs'}{'Y'} = ' checked="checked"'; |
} |
} |
if (ref($current->{'makeuser'}) eq 'ARRAY') { |
if (ref($current->{'makeuser'}) eq 'ARRAY') { |
foreach my $role (@{$current->{'makeuser'}}) { |
foreach my $role (@{$current->{'makeuser'}}) { |
$checked{'makeuser'}{$role} = ' checked="checked"'; |
$checked{'makeuser'}{$role} = ' checked="checked"'; |
Line 4788 sub lti_options {
|
Line 6233 sub lti_options {
|
} else { |
} else { |
$checked{'crssec'}{'N'} = ' checked="checked"'; |
$checked{'crssec'}{'N'} = ' checked="checked"'; |
} |
} |
|
if ($current->{'callback'} ne '') { |
|
$callback = $current->{'callback'}; |
|
$checked{'callback'}{'Y'} = ' checked="checked"'; |
|
$callbacksty = 'inline-block'; |
|
} else { |
|
$checked{'callback'}{'N'} = ' checked="checked"'; |
|
} |
|
if ($current->{'topmenu'}) { |
|
$checked{'topmenu'}{'Y'} = ' checked="checked"'; |
|
} else { |
|
$checked{'topmenu'}{'N'} = ' checked="checked"'; |
|
} |
|
if ($current->{'inlinemenu'}) { |
|
$checked{'inlinemenu'}{'Y'} = ' checked="checked"'; |
|
} else { |
|
$checked{'inlinemenu'}{'N'} = ' checked="checked"'; |
|
} |
|
if (($current->{'topmenu'}) || ($current->{'inlinemenu'})) { |
|
$menusty = 'inline-block'; |
|
if (ref($current->{'lcmenu'}) eq 'ARRAY') { |
|
foreach my $item (@{$current->{'lcmenu'}}) { |
|
if (exists($menutitles{$item})) { |
|
$checked{'menuitem'}{$item} = ' checked="checked"'; |
|
} |
|
} |
|
} |
|
} else { |
|
$menusty = 'none'; |
|
} |
} else { |
} else { |
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'makecrs'}{'N'} = ' checked="checked"'; |
$checked{'crssec'}{'N'} = ' checked="checked"'; |
$checked{'crssec'}{'N'} = ' checked="checked"'; |
#FIXME |
$checked{'callback'}{'N'} = ' checked="checked"'; |
|
$checked{'topmenu'}{'N'} = ' checked="checked"'; |
|
$checked{'inlinemenu'}{'Y'} = ' checked="checked"'; |
|
$checked{'menuitem'}{'grades'} = ' checked="checked"'; |
|
$menusty = 'inline-block'; |
} |
} |
my @coursetypes = ('official','unofficial','community','textbook','placement','lti'); |
my @coursetypes = ('official','unofficial','community','textbook','placement','lti'); |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
my %coursetypetitles = &Apache::lonlocal::texthash ( |
Line 4816 sub lti_options {
|
Line 6294 sub lti_options {
|
my $onclickuser = ' onclick="toggleLTI(this.form,'."'user','$num'".');"'; |
my $onclickuser = ' onclick="toggleLTI(this.form,'."'user','$num'".');"'; |
my $onclickcrs = ' onclick="toggleLTI(this.form,'."'crs','$num'".');"'; |
my $onclickcrs = ' onclick="toggleLTI(this.form,'."'crs','$num'".');"'; |
my $onclicksec = ' onclick="toggleLTI(this.form,'."'sec','$num'".');"'; |
my $onclicksec = ' onclick="toggleLTI(this.form,'."'sec','$num'".');"'; |
|
my $onclickcallback = ' onclick="toggleLTI(this.form,'."'callback','$num'".');"'; |
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 $output = '<fieldset><legend>'.&mt('Mapping users').'</legend>'. |
my $onclickmenu = ' onclick="toggleLTI(this.form,'."'lcmenu','$num'".');"'; |
|
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 4828 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><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><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><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 4882 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><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 4890 sub lti_options {
|
Line 6378 sub lti_options {
|
$checked{'mapcrs'}{$option}.$onclickcrs.' />'.$option.'</label>'. |
$checked{'mapcrs'}{$option}.$onclickcrs.' />'.$option.'</label>'. |
($option eq 'other' ? '' : (' 'x2) ); |
($option eq 'other' ? '' : (' 'x2) ); |
} |
} |
$output .= '</div><div class="LC_floatleft" style="display:'.$crsfieldsty.';" id="lti_crsfield_'.$num.'".>'. |
$output .= '</span></div><div class="LC_floatleft" style="display:'.$crsfieldsty.';" id="lti_crsfield_'.$num.'">'. |
'<input type="text" name="lti_mapcrsfield_'.$num.'" value="'.$cidfield.'" />'. |
'<input type="text" name="lti_mapcrsfield_'.$num.'" value="'.$cidfield.'" />'. |
'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'. |
'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course type(s)').': '; |
'<span class="LC_nobreak">'.&mt('LON-CAPA course type(s)').': '; |
Line 4899 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><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><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><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). |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="1"'. |
'<label><input type="radio" name="lti_crssec_'.$num.'" value="1"'. |
$checked{'crssec'}{'Y'}.$onclicksec.' />'.&mt('Yes').'</label><span></div>'. |
$checked{'crssec'}{'Y'}.$onclicksec.' />'.&mt('Yes').'</label></span></div>'. |
'<div class="LC_floatleft" style="display:'.$crssecfieldsty.';" id="lti_crssecfield_'.$num.'">'. |
'<div class="LC_floatleft" style="display:'.$crssecfieldsty.';" id="lti_crssecfield_'.$num.'">'. |
'<span class="LC_nobreak">'.&mt('From').':<label>'. |
'<span class="LC_nobreak">'.&mt('From').':<label>'. |
'<input type="radio" name="lti_crssecsrc_'.$num.'" value="course_section_sourcedid"'. |
'<input type="radio" name="lti_crssecsrc_'.$num.'" value="course_section_sourcedid"'. |
Line 4926 sub lti_options {
|
Line 6444 sub lti_options {
|
&mt('Standard field').'</label>'.(' 'x2). |
&mt('Standard field').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_crssecsrc_'.$num.'" value="other"'. |
'<label><input type="radio" name="lti_crssecsrc_'.$num.'" value="other"'. |
$checked{'crssecsrc'}{'other'}.$onclicksecsrc.' />'.&mt('Other'). |
$checked{'crssecsrc'}{'other'}.$onclicksecsrc.' />'.&mt('Other'). |
'</label></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'. |
'</label></span></div><div class="LC_floatleft" style="display:'.$secsrcfieldsty.';" id="lti_secsrcfield_'.$num.'">'. |
'<input type="text" name="lti_customsection_'.$num.'" value="'.$crssecsrc.'" />'. |
'<input type="text" name="lti_customsection_'.$num.'" value="'.$crssecsrc.'" />'. |
'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
'</div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
foreach my $extra ('passback','roster') { |
my ($pb1p1chk,$pb1p0chk,$onclickpb); |
|
foreach my $extra ('roster','passback') { |
my $checkedon = ''; |
my $checkedon = ''; |
my $checkedoff = ' checked="checked"'; |
my $checkedoff = ' checked="checked"'; |
|
if ($extra eq 'passback') { |
|
$pb1p1chk = ' checked="checked"'; |
|
$pb1p0chk = ''; |
|
$onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; |
|
} else { |
|
$onclickpb = ''; |
|
} |
if (ref($current) eq 'HASH') { |
if (ref($current) eq 'HASH') { |
if (($current->{$extra})) { |
if (($current->{$extra})) { |
$checkedon = $checkedoff; |
$checkedon = $checkedoff; |
$checkedoff = ''; |
$checkedoff = ''; |
|
if ($extra eq 'passback') { |
|
$passbacksty = 'inline-block'; |
|
} |
|
if ($current->{'passbackformat'} eq '1.0') { |
|
$pb1p0chk = ' checked="checked"'; |
|
$pb1p1chk = ''; |
|
} |
} |
} |
} |
} |
$output .= $lt{$extra}.' '. |
$output .= $lt{$extra}.' '. |
'<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.' />'. |
'<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="0"'.$checkedoff.$onclickpb.' />'. |
&mt('No').'</label>'.(' 'x2). |
&mt('No').'</label>'.(' 'x2). |
'<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.' />'. |
'<label><input type="radio" name="lti_'.$extra.'_'.$num.'" value="1"'.$checkedon.$onclickpb.' />'. |
&mt('Yes').'</label><br />'; |
&mt('Yes').'</label><br />'; |
} |
} |
$output .= '</span></fieldset>'; |
$output .= '<div class="LC_floatleft" style="display:'.$passbacksty.';" id="lti_passback_'.$num.'">'. |
|
'<span class="LC_nobreak">'.&mt('Grade format'). |
|
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.1"'.$pb1p1chk.' />'. |
|
&mt('Outcomes Service (1.1)').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="lti_passbackformat_'.$num.'" value="1.0"'.$pb1p0chk.'/>'. |
|
&mt('Outcomes Extension (1.0)').'</label></span></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div></fieldset>'; |
|
$output .= '</span></div></fieldset>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# '<fieldset><legend>'.&mt('Assigning author roles').'</legend>'; |
# |
# |
# $output .= '</fieldset>'. |
# $output .= '</fieldset>'. |
Line 4952 sub lti_options {
|
Line 6492 sub lti_options {
|
return $output; |
return $output; |
} |
} |
|
|
|
sub ltimenu_titles { |
|
return &Apache::lonlocal::texthash( |
|
fullname => 'Full name', |
|
coursetitle => 'Course title', |
|
role => 'Role', |
|
logout => 'Logout', |
|
grades => 'Grades', |
|
); |
|
} |
|
|
sub print_coursedefaults { |
sub print_coursedefaults { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
Line 4969 sub print_coursedefaults {
|
Line 6519 sub print_coursedefaults {
|
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
); |
); |
my %staticdefaults = ( |
my %staticdefaults = ( |
texengine => 'MathJax', |
|
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
postsubmit => 60, |
postsubmit => 60, |
Line 4983 sub print_coursedefaults {
|
Line 6532 sub print_coursedefaults {
|
'canclone' => 'none', |
'canclone' => 'none', |
); |
); |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
my $deftex = $staticdefaults{'texengine'}; |
my $deftex = $Apache::lonnet::deftex; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'texengine'}) { |
if ($settings->{'texengine'}) { |
if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
if ($settings->{'texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
Line 5021 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 5430 sub print_validation_rows {
|
Line 6979 sub print_validation_rows {
|
'</label></span> '; |
'</label></span> '; |
} |
} |
} elsif ($item eq 'markup') { |
} elsif ($item eq 'markup') { |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5" wrap="soft">'. |
$datatable .= '<textarea name="'.$caller.'_validation_markup" cols="50" rows="5">'. |
$currvalidation{$item}. |
$currvalidation{$item}. |
'</textarea>'; |
'</textarea>'; |
} |
} |
Line 5452 sub print_validation_rows {
|
Line 7001 sub print_validation_rows {
|
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
'validationdc',%currhash); |
'validationdc',%currhash); |
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$datatable .= '</td></tr><tr'.$css_class.'><td>'; |
$datatable .= '<tr'.$css_class.'><td>'; |
if ($numdc > 1) { |
if ($numdc > 1) { |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
} else { |
} else { |
Line 5467 sub print_validation_rows {
|
Line 7016 sub print_validation_rows {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub print_privacy { |
|
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my ($datatable,$css_class,$numinrow,@items,%names,$othertitle,$usertypes,$types); |
|
my $itemcount = 0; |
|
unless ($position eq 'top') { |
|
@items = ('domain','author','course','community'); |
|
%names = &Apache::lonlocal::texthash ( |
|
domain => 'Assigned domain role(s)', |
|
author => 'Assigned co-author role(s)', |
|
course => 'Assigned course role(s)', |
|
community => 'Assigned community role', |
|
); |
|
$numinrow = 4; |
|
($othertitle,$usertypes,$types) = |
|
&Apache::loncommon::sorted_inst_types($dom); |
|
} |
|
if (($position eq 'top') || ($position eq 'middle')) { |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
if ($position eq 'top') { |
|
my %curr; |
|
my @options = ('none','user','domain','auto'); |
|
my %titles = &Apache::lonlocal::texthash ( |
|
none => 'Not allowed', |
|
user => 'User authorizes', |
|
domain => 'DC authorizes', |
|
auto => 'Unrestricted', |
|
instdom => 'Other domain shares institution/provider', |
|
extdom => 'Other domain has different institution/provider', |
|
); |
|
my %names = &Apache::lonlocal::texthash ( |
|
domain => 'Domain role', |
|
author => 'Co-author role', |
|
course => 'Course role', |
|
community => 'Community role', |
|
); |
|
my $primary_id = &Apache::lonnet::domain($dom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
foreach my $domtype ('instdom','extdom') { |
|
my (%checked,$skip); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{$domtype}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
if ($domtype eq 'instdom') { |
|
unless (@instdoms > 1) { |
|
$datatable .= &mt('Nothing to set, as no domains besides [_1] are hosted by [_2]',$dom,$intdom); |
|
$skip = 1; |
|
} |
|
} elsif ($domtype eq 'extdom') { |
|
if (keys(%by_location) == 0) { |
|
$datatable .= &mt('Nothing to set, as no other hosts besides [_1]',$intdom); |
|
$skip = 1; |
|
} |
|
} |
|
unless ($skip) { |
|
foreach my $roletype ('domain','author','course','community') { |
|
$checked{'auto'} = ' checked="checked"'; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{approval}) eq 'HASH') { |
|
if (ref($settings->{approval}->{$domtype}) eq 'HASH') { |
|
if ($settings->{approval}->{$domtype}->{$roletype}=~ /^(none|user|domain)$/) { |
|
$checked{$1} = ' checked="checked"'; |
|
$checked{'auto'} = ''; |
|
} |
|
} |
|
} |
|
} |
|
$datatable .= '<fieldset><legend>'.$names{$roletype}.'</legend>'; |
|
foreach my $option (@options) { |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="privacy_approval_'.$domtype.'_'.$roletype.'" '. |
|
'value="'.$option.'"'.$checked{$option}.' />'.$titles{$option}. |
|
'</label></span> '; |
|
} |
|
$datatable .= '</fieldset>'; |
|
} |
|
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} elsif ($position eq 'middle') { |
|
if ((@instdoms > 1) || (keys(%by_location) > 0)) { |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $item (@{$types}) { |
|
$datatable .= &modifiable_userdata_row('privacy','othdom_'.$item,$settings, |
|
$numinrow,$itemcount,'','','','','', |
|
'',$usertypes->{$item}); |
|
$itemcount ++; |
|
} |
|
} |
|
$datatable .= &modifiable_userdata_row('privacy','othdom_default',$settings, |
|
$numinrow,$itemcount,'','','','','', |
|
'',$othertitle); |
|
$itemcount ++; |
|
} else { |
|
my (@insttypes,%insttitles); |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
@insttypes = @{$types}; |
|
%insttitles = %{$usertypes}; |
|
} |
|
foreach my $item (@insttypes,'default') { |
|
my $title; |
|
if ($item eq 'default') { |
|
$title = $othertitle; |
|
} else { |
|
$title = $insttitles{$item}; |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.$title.'</td>'. |
|
'<td class="LC_left_item">'. |
|
&mt('Nothing to set here, as there are no other domains'). |
|
'</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} |
|
} |
|
} else { |
|
my $prefix; |
|
if ($position eq 'lower') { |
|
$prefix = 'priv'; |
|
} else { |
|
$prefix = 'unpriv'; |
|
} |
|
foreach my $item (@items) { |
|
$datatable .= &modifiable_userdata_row('privacy',$prefix.'_'.$item,$settings, |
|
$numinrow,$itemcount,'','','','','', |
|
'',$names{$item}); |
|
$itemcount ++; |
|
} |
|
} |
|
if (ref($rowtotal)) { |
|
$$rowtotal += $itemcount; |
|
} |
|
return $datatable; |
|
} |
|
|
|
sub print_passwords { |
|
my ($position,$dom,$confname,$settings,$rowtotal) = @_; |
|
my ($datatable,$css_class); |
|
my $itemcount = 0; |
|
my %titles = &Apache::lonlocal::texthash ( |
|
captcha => '"Forgot Password" CAPTCHA validation', |
|
link => 'Reset link expiration (hours)', |
|
case => 'Case-sensitive usernames/e-mail', |
|
prelink => 'Information required (form 1)', |
|
postlink => 'Information required (form 2)', |
|
emailsrc => 'LON-CAPA e-mail address type(s)', |
|
customtext => 'Domain specific text (HTML)', |
|
intauth_cost => 'Encryption cost for bcrypt (positive integer)', |
|
intauth_check => 'Check bcrypt cost if authenticated', |
|
intauth_switch => 'Existing crypt-based switched to bcrypt on authentication', |
|
permanent => 'Permanent e-mail address', |
|
critical => 'Critical notification address', |
|
notify => 'Notification address', |
|
min => 'Minimum password length', |
|
max => 'Maximum password length', |
|
chars => 'Required characters', |
|
expire => 'Password expiration (days)', |
|
numsaved => 'Number of previous passwords to save and disallow reuse', |
|
); |
|
if ($position eq 'top') { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my $shownlinklife = 2; |
|
my $prelink = 'both'; |
|
my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl); |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) { |
|
$shownlinklife = $settings->{resetlink}; |
|
} |
|
if (ref($settings->{resetcase}) eq 'ARRAY') { |
|
map { $casesens{$_} = 1; } (@{$settings->{resetcase}}); |
|
} |
|
if ($settings->{resetprelink} =~ /^(both|either)$/) { |
|
$prelink = $settings->{resetprelink}; |
|
} |
|
if (ref($settings->{resetpostlink}) eq 'HASH') { |
|
%postlink = %{$settings->{resetpostlink}}; |
|
} |
|
if (ref($settings->{resetemail}) eq 'ARRAY') { |
|
map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}}); |
|
} |
|
if ($settings->{resetremove}) { |
|
$nostdtext = 1; |
|
} |
|
if ($settings->{resetcustom}) { |
|
$customurl = $settings->{resetcustom}; |
|
} |
|
} else { |
|
if (ref($types) eq 'ARRAY') { |
|
foreach my $item (@{$types}) { |
|
$casesens{$item} = 1; |
|
$postlink{$item} = ['username','email']; |
|
} |
|
} |
|
$casesens{'default'} = 1; |
|
$postlink{'default'} = ['username','email']; |
|
$prelink = 'both'; |
|
%emailsrc = ( |
|
permanent => 1, |
|
critical => 1, |
|
notify => 1, |
|
); |
|
} |
|
$datatable = &captcha_choice('passwords',$settings,$$rowtotal); |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'link'}.'</td>'. |
|
'<td class="LC_left_item">'. |
|
'<input type="textbox" value="'.$shownlinklife.'" '. |
|
'name="passwords_link" size="3" /></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'case'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $item (@{$types}) { |
|
my $checkedcase; |
|
if ($casesens{$item}) { |
|
$checkedcase = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_case_sensitive" value="'. |
|
$item.'"'.$checkedcase.' />'.$usertypes->{$item}.'</label>'. |
|
'</span> '; |
|
} |
|
} |
|
my $checkedcase; |
|
if ($casesens{'default'}) { |
|
$checkedcase = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '. |
|
'name="passwords_case_sensitive" value="default"'.$checkedcase.' />'. |
|
$othertitle.'</label></span></td>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my %checkedpre = ( |
|
both => ' checked="checked"', |
|
either => '', |
|
); |
|
if ($prelink eq 'either') { |
|
$checkedpre{either} = ' checked="checked"'; |
|
$checkedpre{both} = ''; |
|
} |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'prelink'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="passwords_prelink" value="both"'.$checkedpre{'both'}.' />'. |
|
&mt('Both username and e-mail address').'</label></span> '. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="passwords_prelink" value="either"'.$checkedpre{'either'}.' />'. |
|
&mt('Either username or e-mail address').'</label></span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'postlink'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
my %postlinked; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $item (@{$types}) { |
|
undef(%postlinked); |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$usertypes->{$item}.'</legend>'; |
|
if (ref($postlink{$item}) eq 'ARRAY') { |
|
map { $postlinked{$_} = 1; } (@{$postlink{$item}}); |
|
} |
|
foreach my $field ('email','username') { |
|
my $checked; |
|
if ($postlinked{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_postlink_'.$item.'" value="'. |
|
$field.'"'.$checked.' />'.$field.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</fieldset>'; |
|
} |
|
} |
|
if (ref($postlink{'default'}) eq 'ARRAY') { |
|
map { $postlinked{$_} = 1; } (@{$postlink{'default'}}); |
|
} |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$othertitle.'</legend>'; |
|
foreach my $field ('email','username') { |
|
my $checked; |
|
if ($postlinked{$field}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_postlink_default" value="'. |
|
$field.'"'.$checked.' />'.$field.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</fieldset></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'emailsrc'}.'</td>'. |
|
'<td class="LC_left_item">'; |
|
foreach my $type ('permanent','critical','notify') { |
|
my $checkedemail; |
|
if ($emailsrc{$type}) { |
|
$checkedemail = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_emailsrc" value="'. |
|
$type.'"'.$checkedemail.' />'.$titles{$type}.'</label>'. |
|
'<span> '; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my $switchserver = &check_switchserver($dom,$confname); |
|
my ($showstd,$noshowstd); |
|
if ($nostdtext) { |
|
$noshowstd = ' checked="checked"'; |
|
} else { |
|
$showstd = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'customtext'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
&mt('Retain standard text:'). |
|
'<label><input type="radio" name="passwords_stdtext" value="1"'.$showstd.' />'. |
|
&mt('Yes').'</label>'.' '. |
|
'<label><input type="radio" name="passwords_stdtext" value="0"'.$noshowstd.' />'. |
|
&mt('No').'</label></span><br />'. |
|
'<span class="LC_fontsize_small">'. |
|
&mt('(If you use the same account ... reset a password from this page.)').'</span><br /><br />'. |
|
&mt('Include custom text:'); |
|
if ($customurl) { |
|
my $link = &Apache::loncommon::modal_link($customurl,&mt('custom text'),600,500, |
|
undef,undef,undef,undef,'background-color:#ffffff'); |
|
$datatable .= '<span class="LC_nobreak"> '.$link. |
|
'<label><input type="checkbox" name="passwords_custom_del"'. |
|
' value="1" />'.&mt('Delete?').'</label></span>'. |
|
' <span class="LC_nobreak"> '.&mt('Replace:').'</span>'; |
|
} |
|
if ($switchserver) { |
|
$datatable .= '<span class="LC_nobreak"> '.&mt('Upload to library server: [_1]',$switchserver).'</span>'; |
|
} else { |
|
$datatable .='<span class="LC_nobreak"> '. |
|
'<input type="file" name="passwords_customfile" /></span>'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} elsif ($position eq 'middle') { |
|
my %domconf = &Apache::lonnet::get_dom('configuration',['defaults'],$dom); |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($domconf{'defaults'}) eq 'HASH') { |
|
%defaults = %{$domconf{'defaults'}}; |
|
if ($defaults{'intauth_cost'} !~ /^\d+$/) { |
|
$defaults{'intauth_cost'} = 10; |
|
} |
|
if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_check'} = 0; |
|
} |
|
if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_switch'} = 0; |
|
} |
|
} else { |
|
%defaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
} |
|
foreach my $item (@items) { |
|
if ($itemcount%2) { |
|
$css_class = ''; |
|
} else { |
|
$css_class = ' class="LC_odd_row" '; |
|
} |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles{$item}. |
|
'</span></td><td class="LC_left_item" colspan="3">'; |
|
if ($item eq 'intauth_switch') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
$datatable .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} elsif ($item eq 'intauth_check') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
$datatable .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
my $onclick; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option == 2) { |
|
$onclick = ' onclick="javascript:warnIntAuth(this);"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.$onclick.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} else { |
|
$datatable .= '<input type="text" name="'.$item.'" value="'. |
|
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
} |
|
} elsif ($position eq 'lower') { |
|
my ($min,$max,%chars,$expire,$numsaved); |
|
$min = $Apache::lonnet::passwdmin; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{min}) { |
|
$min = $settings->{min}; |
|
} |
|
if ($settings->{max}) { |
|
$max = $settings->{max}; |
|
} |
|
if (ref($settings->{chars}) eq 'ARRAY') { |
|
map { $chars{$_} = 1; } (@{$settings->{chars}}); |
|
} |
|
if ($settings->{expire}) { |
|
$expire = $settings->{expire}; |
|
} |
|
if ($settings->{numsaved}) { |
|
$numsaved = $settings->{numsaved}; |
|
} |
|
} |
|
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', |
|
); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'min'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_min" value="'.$min.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Enter an integer: 7 or larger)').'</span>'. |
|
'</span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'max'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_max" value="'.$max.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Leave blank for no maximum)').'</span>'. |
|
'</span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'chars'}.'<br />'. |
|
'<span class="LC_nobreak LC_fontsize_small">'.&mt('(Leave unchecked if not required)'). |
|
'</span></td>'; |
|
my $numinrow = 2; |
|
my @possrules = ('uc','lc','num','spec'); |
|
$datatable .= '<td class="LC_left_item"><table>'; |
|
for (my $i=0; $i<@possrules; $i++) { |
|
my ($rem,$checked); |
|
if ($chars{$possrules[$i]}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td><span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_chars" value="'.$possrules[$i].'"'.$checked.' />'. |
|
$rulenames{$possrules[$i]}.'</label></span></td>'; |
|
} |
|
my $rem = @possrules%($numinrow); |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .='</table></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'expire'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_expire" value="'.$expire.'" size="4" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Leave blank for no expiration)').'</span>'. |
|
'</span></td></tr>'; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td>'.$titles{'numsaved'}.'</td>'. |
|
'<td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="passwords_numsaved" value="'.$numsaved.'" size="3" '. |
|
'onblur="javascript:warnIntPass(this);" />'. |
|
'<span class="LC_fontsize_small"> '.&mt('(Leave blank to not save previous passwords)').'</span>'. |
|
'</span></td></tr>'; |
|
} else { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my %ownerchg = ( |
|
by => {}, |
|
for => {}, |
|
); |
|
my %ownertitles = &Apache::lonlocal::texthash ( |
|
by => 'Course owner status(es) allowed', |
|
for => 'Student status(es) allowed', |
|
); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{crsownerchg}) eq 'HASH') { |
|
if (ref($settings->{crsownerchg}{'by'}) eq 'ARRAY') { |
|
map { $ownerchg{by}{$_} = 1; } (@{$settings->{crsownerchg}{'by'}}); |
|
} |
|
if (ref($settings->{crsownerchg}{'for'}) eq 'ARRAY') { |
|
map { $ownerchg{for}{$_} = 1; } (@{$settings->{crsownerchg}{'for'}}); |
|
} |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr '.$css_class.'>'. |
|
'<td>'. |
|
&mt('Requirements').'<ul>'. |
|
'<li>'.&mt("Course 'type' is not a Community or Placement Test").'</li>'. |
|
'<li>'.&mt('User is Course Coordinator and also course owner').'</li>'. |
|
'<li>'.&mt("Student's only active roles are student role(s) in course(s) owned by this user").'</li>'. |
|
'<li>'.&mt('User, course, and student share same domain').'</li>'. |
|
'</ul>'. |
|
'</td>'. |
|
'<td class="LC_left_item">'; |
|
foreach my $item ('by','for') { |
|
$datatable .= '<fieldset style="display: inline-block;">'. |
|
'<legend>'.$ownertitles{$item}.'</legend>'; |
|
if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { |
|
foreach my $type (@{$types}) { |
|
my $checked; |
|
if ($ownerchg{$item}{$type}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="passwords_crsowner_'.$item.'" value="'. |
|
$type.'"'.$checked.' />'.$usertypes->{$type}.'</label>'. |
|
'</span> '; |
|
} |
|
} |
|
my $checked; |
|
if ($ownerchg{$item}{'default'}) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label><input type="checkbox" '. |
|
'name="passwords_crsowner_'.$item.'" value="default"'.$checked.' />'. |
|
$othertitle.'</label></span></fieldset>'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
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 5480 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 5930 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 5950 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 5964 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"; |
|
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"; |
"\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 6089 sub print_loadbalancing {
|
Line 8534 sub print_loadbalancing {
|
my $numinrow = 1; |
my $numinrow = 1; |
my $datatable; |
my $datatable; |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%existing = %{$settings}; |
%existing = %{$settings}; |
} |
} |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
if ((keys(%servers) > 1) || (keys(%existing) > 0)) { |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
} else { |
} else { |
return; |
return; |
} |
} |
Line 6172 sub print_loadbalancing {
|
Line 8617 sub print_loadbalancing {
|
my %hostherechecked = ( |
my %hostherechecked = ( |
no => ' checked="checked"', |
no => ' checked="checked"', |
); |
); |
|
my %balcookiechecked = ( |
|
no => ' checked="checked"', |
|
); |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
my $targettable; |
my $targettable; |
for (my $i=0; $i<$numspares; $i++) { |
for (my $i=0; $i<$numspares; $i++) { |
Line 6227 sub print_loadbalancing {
|
Line 8675 sub print_loadbalancing {
|
} |
} |
} |
} |
} |
} |
|
if ($currcookies{$lonhost}) { |
|
%balcookiechecked = ( |
|
yes => ' checked="checked"', |
|
); |
|
} |
$datatable .= &mt('Hosting on balancer itself').'<br />'. |
$datatable .= &mt('Hosting on balancer itself').'<br />'. |
'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'. |
'<label><input type="radio" name="loadbalancing_target_'.$balnum.'_hosthere" value="no"'. |
$hostherechecked{'no'}.' />'.&mt('No').'</label><br />'; |
$hostherechecked{'no'}.' />'.&mt('No').'</label><br />'; |
Line 6235 sub print_loadbalancing {
|
Line 8688 sub print_loadbalancing {
|
'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}. |
'value="'.$sparetype.'"'.$hostherechecked{$sparetype}.' /><i>'.$typetitles{$sparetype}. |
'</i></label><br />'; |
'</i></label><br />'; |
} |
} |
$datatable .= '</div></td></tr>'. |
$datatable .= &mt('Use balancer cookie').'<br />'. |
|
'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="1"'. |
|
$balcookiechecked{'yes'}.' />'.&mt('Yes').'</label><br />'. |
|
'<label><input type="radio" name="loadbalancing_cookie_'.$balnum.'" value="0"'. |
|
$balcookiechecked{'no'}.' />'.&mt('No').'</label><br />'. |
|
'</div></td></tr>'. |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost}, |
$othertitle,$usertypes,$types,\%servers, |
$othertitle,$usertypes,$types,\%servers, |
\%currbalancer,$lonhost, |
\%currbalancer,$lonhost, |
Line 6249 sub print_loadbalancing {
|
Line 8707 sub print_loadbalancing {
|
} |
} |
|
|
sub get_loadbalancers_config { |
sub get_loadbalancers_config { |
my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_; |
my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_; |
return unless ((ref($servers) eq 'HASH') && |
return unless ((ref($servers) eq 'HASH') && |
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') && |
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') && |
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH')); |
(ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') && |
|
(ref($currcookies) eq 'HASH')); |
if (keys(%{$existing}) > 0) { |
if (keys(%{$existing}) > 0) { |
my $oldlonhost; |
my $oldlonhost; |
foreach my $key (sort(keys(%{$existing}))) { |
foreach my $key (sort(keys(%{$existing}))) { |
Line 6271 sub get_loadbalancers_config {
|
Line 8730 sub get_loadbalancers_config {
|
$currbalancer->{$key} = 1; |
$currbalancer->{$key} = 1; |
$currtargets->{$key} = $existing->{$key}{'targets'}; |
$currtargets->{$key} = $existing->{$key}{'targets'}; |
$currrules->{$key} = $existing->{$key}{'rules'}; |
$currrules->{$key} = $existing->{$key}{'rules'}; |
|
if ($existing->{$key}{'cookie'}) { |
|
$currcookies->{$key} = 1; |
|
} |
} |
} |
} |
} |
} else { |
} else { |
Line 6466 sub contact_titles {
|
Line 8928 sub contact_titles {
|
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'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', |
|
'errorthreshold' => 'Error count threshold for status e-mail to admin(s)', |
|
'errorsysmail' => 'Error count threshold for e-mail to developer group', |
|
'errorweights' => 'Weights used to compute error count', |
|
'errorexcluded' => 'Servers with unsent updates excluded from count', |
); |
); |
my %short_titles = &Apache::lonlocal::texthash ( |
my %short_titles = &Apache::lonlocal::texthash ( |
adminemail => 'Admin E-mail address', |
adminemail => 'Admin E-mail address', |
Line 6755 sub print_selfcreation {
|
Line 9222 sub print_selfcreation {
|
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
'<td class="LC_left_item">'."\n". |
'<td class="LC_left_item">'."\n". |
'<table><tr><td>'."\n"; |
'<table>'."\n"; |
for (my $i=0; $i<@fields; $i++) { |
for (my $i=0; $i<@fields; $i++) { |
$rem = $i%($numperrow); |
$rem = $i%($numperrow); |
if ($rem == 0) { |
if ($rem == 0) { |
Line 7203 sub captcha_choice {
|
Line 9670 sub captcha_choice {
|
$vertext,$currver); |
$vertext,$currver); |
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
|
my $colspan=2; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
$rowname = &mt('CAPTCHA validation'); |
$rowname = &mt('CAPTCHA validation'); |
} elsif ($context eq 'login') { |
} elsif ($context eq 'login') { |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
$rowname = &mt('"Contact helpdesk" CAPTCHA validation'); |
|
} elsif ($context eq 'passwords') { |
|
$rowname = &mt('"Forgot Password" CAPTCHA validation'); |
|
$colspan=1; |
} |
} |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'captcha'}) { |
if ($settings->{'captcha'}) { |
Line 7246 sub captcha_choice {
|
Line 9717 sub captcha_choice {
|
$css_class .= ' style="'.$rowstyle.'"'; |
$css_class .= ' style="'.$rowstyle.'"'; |
} |
} |
my $output = '<tr'.$css_class.'>'. |
my $output = '<tr'.$css_class.'>'. |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="2">'."\n". |
'<td class="LC_left_item">'.$rowname.'</td><td class="LC_left_item" colspan="'.$colspan.'">'."\n". |
'<table><tr><td>'."\n"; |
'<table><tr><td>'."\n"; |
foreach my $option ('original','recaptcha','notused') { |
foreach my $option ('original','recaptcha','notused') { |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
$output .= '<span class="LC_nobreak"><label><input type="radio" name="'.$context.'_captcha" value="'. |
Line 7485 sub print_defaults {
|
Line 9956 sub print_defaults {
|
$datatable .= '</td></tr>'; |
$datatable .= '</td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
} elsif ($position eq 'middle') { |
|
my @items = ('intauth_cost','intauth_check','intauth_switch'); |
|
my %defaults; |
|
if (ref($settings) eq 'HASH') { |
|
%defaults = %{$settings}; |
|
if ($defaults{'intauth_cost'} !~ /^\d+$/) { |
|
$defaults{'intauth_cost'} = 10; |
|
} |
|
if ($defaults{'intauth_check'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_check'} = 0; |
|
} |
|
if ($defaults{'intauth_switch'} !~ /^(0|1|2)$/) { |
|
$defaults{'intauth_switch'} = 0; |
|
} |
|
} else { |
|
%defaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
} |
|
foreach my $item (@items) { |
|
if ($rownum%2) { |
|
$css_class = ''; |
|
} else { |
|
$css_class = ' class="LC_odd_row" '; |
|
} |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td><span class="LC_nobreak">'.$titles->{$item}. |
|
'</span></td><td class="LC_left_item" colspan="3">'; |
|
if ($item eq 'intauth_switch') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
$datatable .= '<table width="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} elsif ($item eq 'intauth_check') { |
|
my @options = (0,1,2); |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
$datatable .= '<table wisth="100%">'; |
|
foreach my $option (@options) { |
|
my $checked = ' '; |
|
my $onclick; |
|
if ($defaults{$item} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option == 2) { |
|
$onclick = ' onclick="javascript:warnIntAuth(this);"'; |
|
} |
|
$datatable .= '<tr><td class="LC_left_item"><span class="LC_nobreak">'. |
|
'<label><input type="radio" name="'.$item. |
|
'" value="'.$option.'"'.$checked.$onclick.' />'. |
|
$optiondesc{$option}.'</label></span></td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} else { |
|
$datatable .= '<input type="text" name="'.$item.'" value="'. |
|
$defaults{$item}.'" size="3" onblur="javascript:warnIntAuth(this);" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$rownum ++; |
|
} |
|
} else { |
} else { |
my %defaults; |
my %defaults; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 7588 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 7608 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 7656 sub defaults_titles {
|
Line 10048 sub defaults_titles {
|
return (\%titles); |
return (\%titles); |
} |
} |
|
|
|
sub print_scantron { |
|
my ($r,$position,$dom,$confname,$settings,$rowtotal) = @_; |
|
if ($position eq 'top') { |
|
return &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
|
} else { |
|
return &print_scantronconfig($dom,$settings,\$rowtotal); |
|
} |
|
} |
|
|
|
sub scantron_javascript { |
|
return <<"ENDSCRIPT"; |
|
|
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleScantron(form) { |
|
var csvfieldset = new Array(); |
|
if (document.getElementById('scantroncsv_cols')) { |
|
csvfieldset.push(document.getElementById('scantroncsv_cols')); |
|
} |
|
if (document.getElementById('scantroncsv_options')) { |
|
csvfieldset.push(document.getElementById('scantroncsv_options')); |
|
} |
|
if (csvfieldset.length) { |
|
if (document.getElementById('scantronconfcsv')) { |
|
var scantroncsv = document.getElementById('scantronconfcsv'); |
|
if (scantroncsv.checked) { |
|
for (var i=0; i<csvfieldset.length; i++) { |
|
csvfieldset[i].style.display = 'block'; |
|
} |
|
} else { |
|
for (var i=0; i<csvfieldset.length; i++) { |
|
csvfieldset[i].style.display = 'none'; |
|
} |
|
var csvselects = document.getElementsByClassName('scantronconfig_csv'); |
|
if (csvselects.length) { |
|
for (var j=0; j<csvselects.length; j++) { |
|
csvselects[j].selectedIndex = 0; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
|
|
} |
|
|
sub print_scantronformat { |
sub print_scantronformat { |
my ($r,$dom,$confname,$settings,$rowtotal) = @_; |
my ($r,$dom,$confname,$settings,$rowtotal) = @_; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 7682 sub print_scantronformat {
|
Line 10126 sub print_scantronformat {
|
if ($configuserok eq 'ok') { |
if ($configuserok eq 'ok') { |
if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
my %legacyfile = ( |
my %legacyfile = ( |
default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', |
default => $Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab', |
custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', |
custom => $Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab', |
); |
); |
my %md5chk; |
my %md5chk; |
foreach my $type (keys(%legacyfile)) { |
foreach my $type (keys(%legacyfile)) { |
Line 7692 sub print_scantronformat {
|
Line 10136 sub print_scantronformat {
|
} |
} |
if ($md5chk{'default'} ne $md5chk{'custom'}) { |
if ($md5chk{'default'} ne $md5chk{'custom'}) { |
foreach my $type (keys(%legacyfile)) { |
foreach my $type (keys(%legacyfile)) { |
($scantronurls{$type},my $error) = |
($scantronurls{$type},my $error) = |
&legacy_scantronformat($r,$dom,$confname, |
&legacy_scantronformat($r,$dom,$confname, |
$type,$legacyfile{$type}, |
$type,$legacyfile{$type}, |
$scantronurls{$type}, |
$scantronurls{$type}, |
Line 7703 sub print_scantronformat {
|
Line 10147 sub print_scantronformat {
|
} |
} |
if (keys(%error) == 0) { |
if (keys(%error) == 0) { |
$is_custom = 1; |
$is_custom = 1; |
$confhash{'scantron'}{'scantronformat'} = |
$confhash{'scantron'}{'scantronformat'} = |
$scantronurls{'custom'}; |
$scantronurls{'custom'}; |
my $putresult = |
my $putresult = |
&Apache::lonnet::put_dom('configuration', |
&Apache::lonnet::put_dom('configuration', |
\%confhash,$dom); |
\%confhash,$dom); |
if ($putresult ne 'ok') { |
if ($putresult ne 'ok') { |
$error{'custom'} = |
$error{'custom'} = |
'<span class="LC_error">'. |
'<span class="LC_error">'. |
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>'; |
&mt('An error occurred updating the domain configuration: [_1]',$putresult).'</span>'; |
} |
} |
Line 7829 sub legacy_scantronformat {
|
Line 10273 sub legacy_scantronformat {
|
return ($url,$error); |
return ($url,$error); |
} |
} |
|
|
|
sub print_scantronconfig { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my $itemcount = 2; |
|
my $is_checked = ' checked="checked"'; |
|
my %optionson = ( |
|
hdr => ' checked="checked"', |
|
pad => ' checked="checked"', |
|
rem => ' checked="checked"', |
|
); |
|
my %optionsoff = ( |
|
hdr => '', |
|
pad => '', |
|
rem => '', |
|
); |
|
my $currcsvsty = 'none'; |
|
my ($datatable,%csvfields,%checked,%onclick,%csvoptions); |
|
my @fields = &scantroncsv_fields(); |
|
my %titles = &scantronconfig_titles(); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{config}) eq 'HASH') { |
|
if ($settings->{config}->{dat}) { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
if (ref($settings->{config}->{csv}) eq 'HASH') { |
|
if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') { |
|
%csvfields = %{$settings->{config}->{csv}->{fields}}; |
|
if (keys(%csvfields) > 0) { |
|
$checked{'csv'} = $is_checked; |
|
$currcsvsty = 'block'; |
|
} |
|
} |
|
if (ref($settings->{config}->{csv}->{options}) eq 'HASH') { |
|
%csvoptions = %{$settings->{config}->{csv}->{options}}; |
|
foreach my $option (keys(%optionson)) { |
|
unless ($csvoptions{$option}) { |
|
$optionsoff{$option} = $optionson{$option}; |
|
$optionson{$option} = ''; |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
} else { |
|
$checked{'dat'} = $is_checked; |
|
} |
|
$onclick{'csv'} = ' onclick="toggleScantron(this.form);"'; |
|
my $css_class = $itemcount%2? ' class="LC_odd_row"':''; |
|
$datatable = '<tr '.$css_class.'><td>'.&mt('Supported formats').'</td>'. |
|
'<td class="LC_left_item" valign="top"><span class="LC_nobreak">'; |
|
foreach my $item ('dat','csv') { |
|
my $id; |
|
if ($item eq 'csv') { |
|
$id = 'id="scantronconfcsv" '; |
|
} |
|
$datatable .= '<label><input type="checkbox" name="scantronconfig" '.$id.'value="'.$item.'"'.$checked{$item}.$onclick{$item}.' />'. |
|
$titles{$item}.'</label>'.(' 'x3); |
|
if ($item eq 'csv') { |
|
$datatable .= '<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_cols">'. |
|
'<legend>'.&mt('CSV Column Mapping').'</legend>'. |
|
'<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Location').'</th></tr>'."\n"; |
|
foreach my $col (@fields) { |
|
my $selnone; |
|
if ($csvfields{$col} eq '') { |
|
$selnone = ' selected="selected"'; |
|
} |
|
$datatable .= '<tr><td>'.$titles{$col}.'</td>'. |
|
'<td><select name="scantronconfig_csv_'.$col.'" class="scantronconfig_csv">'. |
|
'<option value=""'.$selnone.'></option>'; |
|
for (my $i=0; $i<20; $i++) { |
|
my $shown = $i+1; |
|
my $sel; |
|
unless ($selnone) { |
|
if (exists($csvfields{$col})) { |
|
if ($csvfields{$col} == $i) { |
|
$sel = ' selected="selected"'; |
|
} |
|
} |
|
} |
|
$datatable .= '<option value="'.$i.'"'.$sel.'>'.$shown.'</option>'; |
|
} |
|
$datatable .= '</select></td></tr>'; |
|
} |
|
$datatable .= '</table></fieldset>'. |
|
'<fieldset style="display:'.$currcsvsty.'" id="scantroncsv_options">'. |
|
'<legend>'.&mt('CSV Options').'</legend>'; |
|
foreach my $option ('hdr','pad','rem') { |
|
$datatable .= '<span class="LC_nobreak">'.$titles{$option}.':'. |
|
'<label><input type="radio" name="scantroncsv_'.$option.'" value="1"'.$optionson{$option}.' />'. |
|
&mt('Yes').'</label>'.(' 'x2)."\n". |
|
'<label><input type="radio" name="scantroncsv_'.$option.'" value="0"'.$optionsoff{$option}.' />'.&mt('No').'</label></span><br />'; |
|
} |
|
$datatable .= '</fieldset>'; |
|
$itemcount ++; |
|
} |
|
} |
|
$datatable .= '</td></tr>'; |
|
$$rowtotal ++; |
|
return $datatable; |
|
} |
|
|
|
sub scantronconfig_titles { |
|
return &Apache::lonlocal::texthash( |
|
dat => 'Standard format (.dat)', |
|
csv => 'Comma separated values (.csv)', |
|
hdr => 'Remove first line in file (contains column titles)', |
|
pad => 'Prepend 0s to PaperID', |
|
rem => 'Remove leading spaces (except Question Response columns)', |
|
CODE => 'CODE', |
|
ID => 'Student ID', |
|
PaperID => 'Paper ID', |
|
FirstName => 'First Name', |
|
LastName => 'Last Name', |
|
FirstQuestion => 'First Question Response', |
|
Section => 'Section', |
|
); |
|
} |
|
|
|
sub scantroncsv_fields { |
|
return ('PaperID','LastName','FirstName','ID','Section','CODE','FirstQuestion'); |
|
} |
|
|
sub print_coursecategories { |
sub print_coursecategories { |
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_; |
my ($position,$dom,$hdritem,$settings,$rowtotal) = @_; |
my $datatable; |
my $datatable; |
Line 7871 sub print_coursecategories {
|
Line 10438 sub print_coursecategories {
|
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
'<input type="radio" name="coursecat_'.$item.'" value="'.$type.'"'.$ischecked. |
' />'.$lt{$type}.'</label> '; |
' />'.$lt{$type}.'</label> '; |
} |
} |
$datatable .= '</td></tr>'; |
$datatable .= '</span></td></tr>'; |
$itemcount ++; |
$itemcount ++; |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 7957 sub print_coursecategories {
|
Line 10524 sub print_coursecategories {
|
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
'<label><input type="radio" name="categorizecomm"'. |
'<label><input type="radio" name="categorizecomm"'. |
$can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
$can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
'</tr><tr>'. |
'</tr><tr class="LC_odd_row">'. |
'<td>'.$title{'togglecatsplace'}.'</td>'. |
'<td>'.$title{'togglecatsplace'}.'</td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="togglecatsplace"'. |
'<input type="radio" name="togglecatsplace"'. |
Line 8114 sub print_coursecategories {
|
Line 10681 sub print_coursecategories {
|
$datatable .= &initialize_categories($itemcount); |
$datatable .= &initialize_categories($itemcount); |
} |
} |
} else { |
} else { |
$datatable .= '<td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td>' |
$datatable .= '<tr><td class="LC_right_item">'.$hdritem->{'header'}->[1]->{'col2'}.'</td></tr>' |
.&initialize_categories($itemcount); |
.&initialize_categories($itemcount); |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
Line 8162 sub print_serverstatuses {
|
Line 10729 sub print_serverstatuses {
|
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<input type="text" name="'.$type.'_machines" '. |
'<input type="text" name="'.$type.'_machines" '. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'value="'.$machineaccess{$type}.'" size="10" />'. |
'</td></tr>'."\n"; |
'</span></td></tr>'."\n"; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 8177 sub serverstatus_pages {
|
Line 10744 sub serverstatus_pages {
|
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
my $intauthcheck = &mt('Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.'); |
return unless (ref($settings) eq 'HASH'); |
my $intauthcost = &mt('Warning: bcrypt encryption cost for internal authentication must be an integer.'); |
|
&js_escape(\$intauthcheck); |
|
&js_escape(\$intauthcost); |
|
my $intauthjs = <<"ENDSCRIPT"; |
|
|
|
function warnIntAuth(field) { |
|
if (field.name == 'intauth_check') { |
|
if (field.value == '2') { |
|
alert('$intauthcheck'); |
|
} |
|
} |
|
if (field.name == 'intauth_cost') { |
|
field.value.replace(/\s/g,''); |
|
if (field.value != '') { |
|
var regexdigit=/^\\d+\$/; |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intauthcost'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
ENDSCRIPT |
|
|
|
if (ref($settings) ne 'HASH') { |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
|
} |
|
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
if ($maxnum eq '') { |
if ($maxnum eq '') { |
Line 8259 $jstext
|
Line 10798 $jstext
|
return; |
return; |
} |
} |
|
|
$intauthjs |
|
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
ENDSCRIPT |
ENDSCRIPT |
|
} |
|
return; |
|
} |
|
|
|
sub passwords_javascript { |
|
my %intalert = &Apache::lonlocal::texthash ( |
|
authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.', |
|
authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.', |
|
passmin => 'Warning: minimum password length must be a positive integer greater than 6.', |
|
passmax => 'Warning: maximum password length must be a positive integer (or blank).', |
|
passexp => 'Warning: days before password expiration must be a positive integer (or blank).', |
|
passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).', |
|
); |
|
&js_escape(\%intalert); |
|
my $defmin = $Apache::lonnet::passwdmin; |
|
my $intauthjs = <<"ENDSCRIPT"; |
|
|
|
function warnIntAuth(field) { |
|
if (field.name == 'intauth_check') { |
|
if (field.value == '2') { |
|
alert('$intalert{authcheck}'); |
|
} |
|
} |
|
if (field.name == 'intauth_cost') { |
|
field.value.replace(/\s/g,''); |
|
if (field.value != '') { |
|
var regexdigit=/^\\d+\$/; |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intalert{authcost}'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function warnIntPass(field) { |
|
field.value.replace(/^\s+/,''); |
|
field.value.replace(/\s+\$/,''); |
|
var regexdigit=/^\\d+\$/; |
|
if (field.name == 'passwords_min') { |
|
if (field.value == '') { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} else { |
|
if (!regexdigit.test(field.value)) { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} |
|
var minval = parseInt(field.value,10); |
|
if (minval < $defmin) { |
|
alert('$intalert{passmin}'); |
|
field.value = '$defmin'; |
|
} |
|
} |
} else { |
} else { |
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
if (field.value == '0') { |
|
field.value = ''; |
|
} |
|
if (field.value != '') { |
|
if (field.name == 'passwords_expire') { |
|
var regexpposnum=/^\\d+(|\\.\\d*)\$/; |
|
if (!regexpposnum.test(field.value)) { |
|
alert('$intalert{passexp}'); |
|
field.value = ''; |
|
} else { |
|
var expval = parseFloat(field.value); |
|
if (expval == 0) { |
|
alert('$intalert{passexp}'); |
|
field.value = ''; |
|
} |
|
} |
|
} else { |
|
if (!regexdigit.test(field.value)) { |
|
if (field.name == 'passwords_max') { |
|
alert('$intalert{passmax}'); |
|
} else { |
|
if (field.name == 'passwords_numsaved') { |
|
alert('$intalert{passnum}'); |
|
} |
|
} |
|
field.value = ''; |
|
} |
|
} |
|
} |
} |
} |
|
return; |
|
} |
|
|
|
ENDSCRIPT |
|
return &Apache::lonhtmlcommon::scripttag($intauthjs); |
} |
} |
|
|
sub coursecategories_javascript { |
sub coursecategories_javascript { |
Line 8385 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', |
); |
); |
my $select0 = ' selected="selected"'; |
my %selnum = ( |
my $select1 = ''; |
instcode => '0', |
|
communities => '1', |
|
placement => '2', |
|
); |
|
my %selected; |
foreach my $default ('instcode','communities','placement') { |
foreach my $default ('instcode','communities','placement') { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','0'".');"'; |
if (($default eq 'communities') || ($default eq 'placement')) { |
map { $selected{$selnum{$_}} = '' } keys(%selnum); |
$select1 = $select0; |
$selected{$selnum{$default}} = ' selected="selected"'; |
$select0 = ''; |
|
} |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="'.$default.'_pos">' |
.'<select name="'.$default.'_pos"'.$chgstr.'>' |
.'<option value="0"'.$select0.'>1</option>' |
.'<option value="0"'.$selected{'0'}.'>1</option>' |
.'<option value="1"'.$select1.'>2</option>' |
.'<option value="1"'.$selected{'1'}.'>2</option>' |
.'<option value="2">3</option></select> ' |
.'<option value="2"'.$selected{'2'}.'>3</option>' |
|
.'<option value="3">4</option></select> ' |
.$default_names{$default} |
.$default_names{$default} |
.'</span></td><td><span class="LC_nobreak">' |
.'</span></td><td><span class="LC_nobreak">' |
.'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />' |
.'<label><input type="radio" name="'.$default.'" value="1" checked="checked" />' |
Line 8418 sub initialize_categories {
|
Line 11045 sub initialize_categories {
|
.'<select name="addcategory_pos"'.$chgstr.'>' |
.'<select name="addcategory_pos"'.$chgstr.'>' |
.'<option value="0">1</option>' |
.'<option value="0">1</option>' |
.'<option value="1">2</option>' |
.'<option value="1">2</option>' |
.'<option value="2" selected="selected">3</option></select> ' |
.'<option value="2">3</option>' |
.&mt('Add category').'</td><td>'.&mt('Name:') |
.'<option value="3" selected="selected">4</option></select> ' |
.' <input type="text" size="20" name="addcategory_name" value="" /></td></tr>'; |
.&mt('Add category').'</span></td><td><span class="LC_nobreak">'.&mt('Name:') |
|
.' <input type="text" size="20" name="addcategory_name" value="" /></span>' |
|
.'</td></tr>'; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 8475 sub build_category_rows {
|
Line 11104 sub build_category_rows {
|
pop(@{$path}); |
pop(@{$path}); |
} |
} |
} else { |
} else { |
$text .= &mt('Add subcategory:').' </span><input type="textbox" size="20" name="addcategory_name_'; |
$text .= &mt('Add subcategory:').' </span><input type="text" size="20" name="addcategory_name_'; |
if ($j == $numchildren) { |
if ($j == $numchildren) { |
$text .= $name; |
$text .= $name; |
} else { |
} else { |
Line 8498 sub build_category_rows {
|
Line 11127 sub build_category_rows {
|
my $colspan; |
my $colspan; |
if ($parent ne 'instcode') { |
if ($parent ne 'instcode') { |
$colspan = $maxdepth - $depth - 1; |
$colspan = $maxdepth - $depth - 1; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="textbox" size="20" name="subcat_'.$name.'" value="" /></td>'; |
$text .= '<td colspan="'.$colspan.'">'.&mt('Add subcategory:').'<input type="text" size="20" name="subcat_'.$name.'" value="" /></td>'; |
} |
} |
} |
} |
} |
} |
Line 8508 sub build_category_rows {
|
Line 11137 sub build_category_rows {
|
|
|
sub modifiable_userdata_row { |
sub modifiable_userdata_row { |
my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref, |
my ($context,$item,$settings,$numinrow,$rowcount,$usertypes,$fieldsref,$titlesref, |
$rowid,$customcss,$rowstyle) = @_; |
$rowid,$customcss,$rowstyle,$itemdesc) = @_; |
my ($role,$rolename,$statustype); |
my ($role,$rolename,$statustype); |
$role = $item; |
$role = $item; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
Line 8531 sub modifiable_userdata_row {
|
Line 11160 sub modifiable_userdata_row {
|
} |
} |
} elsif ($context eq 'lti') { |
} elsif ($context eq 'lti') { |
$rolename = &mt('Institutional data used (if available)'); |
$rolename = &mt('Institutional data used (if available)'); |
|
} elsif ($context eq 'privacy') { |
|
$rolename = $itemdesc; |
} else { |
} else { |
if ($role eq 'cr') { |
if ($role eq 'cr') { |
$rolename = &mt('Custom role'); |
$rolename = &mt('Custom role'); |
Line 8580 sub modifiable_userdata_row {
|
Line 11211 sub modifiable_userdata_row {
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
$hashref = $settings->{'instdata'}; |
$hashref = $settings->{'instdata'}; |
} |
} |
|
} elsif ($context eq 'privacy') { |
|
my ($key,$inner) = split(/_/,$role); |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$key}) eq 'HASH') { |
|
$hashref = $settings->{$key}->{$inner}; |
|
} |
|
} |
} elsif (ref($settings->{$context}) eq 'HASH') { |
} elsif (ref($settings->{$context}) eq 'HASH') { |
if (ref($settings->{$context}->{$role}) eq 'HASH') { |
if (ref($settings->{$context}->{$role}) eq 'HASH') { |
$hashref = $settings->{'lti_instdata'}; |
$hashref = $settings->{'lti_instdata'}; |
Line 8617 sub modifiable_userdata_row {
|
Line 11255 sub modifiable_userdata_row {
|
my $check = ' '; |
my $check = ' '; |
unless ($role eq 'emailusername') { |
unless ($role eq 'emailusername') { |
if (exists($checks{$fields[$i]})) { |
if (exists($checks{$fields[$i]})) { |
$check = $checks{$fields[$i]} |
$check = $checks{$fields[$i]}; |
|
} elsif ($context eq 'privacy') { |
|
if ($role =~ /^priv_(domain|course)$/) { |
|
if (ref($settings) ne 'HASH') { |
|
$check = ' checked="checked" '; |
|
} |
|
} elsif ($role =~ /^priv_(author|community)$/) { |
|
if (ref($settings) ne 'HASH') { |
|
unless ($fields[$i] eq 'id') { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
|
} elsif ($role =~ /^(unpriv|othdom)_/) { |
|
if (ref($settings) ne 'HASH') { |
|
if (($fields[$i] eq 'lastname') || ($fields[$i] eq 'firstname')) { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
|
} |
} elsif ($context ne 'lti') { |
} elsif ($context ne 'lti') { |
if ($role eq 'st') { |
if ($role eq 'st') { |
if (ref($settings) ne 'HASH') { |
if (ref($settings) ne 'HASH') { |
Line 8646 sub modifiable_userdata_row {
|
Line 11302 sub modifiable_userdata_row {
|
} else { |
} else { |
if ($context eq 'lti') { |
if ($context eq 'lti') { |
$prefix = 'lti'; |
$prefix = 'lti'; |
|
} elsif ($context eq 'privacy') { |
|
$prefix = 'privacy'; |
} |
} |
$output .= '<label>'. |
$output .= '<label>'. |
'<input type="checkbox" name="'.$prefix.'_'.$role.'" '. |
'<input type="checkbox" name="'.$prefix.'_'.$role.'" '. |
Line 8750 sub insttypes_row {
|
Line 11408 sub insttypes_row {
|
} |
} |
$output .= ' '; |
$output .= ' '; |
} else { |
} else { |
if (($rem == 0) && (@{$types} > 0)) { |
if ($rem == 0) { |
$output .= '<tr>'; |
$output .= '<tr>'; |
} |
} |
if ($colsleft > 1) { |
if ($colsleft > 1) { |
Line 8850 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 8863 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 9109 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 9149 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 9228 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 9733 sub check_configuser {
|
Line 12547 sub check_configuser {
|
my ($configuserok,%currroles); |
my ($configuserok,%currroles); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. |
srand( time() ^ ($$ + ($$ << 15)) ); # Seed rand. |
my $configpass = &LONCAPA::Enrollment::create_password(); |
my $configpass = &LONCAPA::Enrollment::create_password($dom); |
$configuserok = |
$configuserok = |
&Apache::lonnet::modifyuser($dom,$confname,'','internal', |
&Apache::lonnet::modifyuser($dom,$confname,'','internal', |
$configpass,'','','','','',undef,$servadm); |
$configpass,'','','','','',undef,$servadm); |
Line 11029 sub modify_ltitools {
|
Line 13843 sub modify_ltitools {
|
if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
$confhash{$itemid}{$extra} = 1; |
$confhash{$itemid}{$extra} = 1; |
if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') { |
if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') { |
my $lifetime = $env{'form.ltitools_'.$extra.'valid_add'}; |
my $lifetime = $env{'form.ltitools_'.$extra.'valid_'.$i}; |
$lifetime =~ s/^\s+|\s+$//g; |
$lifetime =~ s/^\s+|\s+$//g; |
if ($lifetime =~ /^\d+\.?\d*$/) { |
if ($lifetime =~ /^\d+\.?\d*$/) { |
$confhash{$itemid}{$extra.'valid'} = $lifetime; |
$confhash{$itemid}{$extra.'valid'} = $lifetime; |
Line 11196 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 11256 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 11435 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 11443 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 11457 sub modify_lti {
|
Line 14802 sub modify_lti {
|
map { $posslticrs{$_} = 1; } @lticourseroles; |
map { $posslticrs{$_} = 1; } @lticourseroles; |
map { $posscrstype{$_} = 1; } @coursetypes; |
map { $posscrstype{$_} = 1; } @coursetypes; |
|
|
#FIXME |
my %menutitles = <imenu_titles(); |
|
|
my (@items,%deletions,%itemids); |
my (@items,%deletions,%itemids); |
if ($env{'form.lti_add'}) { |
if ($env{'form.lti_add'}) { |
my $consumer = $env{'form.lti_consumer_add'}; |
my $consumer = $env{'form.lti_consumer_add'}; |
Line 11479 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 11495 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') { |
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 11522 sub modify_lti {
|
Line 14867 sub modify_lti {
|
if ($env{'form.lti_version_'.$idx} eq 'LTI-1p0') { |
if ($env{'form.lti_version_'.$idx} eq 'LTI-1p0') { |
$confhash{$itemid}{'version'} = $env{'form.lti_version_'.$idx}; |
$confhash{$itemid}{'version'} = $env{'form.lti_version_'.$idx}; |
} |
} |
if ($env{'form.lti_mapuser_'.$idx} eq 'sourcedid') { |
if ($confhash{$itemid}{'requser'}) { |
$confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid'; |
if ($env{'form.lti_mapuser_'.$idx} eq 'sourcedid') { |
} elsif ($env{'form.lti_mapuser_'.$idx} eq 'email') { |
$confhash{$itemid}{'mapuser'} = 'lis_person_sourcedid'; |
$confhash{$itemid}{'mapuser'} = 'lis_person_contact_email_primary'; |
} elsif ($env{'form.lti_mapuser_'.$idx} eq 'email') { |
} elsif ($env{'form.lti_mapuser_'.$idx} eq 'other') { |
$confhash{$itemid}{'mapuser'} = 'lis_person_contact_email_primary'; |
my $mapuser = $env{'form.lti_customuser_'.$idx}; |
} elsif ($env{'form.lti_mapuser_'.$idx} eq 'other') { |
$mapuser =~ s/(`)/'/g; |
my $mapuser = $env{'form.lti_customuser_'.$idx}; |
$mapuser =~ s/^\s+|\s+$//g; |
$mapuser =~ s/(`)/'/g; |
$confhash{$itemid}{'mapuser'} = $mapuser; |
$mapuser =~ s/^\s+|\s+$//g; |
} |
$confhash{$itemid}{'mapuser'} = $mapuser; |
foreach my $ltirole (@lticourseroles) { |
} |
my $possrole = $env{'form.lti_maprole_'.$ltirole.'_'.$idx}; |
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
if (grep(/^\Q$possrole\E$/,@courseroles)) { |
my @makeuser; |
$confhash{$itemid}{'maproles'}{$ltirole} = $possrole; |
foreach my $ltirole (sort(@possmakeuser)) { |
} |
if ($posslti{$ltirole}) { |
} |
push(@makeuser,$ltirole); |
my @possmakeuser = &Apache::loncommon::get_env_multiple('form.lti_makeuser_'.$idx); |
} |
my @makeuser; |
} |
foreach my $ltirole (sort(@possmakeuser)) { |
$confhash{$itemid}{'makeuser'} = \@makeuser; |
if ($posslti{$ltirole}) { |
if (@makeuser) { |
push(@makeuser,$ltirole); |
my $lcauth = $env{'form.lti_lcauth_'.$idx}; |
} |
if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) { |
} |
$confhash{$itemid}{'lcauth'} = $lcauth; |
$confhash{$itemid}{'makeuser'} = \@makeuser; |
if ($lcauth ne 'internal') { |
if (@makeuser) { |
my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx}; |
my $lcauth = $env{'form.lti_lcauth_'.$idx}; |
$lcauthparm =~ s/^(\s+|\s+)$//g; |
if ($lcauth =~ /^(internal|krb4|krb5|localauth)$/) { |
$lcauthparm =~ s/`//g; |
$confhash{$itemid}{'lcauth'} = $lcauth; |
if ($lcauthparm ne '') { |
if ($lcauth ne 'internal') { |
$confhash{$itemid}{'lcauthparm'} = $lcauthparm; |
my $lcauthparm = $env{'form.lti_lcauthparm_'.$idx}; |
} |
$lcauthparm =~ s/^(\s+|\s+)$//g; |
|
$lcauthparm =~ s/`//g; |
|
if ($lcauthparm ne '') { |
|
$confhash{$itemid}{'lcauthparm'} = $lcauthparm; |
|
} |
} |
|
} else { |
|
$confhash{$itemid}{'lcauth'} = 'lti'; |
} |
} |
} else { |
|
$confhash{$itemid}{'lcauth'} = 'lti'; |
|
} |
|
} |
|
my @possinstdata = &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx); |
|
if (@possinstdata) { |
|
foreach my $field (@possinstdata) { |
|
if (exists($fieldtitles{$field})) { |
|
push(@{$confhash{$itemid}{'instdata'}}); |
|
} |
|
} |
|
} |
|
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); |
|
} |
} |
} |
my @possinstdata = &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx); |
$confhash{$itemid}{'selfenroll'} = \@selfenroll; |
if (@possinstdata) { |
if ($env{'form.lti_crssec_'.$idx}) { |
foreach my $field (@possinstdata) { |
if ($env{'form.lti_crssecsrc_'.$idx} eq 'course_section_sourcedid') { |
if (exists($fieldtitles{$field})) { |
$confhash{$itemid}{'section'} = $env{'form.lti_crssecsrc_'.$idx}; |
push(@{$confhash{$itemid}{'instdata'}}); |
} 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}) { |
foreach my $field ('passback','roster') { |
if ($env{'form.lti_callbackparam_'.$idx}) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
my $callback = $env{'form.lti_callbackparam_'.$idx}; |
$confhash{$itemid}{$field} = 1; |
$callback =~ s/^\s+|\s+$//g; |
|
$confhash{$itemid}{'callback'} = $callback; |
|
} |
} |
} |
} |
foreach my $field ('topmenu','inlinemenu') { |
unless (($idx eq 'add') || ($changes{$itemid})) { |
if ($env{'form.lti_'.$field.'_'.$idx}) { |
foreach my $field ('mapuser','mapcrs','makecrs','section','passback','roster','lcauth','lcauthparm') { |
$confhash{$itemid}{$field} = 1; |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
} |
foreach my $field ('makeuser','mapcrstype','selfenroll','instdata') { |
if ($env{'form.lti_topmenu_'.$idx} || $env{'form.lti_inlinemenu_'.$idx}) { |
unless ($changes{$itemid}) { |
$confhash{$itemid}{lcmenu} = []; |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
my @possmenu = &Apache::loncommon::get_env_multiple('form.lti_menuitem_'.$idx); |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
foreach my $field (@possmenu) { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
if (exists($menutitles{$field})) { |
$confhash{$itemid}{$field}); |
if ($field eq 'grades') { |
if (@diffs) { |
next unless ($env{'form.lti_inlinemenu_'.$idx}); |
$changes{$itemid} = 1; |
|
} |
|
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
push(@{$confhash{$itemid}{lcmenu}},$field); |
if (@{$confhash{$itemid}{$field}} > 0) { |
} |
$changes{$itemid} = 1; |
} |
|
} |
|
if ($confhash{$itemid}{'crsinc'}) { |
|
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_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; |
} |
} |
} |
} |
|
} |
|
foreach my $field ('passback','roster') { |
|
if ($env{'form.lti_'.$field.'_'.$idx}) { |
|
$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 ($changes{$itemid}) { |
unless (($idx eq 'add') || ($changes{$itemid})) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
if ($confhash{$itemid}{'crsinc'}) { |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') { |
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
$changes{$itemid} = 1; |
$confhash{$itemid}{'maproles'}{$ltirole}) { |
} |
|
} |
|
unless ($changes{$itemid}) { |
|
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
|
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
|
} |
} |
} |
} |
|
} |
|
foreach my $field ('mapcrstype','selfenroll') { |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
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; |
last; |
|
} |
} |
} |
} |
} |
} |
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
|
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (keys(%{$confhash{$itemid}{'maproles'}}) > 0) { |
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; |
|
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; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
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; |
} |
} |
} |
} |
|
unless ($changes{$itemid}) { |
|
foreach my $field ('makeuser','lcmenu') { |
|
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 11697 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 11723 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 11739 sub modify_lti {
|
Line 15157 sub modify_lti {
|
my $num = length($encconfig{$itemid}{'secret'}); |
my $num = length($encconfig{$itemid}{'secret'}); |
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
if ($confhash{$itemid}{'mapuser'}) { |
if ($confhash{$itemid}{'requser'}) { |
my $shownmapuser; |
if ($confhash{$itemid}{'callback'}) { |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
$resulttext .= '<li>'.&mt('Callback setting').': '.$confhash{$itemid}{'callback'}.'</li>'; |
$shownmapuser = $lt{'sourcedid'}.' (lis_person_sourcedid)'; |
|
} elsif ($confhash{$itemid}{'mapuser'} eq 'lis_person_contact_email_primary') { |
|
$shownmapuser = $lt{'email'}.' (lis_person_contact_email_primary)'; |
|
} else { |
} else { |
$shownmapuser = &mt('Other').' ('.$confhash{$itemid}{'mapuser'}.')'; |
$resulttext .= '<li>'.&mt('Callback to logout LON-CAPA on log out from Consumer').'</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) { |
if ($confhash{$itemid}{'mapuser'}) { |
$rolemaps =~ s/,$//; |
my $shownmapuser; |
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
if ($confhash{$itemid}{'mapuser'} eq 'lis_person_sourcedid') { |
} |
$shownmapuser = $lt{'sourcedid'}.' (lis_person_sourcedid)'; |
} |
} elsif ($confhash{$itemid}{'mapuser'} eq 'lis_person_contact_email_primary') { |
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
$shownmapuser = $lt{'email'}.' (lis_person_contact_email_primary)'; |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
|
join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />'; |
|
if ($confhash{$itemid}{'lcauth'} eq 'lti') { |
|
$resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>'; |
|
} else { |
} else { |
$resulttext .= &mt('New users will be assigned LON-CAPA authentication: [_1]', |
$shownmapuser = &mt('Other').' ('.$confhash{$itemid}{'mapuser'}.')'; |
$confhash{$itemid}{'lcauth'}); |
} |
if ($confhash{$itemid}{'lcauth'} eq 'internal') { |
$resulttext .= '<li>'.&mt('LON-CAPA username').': '.$shownmapuser.'</li>'; |
$resulttext .= '; '.&mt('a randomly generated password will be created'); |
} |
} elsif ($confhash{$itemid}{'lcauth'} eq 'localauth') { |
if (ref($confhash{$itemid}{'makeuser'}) eq 'ARRAY') { |
if ($confhash{$itemid}{'lcauthparm'} ne '') { |
if (@{$confhash{$itemid}{'makeuser'}} > 0) { |
$resulttext .= ' '.&mt('with argument: [_1]',$confhash{$itemid}{'lcauthparm'}); |
$resulttext .= '<li>'.&mt('Following roles may create user accounts: [_1]', |
} |
join(', ',@{$confhash{$itemid}{'makeuser'}})).'<br />'; |
|
if ($confhash{$itemid}{'lcauth'} eq 'lti') { |
|
$resulttext .= &mt('New users will only be able to authenticate via LTI').'</li>'; |
} else { |
} else { |
$resulttext .= '; '.&mt('Kerberos domain: [_1]',$confhash{$itemid}{'lcauthparm'}); |
$resulttext .= &mt('New users will be assigned LON-CAPA authentication: [_1]', |
|
$confhash{$itemid}{'lcauth'}); |
|
if ($confhash{$itemid}{'lcauth'} eq 'internal') { |
|
$resulttext .= '; '.&mt('a randomly generated password will be created'); |
|
} elsif ($confhash{$itemid}{'lcauth'} eq 'localauth') { |
|
if ($confhash{$itemid}{'lcauthparm'} ne '') { |
|
$resulttext .= ' '.&mt('with argument: [_1]',$confhash{$itemid}{'lcauthparm'}); |
|
} |
|
} else { |
|
$resulttext .= '; '.&mt('Kerberos domain: [_1]',$confhash{$itemid}{'lcauthparm'}); |
|
} |
} |
} |
|
$resulttext .= '</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User account creation not permitted.').'</li>'; |
} |
} |
$resulttext .= '</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('User account creation not permitted.').'</li>'; |
|
} |
|
} |
|
if (ref($confhash{$itemid}{'instdata'}) eq 'ARRAY') { |
|
if (@{$confhash{$itemid}{'instdata'}} > 0) { |
|
$resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]', |
|
join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
|
} |
} |
} |
if (ref($confhash{$itemid}{'instdata'}) eq 'ARRAY') { |
if ($confhash{$itemid}{'mapcrs'}) { |
if (@{$confhash{$itemid}{'instdata'}} > 0) { |
$resulttext .= '<li>'.&mt('Unique course identifier').': '.$confhash{$itemid}{'mapcrs'}.'</li>'; |
$resulttext .= '<li>'.&mt('Institutional data will be used when creating a new user for: [_1]', |
} |
join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'</li>'; |
if (ref($confhash{$itemid}{'mapcrstype'}) eq 'ARRAY') { |
} else { |
if (@{$confhash{$itemid}{'mapcrstype'}} > 0) { |
$resulttext .= '<li>'.&mt('No institutional data used when creating a new user.').'</li>'; |
$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>'; |
|
} |
} |
} |
foreach my $item ('topmenu','inlinemenu') { |
if ($confhash{$itemid}{'makecrs'}) { |
$resulttext .= '<li>'.$lt{$item}.': '; |
$resulttext .= '<li>'.&mt('Instructor may create course (if absent).').'</li>'; |
if ($confhash{$itemid}{$item}) { |
} else { |
$resulttext .= &mt('Yes'); |
$resulttext .= '<li>'.&mt('Instructor may not create course (if absent).').'</li>'; |
} else { |
} |
$resulttext .= &mt('No'); |
if (ref($confhash{$itemid}{'selfenroll'}) eq 'ARRAY') { |
} |
if (@{$confhash{$itemid}{'selfenroll'}} > 0) { |
$resulttext .= '</li>'; |
$resulttext .= '<li>'.&mt('Self-enrollment for following roles: [_1]', |
|
join(', ',@{$confhash{$itemid}{'selfenroll'}})). |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Self-enrollment not permitted').'</li>'; |
|
} |
} |
} |
if (ref($confhash{$itemid}{'lcmenu'}) eq 'ARRAY') { |
if ($confhash{$itemid}{'section'}) { |
if (@{$confhash{$itemid}{'lcmenu'}} > 0) { |
if ($confhash{$itemid}{'section'} eq 'course_section_sourcedid') { |
$resulttext .= '<li>'.&mt('Menu items:').' '. |
$resulttext .= '<li>'.&mt('User section from standard field:'). |
join(', ', map { $menutitles{$_}; } (@{$confhash{$itemid}{'lcmenu'}})).'</li>'; |
' (course_section_sourcedid)'.'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('No menu items displayed in header or online menu').'</li>'; |
$resulttext .= '<li>'.&mt('User section from:').' '. |
} |
$confhash{$itemid}{'section'}.'</li>'; |
|
} |
} |
} else { |
if ($confhash{$itemid}{'crsinc'}) { |
$resulttext .= '<li>'.&mt('No section assignment').'</li>'; |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
} |
my $rolemaps; |
foreach my $item ('passback','roster') { |
foreach my $role (@ltiroles) { |
$resulttext .= '<li>'.$lt{$item}.' '; |
if ($confhash{$itemid}{'maproles'}{$role}) { |
if ($confhash{$itemid}{$item}) { |
$rolemaps .= (' 'x2).$role.'='. |
$resulttext .= &mt('Yes'); |
&Apache::lonnet::plaintext($confhash{$itemid}{'maproles'}{$role}, |
} else { |
'Course').','; |
$resulttext .= &mt('No'); |
} |
|
} |
|
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 { |
|
$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>'; |
|
} |
|
} |
} |
} |
$resulttext .= '</li>'; |
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
Line 12017 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 12062 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 12113 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 12175 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 12487 sub modify_contacts {
|
Line 15977 sub modify_contacts {
|
my (%others,%to,%bcc,%includestr,%includeloc); |
my (%others,%to,%bcc,%includestr,%includeloc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','otherdomsmail', |
'lonstatusmail','requestsmail','updatesmail','idconflictsmail'); |
'lonstatusmail','requestsmail','updatesmail','idconflictsmail','hostipmail'); |
my @toggles = ('reporterrors','reportupdates'); |
my @toggles = ('reporterrors','reportupdates','reportstatus'); |
|
my @lonstatus = ('threshold','sysmail','weights','excluded'); |
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
my ($fields,$fieldtitles,$fieldoptions,$possoptions) = &helpform_fields(); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
@{$newsetting{$type}} = |
@{$newsetting{$type}} = |
Line 12521 sub modify_contacts {
|
Line 16012 sub modify_contacts {
|
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item}; |
$contacts_hash{'contacts'}{$item} = $env{'form.'.$item}; |
} |
} |
} |
} |
|
my ($lonstatus_defs,$lonstatus_names) = &Apache::loncommon::lon_status_items(); |
|
foreach my $item (@lonstatus) { |
|
if ($item eq 'excluded') { |
|
my (%serverhomes,@excluded); |
|
map { $serverhomes{$_} = 1; } values(%Apache::lonnet::serverhomeIDs); |
|
my @possexcluded = &Apache::loncommon::get_env_multiple('form.errorexcluded'); |
|
if (@possexcluded) { |
|
foreach my $id (sort(@possexcluded)) { |
|
if ($serverhomes{$id}) { |
|
push(@excluded,$id); |
|
} |
|
} |
|
} |
|
if (@excluded) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item} = \@excluded; |
|
} |
|
} elsif ($item eq 'weights') { |
|
foreach my $type ('E','W','N','U') { |
|
$env{'form.error'.$item.'_'.$type} =~ s/^\s+|\s+$//g; |
|
if ($env{'form.error'.$item.'_'.$type} =~ /^\d+$/) { |
|
unless ($env{'form.error'.$item.'_'.$type} == $lonstatus_defs->{$type}) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item}{$type} = |
|
$env{'form.error'.$item.'_'.$type}; |
|
} |
|
} |
|
} |
|
} elsif (($item eq 'threshold') || ($item eq 'sysmail')) { |
|
$env{'form.error'.$item} =~ s/^\s+|\s+$//g; |
|
if ($env{'form.error'.$item} =~ /^\d+$/) { |
|
unless ($env{'form.error'.$item} == $lonstatus_defs->{$item}) { |
|
$contacts_hash{'contacts'}{'lonstatus'}{$item} = $env{'form.error'.$item}; |
|
} |
|
} |
|
} |
|
} |
if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) { |
if ((ref($fields) eq 'ARRAY') && (ref($possoptions) eq 'HASH')) { |
foreach my $field (@{$fields}) { |
foreach my $field (@{$fields}) { |
if (ref($possoptions->{$field}) eq 'ARRAY') { |
if (ref($possoptions->{$field}) eq 'ARRAY') { |
Line 12659 sub modify_contacts {
|
Line 16185 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
|
if (ref($currsetting{'lonstatus'}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if ($key eq 'excluded') { |
|
if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') && |
|
(ref($contacts_hash{contacts}{lonstatus}{excluded}) eq 'ARRAY')) { |
|
if ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') && |
|
(@{$currsetting{'lonstatus'}{$key}})) { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($contacts_hash{contacts}{lonstatus}{excluded}, |
|
$currsetting{'lonstatus'}{$key}); |
|
if (@diffs) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif (@{$contacts_hash{contacts}{lonstatus}{excluded}}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ((ref($currsetting{'lonstatus'}{$key}) eq 'ARRAY') && |
|
(@{$currsetting{'lonstatus'}{$key}})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($key eq 'weights') { |
|
if ((ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') && |
|
(ref($contacts_hash{contacts}{lonstatus}{$key}) eq 'HASH')) { |
|
if (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
unless ($contacts_hash{contacts}{lonstatus}{$key}{$type} eq |
|
$currsetting{'lonstatus'}{$key}{$type}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} else { |
|
foreach my $type ('E','W','N','U') { |
|
if ($contacts_hash{contacts}{lonstatus}{$key}{$type} ne '') { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (ref($currsetting{'lonstatus'}{$key}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
if ($currsetting{'lonstatus'}{$key}{$type} ne '') { |
|
push(@{$changes{'lonstatus'}},$key); |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (($key eq 'threshold') || ($key eq 'sysmail')) { |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
if ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) { |
|
if ($currsetting{'lonstatus'}{$key} != $contacts_hash{contacts}{lonstatus}{$key}) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($contacts_hash{contacts}{lonstatus}{$key} =~ /^\d+$/) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} elsif ($currsetting{'lonstatus'}{$key} =~ /^\d+$/) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} |
|
} |
|
} else { |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if (exists($contacts_hash{contacts}{lonstatus}{$key})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} |
|
} |
|
} |
} else { |
} else { |
my %default; |
my %default; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
Line 12670 sub modify_contacts {
|
Line 16266 sub modify_contacts {
|
$default{'lonstatusmail'} = 'adminemail'; |
$default{'lonstatusmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'requestsmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
$default{'updatesmail'} = 'adminemail'; |
|
$default{'hostipmail'} = 'adminemail'; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $default{$item}) { |
if ($to{$item} ne $default{$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
Line 12703 sub modify_contacts {
|
Line 16300 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
|
if (ref($contacts_hash{contacts}{lonstatus}) eq 'HASH') { |
|
foreach my $key ('excluded','weights','threshold','sysmail') { |
|
if (exists($contacts_hash{contacts}{lonstatus}{$key})) { |
|
push(@{$changes{'lonstatus'}},$key); |
|
} |
|
} |
|
} |
} |
} |
foreach my $item (@toggles) { |
foreach my $item (@toggles) { |
if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) { |
if (($env{'form.'.$item} == 1) && ($currsetting{$item} == 0)) { |
Line 12828 sub modify_contacts {
|
Line 16432 sub modify_contacts {
|
} |
} |
} |
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
|
my $corelink = &core_link_msu(); |
if ($changes{'reporterrors'}) { |
if ($changes{'reporterrors'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
&mt('E-mail error reports to [_1] set to "'. |
&mt('E-mail error reports to [_1] set to "'. |
$offon[$env{'form.reporterrors'}].'".', |
$offon[$env{'form.reporterrors'}].'".', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$corelink). |
&mt('LON-CAPA core group - MSU'),600,500)). |
|
'</li>'; |
'</li>'; |
} |
} |
if ($changes{'reportupdates'}) { |
if ($changes{'reportupdates'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'. |
&mt('E-mail record of completed LON-CAPA updates to [_1] set to "'. |
$offon[$env{'form.reportupdates'}].'".', |
$offon[$env{'form.reportupdates'}].'".', |
&Apache::loncommon::modal_link('http://loncapa.org/core.html', |
$corelink). |
&mt('LON-CAPA core group - MSU'),600,500)). |
'</li>'; |
|
} |
|
if ($changes{'reportstatus'}) { |
|
$resulttext .= '<li>'. |
|
&mt('E-mail status if errors above threshold to [_1] set to "'. |
|
$offon[$env{'form.reportstatus'}].'".', |
|
$corelink). |
'</li>'; |
'</li>'; |
} |
} |
|
if (ref($changes{'lonstatus'}) eq 'ARRAY') { |
|
$resulttext .= '<li>'. |
|
&mt('Nightly status check e-mail settings').':<ul>'; |
|
my (%defval,%use_def,%shown); |
|
$defval{'threshold'} = $lonstatus_defs->{'threshold'}; |
|
$defval{'sysmail'} = $lonstatus_defs->{'sysmail'}; |
|
$defval{'weights'} = |
|
join(', ',map { $lonstatus_names->{$_}.'='.$lonstatus_defs->{$_}; } ('E','W','N','U')); |
|
$defval{'excluded'} = &mt('None'); |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}) eq 'HASH') { |
|
foreach my $item ('threshold','sysmail','weights','excluded') { |
|
if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item})) { |
|
if (($item eq 'threshold') || ($item eq 'sysmail')) { |
|
$shown{$item} = $contacts_hash{'contacts'}{'lonstatus'}{$item}; |
|
} elsif ($item eq 'weights') { |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'HASH') { |
|
foreach my $type ('E','W','N','U') { |
|
$shown{$item} .= $lonstatus_names->{$type}.'='; |
|
if (exists($contacts_hash{'contacts'}{'lonstatus'}{$item}{$type})) { |
|
$shown{$item} .= $contacts_hash{'contacts'}{'lonstatus'}{$item}{$type}; |
|
} else { |
|
$shown{$item} .= $lonstatus_defs->{$type}; |
|
} |
|
$shown{$item} .= ', '; |
|
} |
|
$shown{$item} =~ s/, $//; |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} elsif ($item eq 'excluded') { |
|
if (ref($contacts_hash{'contacts'}{'lonstatus'}{$item}) eq 'ARRAY') { |
|
$shown{$item} = join(', ',@{$contacts_hash{'contacts'}{'lonstatus'}{$item}}); |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
} else { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
} else { |
|
foreach my $item ('threshold','weights','excluded','sysmail') { |
|
$shown{$item} = $defval{$item}; |
|
} |
|
} |
|
foreach my $item ('threshold','weights','excluded','sysmail') { |
|
$resulttext .= '<li>'.&mt($titles->{'error'.$item}.' -- [_1]', |
|
$shown{$item}).'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) { |
if ((ref($changes{'helpform'}) eq 'ARRAY') && (ref($fields) eq 'ARRAY')) { |
my (@optional,@required,@unused,$maxsizechg); |
my (@optional,@required,@unused,$maxsizechg); |
foreach my $field (@{$changes{'helpform'}}) { |
foreach my $field (@{$changes{'helpform'}}) { |
Line 12895 sub modify_contacts {
|
Line 16556 sub modify_contacts {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_privacy { |
|
my ($dom,%domconfig) = @_; |
|
my ($resulttext,%current,%changes); |
|
if (ref($domconfig{'privacy'}) eq 'HASH') { |
|
%current = %{$domconfig{'privacy'}}; |
|
} |
|
my @fields = ('lastname','firstname','middlename','generation','permanentemail','id'); |
|
my @items = ('domain','author','course','community'); |
|
my %names = &Apache::lonlocal::texthash ( |
|
domain => 'Assigned domain role(s)', |
|
author => 'Assigned co-author role(s)', |
|
course => 'Assigned course role(s)', |
|
community => 'Assigned community role', |
|
); |
|
my %roles = &Apache::lonlocal::texthash ( |
|
domain => 'Domain role', |
|
author => 'Co-author role', |
|
course => 'Course role', |
|
community => 'Community role', |
|
); |
|
my %titles = &Apache::lonlocal::texthash ( |
|
approval => 'Approval for role in different domain', |
|
othdom => 'User information available in other domain', |
|
priv => 'Information viewable by privileged user in same domain', |
|
unpriv => 'Information viewable by unprivileged user in same domain', |
|
instdom => 'Other domain shares institution/provider', |
|
extdom => 'Other domain has different institution/provider', |
|
none => 'Not allowed', |
|
user => 'User authorizes', |
|
domain => 'Domain Coordinator authorizes', |
|
auto => 'Unrestricted', |
|
); |
|
my %fieldnames = &Apache::lonlocal::texthash ( |
|
id => 'Student/Employee ID', |
|
permanentemail => 'E-mail address', |
|
lastname => 'Last Name', |
|
firstname => 'First Name', |
|
middlename => 'Middle Name', |
|
generation => 'Generation', |
|
); |
|
my ($othertitle,$usertypes,$types) = |
|
&Apache::loncommon::sorted_inst_types($dom); |
|
my (%by_ip,%by_location,@intdoms,@instdoms); |
|
&build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms); |
|
|
|
my %privacyhash = ( |
|
'approval' => { |
|
instdom => {}, |
|
extdom => {}, |
|
}, |
|
'othdom' => {}, |
|
'priv' => {}, |
|
'unpriv' => {}, |
|
); |
|
foreach my $item (@items) { |
|
if (@instdoms > 1) { |
|
if ($env{'form.privacy_approval_instdom'.$item} =~ /^(none|user|domain|auto)$/) { |
|
$privacyhash{'approval'}{'instdom'}{$item} = $env{'form.privacy_approval_instdom_'.$item}; |
|
} |
|
if (ref($current{'approval'}) eq 'HASH') { |
|
if (ref($current{'approval'}{'instdom'}) eq 'HASH') { |
|
unless ($privacyhash{'approval'}{'instdom'}{$item} eq $current{'approval'}{'instdom'}{$item}) { |
|
$changes{'approval'} = 1; |
|
} |
|
} |
|
} elsif ($privacyhash{'approval'}{'instdom'}{$item} ne 'auto') { |
|
$changes{'approval'} = 1; |
|
} |
|
} |
|
if (keys(%by_location) > 0) { |
|
if ($env{'form.privacy_approval_extdom_'.$item} =~ /^(none|user|domain|auto)$/) { |
|
$privacyhash{'approval'}{'extdom'}{$item} = $env{'form.privacy_approval_extdom_'.$item}; |
|
} |
|
if (ref($current{'approval'}) eq 'HASH') { |
|
if (ref($current{'approval'}{'extdom'}) eq 'HASH') { |
|
unless ($privacyhash{'approval'}{'extdom'}{$item} eq $current{'approval'}{'extdom'}{$item}) { |
|
$changes{'approval'} = 1; |
|
} |
|
} |
|
} elsif ($privacyhash{'approval'}{'extdom'}{$item} ne 'auto') { |
|
$changes{'approval'} = 1; |
|
} |
|
} |
|
foreach my $status ('priv','unpriv') { |
|
my @possibles = sort(&Apache::loncommon::get_env_multiple('form.privacy_'.$status.'_'.$item)); |
|
my @newvalues; |
|
foreach my $field (@possibles) { |
|
if (grep(/^\Q$field\E$/,@fields)) { |
|
$privacyhash{$status}{$item}{$field} = 1; |
|
push(@newvalues,$field); |
|
} |
|
} |
|
@newvalues = sort(@newvalues); |
|
if (ref($current{$status}) eq 'HASH') { |
|
if (ref($current{$status}{$item}) eq 'HASH') { |
|
my @currvalues = sort(keys(%{$current{$status}{$item}})); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues); |
|
if (@diffs > 0) { |
|
$changes{$status} = 1; |
|
} |
|
} |
|
} else { |
|
my @stdfields; |
|
foreach my $field (@fields) { |
|
if ($field eq 'id') { |
|
next if ($status eq 'unpriv'); |
|
next if (($status eq 'priv') && ($item eq 'community')); |
|
} |
|
push(@stdfields,$field); |
|
} |
|
my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues); |
|
if (@diffs > 0) { |
|
$changes{$status} = 1; |
|
} |
|
} |
|
} |
|
} |
|
if ((@instdoms > 1) || (keys(%by_location) > 0)) { |
|
my @statuses; |
|
if (ref($types) eq 'ARRAY') { |
|
@statuses = @{$types}; |
|
} |
|
foreach my $type (@statuses,'default') { |
|
my @possfields = &Apache::loncommon::get_env_multiple('form.privacy_othdom_'.$type); |
|
my @newvalues; |
|
foreach my $field (sort(@possfields)) { |
|
if (grep(/^\Q$field\E$/,@fields)) { |
|
$privacyhash{'othdom'}{$type}{$field} = 1; |
|
push(@newvalues,$field); |
|
} |
|
} |
|
@newvalues = sort(@newvalues); |
|
if (ref($current{'othdom'}) eq 'HASH') { |
|
if (ref($current{'othdom'}{$type}) eq 'HASH') { |
|
my @currvalues = sort(keys(%{$current{'othdom'}{$type}})); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@currvalues,\@newvalues); |
|
if (@diffs > 0) { |
|
$changes{'othdom'} = 1; |
|
} |
|
} |
|
} else { |
|
my @stdfields = ('lastname','firstname','middlename','generation','permanentemail'); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@stdfields,\@newvalues); |
|
if (@diffs > 0) { |
|
$changes{'othdom'} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my %confighash = ( |
|
privacy => \%privacyhash, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom); |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes) > 0) { |
|
$resulttext = &mt('Changes made: ').'<ul>'; |
|
foreach my $key ('approval','othdom','priv','unpriv') { |
|
if ($changes{$key}) { |
|
$resulttext .= '<li>'.$titles{$key}.':<ul>'; |
|
if ($key eq 'approval') { |
|
if (keys(%{$privacyhash{$key}{instdom}})) { |
|
$resulttext .= '<li>'.$titles{'instdom'}.'<ul>'; |
|
foreach my $item (@items) { |
|
$resulttext .= '<li>'.$roles{$item}.': '.$titles{$privacyhash{$key}{instdom}{$item}}.'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
if (keys(%{$privacyhash{$key}{extdom}})) { |
|
$resulttext .= '<li>'.$titles{'extdom'}.'<ul>'; |
|
foreach my $item (@items) { |
|
$resulttext .= '<li>'.$roles{$item}.': '.$titles{$privacyhash{$key}{extdom}{$item}}.'</li>'; |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} elsif ($key eq 'othdom') { |
|
my @statuses; |
|
if (ref($types) eq 'ARRAY') { |
|
@statuses = @{$types}; |
|
} |
|
if (ref($privacyhash{$key}) eq 'HASH') { |
|
foreach my $status (@statuses,'default') { |
|
if ($status eq 'default') { |
|
$resulttext .= '<li>'.$othertitle.': '; |
|
} elsif (ref($usertypes) eq 'HASH') { |
|
$resulttext .= '<li>'.$usertypes->{$status}.': '; |
|
} else { |
|
next; |
|
} |
|
if (ref($privacyhash{$key}{$status}) eq 'HASH') { |
|
if (keys(%{$privacyhash{$key}{$status}})) { |
|
$resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$status}})))); |
|
} else { |
|
$resulttext .= &mt('none'); |
|
} |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
} else { |
|
foreach my $item (@items) { |
|
if (ref($privacyhash{$key}{$item}) eq 'HASH') { |
|
$resulttext .= '<li>'.$names{$item}.': '; |
|
if (keys(%{$privacyhash{$key}{$item}})) { |
|
$resulttext .= join(', ', map { $fieldnames{$_}; } (sort(keys(%{$privacyhash{$key}{$item}})))); |
|
} else { |
|
$resulttext .= &mt('none'); |
|
} |
|
$resulttext .= '</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
} else { |
|
$resulttext = &mt('No changes made to user information settings'); |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
|
sub modify_passwords { |
|
my ($r,$dom,$confname,$lastactref,%domconfig) = @_; |
|
my ($resulttext,%current,%changes,%newvalues,@oktypes,$errors, |
|
$updatedefaults,$updateconf); |
|
my $customfn = 'resetpw.html'; |
|
if (ref($domconfig{'passwords'}) eq 'HASH') { |
|
%current = %{$domconfig{'passwords'}}; |
|
} |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
if (ref($types) eq 'ARRAY') { |
|
@oktypes = @{$types}; |
|
} |
|
push(@oktypes,'default'); |
|
|
|
my %titles = &Apache::lonlocal::texthash ( |
|
intauth_cost => 'Encryption cost for bcrypt (positive integer)', |
|
intauth_check => 'Check bcrypt cost if authenticated', |
|
intauth_switch => 'Existing crypt-based switched to bcrypt on authentication', |
|
permanent => 'Permanent e-mail address', |
|
critical => 'Critical notification address', |
|
notify => 'Notification address', |
|
min => 'Minimum password length', |
|
max => 'Maximum password length', |
|
chars => 'Required characters', |
|
expire => 'Password expiration (days)', |
|
numsaved => 'Number of previous passwords to save', |
|
reset => 'Resetting Forgotten Password', |
|
intauth => 'Encryption of Stored Passwords (Internal Auth)', |
|
rules => 'Rules for LON-CAPA Passwords', |
|
crsownerchg => 'Course Owner Changing Student Passwords', |
|
username => 'Username', |
|
email => 'E-mail address', |
|
); |
|
|
|
# |
|
# Retrieve current domain configuration for internal authentication from $domconfig{'defaults'}. |
|
# |
|
my (%curr_defaults,%save_defaults); |
|
if (ref($domconfig{'defaults'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'defaults'}})) { |
|
if ($key =~ /^intauth_(cost|check|switch)$/) { |
|
$curr_defaults{$key} = $domconfig{'defaults'}{$key}; |
|
} else { |
|
$save_defaults{$key} = $domconfig{'defaults'}{$key}; |
|
} |
|
} |
|
} |
|
my %staticdefaults = ( |
|
'resetlink' => 2, |
|
'resetcase' => \@oktypes, |
|
'resetprelink' => 'both', |
|
'resetemail' => ['critical','notify','permanent'], |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
$staticdefaults{'min'} = $Apache::lonnet::passwdmin; |
|
foreach my $type (@oktypes) { |
|
$staticdefaults{'resetpostlink'}{$type} = ['email','username']; |
|
} |
|
my $linklife = $env{'form.passwords_link'}; |
|
$linklife =~ s/^\s+|\s+$//g; |
|
if (($linklife =~ /^\d+(|\.\d*)$/) && ($linklife > 0)) { |
|
$newvalues{'resetlink'} = $linklife; |
|
if ($current{'resetlink'}) { |
|
if ($current{'resetlink'} ne $linklife) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
if ($staticdefaults{'resetlink'} ne $linklife) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} elsif ($current{'resetlink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
my @casesens; |
|
my @posscase = &Apache::loncommon::get_env_multiple('form.passwords_case_sensitive'); |
|
foreach my $case (sort(@posscase)) { |
|
if (grep(/^\Q$case\E$/,@oktypes)) { |
|
push(@casesens,$case); |
|
} |
|
} |
|
$newvalues{'resetcase'} = \@casesens; |
|
if (ref($current{'resetcase'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetcase'},\@casesens); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetcase'},\@casesens); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
if ($env{'form.passwords_prelink'} =~ /^(both|either)$/) { |
|
$newvalues{'resetprelink'} = $env{'form.passwords_prelink'}; |
|
if (exists($current{'resetprelink'})) { |
|
if ($current{'resetprelink'} ne $newvalues{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
if ($staticdefaults{'resetprelink'} ne $newvalues{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} elsif ($current{'resetprelink'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
foreach my $type (@oktypes) { |
|
my @possplink = &Apache::loncommon::get_env_multiple('form.passwords_postlink_'.$type); |
|
my @postlink; |
|
foreach my $item (sort(@possplink)) { |
|
if ($item =~ /^(email|username)$/) { |
|
push(@postlink,$item); |
|
} |
|
} |
|
$newvalues{'resetpostlink'}{$type} = \@postlink; |
|
unless ($changes{'reset'}) { |
|
if (ref($current{'resetpostlink'}) eq 'HASH') { |
|
if (ref($current{'resetpostlink'}{$type}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetpostlink'}{$type},\@postlink); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} else { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetpostlink'}{$type},\@postlink); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} |
|
} |
|
my @possemailsrc = &Apache::loncommon::get_env_multiple('form.passwords_emailsrc'); |
|
my @resetemail; |
|
foreach my $item (sort(@possemailsrc)) { |
|
if ($item =~ /^(permanent|critical|notify)$/) { |
|
push(@resetemail,$item); |
|
} |
|
} |
|
$newvalues{'resetemail'} = \@resetemail; |
|
unless ($changes{'reset'}) { |
|
if (ref($current{'resetemail'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'resetemail'},\@resetemail); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif (!ref($domconfig{passwords}) eq 'HASH') { |
|
my @diffs = &Apache::loncommon::compare_arrays($staticdefaults{'resetemail'},\@resetemail); |
|
if (@diffs > 0) { |
|
$changes{'reset'} = 1; |
|
} |
|
} |
|
} |
|
if ($env{'form.passwords_stdtext'} == 0) { |
|
$newvalues{'resetremove'} = 1; |
|
unless ($current{'resetremove'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
} elsif ($current{'resetremove'}) { |
|
$changes{'reset'} = 1; |
|
} |
|
if ($env{'form.passwords_customfile.filename'} ne '') { |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = |
|
&config_check($dom,$confname,$servadm); |
|
my $error; |
|
if ($configuserok eq 'ok') { |
|
if ($switchserver) { |
|
$error = &mt("Upload of file containing domain-specific text is not permitted to this server: [_1]",$switchserver); |
|
} else { |
|
if ($author_ok eq 'ok') { |
|
my ($result,$customurl) = |
|
&publishlogo($r,'upload','passwords_customfile',$dom, |
|
$confname,'customtext/resetpw','','',$customfn); |
|
if ($result eq 'ok') { |
|
$newvalues{'resetcustom'} = $customurl; |
|
$changes{'reset'} = 1; |
|
} else { |
|
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$customfn,$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].",$customfn,$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].",$customfn,$confname,$dom,$configuserok); |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} elsif ($current{'resetcustom'}) { |
|
if ($env{'form.passwords_custom_del'}) { |
|
$changes{'reset'} = 1; |
|
} else { |
|
$newvalues{'resetcustom'} = $current{'resetcustom'}; |
|
} |
|
} |
|
$env{'form.intauth_cost'} =~ s/^\s+|\s+$//g; |
|
if (($env{'form.intauth_cost'} ne '') && ($env{'form.intauth_cost'} =~ /^\d+$/)) { |
|
$save_defaults{'intauth_cost'} = $env{'form.intauth_cost'}; |
|
if ($save_defaults{'intauth_cost'} ne $curr_defaults{'intauth_cost'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_cost'} = $curr_defaults{'intauth_cost'}; |
|
} |
|
if ($env{'form.intauth_check'} =~ /^(0|1|2)$/) { |
|
$save_defaults{'intauth_check'} = $env{'form.intauth_check'}; |
|
if ($save_defaults{'intauth_check'} ne $curr_defaults{'intauth_check'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'}; |
|
} |
|
if ($env{'form.intauth_switch'} =~ /^(0|1|2)$/) { |
|
$save_defaults{'intauth_switch'} = $env{'form.intauth_switch'}; |
|
if ($save_defaults{'intauth_switch'} ne $curr_defaults{'intauth_switch'}) { |
|
$changes{'intauth'} = 1; |
|
} |
|
} else { |
|
$save_defaults{'intauth_check'} = $curr_defaults{'intauth_check'}; |
|
} |
|
foreach my $item ('cost','check','switch') { |
|
if ($save_defaults{'intauth_'.$item} ne $domdefaults{'intauth_'.$item}) { |
|
$domdefaults{'intauth_'.$item} = $save_defaults{'intauth_'.$item}; |
|
$updatedefaults = 1; |
|
} |
|
} |
|
foreach my $rule ('min','max','expire','numsaved') { |
|
$env{'form.passwords_'.$rule} =~ s/^\s+|\s+$//g; |
|
my $ruleok; |
|
if ($rule eq 'expire') { |
|
if (($env{'form.passwords_'.$rule} =~ /^\d+(|\.\d*)$/) && |
|
($env{'form.passwords_'.$rule} ne '0')) { |
|
$ruleok = 1; |
|
} |
|
} elsif ($rule eq 'min') { |
|
if ($env{'form.passwords_'.$rule} =~ /^\d+$/) { |
|
if ($env{'form.passwords_'.$rule} >= $Apache::lonnet::passwdmin) { |
|
$ruleok = 1; |
|
} |
|
} |
|
} elsif (($env{'form.passwords_'.$rule} =~ /^\d+$/) && |
|
($env{'form.passwords_'.$rule} ne '0')) { |
|
$ruleok = 1; |
|
} |
|
if ($ruleok) { |
|
$newvalues{$rule} = $env{'form.passwords_'.$rule}; |
|
if (exists($current{$rule})) { |
|
if ($newvalues{$rule} ne $current{$rule}) { |
|
$changes{'rules'} = 1; |
|
} |
|
} elsif ($rule eq 'min') { |
|
if ($staticdefaults{$rule} ne $newvalues{$rule}) { |
|
$changes{'rules'} = 1; |
|
} |
|
} else { |
|
$changes{'rules'} = 1; |
|
} |
|
} elsif (exists($current{$rule})) { |
|
$changes{'rules'} = 1; |
|
} |
|
} |
|
my @posschars = &Apache::loncommon::get_env_multiple('form.passwords_chars'); |
|
my @chars; |
|
foreach my $item (sort(@posschars)) { |
|
if ($item =~ /^(uc|lc|num|spec)$/) { |
|
push(@chars,$item); |
|
} |
|
} |
|
$newvalues{'chars'} = \@chars; |
|
unless ($changes{'rules'}) { |
|
if (ref($current{'chars'}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'chars'},\@chars); |
|
if (@diffs > 0) { |
|
$changes{'rules'} = 1; |
|
} |
|
} else { |
|
if (@chars > 0) { |
|
$changes{'rules'} = 1; |
|
} |
|
} |
|
} |
|
my %crsownerchg = ( |
|
by => [], |
|
for => [], |
|
); |
|
foreach my $item ('by','for') { |
|
my @posstypes = &Apache::loncommon::get_env_multiple('form.passwords_crsowner_'.$item); |
|
foreach my $type (sort(@posstypes)) { |
|
if (grep(/^\Q$type\E$/,@oktypes)) { |
|
push(@{$crsownerchg{$item}},$type); |
|
} |
|
} |
|
} |
|
$newvalues{'crsownerchg'} = \%crsownerchg; |
|
if (ref($current{'crsownerchg'}) eq 'HASH') { |
|
foreach my $item ('by','for') { |
|
if (ref($current{'crsownerchg'}{$item}) eq 'ARRAY') { |
|
my @diffs = &Apache::loncommon::compare_arrays($current{'crsownerchg'}{$item},$crsownerchg{$item}); |
|
if (@diffs > 0) { |
|
$changes{'crsownerchg'} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
} elsif (!(ref($domconfig{passwords}) eq 'HASH')) { |
|
foreach my $item ('by','for') { |
|
if (@{$crsownerchg{$item}} > 0) { |
|
$changes{'crsownerchg'} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
|
|
my %confighash = ( |
|
defaults => \%save_defaults, |
|
passwords => \%newvalues, |
|
); |
|
&process_captcha('passwords',\%changes,$confighash{'passwords'},$domconfig{'passwords'}); |
|
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash,$dom); |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes) > 0) { |
|
$resulttext = &mt('Changes made: ').'<ul>'; |
|
foreach my $key ('reset','intauth','rules','crsownerchg') { |
|
if ($changes{$key}) { |
|
unless ($key eq 'intauth') { |
|
$updateconf = 1; |
|
} |
|
$resulttext .= '<li>'.$titles{$key}.':<ul>'; |
|
if ($key eq 'reset') { |
|
if ($confighash{'passwords'}{'captcha'} eq 'original') { |
|
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: original CAPTCHA').'</li>'; |
|
} elsif ($confighash{'passwords'}{'captcha'} eq 'recaptcha') { |
|
$resulttext .= '<li>'.&mt('CAPTCHA validation set to use: reCAPTCHA').' '. |
|
&mt('version: [_1]',$confighash{'passwords'}{'recaptchaversion'}).'<br />'; |
|
if (ref($confighash{'passwords'}{'recaptchakeys'}) eq 'HASH') { |
|
$resulttext .= &mt('Public key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'public'}).'</br>'. |
|
&mt('Private key: [_1]',$confighash{'passwords'}{'recaptchakeys'}{'private'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No CAPTCHA validation').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetlink'}) { |
|
$resulttext .= '<li>'.&mt('Reset link expiration set to [quant,_1,hour]',$confighash{'passwords'}{'resetlink'}).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No reset link expiration set.').' '. |
|
&mt('Will default to 2 hours').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetcase'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetcase'}} == 0) { |
|
$resulttext .= '<li>'.&mt('User input for username and/or e-mail address not case sensitive for "Forgot Password" web form').'</li>'; |
|
} else { |
|
my $casesens; |
|
foreach my $type (@{$confighash{'passwords'}{'resetcase'}}) { |
|
if ($type eq 'default') { |
|
$casesens .= $othertitle.', '; |
|
} elsif ($usertypes->{$type} ne '') { |
|
$casesens .= $usertypes->{$type}.', '; |
|
} |
|
} |
|
$casesens =~ s/\Q, \E$//; |
|
$resulttext .= '<li>'.&mt('"Forgot Password" web form input for username and/or e-mail address is case-sensitive for: [_1]',$casesens).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Case-sensitivity not set for "Forgot Password" web form').' '.&mt('Will default to case-sensitive for username and/or e-mail address for all').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetprelink'} eq 'either') { |
|
$resulttext .= '<li>'.&mt('Users can enter either a username or an e-mail address in "Forgot Password" web form').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Users can enter both a username and an e-mail address in "Forgot Password" web form').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetpostlink'}) eq 'HASH') { |
|
my $output; |
|
if (ref($types) eq 'ARRAY') { |
|
foreach my $type (@{$types}) { |
|
if (ref($confighash{'passwords'}{'resetpostlink'}{$type}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetpostlink'}{$type}} == 0) { |
|
$output .= $usertypes->{$type}.' -- '.&mt('none'); |
|
} else { |
|
$output .= $usertypes->{$type}.' -- '. |
|
join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{$type}})).'; '; |
|
} |
|
} |
|
} |
|
} |
|
if (ref($confighash{'passwords'}{'resetpostlink'}{'default'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetpostlink'}{'default'}} == 0) { |
|
$output .= $othertitle.' -- '.&mt('none'); |
|
} else { |
|
$output .= $othertitle.' -- '. |
|
join(', ',map { $titles{$_}; } (@{$confighash{'passwords'}{'resetpostlink'}{'default'}})); |
|
} |
|
} |
|
if ($output) { |
|
$resulttext .= '<li>'.&mt('Information required for new password form (by user type) set to: [_1]',$output).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Information required for new password form not set.').' '.&mt('Will default to requiring both the username and an e-mail address').'</li>'; |
|
} |
|
if (ref($confighash{'passwords'}{'resetemail'}) eq 'ARRAY') { |
|
if (@{$confighash{'passwords'}{'resetemail'}} > 0) { |
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$confighash{'passwords'}{'resetemail'}})).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('E-mail address(es) in LON-CAPA used for verification will include: [_1]',join(', ',map { $titles{$_}; } @{$staticdefaults{'resetemail'}})).'</li>'; |
|
} |
|
} else { |
|
$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'}) { |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form not shown').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" web form is shown').'</li>'; |
|
} |
|
if ($confighash{'passwords'}{'resetcustom'}) { |
|
my $customlink = &Apache::loncommon::modal_link($confighash{'passwords'}{'resetcustom'}, |
|
&mt('custom text'),600,500,undef,undef, |
|
undef,undef,'background-color:#ffffff'); |
|
$resulttext .= '<li>'.&mt('Preamble to "Forgot Password" form includes: [_1]',$customlink).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('No custom text included in preamble to "Forgot Password" form').'</li>'; |
|
} |
|
} elsif ($key eq 'intauth') { |
|
foreach my $item ('cost','switch','check') { |
|
my $value = $save_defaults{$key.'_'.$item}; |
|
if ($item eq 'switch') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} elsif ($item eq 'check') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$titles{$key.'_'.$item},$value).'</li>'; |
|
} |
|
} elsif ($key eq 'rules') { |
|
foreach my $rule ('min','max','expire','numsaved') { |
|
if ($confighash{'passwords'}{$rule} eq '') { |
|
if ($rule eq 'min') { |
|
$resulttext .= '<li>'.&mt('[_1] not set.',$titles{$rule}); |
|
' '.&mt('Default of [_1] will be used', |
|
$Apache::lonnet::passwdmin).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{$rule}).'</li>'; |
|
} |
|
} else { |
|
$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') { |
|
if (ref($confighash{'passwords'}{'crsownerchg'}) eq 'HASH') { |
|
if ((@{$confighash{'passwords'}{'crsownerchg'}{'by'}} == 0) || |
|
(@{$confighash{'passwords'}{'crsownerchg'}{'for'}} == 0)) { |
|
$resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>'; |
|
} else { |
|
my %crsownerstr; |
|
foreach my $item ('by','for') { |
|
if (ref($confighash{'passwords'}{'crsownerchg'}{$item}) eq 'ARRAY') { |
|
foreach my $type (@{$confighash{'passwords'}{'crsownerchg'}{$item}}) { |
|
if ($type eq 'default') { |
|
$crsownerstr{$item} .= $othertitle.', '; |
|
} elsif ($usertypes->{$type} ne '') { |
|
$crsownerstr{$item} .= $usertypes->{$type}.', '; |
|
} |
|
} |
|
$crsownerstr{$item} =~ s/\Q, \E$//; |
|
} |
|
} |
|
$resulttext .= '<li>'.&mt('Course owner (with status: [_1]) may change passwords for students (with status: [_2]).', |
|
$crsownerstr{'by'},$crsownerstr{'for'}).'</li>'; |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('Course owner may not change student passwords.').'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made to password settings'); |
|
} |
|
my $cachetime = 24*60*60; |
|
if ($updatedefaults) { |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
if ($updateconf) { |
|
&Apache::lonnet::do_cache_new('passwdconf',$dom,$confighash{'passwords'},$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'passwdconf'} = 1; |
|
} |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
if ($errors) { |
|
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
|
$errors.'</ul></p>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_usercreation { |
sub modify_usercreation { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate); |
my ($resulttext,%curr_usercreation,%changes,%authallowed,%cancreate,%save_usercreate); |
Line 13708 sub modify_selfcreation {
|
Line 18141 sub modify_selfcreation {
|
$chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:'). |
$chgtext .= &mt('For self-created accounts verified by e-mail address, username is set as follows:'). |
'<ul>'; |
'<ul>'; |
foreach my $status (@statuses) { |
foreach my $status (@statuses) { |
if ($type eq 'default') { |
if ($status eq 'default') { |
$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
$chgtext .= '<li>'.$othertitle.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
} else { |
} else { |
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
$chgtext .= '<li>'.$usertypes{$status}.' -- '.$options{$cancreate{'emailverified'}{$status}}.'</li>'; |
Line 13977 sub modify_selfcreation {
|
Line 18410 sub modify_selfcreation {
|
} |
} |
|
|
sub process_captcha { |
sub process_captcha { |
my ($container,$changes,$newsettings,$current) = @_; |
my ($container,$changes,$newsettings,$currsettings) = @_; |
return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH') || (ref($current) eq 'HASH')); |
return unless ((ref($changes) eq 'HASH') && (ref($newsettings) eq 'HASH')); |
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'}; |
$newsettings->{'captcha'} = $env{'form.'.$container.'_captcha'}; |
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') { |
unless ($newsettings->{'captcha'} eq 'recaptcha' || $newsettings->{'captcha'} eq 'notused') { |
$newsettings->{'captcha'} = 'original'; |
$newsettings->{'captcha'} = 'original'; |
} |
} |
if ($current->{'captcha'} ne $newsettings->{'captcha'}) { |
my %current; |
|
if (ref($currsettings) eq 'HASH') { |
|
%current = %{$currsettings}; |
|
} |
|
if ($current{'captcha'} ne $newsettings->{'captcha'}) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
push(@{$changes->{'cancreate'}},'captcha'); |
push(@{$changes->{'cancreate'}},'captcha'); |
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['captcha']; |
$changes->{'cancreate'} = ['captcha']; |
} |
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
} else { |
} else { |
$changes->{'captcha'} = 1; |
$changes->{'captcha'} = 1; |
} |
} |
Line 14011 sub process_captcha {
|
Line 18450 sub process_captcha {
|
} |
} |
$newsettings->{'recaptchaversion'} = $newversion; |
$newsettings->{'recaptchaversion'} = $newversion; |
} |
} |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current{'recaptchakeys'}{'public'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$currpriv = $current{'recaptchakeys'}{'private'}; |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
$newsettings->{'recaptchakeys'} = { |
$newsettings->{'recaptchakeys'} = { |
public => '', |
public => '', |
Line 14021 sub process_captcha {
|
Line 18460 sub process_captcha {
|
} |
} |
} |
} |
} |
} |
if ($current->{'captcha'} eq 'recaptcha') { |
if ($current{'captcha'} eq 'recaptcha') { |
$currversion = $current->{'recaptchaversion'}; |
$currversion = $current{'recaptchaversion'}; |
if ($currversion ne '2') { |
if ($currversion ne '2') { |
$currversion = 1; |
$currversion = 1; |
} |
} |
Line 14034 sub process_captcha {
|
Line 18473 sub process_captcha {
|
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['recaptchaversion']; |
$changes->{'cancreate'} = ['recaptchaversion']; |
} |
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
} else { |
} else { |
$changes->{'recaptchaversion'} = 1; |
$changes->{'recaptchaversion'} = 1; |
} |
} |
Line 14045 sub process_captcha {
|
Line 18486 sub process_captcha {
|
} elsif (!defined($changes->{'cancreate'})) { |
} elsif (!defined($changes->{'cancreate'})) { |
$changes->{'cancreate'} = ['recaptchakeys']; |
$changes->{'cancreate'} = ['recaptchakeys']; |
} |
} |
|
} elsif ($container eq 'passwords') { |
|
$changes->{'reset'} = 1; |
} else { |
} else { |
$changes->{'recaptchakeys'} = 1; |
$changes->{'recaptchakeys'} = 1; |
} |
} |
Line 14160 sub modify_defaults {
|
Line 18603 sub modify_defaults {
|
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my ($resulttext,$mailmsgtxt,%newvalues,%changes,@errors); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def', |
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def','datelocale_def', |
'portal_def','intauth_cost','intauth_check','intauth_switch'); |
'portal_def'); |
my @authtypes = ('internal','krb4','krb5','localauth','lti'); |
my @authtypes = ('internal','krb4','krb5','localauth','lti'); |
foreach my $item (@items) { |
foreach my $item (@items) { |
$newvalues{$item} = $env{'form.'.$item}; |
$newvalues{$item} = $env{'form.'.$item}; |
Line 14202 sub modify_defaults {
|
Line 18645 sub modify_defaults {
|
push(@errors,$item); |
push(@errors,$item); |
} |
} |
} |
} |
} elsif ($item eq 'intauth_cost') { |
|
if ($newvalues{$item} ne '') { |
|
if ($newvalues{$item} =~ /\D/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} elsif ($item eq 'intauth_switch') { |
|
if ($newvalues{$item} ne '') { |
|
unless ($newvalues{$item} =~ /^(0|1|2)$/) { |
|
push(@errors,$item); |
|
} |
|
} |
|
} |
} |
if (grep(/^\Q$item\E$/,@errors)) { |
if (grep(/^\Q$item\E$/,@errors)) { |
$newvalues{$item} = $domdefaults{$item}; |
$newvalues{$item} = $domdefaults{$item}; |
Line 14228 sub modify_defaults {
|
Line 18653 sub modify_defaults {
|
} |
} |
$domdefaults{$item} = $newvalues{$item}; |
$domdefaults{$item} = $newvalues{$item}; |
} |
} |
|
my %staticdefaults = ( |
|
'intauth_cost' => 10, |
|
'intauth_check' => 0, |
|
'intauth_switch' => 0, |
|
); |
|
foreach my $item ('intauth_cost','intauth_check','intauth_switch') { |
|
if (exists($domdefaults{$item})) { |
|
$newvalues{$item} = $domdefaults{$item}; |
|
} else { |
|
$newvalues{$item} = $staticdefaults{$item}; |
|
} |
|
} |
my %defaults_hash = ( |
my %defaults_hash = ( |
defaults => \%newvalues, |
defaults => \%newvalues, |
); |
); |
Line 14356 sub modify_defaults {
|
Line 18793 sub modify_defaults {
|
lti => 'lti', |
lti => 'lti', |
); |
); |
$value = $authnames{$shortauth{$value}}; |
$value = $authnames{$shortauth{$value}}; |
} elsif ($item eq 'intauth_switch') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes', |
|
2 => 'Yes, and copy existing passwd file to passwd.bak file', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} elsif ($item eq 'intauth_check') { |
|
my %optiondesc = &Apache::lonlocal::texthash ( |
|
0 => 'No', |
|
1 => 'Yes, allow login then update passwd file using default cost (if higher)', |
|
2 => 'Yes, disallow login if stored cost is less than domain default', |
|
); |
|
if ($value =~ /^(0|1|2)$/) { |
|
$value = $optiondesc{$value}; |
|
} else { |
|
$value = &mt('none -- defaults to No'); |
|
} |
|
} |
} |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to "[_2]"',$title->{$item},$value).'</li>'; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
$mailmsgtext .= "$title->{$item} set to $value\n"; |
Line 14426 sub modify_scantron {
|
Line 18841 sub modify_scantron {
|
my $custom = 'custom.tab'; |
my $custom = 'custom.tab'; |
my $default = 'default.tab'; |
my $default = 'default.tab'; |
my $servadm = $r->dir_config('lonAdmEMail'); |
my $servadm = $r->dir_config('lonAdmEMail'); |
my ($configuserok,$author_ok,$switchserver) = |
my ($configuserok,$author_ok,$switchserver) = |
&config_check($dom,$confname,$servadm); |
&config_check($dom,$confname,$servadm); |
if ($env{'form.scantronformat.filename'} ne '') { |
if ($env{'form.scantronformat.filename'} ne '') { |
my $error; |
my $error; |
Line 14461 sub modify_scantron {
|
Line 18876 sub modify_scantron {
|
if ($env{'form.scantronformat_del'}) { |
if ($env{'form.scantronformat_del'}) { |
$confhash{'scantron'}{'scantronformat'} = ''; |
$confhash{'scantron'}{'scantronformat'} = ''; |
$changes{'scantronformat'} = 1; |
$changes{'scantronformat'} = 1; |
|
} else { |
|
$confhash{'scantron'}{'scantronformat'} = $domconfig{'scantron'}{'scantronformat'}; |
|
} |
|
} |
|
} |
|
my @options = ('hdr','pad','rem'); |
|
my @fields = &scantroncsv_fields(); |
|
my %titles = &scantronconfig_titles(); |
|
my @formats = &Apache::loncommon::get_env_multiple('form.scantronconfig'); |
|
my ($newdat,$currdat,%newcol,%currcol); |
|
if (grep(/^dat$/,@formats)) { |
|
$confhash{'scantron'}{config}{dat} = 1; |
|
$newdat = 1; |
|
} else { |
|
$newdat = 0; |
|
} |
|
if (grep(/^csv$/,@formats)) { |
|
my %bynum; |
|
foreach my $field (@fields) { |
|
if ($env{'form.scantronconfig_csv_'.$field} =~ /^(\d+)$/) { |
|
my $posscol = $1; |
|
if (($posscol < 20) && (!$bynum{$posscol})) { |
|
$confhash{'scantron'}{config}{csv}{fields}{$field} = $posscol; |
|
$bynum{$posscol} = $field; |
|
$newcol{$field} = $posscol; |
|
} |
|
} |
|
} |
|
if (keys(%newcol)) { |
|
foreach my $option (@options) { |
|
if ($env{'form.scantroncsv_'.$option}) { |
|
$confhash{'scantron'}{config}{csv}{options}{$option} = 1; |
|
} |
|
} |
|
} |
|
} |
|
$currdat = 1; |
|
if (ref($domconfig{'scantron'}) eq 'HASH') { |
|
if (ref($domconfig{'scantron'}{'config'}) eq 'HASH') { |
|
unless (exists($domconfig{'scantron'}{'config'}{'dat'})) { |
|
$currdat = 0; |
|
} |
|
if (ref($domconfig{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
|
if (ref($domconfig{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
|
%currcol = %{$domconfig{'scantron'}{'config'}{'csv'}{'fields'}}; |
|
} |
|
} |
|
} |
|
} |
|
if ($currdat != $newdat) { |
|
$changes{'config'} = 1; |
|
} else { |
|
foreach my $field (@fields) { |
|
if ($currcol{$field} ne '') { |
|
if ($currcol{$field} ne $newcol{$field}) { |
|
$changes{'config'} = 1; |
|
last; |
|
} |
|
} elsif ($newcol{$field} ne '') { |
|
$changes{'config'} = 1; |
|
last; |
} |
} |
} |
} |
} |
} |
Line 14471 sub modify_scantron {
|
Line 18947 sub modify_scantron {
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
if ($changes{'scantronformat'}) { |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
} else { |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
} else { |
|
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
|
} |
|
} |
|
if ($changes{'config'}) { |
|
if (ref($confhash{'scantron'}{'config'}) eq 'HASH') { |
|
if ($confhash{'scantron'}{'config'}{'dat'}) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .dat format').'</li>'; |
|
} |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}) eq 'HASH') { |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}{'fields'}) eq 'HASH') { |
|
if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'fields'}})) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following fields/column numbers supported:').'<ul>'; |
|
foreach my $field (@fields) { |
|
if ($confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} ne '') { |
|
my $showcol = $confhash{'scantron'}{'config'}{'csv'}{'fields'}{$field} + 1; |
|
$resulttext .= '<li>'.$titles{$field}.': '.$showcol.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
if (ref($confhash{'scantron'}{'config'}{'csv'}{'options'}) eq 'HASH') { |
|
if (keys(%{$confhash{'scantron'}{'config'}{'csv'}{'options'}})) { |
|
$resulttext .= '<li>'.&mt('Bubblesheet data upload formats includes .csv format, with following options:').'<ul>'; |
|
foreach my $option (@options) { |
|
if ($confhash{'scantron'}{'config'}{'csv'}{'options'}{$option} ne '') { |
|
$resulttext .= '<li>'.$titles{$option}.'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$resulttext .= '<li>'.&mt('No bubblesheet data upload formats set -- will default to assuming .dat format').'</li>'; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
} |
} |
$resulttext .= '</ul>'; |
|
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to bubblesheet format file'); |
$resulttext = &mt('No changes made to bubblesheet format settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
Line 14496 sub modify_scantron {
|
Line 19007 sub modify_scantron {
|
$resulttext = &mt('No changes made to bubblesheet format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$resulttext .= '<p>'.&mt('The following errors occurred: ').'<ul>'. |
$errors.'</ul>'; |
$errors.'</ul></p>'; |
} |
} |
return $resulttext; |
return $resulttext; |
} |
} |
Line 14772 sub modify_coursecategories {
|
Line 19283 sub modify_coursecategories {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
|
&Apache::lonnet::do_cache_new('cats',$dom,$cathash,3600); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'cats'} = 1; |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
if ($changes{'unauth'} || $changes{'auth'}) { |
if ($changes{'unauth'} || $changes{'auth'}) { |
Line 15318 sub modify_coursedefaults {
|
Line 19833 sub modify_coursedefaults {
|
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
} |
} |
if ($currdef ne $newdef) { |
if ($currdef ne $newdef) { |
my $staticdef; |
|
if ($item eq 'anonsurvey_threshold') { |
if ($item eq 'anonsurvey_threshold') { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
Line 15334 sub modify_coursedefaults {
|
Line 19848 sub modify_coursedefaults {
|
my $texengine; |
my $texengine; |
if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
if ($env{'form.texengine'} =~ /^(MathJax|mimetex|tth)$/) { |
$texengine = $env{'form.texengine'}; |
$texengine = $env{'form.texengine'}; |
if ($defaultshash{'coursedefaults'}{'texengine'} eq '') { |
my $currdef = $domconfig{'coursedefaults'}{'texengine'}; |
unless ($texengine eq 'MathJax') { |
if ($currdef eq '') { |
|
unless ($texengine eq $Apache::lonnet::deftex) { |
$changes{'texengine'} = 1; |
$changes{'texengine'} = 1; |
} |
} |
} elsif ($defaultshash{'coursedefaults'}{'texengine'} ne $texengine) { |
} elsif ($currdef ne $texengine) { |
$changes{'texengine'} = 1; |
$changes{'texengine'} = 1; |
} |
} |
} |
} |
Line 15886 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 16053 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 16069 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 16079 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 16115 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 16155 sub modify_usersessions {
|
Line 21040 sub modify_usersessions {
|
} else { |
} else { |
foreach my $type (@{$types{$prefix}}) { |
foreach my $type (@{$types{$prefix}}) { |
if (defined($changes{$prefix}{$type})) { |
if (defined($changes{$prefix}{$type})) { |
my $newvalue; |
my ($newvalue,$notinuse); |
if (ref($defaultshash{'usersessions'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}{$prefix})) { |
if (ref($defaultshash{'usersessions'}{$prefix})) { |
if ($type eq 'version') { |
if ($type eq 'version') { |
$newvalue = $defaultshash{'usersessions'}{$prefix}{$type}; |
$newvalue = $defaultshash{'usersessions'}{$prefix}{$type}; |
} elsif (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
} else { |
if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) { |
if (ref($defaultshash{'usersessions'}{$prefix}{$type}) eq 'ARRAY') { |
$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}}); |
if (@{$defaultshash{'usersessions'}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{'usersessions'}{$prefix}{$type}}); |
|
} |
|
} else { |
|
$notinuse = 1; |
} |
} |
} |
} |
} |
} |
Line 16170 sub modify_usersessions {
|
Line 21059 sub modify_usersessions {
|
if ($newvalue eq '') { |
if ($newvalue eq '') { |
if ($type eq 'version') { |
if ($type eq 'version') { |
$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: off',$lt{$type}).'</li>'; |
|
} elsif ($notinuse) { |
|
$resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
} |
} |
} else { |
} else { |
if ($type eq 'version') { |
if ($type eq 'version') { |
$newvalue .= ' '.&mt('(or later)'); |
$newvalue .= ' '.&mt('(or later)'); |
} |
} |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
} |
} |
Line 16188 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 { |
|
$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 { |
} 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 other institutions on next access.').'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 16243 sub modify_ssl {
|
Line 21149 sub modify_ssl {
|
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
if ($env{'form.'.$prefix.'_'.$type} =~ /^(no|req)$/) { |
$value = $env{'form.'.$prefix.'_'.$type}; |
$value = $env{'form.'.$prefix.'_'.$type}; |
} |
} |
if (ref($domconfig{$action}{$prefix}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
if ($domconfig{$action}{$prefix}{$type} ne '') { |
if (ref($domconfig{$action}{$prefix}) eq 'HASH') { |
if ($value ne $domconfig{$action}{$prefix}{$type}) { |
if ($domconfig{$action}{$prefix}{$type} ne '') { |
|
if ($value ne $domconfig{$action}{$prefix}{$type}) { |
|
$changes{$prefix}{$type} = 1; |
|
} |
|
$defaultshash{$action}{$prefix}{$type} = $value; |
|
} else { |
|
$defaultshash{$action}{$prefix}{$type} = $value; |
$changes{$prefix}{$type} = 1; |
$changes{$prefix}{$type} = 1; |
} |
} |
$defaultshash{$action}{$prefix}{$type} = $value; |
|
} else { |
} else { |
$defaultshash{$action}{$prefix}{$type} = $value; |
$defaultshash{$action}{$prefix}{$type} = $value; |
$changes{$prefix}{$type} = 1; |
$changes{$prefix}{$type} = 1; |
Line 16318 sub modify_ssl {
|
Line 21229 sub modify_ssl {
|
} |
} |
} |
} |
} |
} |
|
if (keys(%changes)) { |
|
foreach my $prefix (keys(%changes)) { |
|
if (ref($changes{$prefix}) eq 'HASH') { |
|
if (scalar(keys(%{$changes{$prefix}})) == 0) { |
|
delete($changes{$prefix}); |
|
} |
|
} else { |
|
delete($changes{$prefix}); |
|
} |
|
} |
|
} |
my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings'); |
my $nochgmsg = &mt('No changes made to LON-CAPA SSL settings'); |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
Line 16328 sub modify_ssl {
|
Line 21250 sub modify_ssl {
|
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
$domdefaults{'replication'} = $defaultshash{$action}{'replication'}; |
} |
} |
if (ref($defaultshash{$action}{'connto'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'connto'}) eq 'HASH') { |
$domdefaults{'connto'} = $domconfig{$action}{'connto'}; |
$domdefaults{'connto'} = $defaultshash{$action}{'connto'}; |
} |
} |
if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') { |
if (ref($defaultshash{$action}{'connfrom'}) eq 'HASH') { |
$domdefaults{'connfrom'} = $domconfig{$action}{'connfrom'}; |
$domdefaults{'connfrom'} = $defaultshash{$action}{'connfrom'}; |
} |
} |
} |
} |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
Line 16347 sub modify_ssl {
|
Line 21269 sub modify_ssl {
|
$resulttext .= '<li>'.$titles{$prefix}.'<ul>'; |
$resulttext .= '<li>'.$titles{$prefix}.'<ul>'; |
foreach my $type (@{$types{$prefix}}) { |
foreach my $type (@{$types{$prefix}}) { |
if (defined($changes{$prefix}{$type})) { |
if (defined($changes{$prefix}{$type})) { |
my $newvalue; |
my ($newvalue,$notinuse); |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}) eq 'HASH') { |
if (ref($defaultshash{$action}{$prefix})) { |
if (ref($defaultshash{$action}{$prefix})) { |
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
if (($prefix eq 'connto') || ($prefix eq 'connfrom')) { |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
$newvalue = $titles{$defaultshash{$action}{$prefix}{$type}}; |
} elsif (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
} else { |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
if (ref($defaultshash{$action}{$prefix}{$type}) eq 'ARRAY') { |
$newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}}); |
if (@{$defaultshash{$action}{$prefix}{$type}} > 0) { |
|
$newvalue = join(', ',@{$defaultshash{$action}{$prefix}{$type}}); |
|
} |
|
} else { |
|
$notinuse = 1; |
} |
} |
} |
} |
} |
} |
if ($newvalue eq '') { |
if ($notinuse) { |
|
$resulttext .= '<li>'.&mt('[_1] set to: not in use',$titles{$type}).'</li>'; |
|
} elsif ($newvalue eq '') { |
$resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: none',$titles{$type}).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$titles{$type},$newvalue).'</li>'; |
Line 16472 sub modify_trust {
|
Line 21400 sub modify_trust {
|
$resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
$resulttext .= '<li>'.$lt{$prefix}.'<ul>'; |
foreach my $type (@types) { |
foreach my $type (@types) { |
if (defined($changes{$prefix}{$type})) { |
if (defined($changes{$prefix}{$type})) { |
my $newvalue; |
my ($newvalue,$notinuse); |
if (ref($defaultshash{'trust'}) eq 'HASH') { |
if (ref($defaultshash{'trust'}) eq 'HASH') { |
if (ref($defaultshash{'trust'}{$prefix})) { |
if (ref($defaultshash{'trust'}{$prefix})) { |
if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
if (ref($defaultshash{'trust'}{$prefix}{$type}) eq 'ARRAY') { |
if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) { |
if (@{$defaultshash{'trust'}{$prefix}{$type}} > 0) { |
$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}}); |
$newvalue = join(', ',@{$defaultshash{'trust'}{$prefix}{$type}}); |
} |
} |
|
} else { |
|
$notinuse = 1; |
} |
} |
} |
} |
} |
} |
if ($newvalue eq '') { |
if ($notinuse) { |
|
$resulttext .= '<li>'.&mt('[_1] set to: not in use',$lt{$type}).'</li>'; |
|
} elsif ($newvalue eq '') { |
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: none',$lt{$type}).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: [_2].',$lt{$type},$newvalue).'</li>'; |
Line 16517 sub modify_loadbalancing {
|
Line 21449 sub modify_loadbalancing {
|
my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
my $resulttext; |
my $resulttext; |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
} |
} |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
my ($saveloadbalancing,%defaultshash,%changes); |
my ($saveloadbalancing,%defaultshash,%changes); |
my ($alltypes,$othertypes,$titles) = |
my ($alltypes,$othertypes,$titles) = |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
&loadbalancing_titles($dom,$intdom,$usertypes,$types); |
Line 16574 sub modify_loadbalancing {
|
Line 21506 sub modify_loadbalancing {
|
} |
} |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype} = \@offloadto; |
} |
} |
|
if ($env{'form.loadbalancing_cookie_'.$i}) { |
|
$defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1; |
|
if (exists($currbalancer{$balancer})) { |
|
unless ($currcookies{$balancer}) { |
|
$changes{'curr'}{$balancer}{'cookie'} = 1; |
|
} |
|
} |
|
} elsif (exists($currbalancer{$balancer})) { |
|
if ($currcookies{$balancer}) { |
|
$changes{'curr'}{$balancer}{'cookie'} = 1; |
|
} |
|
} |
if (ref($currtargets{$balancer}) eq 'HASH') { |
if (ref($currtargets{$balancer}) eq 'HASH') { |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') { |
if (ref($currtargets{$balancer}{$sparetype}) eq 'ARRAY') { |
Line 16727 sub modify_loadbalancing {
|
Line 21671 sub modify_loadbalancing {
|
} |
} |
} |
} |
} |
} |
if (keys(%toupdate)) { |
if ($changes{'curr'}{$balancer}{'cookie'}) { |
my %thismachine; |
if ($currcookies{$balancer}) { |
my $updatedhere; |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use disabled', |
my $cachetime = 60*60*24; |
$balancer).'</li>'; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
} else { |
foreach my $lonhost (keys(%toupdate)) { |
$resulttext .= '<li>'.&mt('Load Balancer: [_1] -- cookie use enabled', |
if ($thismachine{$lonhost}) { |
$balancer).'</li>'; |
unless ($updatedhere) { |
} |
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
} |
$defaultshash{'loadbalancing'}, |
} |
$cachetime); |
} |
$updatedhere = 1; |
if (keys(%toupdate)) { |
} |
my %thismachine; |
} else { |
my $updatedhere; |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
my $cachetime = 60*60*24; |
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
} |
foreach my $lonhost (keys(%toupdate)) { |
|
if ($thismachine{$lonhost}) { |
|
unless ($updatedhere) { |
|
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
|
$defaultshash{'loadbalancing'}, |
|
$cachetime); |
|
$updatedhere = 1; |
} |
} |
|
} else { |
|
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
} |
} |
} |
} |
} |
} |
Line 16956 sub lonbalance_targets_js {
|
Line 21909 sub lonbalance_targets_js {
|
} |
} |
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
push(@alltypes,'default','_LC_adv','_LC_author','_LC_internetdom','_LC_external'); |
$allinsttypes = join("','",@alltypes); |
$allinsttypes = join("','",@alltypes); |
my (%currbalancer,%currtargets,%currrules,%existing); |
my (%currbalancer,%currtargets,%currrules,%existing,%currcookies); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
%existing = %{$settings}; |
%existing = %{$settings}; |
} |
} |
&get_loadbalancers_config($servers,\%existing,\%currbalancer, |
&get_loadbalancers_config($servers,\%existing,\%currbalancer, |
\%currtargets,\%currrules); |
\%currtargets,\%currrules,\%currcookies); |
my $balancers = join("','",sort(keys(%currbalancer))); |
my $balancers = join("','",sort(keys(%currbalancer))); |
return <<"END"; |
return <<"END"; |
|
|
Line 17241 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 17314 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 17448 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 17503 sub devalidate_remote_domconfs {
|
Line 22457 sub devalidate_remote_domconfs {
|
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %thismachine; |
my %thismachine; |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions','directorysrch'); |
my @posscached = ('domainconfig','domdefaults','ltitools','usersessions', |
|
'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); |
} |
} |