version 1.423, 2023/05/22 21:10:55
|
version 1.443, 2024/08/31 18:48:53
|
Line 95 about default quota sizes for portfolio
|
Line 95 about default quota sizes for portfolio
|
institutional affiliation in the domain (e.g., Faculty, Staff, Student etc.), |
institutional affiliation in the domain (e.g., Faculty, Staff, Student etc.), |
but is now also used to manage availability of user tools: |
but is now also used to manage availability of user tools: |
i.e., blogs, aboutme page, and portfolios, and the course request tool, |
i.e., blogs, aboutme page, and portfolios, and the course request tool, |
used by course owners to request creation of a course, and to display/store |
used by course owners to request creation of a course. |
default quota sizes for Authoring Spaces. |
|
|
|
Outputs: 1 |
Outputs: 1 |
|
|
Line 105 $datatable - HTML containing form eleme
|
Line 104 $datatable - HTML containing form eleme
|
In the case of course requests, radio buttons are displayed for each institutional |
In the case of course requests, radio buttons are displayed for each institutional |
affiliate type (and also default, and _LC_adv) for each of the course types |
affiliate type (and also default, and _LC_adv) for each of the course types |
(official, unofficial, community, textbook, placement, and lti). |
(official, unofficial, community, textbook, placement, and lti). |
In each case the radio buttons allow the selection of one of four values: |
In each case the radio buttons allow the selection of one of four values: |
|
|
0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
which have the following effects: |
which have the following effects: |
Line 178 use DateTime::TimeZone;
|
Line 177 use DateTime::TimeZone;
|
use DateTime::Locale; |
use DateTime::Locale; |
use Time::HiRes qw( sleep ); |
use Time::HiRes qw( sleep ); |
use Net::CIDR; |
use Net::CIDR; |
|
use Crypt::CBC; |
|
|
my $registered_cleanup; |
my $registered_cleanup; |
my $modified_urls; |
my $modified_urls; |
Line 222 sub handler {
|
Line 222 sub handler {
|
'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
'requestauthor','selfenrollment','inststatus', |
'requestauthor','selfenrollment','inststatus', |
'ltitools','toolsec','ssl','trust','lti','ltisec', |
'ltitools','toolsec','ssl','trust','lti','ltisec', |
'privacy','passwords','proctoring','wafproxy','ipaccess'],$dom); |
'privacy','passwords','proctoring','wafproxy', |
|
'ipaccess','authordefaults'],$dom); |
my %encconfig = |
my %encconfig = |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1); |
&Apache::lonnet::get_dom('encconfig',['ltitools','lti','proctoring','linkprot'],$dom,undef,1); |
|
my ($checked_is_home,$is_home); |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
if (ref($encconfig{'ltitools'}) eq 'HASH') { |
my $is_home; |
|
my $home = &Apache::lonnet::domain($dom,'primary'); |
my $home = &Apache::lonnet::domain($dom,'primary'); |
unless (($home eq 'no_host') || ($home eq '')) { |
unless (($home eq 'no_host') || ($home eq '')) { |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 235 sub handler {
|
Line 236 sub handler {
|
$is_home = 1; |
$is_home = 1; |
} |
} |
} |
} |
|
$checked_is_home = 1; |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
foreach my $id (keys(%{$domconfig{'ltitools'}})) { |
if ((ref($domconfig{'ltitools'}{$id}) eq 'HASH') && |
if ((ref($domconfig{'ltitools'}{$id}) eq 'HASH') && |
(ref($encconfig{'ltitools'}{$id}) eq 'HASH')) { |
(ref($encconfig{'ltitools'}{$id}) eq 'HASH')) { |
Line 248 sub handler {
|
Line 250 sub handler {
|
} |
} |
if (ref($domconfig{'lti'}) eq 'HASH') { |
if (ref($domconfig{'lti'}) eq 'HASH') { |
if (ref($encconfig{'lti'}) eq 'HASH') { |
if (ref($encconfig{'lti'}) eq 'HASH') { |
|
unless ($checked_is_home) { |
|
my $home = &Apache::lonnet::domain($dom,'primary'); |
|
unless (($home eq 'no_host') || ($home eq '')) { |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
if (grep(/^\Q$home\E$/,@ids)) { |
|
$is_home = 1; |
|
} |
|
} |
|
$checked_is_home = 1; |
|
} |
foreach my $id (keys(%{$domconfig{'lti'}})) { |
foreach my $id (keys(%{$domconfig{'lti'}})) { |
if ((ref($domconfig{'lti'}{$id}) eq 'HASH') && |
if ((ref($domconfig{'lti'}{$id}) eq 'HASH') && |
(ref($encconfig{'lti'}{$id}) eq 'HASH')) { |
(ref($encconfig{'lti'}{$id}) eq 'HASH')) { |
foreach my $item ('key','secret') { |
$domconfig{'lti'}{$id}{'key'} = $encconfig{'lti'}{$id}{'key'}; |
$domconfig{'lti'}{$id}{$item} = $encconfig{'lti'}{$id}{$item}; |
if (($is_home) && ($phase eq 'process')) { |
|
$domconfig{'lti'}{$id}{'secret'} = $encconfig{'lti'}{$id}{'secret'}; |
} |
} |
} |
} |
} |
} |
Line 292 sub handler {
|
Line 305 sub handler {
|
'contacts','privacy','usercreation','selfcreation', |
'contacts','privacy','usercreation','selfcreation', |
'usermodification','scantron','requestcourses','requestauthor', |
'usermodification','scantron','requestcourses','requestauthor', |
'coursecategories','serverstatuses','helpsettings','coursedefaults', |
'coursecategories','serverstatuses','helpsettings','coursedefaults', |
'ltitools','proctoring','selfenrollment','usersessions','ssl', |
'authordefaults','ltitools','proctoring','selfenrollment', |
'trust','lti'); |
'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 369 sub handler {
|
Line 382 sub handler {
|
modify => \&modify_passwords, |
modify => \&modify_passwords, |
}, |
}, |
'quotas' => |
'quotas' => |
{ text => 'Blogs, personal pages/timezones, webDAV/quotas, portfolio', |
{ text => 'Blogs, personal pages/timezones, portfolio/quotas', |
help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
header => [{col1 => 'User affiliation', |
header => [{col1 => 'User affiliation', |
col2 => 'Available tools', |
col2 => 'Available tools', |
col3 => 'Quotas, MB; (Authoring requires role)',}], |
col3 => 'Portfolio quota (MB)',}], |
print => \&print_quotas, |
print => \&print_quotas, |
modify => \&modify_quotas, |
modify => \&modify_quotas, |
}, |
}, |
Line 459 sub handler {
|
Line 472 sub handler {
|
header => [{col1 => 'Target user has role', |
header => [{col1 => 'Target user has role', |
col2 => 'User information updatable in author context'}, |
col2 => 'User information updatable in author context'}, |
{col1 => 'Target user has role', |
{col1 => 'Target user has role', |
|
col2 => 'User information updatable by co-author manager'}, |
|
{col1 => 'Target user has role', |
col2 => 'User information updatable in course context'}], |
col2 => 'User information updatable in course context'}], |
print => \&print_usermodification, |
print => \&print_usermodification, |
modify => \&modify_usermodification, |
modify => \&modify_usermodification, |
Line 555 sub handler {
|
Line 570 sub handler {
|
modify => \&modify_selfenrollment, |
modify => \&modify_selfenrollment, |
}, |
}, |
'privacy' => |
'privacy' => |
{text => 'Availability of User Information', |
{text => 'Role assignments and user privacy', |
help => 'Domain_Configuration_User_Privacy', |
help => 'Domain_Configuration_User_Privacy', |
header => [{col1 => 'Role assigned in different domain', |
header => [{col1 => 'Role assigned in different domain', |
col2 => 'Approval options'}, |
col2 => 'Approval options'}, |
Line 591 sub handler {
|
Line 606 sub handler {
|
print => \&print_loadbalancing, |
print => \&print_loadbalancing, |
modify => \&modify_loadbalancing, |
modify => \&modify_loadbalancing, |
}, |
}, |
'ltitools' => |
'ltitools' => |
{text => 'External Tools (LTI)', |
{text => 'External Tools (LTI)', |
help => 'Domain_Configuration_LTI_Tools', |
help => 'Domain_Configuration_LTI_Tools', |
header => [{col1 => 'Encryption of shared secrets', |
header => [{col1 => 'Encryption of shared secrets', |
Line 649 sub handler {
|
Line 664 sub handler {
|
print => \&print_trust, |
print => \&print_trust, |
modify => \&modify_trust, |
modify => \&modify_trust, |
}, |
}, |
'lti' => |
'lti' => |
{text => 'LTI Link Protection and LTI Consumers', |
{text => 'LTI Link Protection and LTI Consumers', |
help => 'Domain_Configuration_LTI_Provider', |
help => 'Domain_Configuration_LTI_Provider', |
header => [{col1 => 'Encryption of shared secrets', |
header => [{col1 => 'Encryption of shared secrets', |
col2 => 'Settings'}, |
col2 => 'Settings'}, |
{col1 => 'Rules for shared secrets', |
{col1 => 'Rules for shared secrets', |
col2 => 'Settings'}, |
col2 => 'Settings'}, |
|
{col1 => 'Link Protectors in Courses', |
|
col2 => 'Values'}, |
{col1 => 'Link Protectors', |
{col1 => 'Link Protectors', |
col2 => 'Settings'}, |
col2 => 'Settings'}, |
{col1 => 'Consumers', |
{col1 => 'Consumers', |
Line 663 sub handler {
|
Line 680 sub handler {
|
print => \&print_lti, |
print => \&print_lti, |
modify => \&modify_lti, |
modify => \&modify_lti, |
}, |
}, |
'ipaccess' => |
'ipaccess' => |
{text => 'IP-based access control', |
{text => 'IP-based access control', |
help => 'Domain_Configuration_IP_Access', |
help => 'Domain_Configuration_IP_Access', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
Line 671 sub handler {
|
Line 688 sub handler {
|
print => \&print_ipaccess, |
print => \&print_ipaccess, |
modify => \&modify_ipaccess, |
modify => \&modify_ipaccess, |
}, |
}, |
|
'authordefaults' => |
|
{text => 'Authoring Space defaults', |
|
help => 'Domain_Configuration_Author_Defaults', |
|
header => [{col1 => 'Defaults which can be overridden by Author', |
|
col2 => 'Settings',}, |
|
{col1 => 'Defaults which can be overridden by a Dom. Coord.', |
|
col2 => 'Settings',},], |
|
print => \&print_authordefaults, |
|
modify => \&modify_authordefaults, |
|
}, |
); |
); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
$prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
Line 869 sub process_changes {
|
Line 896 sub process_changes {
|
} 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') { |
} elsif ($action eq 'privacy') { |
$output = &modify_privacy($dom,%domconfig); |
$output = &modify_privacy($dom,$lastactref,%domconfig); |
} elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
$output = &modify_passwords($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'wafproxy') { |
} elsif ($action eq 'wafproxy') { |
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
$output = &modify_wafproxy($dom,$action,$lastactref,%domconfig); |
} elsif ($action eq 'ipaccess') { |
} elsif ($action eq 'ipaccess') { |
$output = &modify_ipaccess($dom,$lastactref,%domconfig); |
$output = &modify_ipaccess($dom,$lastactref,%domconfig); |
|
} elsif ($action eq 'authordefaults') { |
|
$output = &modify_authordefaults($dom,$lastactref,%domconfig); |
} |
} |
return $output; |
return $output; |
} |
} |
Line 904 sub print_config_box {
|
Line 933 sub print_config_box {
|
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); |
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); |
$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') { |
} elsif ($action eq 'ltitools') { |
$output .= &Apache::lonconfigsettings::ltitools_javascript($settings); |
$output .= &Apache::lonconfigsettings::ltitools_javascript($settings); |
Line 923 sub print_config_box {
|
Line 952 sub print_config_box {
|
$output .= &saml_javascript(); |
$output .= &saml_javascript(); |
} elsif ($action eq 'ipaccess') { |
} elsif ($action eq 'ipaccess') { |
$output .= &ipaccess_javascript($settings); |
$output .= &ipaccess_javascript($settings); |
|
} elsif ($action eq 'authordefaults') { |
|
$output .= &authordefaults_javascript(); |
} |
} |
$output .= |
$output .= |
'<table class="LC_nested_outer"> |
'<table class="LC_nested_outer"> |
Line 965 sub print_config_box {
|
Line 996 sub print_config_box {
|
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'ssl') || |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
($action eq 'directorysrch') || ($action eq 'trust') || ($action eq 'helpsettings') || |
($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy') || |
($action eq 'contacts') || ($action eq 'privacy') || ($action eq 'wafproxy') || |
($action eq 'lti') || ($action eq 'ltitools')) { |
($action eq 'lti') || ($action eq 'ltitools') || ($action eq 'authordefaults')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$confname,$settings,\$rowtotal); |
Line 1002 sub print_config_box {
|
Line 1033 sub print_config_box {
|
($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 'defaults') || |
($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') || |
($action eq 'privacy') || ($action eq 'passwords') || ($action eq 'lti') || |
($action eq 'ltitools')) { |
($action eq 'ltitools') || ($action eq 'usermodification')) { |
if ($action eq 'coursecategories') { |
if ($action eq 'coursecategories') { |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$output .= &print_coursecategories('middle',$dom,$item,$settings,\$rowtotal); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
Line 1010 sub print_config_box {
|
Line 1041 sub print_config_box {
|
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('shared',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'passwords') { |
} elsif ($action eq 'passwords') { |
$output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$confname,$settings,\$rowtotal); |
|
} elsif ($action eq 'lti') { |
|
$output .= $item->{'print'}->('upper',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
|
</tr>'."\n". |
|
$item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} else { |
} else { |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('middle',$dom,$settings,\$rowtotal); |
} |
} |
Line 1042 sub print_config_box {
|
Line 1086 sub print_config_box {
|
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'. |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[8]->{'col2'}).'</td></tr>'. |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
} else { |
} else { |
|
my $hdridx = 2; |
|
if ($action eq 'lti') { |
|
$hdridx = 3; |
|
} |
$output .= ' |
$output .= ' |
</table> |
</table> |
</td> |
</td> |
Line 1050 sub print_config_box {
|
Line 1098 sub print_config_box {
|
<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'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[$hdridx]->{'col2'}).'</td> |
</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); |
Line 1062 sub print_config_box {
|
Line 1110 sub print_config_box {
|
} else { |
} else { |
$output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('lower',$dom,$settings,\$rowtotal); |
} |
} |
|
$hdridx ++; |
$output .= ' |
$output .= ' |
</tr> |
</tr> |
</table> |
</table> |
Line 1071 sub print_config_box {
|
Line 1120 sub print_config_box {
|
<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'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item'.$leftnobr.'"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col1'}).'</td> |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td></tr>'."\n"; |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[$hdridx]->{'col2'}).'</td></tr>'."\n"; |
if ($action eq 'passwords') { |
if ($action eq 'passwords') { |
$output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$confname,$settings,\$rowtotal); |
} else { |
} else { |
Line 1088 sub print_config_box {
|
Line 1137 sub print_config_box {
|
} |
} |
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'coursedefaults') || ($action eq 'authordefaults') || |
($action eq 'directorysrch') || ($action eq 'helpsettings') || |
($action eq 'directorysrch') || ($action eq 'helpsettings') || |
($action eq 'wafproxy')) { |
($action eq 'wafproxy')) { |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
Line 2384 sub print_quotas {
|
Line 2433 sub print_quotas {
|
} else { |
} else { |
$context = $action; |
$context = $action; |
} |
} |
my ($datatable,$defaultquota,$authorquota,@usertools,@options,%validations); |
my ($datatable,$defaultquota,@usertools,@options,%validations); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my $typecount = 0; |
my $typecount = 0; |
my ($css_class,%titles); |
my ($css_class,%titles); |
Line 2398 sub print_quotas {
|
Line 2447 sub print_quotas {
|
@options = ('norequest','approval','automatic'); |
@options = ('norequest','approval','automatic'); |
%titles = &authorrequest_titles(); |
%titles = &authorrequest_titles(); |
} else { |
} else { |
@usertools = ('aboutme','blog','webdav','portfolio','timezone'); |
@usertools = ('aboutme','blog','portfolio','portaccess','timezone'); |
%titles = &tool_titles(); |
%titles = &tool_titles(); |
} |
} |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
my ($currdefquota,$currauthorquota); |
my $currdefquota; |
unless (($context eq 'requestcourses') || |
unless (($context eq 'requestcourses') || |
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 2412 sub print_quotas {
|
Line 2461 sub print_quotas {
|
} else { |
} else { |
$currdefquota = $settings->{$type}; |
$currdefquota = $settings->{$type}; |
} |
} |
if (ref($settings->{authorquota}) eq 'HASH') { |
|
$currauthorquota = $settings->{authorquota}->{$type}; |
|
} |
|
} |
} |
} |
} |
if (defined($usertypes->{$type})) { |
if (defined($usertypes->{$type})) { |
Line 2532 sub print_quotas {
|
Line 2578 sub print_quotas {
|
($context eq 'requestauthor')) { |
($context eq 'requestauthor')) { |
$datatable .= |
$datatable .= |
'<td class="LC_right_item">'. |
'<td class="LC_right_item">'. |
'<span class="LC_nobreak">'.&mt('Portfolio').': '. |
'<span class="LC_nobreak">'. |
'<input type="text" name="quota_'.$type. |
'<input type="text" name="quota_'.$type. |
'" value="'.$currdefquota. |
'" value="'.$currdefquota. |
'" size="5" /></span>'.(' ' x 2). |
|
'<span class="LC_nobreak">'.&mt('Authoring').': '. |
|
'<input type="text" name="authorquota_'.$type. |
|
'" value="'.$currauthorquota. |
|
'" size="5" /></span></td>'; |
'" size="5" /></span></td>'; |
} |
} |
$datatable .= '</tr>'; |
$datatable .= '</tr>'; |
Line 2547 sub print_quotas {
|
Line 2589 sub print_quotas {
|
} |
} |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
$defaultquota = '20'; |
$defaultquota = '20'; |
$authorquota = '500'; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'defaultquota'}) eq 'HASH') { |
if (ref($settings->{'defaultquota'}) eq 'HASH') { |
$defaultquota = $settings->{'defaultquota'}->{'default'}; |
$defaultquota = $settings->{'defaultquota'}->{'default'}; |
} elsif (defined($settings->{'default'})) { |
} elsif (defined($settings->{'default'})) { |
$defaultquota = $settings->{'default'}; |
$defaultquota = $settings->{'default'}; |
} |
} |
if (ref($settings->{'authorquota'}) eq 'HASH') { |
|
$authorquota = $settings->{'authorquota'}->{'default'}; |
|
} |
|
} |
} |
} |
} |
$typecount ++; |
$typecount ++; |
Line 2668 sub print_quotas {
|
Line 2706 sub print_quotas {
|
$datatable .= '</td>'; |
$datatable .= '</td>'; |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
unless (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
$datatable .= '<td class="LC_right_item">'. |
$datatable .= '<td class="LC_right_item">'. |
'<span class="LC_nobreak">'.&mt('Portfolio').': '. |
'<span class="LC_nobreak">'. |
'<input type="text" name="defaultquota" value="'. |
'<input type="text" name="defaultquota" value="'. |
$defaultquota.'" size="5" /></span>'.(' ' x2). |
$defaultquota.'" size="5" /></span></td>'; |
'<span class="LC_nobreak">'.&mt('Authoring').': '. |
|
'<input type="text" name="authorquota" value="'. |
|
$authorquota.'" size="5" /></span></td>'; |
|
} |
} |
$datatable .= '</tr>'; |
$datatable .= '</tr>'; |
$typecount ++; |
$typecount ++; |
Line 3540 sub lti_toggle_js {
|
Line 3575 sub lti_toggle_js {
|
my %servers = &Apache::lonnet::get_servers($dom,'library'); |
my %servers = &Apache::lonnet::get_servers($dom,'library'); |
my $primary = &Apache::lonnet::domain($dom,'primary'); |
my $primary = &Apache::lonnet::domain($dom,'primary'); |
my $course_servers = "'".join("','",keys(%servers))."'"; |
my $course_servers = "'".join("','",keys(%servers))."'"; |
|
|
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 3639 function toggleLTI(form,setting,item) {
|
Line 3673 function toggleLTI(form,setting,item) {
|
break; |
break; |
} |
} |
} |
} |
} |
} |
} |
} |
if (!setvis) { |
if (!setvis) { |
if (document.getElementById(divid)) { |
if (document.getElementById(divid)) { |
Line 3716 function toggleLTI(form,setting,item) {
|
Line 3750 function toggleLTI(form,setting,item) {
|
var divid = 'lti_menufield_'+item; |
var divid = 'lti_menufield_'+item; |
var setvis = ''; |
var setvis = ''; |
for (var i=0; i<menus.length; i++) { |
for (var i=0; i<menus.length; i++) { |
var radioname = menus[i]; |
var radioname = menus[i]; |
var num = form.elements[radioname].length; |
var num = form.elements[radioname].length; |
if (num) { |
if (num) { |
for (var j=0; j<num; j++) { |
for (var j=0; j<num; j++) { |
Line 3824 sub saml_javascript {
|
Line 3858 sub saml_javascript {
|
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function toggleSamlOptions(form,hostid) { |
function toggleSamlOptions(form,hostid) { |
var radioname = 'saml_'+hostid; |
var radioname = 'saml_'+hostid; |
var tablecellon = 'samloptionson_'+hostid; |
var tablecellon = 'samloptionson_'+hostid; |
var tablecelloff = 'samloptionsoff_'+hostid; |
var tablecelloff = 'samloptionsoff_'+hostid; |
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 == '1') { |
if (form.elements[radioname][i].value == '1') { |
if (document.getElementById(tablecellon)) { |
if (document.getElementById(tablecellon)) { |
document.getElementById(tablecellon).style.display=''; |
document.getElementById(tablecellon).style.display=''; |
} |
} |
Line 3930 $jstext
|
Line 3964 $jstext
|
ENDSCRIPT |
ENDSCRIPT |
} |
} |
|
|
|
sub authordefaults_javascript { |
|
my %alert = &Apache::lonlocal::texthash ( |
|
reqd => 'Warning: at least one editor needs to be available.', |
|
rest => 'Unchecking this editor disallowed while others unchecked.', |
|
); |
|
&js_escape(\%alert); |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function checkEditors(form,checkbox,current) { |
|
if (form.elements[checkbox].length != undefined) { |
|
var count = 0; |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
if (form.elements[checkbox][i].checked) { |
|
count ++; |
|
} |
|
} |
|
if (count == 0) { |
|
if (current.type =='radio') { |
|
current.checked = true; |
|
alert('$alert{reqd}\\n$alert{rest}'); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
|
ENDSCRIPT |
|
} |
|
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
Line 4601 sub print_contacts {
|
Line 4668 sub print_contacts {
|
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}}; |
} |
} |
} |
} |
foreach my $item ('errorthreshold','errorsysmail') { |
foreach my $item ('errorthreshold','errorsysmail') { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
'<td class="LC_left_item"><span class="LC_nobreak">'. |
'<td class="LC_left_item"><span class="LC_nobreak">'. |
Line 4683 sub print_contacts {
|
Line 4750 sub print_contacts {
|
$includeloc{'override_'.$key} = ''; |
$includeloc{'override_'.$key} = ''; |
$includestr{'override_'.$key} = ''; |
$includestr{'override_'.$key} = ''; |
if ($settings->{'overrides'}{$key}{'include'} ne '') { |
if ($settings->{'overrides'}{$key}{'include'} ne '') { |
($includeloc{'override_'.$key},$includestr{'override_'.$key}) = |
($includeloc{'override_'.$key},$includestr{'override_'.$key}) = |
split(/:/,$settings->{'overrides'}{$key}{'include'},2); |
split(/:/,$settings->{'overrides'}{$key}{'include'},2); |
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key}); |
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key}); |
} |
} |
Line 4695 sub print_contacts {
|
Line 4762 sub print_contacts {
|
my $optionsprefix = 'LC_options_helpdesk_'; |
my $optionsprefix = 'LC_options_helpdesk_'; |
|
|
my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');"; |
my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');"; |
|
|
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$numinrow,$othertitle,'overrides', |
$numinrow,$othertitle,'overrides', |
\$rownum,$onclicktypes,$customclass); |
\$rownum,$onclicktypes,$customclass); |
Line 4762 sub overridden_helpdesk {
|
Line 4828 sub overridden_helpdesk {
|
} |
} |
my $title; |
my $title; |
if (ref($short_titles) eq 'HASH') { |
if (ref($short_titles) eq 'HASH') { |
$title = $short_titles->{$item}; |
$title = $short_titles->{$item}; |
} |
} |
$output .= '<label>'. |
$output .= '<label>'. |
'<input type="checkbox" name="override_'.$type.'"'.$check. |
'<input type="checkbox" name="override_'.$type.'"'.$check. |
Line 4841 function toggleHelpdeskRow(form,checkbox
|
Line 4907 function toggleHelpdeskRow(form,checkbox
|
return; |
return; |
} |
} |
|
|
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
Line 5352 sub ltitools_names {
|
Line 5417 sub ltitools_names {
|
'key' => 'Key', |
'key' => 'Key', |
'lifetime' => 'Nonce lifetime (s)', |
'lifetime' => 'Nonce lifetime (s)', |
'secret' => 'Secret', |
'secret' => 'Secret', |
'icon' => 'Icon', |
'icon' => 'Icon', |
'user' => 'User', |
'user' => 'User', |
'fullname' => 'Full Name', |
'fullname' => 'Full Name', |
'firstname' => 'First Name', |
'firstname' => 'First Name', |
Line 5370 sub ltitools_names {
|
Line 5435 sub ltitools_names {
|
'roster' => 'Tool can retrieve roster:', |
'roster' => 'Tool can retrieve roster:', |
'crstarget' => 'Display target', |
'crstarget' => 'Display target', |
'crslabel' => 'Course label', |
'crslabel' => 'Course label', |
'crstitle' => 'Course title', |
'crstitle' => 'Course title', |
'crslinktext' => 'Link Text', |
'crslinktext' => 'Link Text', |
'crsexplanation' => 'Explanation', |
'crsexplanation' => 'Explanation', |
'crsappend' => 'Provider URL', |
'crsappend' => 'Provider URL', |
Line 6133 sub print_lti {
|
Line 6198 sub print_lti {
|
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $itemcount = 1; |
my $itemcount = 1; |
my ($datatable,$css_class); |
my ($datatable,$css_class); |
my (%rules,%encrypt,%privkeys,%linkprot); |
my (%rules,%encrypt,%privkeys,%linkprot,%suggestions); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($position eq 'top') { |
if ($position eq 'top') { |
if (exists($settings->{'encrypt'})) { |
if (exists($settings->{'encrypt'})) { |
Line 6156 sub print_lti {
|
Line 6221 sub print_lti {
|
} |
} |
} |
} |
} |
} |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'upper') { |
if (exists($settings->{'rules'})) { |
if (exists($settings->{'rules'})) { |
if (ref($settings->{'rules'}) eq 'HASH') { |
if (ref($settings->{'rules'}) eq 'HASH') { |
%rules = %{$settings->{'rules'}}; |
%rules = %{$settings->{'rules'}}; |
} |
} |
} |
} |
|
} elsif ($position eq 'middle') { |
|
if (exists($settings->{'suggested'})) { |
|
if (ref($settings->{'suggested'}) eq 'HASH') { |
|
%suggestions = %{$settings->{'suggested'}}; |
|
} |
|
} |
} elsif ($position eq 'lower') { |
} elsif ($position eq 'lower') { |
if (exists($settings->{'linkprot'})) { |
if (exists($settings->{'linkprot'})) { |
if (ref($settings->{'linkprot'}) eq 'HASH') { |
if (ref($settings->{'linkprot'}) eq 'HASH') { |
Line 6172 sub print_lti {
|
Line 6243 sub print_lti {
|
} |
} |
} |
} |
} else { |
} else { |
foreach my $key ('encrypt','private','rules','linkprot') { |
foreach my $key ('encrypt','private','rules','linkprot','suggestions') { |
if (exists($settings->{$key})) { |
if (exists($settings->{$key})) { |
delete($settings->{$key}); |
delete($settings->{$key}); |
} |
} |
Line 6181 sub print_lti {
|
Line 6252 sub print_lti {
|
} |
} |
if ($position eq 'top') { |
if ($position eq 'top') { |
$datatable = &secrets_form($dom,'ltisec',\%encrypt,\%privkeys,$rowtotal); |
$datatable = &secrets_form($dom,'ltisec',\%encrypt,\%privkeys,$rowtotal); |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'upper') { |
$datatable = &password_rules('ltisecrets',\$itemcount,\%rules); |
$datatable = &password_rules('ltisecrets',\$itemcount,\%rules); |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
|
} elsif ($position eq 'middle') { |
|
$datatable = &linkprot_suggestions(\%suggestions,\$itemcount); |
|
$$rowtotal += $itemcount; |
} elsif ($position eq 'lower') { |
} elsif ($position eq 'lower') { |
$datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain'); |
$datatable .= &Apache::courseprefs::print_linkprotection($dom,'',$settings,$rowtotal,'','','domain'); |
} else { |
} else { |
|
my ($switchserver,$switchmessage); |
|
$switchserver = &check_switchserver($dom); |
|
$switchmessage = &mt("submit from domain's primary library server: [_1].",$switchserver); |
my $maxnum = 0; |
my $maxnum = 0; |
my %ordered; |
my %ordered; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
Line 6207 sub print_lti {
|
Line 6284 sub print_lti {
|
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $item = $ordered{$items[$i]}; |
my $item = $ordered{$items[$i]}; |
my ($key,$secret,$lifetime,$consumer,$requser,$crsinc,$current); |
my ($key,$secret,$usable,$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'}; |
$usable = $settings->{$item}->{'usable'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$lifetime = $settings->{$item}->{'lifetime'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$consumer = $settings->{$item}->{'consumer'}; |
$requser = $settings->{$item}->{'requser'}; |
$requser = $settings->{$item}->{'requser'}; |
Line 6258 sub print_lti {
|
Line 6335 sub print_lti {
|
'<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="3" /></span>'. |
'value="'.$lifetime.'" size="3" /></span><br /><br />'; |
(' 'x2). |
if ($key ne '') { |
|
$datatable .= '<span class="LC_nobreak">'.$lt{'key'}; |
|
if ($switchserver) { |
|
$datatable .= ': ['.&mt('[_1] to view/edit',$switchserver).']'; |
|
} else { |
|
$datatable .= ':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" autocomplete="off" />'; |
|
} |
|
$datatable .= '</span> '.(' 'x2); |
|
} elsif (!$switchserver) { |
|
$datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':'. |
|
'<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" autocomplete="off" />'. |
|
'</span> '.(' 'x2); |
|
} |
|
if ($switchserver) { |
|
if ($usable ne '') { |
|
$datatable .= '<div id="lti_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'. |
|
$lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
|
'<span class="LC_nobreak">'.&mt('Change secret?'). |
|
'<label><input type="radio" value="0" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" checked="checked" />'.&mt('No').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" value="1" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" />'.&mt('Yes').'</label>'.(' 'x2). |
|
'</span><div id="lti_divchgsecret_'.$i.'" style="display:none" />'. |
|
'<span class="LC_nobreak"> - '.$switchmessage.'</span>'. |
|
'</div>'; |
|
} elsif ($key eq '') { |
|
$datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n"; |
|
} else { |
|
$datatable .= '<span class="LC_nobreak">'.&mt('Secret required').' - '.$switchmessage.'</span>'."\n"; |
|
} |
|
} else { |
|
if ($usable ne '') { |
|
$datatable .= '<div id="lti_divcurrsecret_'.$i.'" style="display:inline-block" /><span class="LC_nobreak">'. |
|
$lt{'secret'}.': ['.&mt('not shown').'] '.(' 'x2).'</span></div>'. |
|
'<span class="LC_nobreak">'.&mt('Change?'). |
|
'<label><input type="radio" value="0" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" checked="checked" />'.&mt('No').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" value="1" name="lti_changesecret_'.$i.'" onclick="javascript:toggleChgSecret(this.form,'."'$i','secret','lti'".');" />'.&mt('Yes'). |
|
'</label> </span><div id="lti_divchgsecret_'.$i.'" style="display:none" />'. |
|
'<span class="LC_nobreak">'.&mt('New Secret').':'. |
|
'<input type="password" size="20" name="lti_secret_'.$i.'" value="" autocomplete="new-password" />'. |
|
'<label><input type="checkbox" name="lti_visible_'.$i.'" id="lti_visible_'.$i.'" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label></span></div>'; |
|
} else { |
|
$datatable .= |
|
'<span class="LC_nobreak">'.$lt{'secret'}.':'. |
|
'<input type="password" size="20" name="lti_secret_'.$i.'" value="" autocomplete="new-password" />'. |
|
'<label><input type="checkbox" name="lti_visible_'.$i.'" id="lti_visible_'.$i.'" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'; |
|
} |
|
} |
|
$datatable .= '<br /><br />'. |
'<span class="LC_nobreak">'.$lt{'requser'}.':'. |
'<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="1"'.$onclickrequser.$checkedrequser{yes}.' />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_'.$i.'" value="0"'.$onclickrequser.$checkedrequser{no}.' />'.&mt('No').'</label></span>'."\n". |
Line 6268 sub print_lti {
|
Line 6393 sub print_lti {
|
'<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="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". |
'<label><input type="radio" name="lti_crsinc_'.$i.'" value="0"'.$onclickcrsinc.$checkedcrsinc{no}.' />'.&mt('No').'</label></span>'."\n". |
(' 'x4). |
(' 'x4). |
'<span class="LC_nobreak">'.$lt{'key'}. |
|
':<input type="text" size="25" name="lti_key_'.$i.'" value="'.$key.'" /></span> '. |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'secret'}.':'. |
|
'<input type="password" size="20" name="lti_secret_'.$i.'" value="'.$secret.'" />'. |
|
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_'.$i.'.type='."'text'".' } else { this.form.lti_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'. |
|
'<input type="hidden" name="lti_id_'.$i.'" value="'.$item.'" /></span>'. |
'<input type="hidden" name="lti_id_'.$i.'" value="'.$item.'" /></span>'. |
'</fieldset>'.<i_options($i,$current,$itemcount,%lt).'</td></tr>'; |
'</fieldset>'.<i_options($i,$current,$itemcount,%lt).'</td></tr>'; |
$itemcount ++; |
$itemcount ++; |
Line 6302 sub print_lti {
|
Line 6421 sub print_lti {
|
'<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="3" 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><br /><br />'."\n"; |
(' 'x2). |
if ($switchserver) { |
|
$datatable .= '<span class="LC_nobreak">'.&mt('Key and Secret are required').' - '.$switchmessage.'</span>'."\n"; |
|
} else { |
|
$datatable .= '<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="lti_key_add" value="" autocomplete="off" /></span> '."\n". |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" autocomplete="new-password" />'. |
|
'<label><input type="checkbox" name="lti_add_visible" id="lti_add_visible" onclick="if (this.checked) { this.form.lti_secret_add.type='."'text'".' } else { this.form.lti_secret_add.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n"; |
|
} |
|
$datatable .= '<br /><br />'. |
'<span class="LC_nobreak">'.$lt{'requser'}.':'. |
'<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="1" onclick="toggleLTI(this.form,'."'requser','add'".');" checked="checked" />'.&mt('Yes').'</label> '."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
'<label><input type="radio" name="lti_requser_add" value="0" onclick="toggleLTI(this.form,'."'requser','add'".');" />'.&mt('No').'</label></span>'."\n". |
Line 6311 sub print_lti {
|
Line 6438 sub print_lti {
|
'<span class="LC_nobreak">'.$lt{'crsinc'}.':'. |
'<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="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". |
'<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". |
|
(' 'x2). |
|
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="lti_secret_add" value="" />'. |
|
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.lti_secret_add.type='."'text'".' } else { this.form.lti_secret_add.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n". |
|
'</fieldset>'.<i_options('add',undef,$itemcount,%lt). |
'</fieldset>'.<i_options('add',undef,$itemcount,%lt). |
'</td>'."\n". |
'</td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
Line 6388 sub lti_options {
|
Line 6510 sub lti_options {
|
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') { |
$checked{'mapuser'}{'email'} = ' checked="checked"'; |
$checked{'mapuser'}{'email'} = ' checked="checked"'; |
} else { |
} else { |
$checked{'mapuser'}{'other'} = ' checked="checked"'; |
$checked{'mapuser'}{'other'} = ' checked="checked"'; |
$userfield = $current->{'mapuser'}; |
$userfield = $current->{'mapuser'}; |
Line 6398 sub lti_options {
|
Line 6520 sub lti_options {
|
if (($current->{'mapcrs'} ne '') && ($current->{'mapcrs'} ne 'course_offering_sourcedid')) { |
if (($current->{'mapcrs'} ne '') && ($current->{'mapcrs'} ne 'course_offering_sourcedid')) { |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ''; |
$checked{'mapcrs'}{'course_offering_sourcedid'} = ''; |
if ($current->{'mapcrs'} eq 'context_id') { |
if ($current->{'mapcrs'} eq 'context_id') { |
$checked{'mapcrs'}{'context_id'} = ' checked="checked"'; |
$checked{'mapcrs'}{'context_id'} = ' checked="checked"'; |
} else { |
} else { |
$checked{'mapcrs'}{'other'} = ' checked="checked"'; |
$checked{'mapcrs'}{'other'} = ' checked="checked"'; |
$cidfield = $current->{'mapcrs'}; |
$cidfield = $current->{'mapcrs'}; |
Line 6426 sub lti_options {
|
Line 6548 sub lti_options {
|
$checked{'lcauth'}{$1} = ' checked="checked"'; |
$checked{'lcauth'}{$1} = ' checked="checked"'; |
unless (($current->{'lcauth'} eq 'lti') || ($current->{'lcauth'} eq 'internal')) { |
unless (($current->{'lcauth'} eq 'lti') || ($current->{'lcauth'} eq 'internal')) { |
$lcauthparm = $current->{'lcauthparm'}; |
$lcauthparm = $current->{'lcauthparm'}; |
$lcauthparmstyle = 'display:table-row'; |
$lcauthparmstyle = 'display:table-row'; |
if ($current->{'lcauth'} eq 'localauth') { |
if ($current->{'lcauth'} eq 'localauth') { |
$lcauthparmtext = &mt('Local auth argument'); |
$lcauthparmtext = &mt('Local auth argument'); |
} else { |
} else { |
Line 6443 sub lti_options {
|
Line 6565 sub lti_options {
|
%rolemaps = %{$current->{'maproles'}}; |
%rolemaps = %{$current->{'maproles'}}; |
} |
} |
if ($current->{'section'} ne '') { |
if ($current->{'section'} ne '') { |
$checked{'crssec'}{'Y'} = ' checked="checked"'; |
$checked{'crssec'}{'Y'} = ' checked="checked"'; |
$crssecfieldsty = 'inline-block'; |
$crssecfieldsty = 'inline-block'; |
if ($current->{'section'} eq 'course_section_sourcedid') { |
if ($current->{'section'} eq 'course_section_sourcedid') { |
$checked{'crssecsrc'}{'sourcedid'} = ' checked="checked"'; |
$checked{'crssecsrc'}{'sourcedid'} = ' checked="checked"'; |
Line 6489 sub lti_options {
|
Line 6611 sub lti_options {
|
$checked{'crssec'}{'N'} = ' checked="checked"'; |
$checked{'crssec'}{'N'} = ' checked="checked"'; |
$checked{'callback'}{'N'} = ' checked="checked"'; |
$checked{'callback'}{'N'} = ' checked="checked"'; |
$checked{'topmenu'}{'N'} = ' checked="checked"'; |
$checked{'topmenu'}{'N'} = ' checked="checked"'; |
$checked{'inlinemenu'}{'Y'} = ' checked="checked"'; |
$checked{'inlinemenu'}{'Y'} = ' checked="checked"'; |
$checked{'menuitem'}{'grades'} = ' checked="checked"'; |
$checked{'menuitem'}{'grades'} = ' checked="checked"'; |
$menusty = 'inline-block'; |
$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 6544 sub lti_options {
|
Line 6666 sub lti_options {
|
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('Roles which may create user accounts').'</legend>'; |
foreach my $ltirole (@ltiroles) { |
foreach my $ltirole (@ltiroles) { |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$output .= '<span class="LC_nobreak"><label><input type="checkbox" name="lti_makeuser_'.$num.'" value="'.$ltirole.'"'. |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
$checked{'makeuser'}{$ltirole}.' />'.$ltirole.'</label> </span> '; |
} |
} |
$output .= '</fieldset>'. |
$output .= '</fieldset>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
'<fieldset class="ltioption_usr_'.$num.'" style="display:'.$optionsty.'"><legend>'.&mt('New user accounts created for LTI users').'</legend>'. |
Line 6676 sub lti_options {
|
Line 6798 sub lti_options {
|
if ($extra eq 'passback') { |
if ($extra eq 'passback') { |
$pb1p1chk = ' checked="checked"'; |
$pb1p1chk = ' checked="checked"'; |
$pb1p0chk = ''; |
$pb1p0chk = ''; |
$onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; |
$onclickpb = ' onclick="toggleLTI(this.form,'."'passback','$num'".');"'; |
} else { |
} else { |
$onclickpb = ''; |
$onclickpb = ''; |
} |
} |
if (ref($current) eq 'HASH') { |
if (ref($current) eq 'HASH') { |
if (($current->{$extra})) { |
if (($current->{$extra})) { |
Line 6724 sub ltimenu_titles {
|
Line 6846 sub ltimenu_titles {
|
); |
); |
} |
} |
|
|
sub check_switchserver { |
sub linkprot_suggestions { |
my ($home) = @_; |
my ($suggested,$itemcount) = @_; |
my $switchserver; |
my $count = 0; |
if ($home ne '') { |
my $next = 1; |
my $allowed; |
my %lt = &Apache::lonlocal::texthash( |
my @ids=&Apache::lonnet::current_machine_ids(); |
'name' => 'Suggested Launcher', |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
'info' => 'Recommendations', |
if (!$allowed) { |
); |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role='. |
my ($datatable,$css_class,$dest); |
&HTML::Entities::encode($env{'request.role'},'\'<>"&'). |
if (ref($suggested) eq 'HASH') { |
'&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
my @current = sort { $a <=> $b } keys(%{$suggested}); |
|
$next += $current[-1]; |
|
for (my $i=0; $i<@current; $i++) { |
|
my $num = $current[$i]; |
|
my %values; |
|
if (ref($suggested->{$num}) eq 'HASH') { |
|
%values = %{$suggested->{$num}}; |
|
} else { |
|
next; |
|
} |
|
$css_class = $$itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
|
'<label><input type="checkbox" name="linkprot_suggested_del" value="'.$i.'" />'."\n". |
|
&mt('Delete?').'</label></span></td><td>'."\n". |
|
'<div class="LC_floatleft"><fieldset><legend>'.$lt{'name'}.'</legend>'."\n". |
|
'<input type="text" size="15" name="linkprot_suggested_name_'.$i.'" value="'.$values{'name'}.'" autocomplete="off" />'."\n". |
|
'</fieldset></div>'. |
|
'<div class="LC_floatleft"><fieldset><legend>'.$lt{'info'}.'</legend>'."\n". |
|
'<textarea cols="55" rows="5" name="linkprot_suggested_info_'.$i.'">'.$values{'info'}.'</textarea>'. |
|
'</fieldset></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n". |
|
'<input type="hidden" name="linkprot_suggested_id_'.$i.'" value="'.$num.'" /></td></tr>'."\n"; |
|
$$itemcount ++; |
} |
} |
} |
} |
return $switchserver; |
$css_class = $$itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
|
'<input type="hidden" name="linkprot_suggested_maxnum" value="'.$next.'" />'."\n". |
|
'<input type="checkbox" name="linkprot_suggested_add" value="1" />'.&mt('Add').'</span></td>'."\n". |
|
'<td>'."\n". |
|
'<div class="LC_floatleft"><fieldset><legend>'.$lt{'name'}.'</legend>'."\n". |
|
'<input type="text" size="15" name="linkprot_suggested_name_add" value="" autocomplete="off" />'."\n". |
|
'</fieldset></div>'. |
|
'<div class="LC_floatleft"><fieldset><legend>'.$lt{'info'}.'</legend>'."\n". |
|
'<textarea cols="55" rows="5" name="linkprot_suggested_info_add"></textarea>'. |
|
'</fieldset></div>'. |
|
'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n". |
|
'</td></tr>'."\n"; |
|
return $datatable; |
} |
} |
|
|
sub print_coursedefaults { |
sub print_coursedefaults { |
Line 6747 sub print_coursedefaults {
|
Line 6905 sub print_coursedefaults {
|
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
|
coursequota => 'Default cumulative quota for all group portfolio spaces in course (MB)', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
coursecredits => 'Credits can be specified for courses', |
coursecredits => 'Credits can be specified for courses', |
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)', |
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)', |
Line 6759 sub print_coursedefaults {
|
Line 6918 sub print_coursedefaults {
|
ltiauth => 'Student username in LTI launch of deep-linked URL can be accepted without re-authentication', |
ltiauth => 'Student username in LTI launch of deep-linked URL can be accepted without re-authentication', |
domexttool => 'External Tools defined in the domain may be used in courses/communities (by type)', |
domexttool => 'External Tools defined in the domain may be used in courses/communities (by type)', |
exttool => 'External Tools can be defined and configured in courses/communities (by type)', |
exttool => 'External Tools can be defined and configured in courses/communities (by type)', |
|
crsauthor => 'Standard LON-CAPA problems can be created within a course/community (by type)', |
|
crseditors => 'Available editors for web pages and/or problems created in a course/community', |
); |
); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
|
coursequota => 20, |
postsubmit => 60, |
postsubmit => 60, |
mysqltables => 172800, |
mysqltables => 172800, |
domexttool => 1, |
domexttool => 1, |
exttool => 0, |
exttool => 0, |
|
crsauthor => 1, |
|
crseditors => ['edit','xml'], |
); |
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
%defaultchecked = ( |
%defaultchecked = ( |
Line 6880 sub print_coursedefaults {
|
Line 7044 sub print_coursedefaults {
|
$itemcount ++; |
$itemcount ++; |
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
my ($currdefresponder,%defcredits,%curruploadquota,%currcoursequota, |
|
%deftimeout,%currmysql); |
my $currusecredits = 0; |
my $currusecredits = 0; |
my $postsubmitclient = 1; |
my $postsubmitclient = 1; |
my $ltiauth = 0; |
my $ltiauth = 0; |
my %domexttool; |
my %domexttool; |
my %exttool; |
my %exttool; |
|
my %crsauthor; |
|
my %crseditors; |
my @types = ('official','unofficial','community','textbook','placement'); |
my @types = ('official','unofficial','community','textbook','placement'); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if ($settings->{'ltiauth'}) { |
if ($settings->{'ltiauth'}) { |
Line 6911 sub print_coursedefaults {
|
Line 7078 sub print_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
if (ref($settings->{'crsauthor'}) eq 'HASH') { |
|
foreach my $type (@types) { |
|
if ($settings->{'crsauthor'}->{$type}) { |
|
$crsauthor{$type} = ' checked="checked"'; |
|
} |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
if ($staticdefaults{'crsauthor'}) { |
|
$crsauthor{$type} = ' checked="checked"'; |
|
} |
|
} |
|
} |
|
if (ref($settings->{'crseditors'}) eq 'ARRAY') { |
|
foreach my $editor (@{$settings->{'crseditors'}}) { |
|
$crseditors{$editor} = ' checked="checked"'; |
|
} |
|
} else { |
|
foreach my $editor (@{$staticdefaults{'crseditors'}}) { |
|
$crseditors{$editor} = ' checked="checked"'; |
|
} |
|
} |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
foreach my $type (keys(%{$settings->{'uploadquota'}})) { |
foreach my $type (keys(%{$settings->{'uploadquota'}})) { |
$curruploadquota{$type} = $settings->{'uploadquota'}{$type}; |
$curruploadquota{$type} = $settings->{'uploadquota'}{$type}; |
} |
} |
} |
} |
|
if (ref($settings->{'coursequota'}) eq 'HASH') { |
|
foreach my $type (keys(%{$settings->{'coursequota'}})) { |
|
$currcoursequota{$type} = $settings->{'coursequota'}{$type}; |
|
} |
|
} |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
foreach my $type (@types) { |
foreach my $type (@types) { |
next if ($type eq 'community'); |
next if ($type eq 'community'); |
Line 6965 sub print_coursedefaults {
|
Line 7159 sub print_coursedefaults {
|
if ($staticdefaults{'domexttool'}) { |
if ($staticdefaults{'domexttool'}) { |
$domexttool{$type} = ' checked="checked"'; |
$domexttool{$type} = ' checked="checked"'; |
} |
} |
|
if ($staticdefaults{'crsauthor'}) { |
|
$crsauthor{$type} = ' checked="checked"'; |
|
} |
|
} |
|
foreach my $editor (@{$staticdefaults{'crseditors'}}) { |
|
$crseditors{$editor} = ' checked="checked"'; |
} |
} |
} |
} |
if (!$currdefresponder) { |
if (!$currdefresponder) { |
Line 6976 sub print_coursedefaults {
|
Line 7176 sub print_coursedefaults {
|
if ($curruploadquota{$type} eq '') { |
if ($curruploadquota{$type} eq '') { |
$curruploadquota{$type} = $staticdefaults{'uploadquota'}; |
$curruploadquota{$type} = $staticdefaults{'uploadquota'}; |
} |
} |
|
if ($currcoursequota{$type} eq '') { |
|
$currcoursequota{$type} = $staticdefaults{'coursequota'}; |
|
} |
} |
} |
$datatable .= |
$datatable .= |
'<tr'.$css_class.'><td><span class="LC_nobreak">'. |
'<tr'.$css_class.'><td><span class="LC_nobreak">'. |
Line 6999 sub print_coursedefaults {
|
Line 7202 sub print_coursedefaults {
|
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'coursequota'}. |
|
'</span></td>'. |
|
'<td style="text-align: right" class="LC_right_item">'. |
|
'<table><tr>'; |
|
foreach my $type (@types) { |
|
$datatable .= '<td style="text-align: center">'.&mt($type).'<br />'. |
|
'<input type="text" name="coursequota_'.$type.'"'. |
|
' value="'.$currcoursequota{$type}.'" size="5" /></td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
|
$itemcount ++; |
my $onclick = "toggleDisplay(this.form,'credits');"; |
my $onclick = "toggleDisplay(this.form,'credits');"; |
my $display = 'none'; |
my $display = 'none'; |
if ($currusecredits) { |
if ($currusecredits) { |
Line 7077 sub print_coursedefaults {
|
Line 7293 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
$datatable .= '<td style="text-align: left">'. |
$datatable .= '<td style="text-align: left">'. |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<input type="checkbox" name="domexttool"'. |
'<label><input type="checkbox" name="domexttool"'. |
' value="'.$type.'"'.$domexttool{$type}.' />'. |
' value="'.$type.'"'.$domexttool{$type}.' />'. |
&mt($type).'</span></td>'."\n"; |
&mt($type).'</label></span></td>'."\n"; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 7092 sub print_coursedefaults {
|
Line 7308 sub print_coursedefaults {
|
foreach my $type (@types) { |
foreach my $type (@types) { |
$datatable .= '<td style="text-align: left">'. |
$datatable .= '<td style="text-align: left">'. |
'<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
'<input type="checkbox" name="exttool"'. |
'<label><input type="checkbox" name="exttool"'. |
' value="'.$type.'"'.$exttool{$type}.' />'. |
' value="'.$type.'"'.$exttool{$type}.' />'. |
&mt($type).'</span></td>'."\n"; |
&mt($type).'</label></span></td>'."\n"; |
} |
} |
$datatable .= '</tr></table></td></tr>'."\n"; |
$datatable .= '</tr></table></td></tr>'."\n"; |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'crsauthor'}. |
|
'</span></td>'. |
|
'<td style="text-align: right" class="LC_right_item">'. |
|
'<table><tr>'; |
|
foreach my $type (@types) { |
|
$datatable .= '<td style="text-align: left">'. |
|
'<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="crsauthor"'. |
|
' value="'.$type.'"'.$crsauthor{$type}.' />'. |
|
&mt($type).'</label></span></td>'."\n"; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
|
$itemcount ++; |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'crseditors'}. |
|
'</span></td>'. |
|
'<td style="text-align: right" class="LC_right_item">'. |
|
'<table><tr>'; |
|
my @editors = ('edit','xml','daxe'); |
|
my %editornames = &crseditor_titles(); |
|
foreach my $editor (@editors) { |
|
$datatable .= '<td style="text-align: left">'. |
|
'<span class="LC_nobreak">'. |
|
'<label><input type="checkbox" name="crseditors"'. |
|
' value="'.$editor.'"'.$crseditors{$editor}.' />'. |
|
$editornames{$editor}.'</label></span></td>'."\n"; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
|
} |
|
$$rowtotal += $itemcount; |
|
return $datatable; |
|
} |
|
|
|
sub crseditor_titles { |
|
return &Apache::lonlocal::texthash( |
|
edit => 'Standard editor (Edit)', |
|
xml => 'Text editor (EditXML)', |
|
daxe => 'Daxe editor (Daxe)', |
|
); |
|
} |
|
|
|
sub print_authordefaults { |
|
my ($position,$dom,$settings,$rowtotal) = @_; |
|
my ($css_class,$datatable,%checkedon,%checkedoff); |
|
my $itemcount = 1; |
|
my %titles = &authordefaults_titles(); |
|
if ($position eq 'top') { |
|
my %defaultchecked = ( |
|
'nocodemirror' => 'off', |
|
'daxecollapse' => 'off', |
|
'domcoordacc' => 'on', |
|
); |
|
my @toggles = ('nocodemirror','daxecollapse','domcoordacc'); |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
|
\%titles,$itemcount); |
|
my %staticdefaults = ( |
|
'copyright' => 'default', |
|
'sourceavail' => 'closed', |
|
); |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my %currrights; |
|
foreach my $item ('copyright','sourceavail') { |
|
$currrights{$item} = $staticdefaults{$item}; |
|
if (ref($settings) eq 'HASH') { |
|
if (exists($settings->{$item})) { |
|
$currrights{$item} = $settings->{$item}; |
|
} |
|
} |
|
} |
|
$datatable .= '<tr'.$css_class.'><td style="vertical-align: top">'. |
|
'<span class="LC_nobreak">'.$titles{'copyright'}. |
|
'</span></td><td class="LC_right_item">'. |
|
&selectbox('copyright',$currrights{'copyright'},'', |
|
\&Apache::loncommon::copyrightdescription, |
|
(grep !/^priv|custom$/,(&Apache::loncommon::copyrightids))). |
|
'</td></tr>'."\n"; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'><td style="vertical-align: top">'. |
|
'<span class="LC_nobreak">'.$titles{'sourceavail'}. |
|
'</span></td><td class="LC_right_item">'. |
|
&selectbox('sourceavail',$currrights{'sourceavail'},'', |
|
\&Apache::loncommon::source_copyrightdescription, |
|
(&Apache::loncommon::source_copyrightids)). |
|
'</td></tr>'."\n"; |
|
} else { |
|
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
my $curreditors; |
|
my %staticdefaults = ( |
|
editors => ['edit','xml'], |
|
authorquota => 500, |
|
webdav => 0, |
|
); |
|
my $curreditors = $staticdefaults{'editors'}; |
|
if ((ref($settings) eq 'HASH') && |
|
(ref($settings->{'editors'}) eq 'ARRAY')) { |
|
$curreditors = $settings->{'editors'}; |
|
} else { |
|
$curreditors = $staticdefaults{'editors'}; |
|
} |
|
my @editors = ('edit','xml','daxe'); |
|
$datatable = '<tr'.$css_class.'>'."\n". |
|
'<td>'.$titles{'editors'}.'</td>'."\n". |
|
'<td class="LC_left_item">'."\n". |
|
'<span class="LC_nobreak">'; |
|
foreach my $editor (@editors) { |
|
my $checked; |
|
if (grep(/^\Q$editor\E$/,@{$curreditors})) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<label>'. |
|
'<input type="checkbox" name="author_editors" '. |
|
$checked.' value="'.$editor.'" '. |
|
'onclick="javascript:checkEditors(this.form,'."'author_editors'".',this);" />'. |
|
$titles{$editor}.'</label> '; |
|
} |
|
$datatable .= '</span>'."\n".'</td>'."\n".'</tr>'."\n"; |
|
$itemcount ++; |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my @insttypes; |
|
if (ref($types) eq 'ARRAY') { |
|
@insttypes = @{$types}; |
|
} |
|
my $typecount = 0; |
|
my %domconf = &Apache::lonnet::get_dom('configuration',['quotas'],$dom); |
|
my @items = ('webdav','authorquota'); |
|
my %quotas; |
|
if (ref($domconf{'quotas'}) eq 'HASH') { |
|
%quotas = %{$domconf{'quotas'}}; |
|
foreach my $item (@items) { |
|
if (ref($quotas{$item}) eq 'HASH') { |
|
foreach my $type (@insttypes,'default') { |
|
if ($item eq 'authorquota') { |
|
if ($quotas{$item}{$type} !~ /^\d+$/) { |
|
$quotas{$item}{$type} = $staticdefaults{$item}; |
|
} |
|
} elsif ($item eq 'webdav') { |
|
if ($quotas{$item}{$type} !~ /^(0|1)$/) { |
|
$quotas{$item}{$type} = $staticdefaults{$item}; |
|
} |
|
} |
|
} |
|
} else { |
|
foreach my $type (@insttypes,'default') { |
|
$quotas{$item}{$type} = $staticdefaults{$item}; |
|
} |
|
} |
|
} |
|
} else { |
|
foreach my $item (@items) { |
|
foreach my $type (@insttypes,'default') { |
|
$quotas{$item}{$type} = $staticdefaults{$item}; |
|
} |
|
} |
|
} |
|
if (ref($usertypes) eq 'HASH') { |
|
my $numinrow = 4; |
|
my $onclick = ''; |
|
$datatable .= &insttypes_row(\%quotas,$types,$usertypes,$dom, |
|
$numinrow,$othertitle,'authorquota', |
|
\$itemcount,$onclick); |
|
$itemcount ++; |
|
$datatable .= &insttypes_row(\%quotas,$types,$usertypes,$dom, |
|
$numinrow,$othertitle,'webdav', |
|
\$itemcount); |
|
$itemcount ++; |
|
} |
|
my $checkedno = ' checked="checked"'; |
|
my ($checkedon,$checkedoff); |
|
if (ref($quotas{'webdav'}) eq 'HASH') { |
|
if ($quotas{'webdav'}{'_LC_adv'} =~ /^0|1$/) { |
|
if ($quotas{'webdav'}{'_LC_adv'}) { |
|
$checkedon = $checkedno; |
|
} else { |
|
$checkedoff = $checkedno; |
|
} |
|
undef($checkedno); |
|
} |
|
} |
|
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.$titles{'webdav_LC_adv'}.'<br />'. |
|
$titles{'webdav_LC_adv_over'}. |
|
'</td>'. |
|
'<td class="LC_left_item">'; |
|
foreach my $option ('none','off','on') { |
|
my ($text,$val,$checked); |
|
if ($option eq 'none') { |
|
$text = $titles{'none'}; |
|
$val = ''; |
|
$checked = $checkedno; |
|
} elsif ($option eq 'off') { |
|
$text = $titles{'overoff'}; |
|
$val = 0; |
|
$checked = $checkedoff; |
|
} elsif ($option eq 'on') { |
|
$text = $titles{'overon'}; |
|
$val = 1; |
|
$checked = $checkedon; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="webdav_LC_adv"'. |
|
' value="'.$val.'"'.$checked.' />'. |
|
$text.'</label></span> '; |
|
} |
|
$datatable .= '</td></tr>'; |
|
$itemcount ++; |
|
my %defchecked = ( |
|
'archive' => 'off', |
|
); |
|
my @toggles = ('archive'); |
|
(my $archive,$itemcount) = &radiobutton_prefs($settings,['archive'], |
|
{'archive' => 'off'}, |
|
\%titles,$itemcount); |
|
$datatable .= $archive."\n"; |
|
$itemcount ++; |
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub authordefaults_titles { |
|
return &Apache::lonlocal::texthash( |
|
copyright => 'Copyright/Distribution', |
|
sourceavail => ' Source Available', |
|
editors => 'Available Editors', |
|
webdav => 'WebDAV', |
|
authorquota => 'Authoring Space quotas (MB)', |
|
nocodemirror => 'Deactivate CodeMirror for EditXML editor', |
|
daxecollapse => 'Daxe editor: LON-CAPA standard menus start collapsed', |
|
domcoordacc => 'Dom. Coords. can enter Authoring Spaces in domain', |
|
edit => 'Standard editor (Edit)', |
|
xml => 'Text editor (EditXML)', |
|
daxe => 'Daxe editor (Daxe)', |
|
webdav_LC_adv => 'WebDAV access for LON-CAPA "advanced" users', |
|
webdav_LC_adv_over => '(overrides access based on affiliation, if set)', |
|
none => 'No override set', |
|
overon => 'Override -- webDAV on', |
|
overoff => 'Override -- webDAV off', |
|
archive => 'Authors can download tar.gz file of Authoring Space', |
|
); |
|
} |
|
|
|
sub selectbox { |
|
my ($name,$value,$readonly,$functionref,@idlist)=@_; |
|
my $selout = '<select name="'.$name.'">'; |
|
foreach my $id (@idlist) { |
|
$selout.='<option value="'.$id.'"'; |
|
if ($id eq $value) { |
|
$selout.=' selected="selected"'; |
|
} |
|
if ($readonly) { |
|
$selout .= ' disabled="disabled"'; |
|
} |
|
$selout.='>'.&{$functionref}($id).'</option>'; |
|
} |
|
$selout.='</select>'; |
|
return $selout; |
|
} |
|
|
sub print_selfenrollment { |
sub print_selfenrollment { |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
Line 7868 sub password_rules {
|
Line 8344 sub password_rules {
|
if (ref($settings->{chars}) eq 'ARRAY') { |
if (ref($settings->{chars}) eq 'ARRAY') { |
map { $chars{$_} = 1; } (@{$settings->{chars}}); |
map { $chars{$_} = 1; } (@{$settings->{chars}}); |
} |
} |
if ($prefix eq 'passwords') { |
if ($prefix eq 'passwords') { |
if ($settings->{expire}) { |
if ($settings->{expire}) { |
$expire = $settings->{expire}; |
$expire = $settings->{expire}; |
} |
} |
Line 8011 sub print_wafproxy {
|
Line 8487 sub print_wafproxy {
|
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
my %config = &Apache::lonnet::get_dom('configuration',['wafproxy'],$domain); |
if (ref($config{'wafproxy'}) eq 'HASH') { |
if (ref($config{'wafproxy'}) eq 'HASH') { |
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
$aliases{$domain} = $config{'wafproxy'}{'alias'}; |
if (exists($config{'wafproxy'}{'saml'})) { |
if (exists($config{'wafproxy'}{'saml'})) { |
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
$saml{$domain} = $config{'wafproxy'}{'saml'}; |
} |
} |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
foreach my $item ('remoteip','ipheader','trusted','vpnint','vpnext') { |
Line 8028 sub print_wafproxy {
|
Line 8504 sub print_wafproxy {
|
my $dom_in_effect; |
my $dom_in_effect; |
my $aliasrows = '<tr>'. |
my $aliasrows = '<tr>'. |
'<td class="LC_left_item" style="vertical-align: baseline;">'. |
'<td class="LC_left_item" style="vertical-align: baseline;">'. |
&mt('Hostname').': '. |
&mt('Hostname').': '. |
'<i>'.&Apache::lonnet::hostname($server).'</i></td><td> </td>'; |
'<span class="LC_nobreak LC_cusr_emph">'. |
|
&Apache::lonnet::hostname($server). |
|
'</span></td><td> </td>'; |
if ($othercontrol{$server}) { |
if ($othercontrol{$server}) { |
$dom_in_effect = $othercontrol{$server}; |
$dom_in_effect = $othercontrol{$server}; |
my ($current,$forsaml); |
my ($current,$forsaml); |
Line 8076 sub print_wafproxy {
|
Line 8554 sub print_wafproxy {
|
(' 'x2).'<span class="LC_nobreak">'. |
(' 'x2).'<span class="LC_nobreak">'. |
&mt('Alias used for SSO Auth').': <label>'. |
&mt('Alias used for SSO Auth').': <label>'. |
'<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'. |
'<input type="radio" value="0"'.$samloff.' name="wafproxy_alias_saml_'.$server.'" />'. |
&mt('No').'</label> <label>'. |
&mt('No').'</label> <label>'. |
'<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'. |
'<input type="radio" value="1"'.$samlon.' name="wafproxy_alias_saml_'.$server.'" />'. |
&mt('Yes').'</label></span>'. |
&mt('Yes').'</label></span>'. |
'</td>'; |
'</td>'; |
} |
} |
$aliasrows .= '</tr>'; |
$aliasrows .= '</tr>'; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
$aliasinfo{$dom_in_effect} .= $aliasrows; |
Line 8989 sub print_loadbalancing {
|
Line 9467 sub print_loadbalancing {
|
no => ' checked="checked"', |
no => ' checked="checked"', |
); |
); |
my %balcookiechecked = ( |
my %balcookiechecked = ( |
no => ' checked="checked"', |
no => ' checked="checked"', |
); |
); |
foreach my $sparetype (@sparestypes) { |
foreach my $sparetype (@sparestypes) { |
my $targettable; |
my $targettable; |
Line 9344 sub tool_titles {
|
Line 9822 sub tool_titles {
|
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
aboutme => 'Personal web page', |
aboutme => 'Personal web page', |
blog => 'Blog', |
blog => 'Blog', |
webdav => 'WebDAV', |
|
portfolio => 'Portfolio', |
portfolio => 'Portfolio', |
|
portaccess => 'Share portfolio files', |
timezone => 'Can set time zone', |
timezone => 'Can set time zone', |
official => 'Official courses (with institutional codes)', |
official => 'Official courses (with institutional codes)', |
unofficial => 'Unofficial courses', |
unofficial => 'Unofficial courses', |
Line 9576 sub print_selfcreation {
|
Line 10054 sub print_selfcreation {
|
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick); |
\%choices,$itemcount,$onclick); |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
|
|
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
$datatable .= &insttypes_row($createsettings,$types,$usertypes, |
Line 9713 sub print_selfcreation {
|
Line 10191 sub print_selfcreation {
|
my $currstyle = 'display:none'; |
my $currstyle = 'display:none'; |
if (grep(/^\Q$status\E$/,@ordered)) { |
if (grep(/^\Q$status\E$/,@ordered)) { |
$currstyle = $rowstyle; |
$currstyle = $rowstyle; |
$hidden = 0; |
$hidden = 0; |
} |
} |
$datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain, |
$datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain, |
$emailrules,$emailruleorder,$settings,$status,$rowid, |
$emailrules,$emailruleorder,$settings,$status,$rowid, |
Line 9740 sub print_selfcreation {
|
Line 10218 sub print_selfcreation {
|
foreach my $status (@posstypes) { |
foreach my $status (@posstypes) { |
my $rowid = $classprefix.$status; |
my $rowid = $classprefix.$status; |
my $datarowstyle = 'display:none'; |
my $datarowstyle = 'display:none'; |
if (grep(/^\Q$status\E$/,@ordered)) { |
if (grep(/^\Q$status\E$/,@ordered)) { |
$datarowstyle = $rowstyle; |
$datarowstyle = $rowstyle; |
} |
} |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$datatable .= &modifiable_userdata_row('cancreate','emailusername_'.$status,$settings, |
$numinrow,$$rowtotal,\%usertypeshash,$infofields, |
$numinrow,$$rowtotal,\%usertypeshash,$infofields, |
Line 9843 function toggleEmailOptions(form,radio,p
|
Line 10321 function toggleEmailOptions(form,radio,p
|
document.getElementById(altprefix+'_inst_'+status).style.display = 'none'; |
document.getElementById(altprefix+'_inst_'+status).style.display = 'none'; |
document.getElementById(altprefix+'_noninst_'+status).style.display = 'none'; |
document.getElementById(altprefix+'_noninst_'+status).style.display = 'none'; |
if (curr == 'custom') { |
if (curr == 'custom') { |
if (prefix) { |
if (prefix) { |
document.getElementById(prefix+'_'+status).style.display = 'inline'; |
document.getElementById(prefix+'_'+status).style.display = 'inline'; |
} |
} |
} else if (curr == 'inst') { |
} else if (curr == 'inst') { |
Line 9866 ENDSCRIPT
|
Line 10344 ENDSCRIPT
|
|
|
sub noninst_users { |
sub noninst_users { |
my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules, |
my ($processing,$emailverified,$emailoptions,$emaildomain,$emailrules, |
$emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_; |
$emailruleorder,$settings,$type,$rowid,$typetitle,$css_class,$rowstyle,$intdom) = @_; |
my $class = 'LC_left_item'; |
my $class = 'LC_left_item'; |
if ($css_class) { |
if ($css_class) { |
$css_class = ' class="'.$css_class.'"'; |
$css_class = ' class="'.$css_class.'"'; |
} |
} |
if ($rowid) { |
if ($rowid) { |
$rowid = ' id="'.$rowid.'"'; |
$rowid = ' id="'.$rowid.'"'; |
Line 9884 sub noninst_users {
|
Line 10362 sub noninst_users {
|
$description = &mt('Requests for: [_1] (status self-reported)',$typetitle); |
$description = &mt('Requests for: [_1] (status self-reported)',$typetitle); |
} |
} |
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
"<td>$description</td>\n". |
"<td>$description</td>\n". |
'<td class="'.$class.'" colspan="2">'. |
'<td class="'.$class.'" colspan="2">'. |
'<table><tr>'; |
'<table><tr>'; |
my %headers = &Apache::lonlocal::texthash( |
my %headers = &Apache::lonlocal::texthash( |
approve => 'Processing', |
approve => 'Processing', |
email => 'E-mail', |
email => 'E-mail', |
username => 'Username', |
username => 'Username', |
Line 10012 sub noninst_users {
|
Line 10490 sub noninst_users {
|
my $value; |
my $value; |
if (ref($emaildomain) eq 'HASH') { |
if (ref($emaildomain) eq 'HASH') { |
if (ref($emaildomain->{$type}) eq 'HASH') { |
if (ref($emaildomain->{$type}) eq 'HASH') { |
$value = $emaildomain->{$type}->{$option}; |
$value = $emaildomain->{$type}->{$option}; |
} |
} |
} |
} |
if ($value eq '') { |
if ($value eq '') { |
Line 10248 sub print_usermodification {
|
Line 10726 sub print_usermodification {
|
$$rowtotal ++; |
$$rowtotal ++; |
$rowcount ++; |
$rowcount ++; |
} |
} |
|
} elsif ($position eq 'middle') { |
|
$rowcount = 0; |
|
$context = 'coauthor'; |
|
foreach my $role ('ca','aa') { |
|
$datatable .= &modifiable_userdata_row($context,$role,$settings, |
|
$numinrow,$rowcount); |
|
$$rowtotal ++; |
|
$rowcount ++; |
|
} |
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
$context = 'course'; |
$context = 'course'; |
$rowcount = 0; |
$rowcount = 0; |
Line 10330 sub print_defaults {
|
Line 10817 sub print_defaults {
|
if ($defaults{$item.'_'.$field}) { |
if ($defaults{$item.'_'.$field}) { |
$checkedon = $checkedoff; |
$checkedon = $checkedoff; |
$checkedoff = ''; |
$checkedoff = ''; |
} |
} |
$datatable .= '<div id="'.$item.'_'.$field.'_div" style="display:'.$portalsty.'">'. |
$datatable .= '<div id="'.$item.'_'.$field.'_div" style="display:'.$portalsty.'">'. |
'<span class="LC_nobreak">'.$titles->{$field}.' '. |
'<span class="LC_nobreak">'.$titles->{$field}.' '. |
'<label><input type="radio" name="'.$item.'_'.$field.'" value="1"'.$checkedon.'/>'.&mt('Yes').'</label>'. |
'<label><input type="radio" name="'.$item.'_'.$field.'" value="1"'.$checkedon.'/>'.&mt('Yes').'</label>'. |
Line 11159 sub defaults_javascript {
|
Line 11646 sub defaults_javascript {
|
function portalExtras(caller) { |
function portalExtras(caller) { |
var x = caller.value; |
var x = caller.value; |
var y = new Array('email','web'); |
var y = new Array('email','web'); |
for (var i=0; i<y.length; i++) { |
for (var i=0; i<y.length; i++) { |
if (document.getElementById('portal_def_'+y[i]+'_div')) { |
if (document.getElementById('portal_def_'+y[i]+'_div')) { |
var z = document.getElementById('portal_def_'+y[i]+'_div'); |
var z = document.getElementById('portal_def_'+y[i]+'_div'); |
if (x.length > 0) { |
if (x.length > 0) { |
Line 11263 sub passwords_javascript {
|
Line 11750 sub passwords_javascript {
|
} |
} |
&js_escape(\%intalert); |
&js_escape(\%intalert); |
my $defmin = $Apache::lonnet::passwdmin; |
my $defmin = $Apache::lonnet::passwdmin; |
my $intauthjs; |
my $intauthjs; |
if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT"; |
if ($prefix eq 'passwords') { $intauthjs = <<"ENDSCRIPT"; |
|
|
function warnIntAuth(field) { |
function warnIntAuth(field) { |
Line 11657 sub modifiable_userdata_row {
|
Line 12144 sub modifiable_userdata_row {
|
'<td class="LC_left_item" colspan="2"><table>'; |
'<td class="LC_left_item" colspan="2"><table>'; |
my $rem; |
my $rem; |
my %checks; |
my %checks; |
my %current; |
|
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
my $hashref; |
my $hashref; |
if ($context eq 'lti') { |
if ($context eq 'lti') { |
Line 11683 sub modifiable_userdata_row {
|
Line 12169 sub modifiable_userdata_row {
|
} |
} |
} |
} |
} |
} |
if (ref($hashref) eq 'HASH') { |
if (ref($hashref) eq 'HASH') { |
foreach my $field (@fields) { |
foreach my $field (@fields) { |
if ($hashref->{$field}) { |
if ($hashref->{$field}) { |
if ($role eq 'emailusername') { |
if ($role eq 'emailusername') { |
Line 11695 sub modifiable_userdata_row {
|
Line 12181 sub modifiable_userdata_row {
|
} |
} |
} |
} |
} |
} |
|
|
my $total = scalar(@fields); |
my $total = scalar(@fields); |
for (my $i=0; $i<$total; $i++) { |
for (my $i=0; $i<$total; $i++) { |
$rem = $i%($numinrow); |
$rem = $i%($numinrow); |
Line 11755 sub modifiable_userdata_row {
|
Line 12240 sub modifiable_userdata_row {
|
} else { |
} else { |
if ($context eq 'lti') { |
if ($context eq 'lti') { |
$prefix = 'lti'; |
$prefix = 'lti'; |
|
} elsif ($context eq 'coauthor') { |
|
$prefix = 'cacanmodify'; |
} elsif ($context eq 'privacy') { |
} elsif ($context eq 'privacy') { |
$prefix = 'privacy'; |
$prefix = 'privacy'; |
} |
} |
Line 11784 sub insttypes_row {
|
Line 12271 sub insttypes_row {
|
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick, |
my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context,$rowtotal,$onclick, |
$customcss,$rowstyle) = @_; |
$customcss,$rowstyle) = @_; |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
cansearch => 'Users allowed to search', |
cansearch => 'Users allowed to search', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
lockablenames => 'User preference to lock name', |
lockablenames => 'User preference to lock name', |
selfassign => 'Self-reportable affiliations', |
selfassign => 'Self-reportable affiliations', |
overrides => "Override domain's helpdesk settings based on requester's affiliation", |
overrides => "Override domain's helpdesk settings based on requester's affiliation", |
|
webdav => 'WebDAV access available', |
|
authorquota => 'Authoring Space quota (MB)', |
); |
); |
my $showdom; |
my ($showdom,$defaultquota); |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
$showdom = ' ('.$dom.')'; |
$showdom = ' ('.$dom.')'; |
|
} elsif ($context eq 'authorquota') { |
|
$defaultquota = 500; |
} |
} |
my $class = 'LC_left_item'; |
my $class = 'LC_left_item'; |
if ($context eq 'statustocreate') { |
if ($context eq 'statustocreate') { |
Line 11829 sub insttypes_row {
|
Line 12320 sub insttypes_row {
|
} |
} |
$output .= '<tr>'; |
$output .= '<tr>'; |
} |
} |
my $check = ' '; |
if ($context eq 'authorquota') { |
if (ref($settings) eq 'HASH') { |
my $currquota; |
if (ref($settings->{$context}) eq 'ARRAY') { |
if ($settings->{$context}->{$types->[$i]} =~ /^\d+$/) { |
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
$currquota = $settings->{$context}->{$types->[$i]}; |
$check = ' checked="checked" '; |
} else { |
} |
$currquota = $defaultquota; |
} elsif (ref($settings->{$context}) eq 'HASH') { |
} |
if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') { |
$output .= '<td class="LC_left_item">'."\n". |
|
'<label><span class="LC_nobreak">'."\n". |
|
$usertypes->{$types->[$i]}.'</span><br />'."\n". |
|
'<input type="text" name="'.$context.'_'.$types->[$i].'" '. |
|
'value="'.$currquota.'" size="5"'.$onclick.'/>'."\n". |
|
'</label></td>'; |
|
} else { |
|
my $check = ' '; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$context}) eq 'ARRAY') { |
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
|
$check = ' checked="checked" '; |
|
} |
|
} elsif (ref($settings->{$context}) eq 'HASH') { |
|
if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') { |
|
$check = ' checked="checked" '; |
|
} elsif ($context eq 'webdav') { |
|
if ($settings->{$context}->{$types->[$i]}) { |
|
$check = ' checked="checked" '; |
|
} |
|
} |
|
} elsif ($context eq 'statustocreate') { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
} elsif ($context eq 'statustocreate') { |
|
$check = ' checked="checked" '; |
|
} |
} |
|
$output .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="'.$types->[$i].'"'.$check.$onclick.'/>'. |
|
$usertypes->{$types->[$i]}.'</label></span></td>'; |
} |
} |
$output .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="'.$types->[$i].'"'.$check.$onclick.' />'. |
|
$usertypes->{$types->[$i]}.'</label></span></td>'; |
|
} |
} |
} |
} |
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
Line 11859 sub insttypes_row {
|
Line 12369 sub insttypes_row {
|
} else { |
} else { |
$output .= '<td class="LC_left_item">'; |
$output .= '<td class="LC_left_item">'; |
} |
} |
$output .= ' '; |
$output .= ' '; |
} else { |
} else { |
if ($rem == 0) { |
if ($rem == 0) { |
$output .= '<tr>'; |
$output .= '<tr>'; |
Line 11869 sub insttypes_row {
|
Line 12379 sub insttypes_row {
|
} else { |
} else { |
$output .= '<td class="LC_left_item">'; |
$output .= '<td class="LC_left_item">'; |
} |
} |
my $defcheck = ' '; |
if ($context eq 'authorquota') { |
if (ref($settings) eq 'HASH') { |
my $currquota = 500; |
if (ref($settings->{$context}) eq 'ARRAY') { |
if ((ref($settings) eq 'HASH') && (ref($settings->{$context}) eq 'HASH')) { |
if (grep(/^default$/,@{$settings->{$context}})) { |
if ($settings->{$context}{'default'} =~ /^\d+$/) { |
|
$currquota = $settings->{$context}{'default'}; |
|
} |
|
} |
|
$output .= '<label><span class="LC_nobreak">'.$othertitle.'</span><br />'."\n". |
|
'<input type="text" name="'.$context.'_default" '. |
|
'value="'.$currquota.'" size="5"'.$onclick.'/>'."\n". |
|
'</label>'; |
|
} else { |
|
my $defcheck = ' '; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$context}) eq 'ARRAY') { |
|
if (grep(/^default$/,@{$settings->{$context}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} elsif (ref($settings->{$context}) eq 'HASH') { |
|
if (ref($settings->{$context}->{'default'}) eq 'HASH') { |
|
$defcheck = ' checked="checked" '; |
|
} elsif ($context eq 'webdav') { |
|
if ($settings->{$context}->{'default'}) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} |
|
} elsif ($context eq 'statustocreate') { |
$defcheck = ' checked="checked" '; |
$defcheck = ' checked="checked" '; |
} |
} |
} elsif ($context eq 'statustocreate') { |
|
$defcheck = ' checked="checked" '; |
|
} |
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.$onclick.'/>'. |
|
$othertitle.'</label></span>'; |
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.$onclick.' />'. |
|
$othertitle.'</label></span>'; |
|
} |
} |
$output .= '</td></tr></table></td></tr>'; |
$output .= '</td></tr></table></td></tr>'; |
return $output; |
return $output; |
Line 12135 sub modify_login {
|
Line 12666 sub modify_login {
|
if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
if ($lang eq $env{'form.loginhelpurl_add_lang'}) { |
$formelem = 'loginhelpurl_add_file'; |
$formelem = 'loginhelpurl_add_file'; |
} |
} |
(my $result,$newurl{$lang}) = |
(my $result,$newurl{$lang}) = |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
"help/$lang",'','',$newfile{$lang}, |
"help/$lang",'','',$newfile{$lang}, |
$modified); |
$modified); |
Line 12212 sub modify_login {
|
Line 12743 sub modify_login {
|
my $modified = []; |
my $modified = []; |
foreach my $lonhost (@newhosts) { |
foreach my $lonhost (@newhosts) { |
my $formelem = 'loginheadtag_'.$lonhost; |
my $formelem = 'loginheadtag_'.$lonhost; |
(my $result,$newheadtagurls{$lonhost}) = |
(my $result,$newheadtagurls{$lonhost}) = |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
"login/headtag/$lonhost",'','', |
"login/headtag/$lonhost",'','', |
$env{'form.loginheadtag_'.$lonhost.'.filename'}, |
$env{'form.loginheadtag_'.$lonhost.'.filename'}, |
Line 12289 sub modify_login {
|
Line 12820 sub modify_login {
|
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
$currsaml{$lonhost}{$item} = $env{'form.saml_'.$item.'_'.$lonhost}; |
} |
} |
} else { |
} else { |
if ($saml{$lonhost}) { |
if ($saml{$lonhost}) { |
$changes{'saml'}{$lonhost} = 1; |
$changes{'saml'}{$lonhost} = 1; |
delete($currsaml{$lonhost}); |
delete($currsaml{$lonhost}); |
} |
} |
} |
} |
} |
} |
foreach my $posshost (keys(%currsaml)) { |
foreach my $posshost (keys(%currsaml)) { |
unless (exists($domservers{$posshost})) { |
unless (exists($domservers{$posshost})) { |
delete($currsaml{$posshost}); |
delete($currsaml{$posshost}); |
} |
} |
} |
} |
%{$loginhash{'login'}{'saml'}} = %currsaml; |
%{$loginhash{'login'}{'saml'}} = %currsaml; |
Line 12311 sub modify_login {
|
Line 12842 sub modify_login {
|
my $modified = []; |
my $modified = []; |
foreach my $lonhost (@newsamlimgs) { |
foreach my $lonhost (@newsamlimgs) { |
my $formelem = 'saml_img_'.$lonhost; |
my $formelem = 'saml_img_'.$lonhost; |
my ($result,$imgurl) = |
my ($result,$imgurl) = |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
&Apache::lonconfigsettings::publishlogo($r,'upload',$formelem,$dom,$confname, |
"login/saml/$lonhost",'','', |
"login/saml/$lonhost",'','', |
$env{'form.saml_img_'.$lonhost.'.filename'}, |
$env{'form.saml_img_'.$lonhost.'.filename'}, |
Line 12681 sub modify_ipaccess {
|
Line 13212 sub modify_ipaccess {
|
$possrange =~ s/,+/,/g; |
$possrange =~ s/,+/,/g; |
if ($possrange ne '') { |
if ($possrange ne '') { |
my (@ok,$count); |
my (@ok,$count); |
$count = 0; |
$count = 0; |
foreach my $poss (split(/\,/,$possrange)) { |
foreach my $poss (split(/\,/,$possrange)) { |
$count ++; |
$count ++; |
$poss = &validate_ip_pattern($poss); |
$poss = &validate_ip_pattern($poss); |
Line 12714 sub modify_ipaccess {
|
Line 13245 sub modify_ipaccess {
|
} |
} |
} |
} |
$confhash{$itemid}{'commblocks'} = {}; |
$confhash{$itemid}{'commblocks'} = {}; |
|
|
my %commblocks; |
my %commblocks; |
map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx); |
map { $commblocks{$_} = 1; } &Apache::loncommon::get_env_multiple('form.ipaccess_block_'.$idx); |
foreach my $type (@{$typeorder}) { |
foreach my $type (@{$typeorder}) { |
if ($commblocks{$type}) { |
if ($commblocks{$type}) { |
$confhash{$itemid}{'commblocks'}{$type} = 'on'; |
$confhash{$itemid}{'commblocks'}{$type} = 'on'; |
Line 12748 sub modify_ipaccess {
|
Line 13279 sub modify_ipaccess {
|
} |
} |
$env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g; |
$env{'form.ipaccess_cnum_'.$idx} =~ s/^\s+|\s+$//g; |
$env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g; |
$env{'form.ipaccess_cdom_'.$idx} =~ s/^\s+|\s+$//g; |
if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) && |
if (($env{'form.ipaccess_cnum_'.$idx} =~ /^$match_courseid$/) && |
($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) { |
($env{'form.ipaccess_cdom_'.$idx} =~ /^$match_domain$/)) { |
if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx}, |
if (&Apache::lonnet::homeserver($env{'form.ipaccess_cnum_'.$idx}, |
$env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') { |
$env{'form.ipaccess_cdom_'.$idx}) eq 'no_host') { |
Line 12828 sub modify_ipaccess {
|
Line 13359 sub modify_ipaccess {
|
if (keys(%{$confhash{$itemid}{'courses'}})) { |
if (keys(%{$confhash{$itemid}{'courses'}})) { |
my @courses; |
my @courses; |
foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) { |
foreach my $cid (sort(keys(%{$confhash{$itemid}{'courses'}}))) { |
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
my %courseinfo = &Apache::lonnet::coursedescription($cid,{'one_time' => 1}); |
push(@courses,$courseinfo{'description'}.' ('.$cid.')'); |
push(@courses,$courseinfo{'description'}.' ('.$cid.')'); |
} |
} |
$resulttext .= '<li>'.&mt('Courses/Communities allowed').':<ul><li>'. |
$resulttext .= '<li>'.&mt('Courses/Communities allowed').':<ul><li>'. |
Line 12896 sub get_ipaccess_id {
|
Line 13427 sub get_ipaccess_id {
|
return ($id,$error); |
return ($id,$error); |
} |
} |
|
|
|
sub modify_authordefaults { |
|
my ($dom,$lastactref,%domconfig) = @_; |
|
# |
|
# Retrieve current domain configuration for webDAV and Authoring Space quotas from $domconfig{'quotas'}. |
|
# |
|
my (%curr_quotas,%save_quotas,%confhash,%changes,%newvalues); |
|
if (ref($domconfig{'quotas'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'quotas'}})) { |
|
if ($key =~ /^webdav|authorquota$/) { |
|
$curr_quotas{$key} = $domconfig{'quotas'}{$key}; |
|
} else { |
|
$save_quotas{$key} = $domconfig{'quotas'}{$key}; |
|
} |
|
} |
|
} |
|
my %staticdefaults = ( |
|
'copyright' => 'default', |
|
'sourceavail' => 'closed', |
|
'nocodemirror' => 'off', |
|
'daxecollapse' => 'off', |
|
'domcoordacc' => 'on', |
|
'editors' => ['edit','xml'], |
|
'authorquota' => 500, |
|
'webdav' => 0, |
|
'archive' => 'off', |
|
); |
|
my %titles = &authordefaults_titles(); |
|
foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') { |
|
if ($env{'form.'.$item} =~ /^(0|1)$/) { |
|
$confhash{$item} = $env{'form.'.$item}; |
|
} |
|
} |
|
if ($env{'form.copyright'} =~ /^(default|domain|public)$/) { |
|
$confhash{'copyright'} = $1; |
|
} |
|
if ($env{'form.sourceavail'} =~ /^(closed|open)$/) { |
|
$confhash{'sourceavail'} = $1; |
|
} |
|
my @posseditors = &Apache::loncommon::get_env_multiple('form.author_editors'); |
|
my @okeditors = ('edit','xml','daxe'); |
|
my @editors; |
|
foreach my $item (@posseditors) { |
|
if (grep(/^\Q$item\E$/,@okeditors)) { |
|
push(@editors,$item); |
|
} |
|
} |
|
$confhash{'editors'} = \@editors; |
|
|
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my @insttypes; |
|
if (ref($types) eq 'ARRAY') { |
|
@insttypes = @{$types}; |
|
} |
|
my @webdavon = &Apache::loncommon::get_env_multiple('form.webdav'); |
|
my %webdav; |
|
map { $webdav{$_} = 1; } @webdavon; |
|
foreach my $type (@insttypes,'default') { |
|
my $possquota = $env{'form.authorquota_'.$type}; |
|
if ($possquota =~ /^\d+$/) { |
|
$save_quotas{'authorquota'}{$type} = $possquota; |
|
} |
|
if ($webdav{$type}) { |
|
$save_quotas{'webdav'}{$type} = 1; |
|
} else { |
|
$save_quotas{'webdav'}{$type} = 0; |
|
} |
|
} |
|
if ($env{'form.webdav_LC_adv'} =~ /^(0|1)$/) { |
|
$save_quotas{'webdav'}{'_LC_adv'} = $env{'form.webdav_LC_adv'}; |
|
} |
|
if (ref($domconfig{'authordefaults'}) eq 'HASH') { |
|
foreach my $item ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail','archive') { |
|
if ($domconfig{'authordefaults'}{$item} ne $confhash{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($confhash{'editors'}, |
|
$domconfig{'authordefaults'}{'editors'}); |
|
unless (@diffs == 0) { |
|
$changes{'editors'} = 1; |
|
} |
|
} else { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($confhash{'editors'}, |
|
$staticdefaults{'editors'}); |
|
unless (@diffs == 0) { |
|
$changes{'editors'} = 1; |
|
} |
|
} |
|
} else { |
|
my @offon = ('off','on'); |
|
foreach my $item ('nocodemirror','daxecollapse','domcoordacc','archive') { |
|
if ($offon[$confhash{$item}] ne $staticdefaults{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
foreach my $item ('copyright','sourceavail') { |
|
if ($confhash{$item} ne $staticdefaults{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($confhash{'editors'}, |
|
$staticdefaults{'editors'}); |
|
unless (@diffs == 0) { |
|
$changes{'editors'} = 1; |
|
} |
|
} |
|
foreach my $key ('authorquota','webdav') { |
|
if (ref($curr_quotas{$key}) eq 'HASH') { |
|
foreach my $type (@insttypes,'default') { |
|
if (exists($save_quotas{$key}{$type})) { |
|
if ($save_quotas{$key}{$type} ne $curr_quotas{$key}{$type}) { |
|
$changes{$key}{$type} = 1; |
|
} |
|
} elsif (exists($curr_quotas{$key}{$type})) { |
|
$save_quotas{$key}{$type} = $curr_quotas{$key}{$type}; |
|
} else { |
|
$save_quotas{$key}{$type} = $staticdefaults{$key}; |
|
} |
|
} |
|
} else { |
|
foreach my $type (@insttypes,'default') { |
|
if (exists($save_quotas{$key}{$type})) { |
|
unless ($save_quotas{$key}{$type} eq $staticdefaults{$key}) { |
|
$changes{$key}{$type} = 1; |
|
} |
|
} else { |
|
$save_quotas{$key}{$type} = $staticdefaults{$key}; |
|
} |
|
} |
|
} |
|
} |
|
if (ref($curr_quotas{'webdav'}) eq 'HASH') { |
|
if (exists($save_quotas{'webdav'}{'_LC_adv'})) { |
|
if ($save_quotas{'webdav'}{'_LC_adv'} ne $curr_quotas{'webdav'}{'_LC_adv'}) { |
|
$changes{'webdav_LC_adv'} = 1; |
|
} |
|
} elsif (exists($curr_quotas{'webdav'}{'_LC_adv'})) { |
|
$changes{'webdav_LC_adv'} = 1; |
|
} |
|
} elsif (exists($save_quotas{'webdav'}{'_LC_adv'})) { |
|
$changes{'webdav_LC_adv'} = 1; |
|
} |
|
my %confighash = ( |
|
quotas => \%save_quotas, |
|
authordefaults => \%confhash, |
|
); |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%confighash, |
|
$dom); |
|
my $resulttext; |
|
if ($putresult eq 'ok') { |
|
if (keys(%changes)) { |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
if ((exists($changes{'authorquota'})) || (exists($changes{'webdav'})) || |
|
($changes{'webdav_LC_adv'})) { |
|
if ((exists($changes{'authorquota'})) && (ref($save_quotas{'authorquota'}) eq 'HASH')) { |
|
$domdefaults{'authorquota'} = $save_quotas{'authorquota'}; |
|
} |
|
if (((exists($changes{'webdav'})) || ($changes{'webdav_LC_adv'})) && |
|
(ref($save_quotas{'webdav'}) eq 'HASH')) { |
|
$domdefaults{'webdav'} = $save_quotas{'webdav'}; |
|
} |
|
} |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
my $authoroverride; |
|
foreach my $key ('nocodemirror','daxecollapse','domcoordacc','copyright','sourceavail') { |
|
if (exists($changes{$key})) { |
|
$domdefaults{$key} = $confhash{$key}; |
|
my $shown; |
|
unless ($authoroverride) { |
|
$resulttext .= '<li>'.&mt('Defaults which can be overridden by Author').'<ul>'; |
|
$authoroverride = 1; |
|
} |
|
if (($key eq 'nocodemirror') || ($key eq 'daxecollapse') || ($key eq 'domcoordacc')) { |
|
$shown = ($confhash{$key} ? &mt('Yes') : &mt('No')); |
|
} elsif ($key eq 'copyright') { |
|
$shown = &Apache::loncommon::copyrightdescription($confhash{$key}); |
|
} elsif ($key eq 'sourceavail') { |
|
$shown = &Apache::loncommon::source_copyrightdescription($confhash{$key}); |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>'; |
|
} |
|
} |
|
if ($authoroverride) { |
|
$resulttext .= '</ul></li>'; |
|
} |
|
my $domcoordoverride; |
|
foreach my $key ('editors','authorquota','webdav','webdav_LC_adv','archive') { |
|
if (exists($changes{$key})) { |
|
my $shown; |
|
unless ($domcoordoverride) { |
|
$resulttext .= '<li>'.&mt('Defaults which can be overridden by a Domain Coodinator').'<ul>'; |
|
$domcoordoverride = 1; |
|
} |
|
if ($key eq 'editors') { |
|
if (ref($confhash{'editors'}) eq 'ARRAY') { |
|
$domdefaults{'editors'} = join(',',@{$confhash{'editors'}}); |
|
if (@{$confhash{'editors'}}) { |
|
$shown = join(', ', map { $titles{$_} } @{$confhash{'editors'}}); |
|
} else { |
|
$shown = &mt('None'); |
|
} |
|
} |
|
} elsif ($key eq 'authorquota') { |
|
foreach my $type (@insttypes) { |
|
$shown .= $usertypes->{$type}.' -- '.$save_quotas{$key}{$type}.', '; |
|
} |
|
$shown .= $othertitle.' -- '.$save_quotas{$key}{'default'}; |
|
} elsif ($key eq 'webdav') { |
|
foreach my $type (@insttypes) { |
|
$shown .= $usertypes->{$type}.' -- '. ($save_quotas{$key}{$type} ? &mt('Yes') : &mt('No')).', '; |
|
} |
|
$shown .= $othertitle.' -- '. ($save_quotas{$key}{'default'} ? &mt('Yes') : &mt('No')); |
|
} elsif ($key eq 'webdav_LC_adv') { |
|
if (exists($save_quotas{'webdav'}{'_LC_adv'})) { |
|
$shown = ($save_quotas{'webdav'}{'_LC_adv'} ? $titles{'overon'} : $titles{'overoff'}); |
|
} else { |
|
$shown = $titles{'none'}; |
|
} |
|
} elsif ($key eq 'archive') { |
|
$domdefaults{$key} = $confhash{$key}; |
|
$shown = ($confhash{$key} ? &mt('Yes') : &mt('No')); |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{$key},$shown).'</li>'; |
|
} |
|
} |
|
if ($domcoordoverride) { |
|
$resulttext .= '</ul></li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} else { |
|
$resulttext = &mt('No changes made to Authoring Space defaults'); |
|
} |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_rolecolors { |
sub modify_rolecolors { |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($r,$dom,$confname,$roles,$lastactref,%domconfig) = @_; |
my ($resulttext,%rolehash); |
my ($resulttext,%rolehash); |
Line 13423 sub subscribed_hosts {
|
Line 14199 sub subscribed_hosts {
|
|
|
sub check_switchserver { |
sub check_switchserver { |
my ($dom,$confname) = @_; |
my ($dom,$confname) = @_; |
my ($allowed,$switchserver); |
my ($allowed,$switchserver,$home); |
my $home = &Apache::lonnet::homeserver($confname,$dom); |
if ($confname eq '') { |
if ($home eq 'no_host') { |
|
$home = &Apache::lonnet::domain($dom,'primary'); |
$home = &Apache::lonnet::domain($dom,'primary'); |
|
} else { |
|
$home = &Apache::lonnet::homeserver($confname,$dom); |
|
if ($home eq 'no_host') { |
|
$home = &Apache::lonnet::domain($dom,'primary'); |
|
} |
} |
} |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role='. |
|
&HTML::Entities::encode($env{'request.role'},'\'<>"&'). |
|
'&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
} |
} |
return $switchserver; |
return $switchserver; |
} |
} |
Line 13443 sub modify_quotas {
|
Line 14225 sub modify_quotas {
|
$author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref, |
$author_ok,$switchserver,$errors,$validationitemsref,$validationnamesref, |
$validationfieldsref); |
$validationfieldsref); |
if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
$context = 'tools'; |
$context = 'tools'; |
} else { |
} else { |
$context = $action; |
$context = $action; |
} |
} |
Line 13463 sub modify_quotas {
|
Line 14245 sub modify_quotas {
|
@usertools = ('author'); |
@usertools = ('author'); |
%titles = &authorrequest_titles(); |
%titles = &authorrequest_titles(); |
} else { |
} else { |
@usertools = ('aboutme','blog','webdav','portfolio','timezone'); |
@usertools = ('aboutme','blog','portfolio','portaccess','timezone'); |
%titles = &tool_titles(); |
%titles = &tool_titles(); |
} |
} |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
Line 13486 sub modify_quotas {
|
Line 14268 sub modify_quotas {
|
} else { |
} else { |
if ($key =~ /^form\.quota_(.+)$/) { |
if ($key =~ /^form\.quota_(.+)$/) { |
$confhash{'defaultquota'}{$1} = $env{$key}; |
$confhash{'defaultquota'}{$1} = $env{$key}; |
} elsif ($key =~ /^form\.authorquota_(.+)$/) { |
|
$confhash{'authorquota'}{$1} = $env{$key}; |
|
} elsif ($key =~ /^form\.\Q$context\E_(.+)$/) { |
} elsif ($key =~ /^form\.\Q$context\E_(.+)$/) { |
@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key); |
@{$toolshash{$1}} = &Apache::loncommon::get_env_multiple($key); |
} |
} |
Line 13781 sub modify_quotas {
|
Line 14561 sub modify_quotas {
|
} |
} |
} else { |
} else { |
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'}; |
$confhash{'defaultquota'}{'default'} = $env{'form.defaultquota'}; |
$confhash{'authorquota'}{'default'} = $env{'form.authorquota'}; |
|
} |
} |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
foreach my $type (@{$types},'default','_LC_adv') { |
foreach my $type (@{$types},'default','_LC_adv') { |
Line 13870 sub modify_quotas {
|
Line 14649 sub modify_quotas {
|
} |
} |
} |
} |
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
foreach my $key (keys(%{$domconfig{'quotas'}{'authorquota'}})) { |
$confhash{'authorquota'} = $domconfig{'quotas'}{'authorquota'}; |
if (exists($confhash{'authorquota'}{$key})) { |
} |
if ($confhash{'authorquota'}{$key} ne $domconfig{'quotas'}{'authorquota'}{$key}) { |
if (ref($domconfig{'quotas'}{'webdav'}) eq 'HASH') { |
$changes{'authorquota'}{$key} = 1; |
$confhash{'webdav'} = $domconfig{'quotas'}{'webdav'}; |
} |
|
} else { |
|
$confhash{'authorquota'}{$key} = $domconfig{'quotas'}{'authorquota'}{$key}; |
|
} |
|
} |
|
} |
} |
} |
} |
if (ref($confhash{'defaultquota'}) eq 'HASH') { |
if (ref($confhash{'defaultquota'}) eq 'HASH') { |
Line 13898 sub modify_quotas {
|
Line 14672 sub modify_quotas {
|
} |
} |
} |
} |
} |
} |
if (ref($confhash{'authorquota'}) eq 'HASH') { |
|
foreach my $key (keys(%{$confhash{'authorquota'}})) { |
|
if (ref($domconfig{'quotas'}) eq 'HASH') { |
|
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
|
if (!exists($domconfig{'quotas'}{'authorquota'}{$key})) { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} else { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} else { |
|
$changes{'authorquota'}{$key} = 1; |
|
} |
|
} |
|
} |
|
} |
} |
|
|
if ($context eq 'requestauthor') { |
if ($context eq 'requestauthor') { |
Line 13953 sub modify_quotas {
|
Line 14712 sub modify_quotas {
|
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
if (ref($changes{'authorquota'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Authoring Space default quotas').'<ul>'; |
|
foreach my $type (@{$types},'default') { |
|
if (defined($changes{'authorquota'}{$type})) { |
|
my $typetitle = $usertypes->{$type}; |
|
if ($type eq 'default') { |
|
$typetitle = $othertitle; |
|
} |
|
$resulttext .= '<li>'.&mt('[_1] set to [_2] MB',$typetitle,$confhash{'authorquota'}{$type}).'</li>'; |
|
} |
|
} |
|
$resulttext .= '</ul></li>'; |
|
} |
|
} |
} |
my %newenv; |
my %newenv; |
foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
Line 14117 sub modify_quotas {
|
Line 14863 sub modify_quotas {
|
$resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]', |
$resulttext .= '<li>'.&mt('Validated course requests identified as processed by: [_1]', |
'<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>'; |
'<b>'.$changes{'validation'}{'dc'}.'</b>').'</li>'; |
} |
} |
|
$resulttext .= '</ul></li>'; |
} |
} |
} |
} |
} |
} |
Line 14352 sub fetch_secrets {
|
Line 15099 sub fetch_secrets {
|
|
|
foreach my $hostid (keys(%servers)) { |
foreach my $hostid (keys(%servers)) { |
if (($hostid ne '') && (grep(/^\Q$hostid\E$/,@ids))) { |
if (($hostid ne '') && (grep(/^\Q$hostid\E$/,@ids))) { |
my $newkey; |
|
my $keyitem = 'form.'.$context.'_privkey_'.$hostid; |
my $keyitem = 'form.'.$context.'_privkey_'.$hostid; |
if (exists($env{$keyitem})) { |
if (exists($env{$keyitem})) { |
$env{$keyitem} =~ s/(`)/'/g; |
$env{$keyitem} =~ s/(`)/'/g; |
Line 14376 sub fetch_secrets {
|
Line 15122 sub fetch_secrets {
|
} |
} |
|
|
sub store_security { |
sub store_security { |
my ($dom,$context,$secchanges,$newkeyset,$keystore,$lastactref) = @_; |
my ($dom,$context,$secchanges,$newkeyset,$keystore) = @_; |
return unless ((ref($secchanges) eq 'HASH') && (ref($newkeyset) eq 'HASH') && |
return unless ((ref($secchanges) eq 'HASH') && (ref($newkeyset) eq 'HASH') && |
(ref($keystore) eq 'HASH')); |
(ref($keystore) eq 'HASH')); |
if (keys(%{$secchanges})) { |
if (keys(%{$secchanges})) { |
Line 14391 sub store_security {
|
Line 15137 sub store_security {
|
$dom,$hostid); |
$dom,$hostid); |
} |
} |
} |
} |
if (ref($lastactref) eq 'HASH') { |
|
if (($secchanges->{'encrypt'}) || ($secchanges->{'private'})) { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
} |
} |
} |
} |
|
|
Line 14434 sub lti_security_results {
|
Line 15175 sub lti_security_results {
|
off => &mt('Encryption of stored external tool secrets defined in domain disabled'), |
off => &mt('Encryption of stored external tool secrets defined in domain disabled'), |
}, |
}, |
); |
); |
|
|
} |
} |
my @types= ('crs','dom'); |
my @types= ('crs','dom'); |
if ($context eq 'lti') { |
if ($context eq 'lti') { |
Line 14530 sub lti_security_results {
|
Line 15270 sub lti_security_results {
|
} |
} |
} elsif ($item eq 'linkprot') { |
} elsif ($item eq 'linkprot') { |
next; |
next; |
|
} elsif ($item eq 'suggested') { |
|
if ((ref($secchanges->{'suggested'}) eq 'HASH') && |
|
(ref($newsec->{'suggested'}) eq 'HASH')) { |
|
my $suggestions; |
|
foreach my $id (sort { $a <=> $b } keys(%{$secchanges->{'suggested'}})) { |
|
if (ref($newsec->{'suggested'}->{$id}) eq 'HASH') { |
|
my $name = $newsec->{'suggested'}->{$id}->{'name'}; |
|
my $info = $newsec->{'suggested'}->{$id}->{'info'}; |
|
$suggestions .= '<li>'.&mt('Launcher: [_1]',$name).'<br />'. |
|
&mt('Recommend: [_1]','<pre>'.$info.'</pre>'). |
|
'</li>'; |
|
} else { |
|
$suggestions .= '<li>'.&mt('Recommendations deleted for Launcher: [_1]', |
|
$newsec->{'suggested'}->{$id}).'</li>'; |
|
} |
|
} |
|
if ($suggestions) { |
|
$output .= '<li>'.&mt('Hints in Courses for Link Protector Configuration'). |
|
'<ul>'.$suggestions.'</ul>'. |
|
'</li>'; |
|
} |
|
} |
} |
} |
} |
} |
if ($needs_update) { |
if ($needs_update) { |
Line 15075 sub process_proctoring_image {
|
Line 15837 sub process_proctoring_image {
|
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); |
my ($newid,@allpos,%changes,%confhash,%encconfig,$errors,$resulttext); |
my ($newid,@allpos,%changes,%confhash,%ltienc,$errors,$resulttext); |
my (%posslti,%posslticrs,%posscrstype); |
my (%posslti,%posslticrs,%posscrstype); |
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); |
Line 15134 sub modify_lti {
|
Line 15896 sub modify_lti {
|
} |
} |
} |
} |
if (ref($currltisec{'linkprot'}) eq 'HASH') { |
if (ref($currltisec{'linkprot'}) eq 'HASH') { |
foreach my $id (%{$currltisec{'linkprot'}}) { |
foreach my $id (keys(%{$currltisec{'linkprot'}})) { |
next if ($id !~ /^\d+$/); |
next if ($id !~ /^\d+$/); |
unless (exists($linkprotchg{$id})) { |
unless (exists($linkprotchg{$id})) { |
if (ref($currltisec{'linkprot'}{$id}) eq 'HASH') { |
if (ref($currltisec{'linkprot'}{$id}) eq 'HASH') { |
Line 15156 sub modify_lti {
|
Line 15918 sub modify_lti {
|
if ($proterror) { |
if ($proterror) { |
$errors .= '<li>'.$proterror.'</li>'; |
$errors .= '<li>'.$proterror.'</li>'; |
} |
} |
|
|
|
my (%delsuggested,%suggids,@suggested);; |
|
if (ref($currltisec{'suggested'}) eq 'HASH') { |
|
my $maxnum = $env{'form.linkprot_suggested_maxnum'}; |
|
my @todelete = &Apache::loncommon::get_env_multiple('form.linkprot_suggested_del'); |
|
for (my $i=0; $i<$maxnum; $i++) { |
|
my $itemid = $env{'form.linkprot_suggested_id_'.$i}; |
|
$itemid =~ s/\D+//g; |
|
if ($itemid) { |
|
if (ref($currltisec{'suggested'}->{$itemid}) eq 'HASH') { |
|
push(@suggested,$i); |
|
$suggids{$i} = $itemid; |
|
if ((@todelete > 0) && (grep(/^$i$/,@todelete))) { |
|
if (ref($currltisec{'suggested'}{$itemid}) eq 'HASH') { |
|
$delsuggested{$itemid} = $currltisec{'suggested'}{$itemid}{'name'}; |
|
} |
|
} else { |
|
if ($env{'form.linkprot_suggested_name_'.$i} eq '') { |
|
$delsuggested{$itemid} = $currltisec{'suggested'}{$itemid}{'name'}; |
|
} else { |
|
$env{'form.linkprot_suggested_name_'.$i} =~ s/(`)/'/g; |
|
$env{'form.linkprot_suggested_info_'.$i} =~ s/(`)/'/g; |
|
$newltisec{'suggested'}{$itemid}{'name'} = $env{'form.linkprot_suggested_name_'.$i}; |
|
$newltisec{'suggested'}{$itemid}{'info'} = $env{'form.linkprot_suggested_info_'.$i}; |
|
if (($currltisec{'suggested'}{$itemid}{'name'} ne $newltisec{'suggested'}{$itemid}{'name'}) || |
|
($currltisec{'suggested'}{$itemid}{'info'} ne $newltisec{'suggested'}{$itemid}{'info'})) { |
|
$secchanges{'suggested'}{$itemid} = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
foreach my $key (keys(%delsuggested)) { |
|
$newltisec{'suggested'}{$key} = $delsuggested{$key}; |
|
$secchanges{'suggested'}{$key} = 1; |
|
} |
|
if (($env{'form.linkprot_suggested_add'}) && |
|
($env{'form.linkprot_suggested_name_add'} ne '')) { |
|
$env{'form.linkprot_suggested_name_add'} =~ s/(`)/'/g; |
|
$env{'form.linkprot_suggested_info_add'} =~ s/(`)/'/g; |
|
my ($newsuggid,$errormsg) = &get_lti_id($dom,$env{'form.linkprot_suggested_name_add'},'suggested'); |
|
if ($newsuggid) { |
|
$newltisec{'suggested'}{$newsuggid}{'name'} = $env{'form.linkprot_suggested_name_add'}; |
|
$newltisec{'suggested'}{$newsuggid}{'info'} = $env{'form.linkprot_suggested_info_add'}; |
|
$secchanges{'suggested'}{$newsuggid} = 1; |
|
} else { |
|
my $error = &mt('Failed to acquire unique ID for new Link Protectors in Courses Suggestion'); |
|
if ($errormsg) { |
|
$error .= ' ('.$errormsg.')'; |
|
} |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
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'}; |
$consumer =~ s/(`)/'/g; |
$consumer =~ s/(`)/'/g; |
($newid,my $error) = &get_lti_id($dom,$consumer); |
($newid,my $errormsg) = &get_lti_id($dom,$consumer,'lti'); |
if ($newid) { |
if ($newid) { |
$itemids{'add'} = $newid; |
$itemids{'add'} = $newid; |
push(@items,'add'); |
push(@items,'add'); |
$changes{$newid} = 1; |
$changes{$newid} = 1; |
} else { |
} else { |
my $error = &mt('Failed to acquire unique ID for new LTI configuration'); |
my $error = &mt('Failed to acquire unique ID for new LTI configuration'); |
|
if ($errormsg) { |
|
$error .= ' ('.$errormsg.')'; |
|
} |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
} |
} |
} |
Line 15189 sub modify_lti {
|
Line 16009 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
|
my (%keystore,$secstored); |
|
if ($is_home) { |
|
&store_security($dom,'lti',\%secchanges,\%newkeyset,\%keystore); |
|
} |
|
|
|
my ($cipher,$privnum); |
|
if ((@items > 0) && ($is_home)) { |
|
($cipher,$privnum) = &get_priv_creds($dom,$home,$secchanges{'encrypt'}, |
|
$newltisec{'encrypt'},$keystore{$home}); |
|
} |
foreach my $idx (@items) { |
foreach my $idx (@items) { |
my $itemid = $itemids{$idx}; |
my $itemid = $itemids{$idx}; |
next unless ($itemid); |
next unless ($itemid); |
|
my %currlti; |
|
unless ($idx eq 'add') { |
|
if (ref($domconfig{$action}) eq 'HASH') { |
|
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
|
%currlti = %{$domconfig{$action}{$itemid}}; |
|
} |
|
} |
|
} |
my $position = $env{'form.lti_pos_'.$itemid}; |
my $position = $env{'form.lti_pos_'.$itemid}; |
$position =~ s/\D+//g; |
$position =~ s/\D+//g; |
if ($position ne '') { |
if ($position ne '') { |
$allpos[$position] = $itemid; |
$allpos[$position] = $itemid; |
} |
} |
foreach my $item ('consumer','key','secret','lifetime','requser','crsinc') { |
foreach my $item ('consumer','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') { |
$env{$formitem} =~ s/[^\d.]//g; |
$env{$formitem} =~ s/[^\d.]//g; |
} |
} |
if ($env{$formitem} ne '') { |
if ($env{$formitem} ne '') { |
if (($item eq 'key') || ($item eq 'secret')) { |
$confhash{$itemid}{$item} = $env{$formitem}; |
$encconfig{$itemid}{$item} = $env{$formitem}; |
unless (($idx eq 'add') || ($changes{$itemid})) { |
} else { |
if ($currlti{$item} ne $confhash{$itemid}{$item}) { |
$confhash{$itemid}{$item} = $env{$formitem}; |
$changes{$itemid} = 1; |
unless (($idx eq 'add') || ($changes{$itemid})) { |
|
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 15352 sub modify_lti {
|
Line 16186 sub modify_lti {
|
unless (($idx eq 'add') || ($changes{$itemid})) { |
unless (($idx eq 'add') || ($changes{$itemid})) { |
if ($confhash{$itemid}{'crsinc'}) { |
if ($confhash{$itemid}{'crsinc'}) { |
foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') { |
foreach my $field ('mapcrs','storecrs','makecrs','section','passback','roster') { |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
if ($currlti{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if ($domconfig{$action}{$itemid}{'passback'} eq $confhash{$itemid}{'passback'}) { |
if ($currlti{'passback'} eq $confhash{$itemid}{'passback'}) { |
if ($domconfig{$action}{$itemid}{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
if ($currlti{'passbackformat'} ne $confhash{$itemid}{'passbackformat'}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
} |
} |
foreach my $field ('mapcrstype','selfenroll') { |
foreach my $field ('mapcrstype','selfenroll') { |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if (ref($currlti{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
my @diffs = &Apache::loncommon::compare_arrays($currlti{$field}, |
$confhash{$itemid}{$field}); |
$confhash{$itemid}{$field}); |
if (@diffs) { |
if (@diffs) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
} elsif (@{$currlti{$field}} > 0) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
Line 15383 sub modify_lti {
|
Line 16217 sub modify_lti {
|
} |
} |
} |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
if (ref($domconfig{$action}{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($currlti{'maproles'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
foreach my $ltirole (keys(%{$domconfig{$action}{$itemid}{'maproles'}})) { |
foreach my $ltirole (keys(%{$currlti{'maproles'}})) { |
if ($domconfig{$action}{$itemid}{'maproles'}{$ltirole} ne |
if ($currlti{'maproles'}{$ltirole} ne |
$confhash{$itemid}{'maproles'}{$ltirole}) { |
$confhash{$itemid}{'maproles'}{$ltirole}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
last; |
Line 15395 sub modify_lti {
|
Line 16229 sub modify_lti {
|
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
foreach my $ltirole (keys(%{$confhash{$itemid}{'maproles'}})) { |
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
if ($confhash{$itemid}{'maproles'}{$ltirole} ne |
$domconfig{$action}{$itemid}{'maproles'}{$ltirole}) { |
$currlti{'maproles'}{$ltirole}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
last; |
last; |
} |
} |
} |
} |
} |
} |
} elsif (keys(%{$domconfig{$action}{$itemid}{'maproles'}}) > 0) { |
} elsif (keys(%{$currlti{'maproles'}}) > 0) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
} elsif (ref($confhash{$itemid}{'maproles'}) eq 'HASH') { |
Line 15415 sub modify_lti {
|
Line 16249 sub modify_lti {
|
} |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
foreach my $field ('mapuser','lcauth','lcauthparm','topmenu','inlinemenu','callback') { |
if ($domconfig{$action}{$itemid}{$field} ne $confhash{$itemid}{$field}) { |
if ($currlti{$field} ne $confhash{$itemid}{$field}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} |
} |
unless ($changes{$itemid}) { |
unless ($changes{$itemid}) { |
foreach my $field ('makeuser','lcmenu') { |
foreach my $field ('makeuser','lcmenu') { |
if (ref($domconfig{$action}{$itemid}{$field}) eq 'ARRAY') { |
if (ref($currlti{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
my @diffs = &Apache::loncommon::compare_arrays($domconfig{$action}{$itemid}{$field}, |
my @diffs = &Apache::loncommon::compare_arrays($currlti{$field}, |
$confhash{$itemid}{$field}); |
$confhash{$itemid}{$field}); |
if (@diffs) { |
if (@diffs) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (@{$domconfig{$action}{$itemid}{$field}} > 0) { |
} elsif (@{$currlti{$field}} > 0) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
} elsif (ref($confhash{$itemid}{$field}) eq 'ARRAY') { |
Line 15441 sub modify_lti {
|
Line 16275 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
|
if ($is_home) { |
|
my $keyitem = 'form.lti_key_'.$idx; |
|
$env{$keyitem} =~ s/(`)/'/g; |
|
if ($env{$keyitem} ne '') { |
|
$ltienc{$itemid}{'key'} = $env{$keyitem}; |
|
unless ($changes{$itemid}) { |
|
if ($currlti{'key'} ne $env{$keyitem}) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
} |
|
my $secretitem = 'form.lti_secret_'.$idx; |
|
$env{$secretitem} =~ s/(`)/'/g; |
|
if ($currlti{'usable'}) { |
|
if ($env{'form.lti_changesecret_'.$idx}) { |
|
if ($env{$secretitem} ne '') { |
|
if ($privnum && $cipher) { |
|
$ltienc{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem}); |
|
$confhash{$itemid}{'cipher'} = $privnum; |
|
} else { |
|
$ltienc{$itemid}{'secret'} = $env{$secretitem}; |
|
} |
|
$changes{$itemid} = 1; |
|
} |
|
} else { |
|
$ltienc{$itemid}{'secret'} = $currlti{'secret'}; |
|
$confhash{$itemid}{'cipher'} = $currlti{'cipher'}; |
|
} |
|
if (ref($ltienc{$itemid}) eq 'HASH') { |
|
if (($ltienc{$itemid}{'key'} ne '') && ($ltienc{$itemid}{'secret'} ne '')) { |
|
$confhash{$itemid}{'usable'} = 1; |
|
} |
|
} |
|
} elsif ($env{$secretitem} ne '') { |
|
if ($privnum && $cipher) { |
|
$ltienc{$itemid}{'secret'} = $cipher->encrypt_hex($env{$secretitem}); |
|
$confhash{$itemid}{'cipher'} = $privnum; |
|
} else { |
|
$ltienc{$itemid}{'secret'} = $env{$secretitem}; |
|
} |
|
if (ref($ltienc{$itemid}) eq 'HASH') { |
|
if (($ltienc{$itemid}{'key'} ne '') && ($ltienc{$itemid}{'key'} ne '')) { |
|
$confhash{$itemid}{'usable'} = 1; |
|
} |
|
} |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
unless ($changes{$itemid}) { |
|
foreach my $key (keys(%currlti)) { |
|
if (ref($currlti{$key}) eq 'HASH') { |
|
if (ref($confhash{$itemid}{$key}) eq 'HASH') { |
|
foreach my $innerkey (keys(%{$currlti{$key}})) { |
|
unless (exists($confhash{$itemid}{$key}{$innerkey})) { |
|
$changes{$itemid} = 1; |
|
last; |
|
} |
|
} |
|
} elsif (keys(%{$currlti{$key}}) > 0) { |
|
$changes{$itemid} = 1; |
|
} |
|
} |
|
last if ($changes{$itemid}); |
|
} |
|
} |
} |
} |
if (@allpos > 0) { |
if (@allpos > 0) { |
my $idx = 0; |
my $idx = 0; |
Line 15458 sub modify_lti {
|
Line 16357 sub modify_lti {
|
} |
} |
} |
} |
} |
} |
|
|
|
if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) { |
|
return &mt('No changes made.'); |
|
} |
|
|
my %ltihash = ( |
my %ltihash = ( |
$action => { %confhash } |
$action => { %confhash } |
); |
); |
my %ltienchash = ( |
my %ltienchash; |
$action => { %encconfig } |
|
); |
if ($is_home) { |
|
%ltienchash = ( |
|
$action => { %ltienc } |
|
); |
|
} |
if (keys(%secchanges)) { |
if (keys(%secchanges)) { |
$ltihash{'ltisec'} = \%newltisec; |
$ltihash{'ltisec'} = \%newltisec; |
if ($secchanges{'linkprot'}) { |
if ($secchanges{'linkprot'}) { |
Line 15474 sub modify_lti {
|
Line 16382 sub modify_lti {
|
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltihash,$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
my %keystore; |
if (keys(%ltienchash)) { |
&store_security($dom,'lti',\%secchanges,\%newkeyset,\%keystore,$lastactref); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
&Apache::lonnet::put_dom('encconfig',\%ltienchash,$dom,undef,1); |
|
if ((keys(%changes) == 0) && (keys(%secchanges) == 0)) { |
|
return &mt('No changes made.'); |
|
} |
} |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if (keys(%secchanges) > 0) { |
if (keys(%secchanges) > 0) { |
Line 15489 sub modify_lti {
|
Line 16394 sub modify_lti {
|
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
my %ltiall = %confhash; |
&Apache::lonnet::do_cache_new('lti',$dom,\%confhash,$cachetime); |
foreach my $id (keys(%ltiall)) { |
|
if (ref($encconfig{$id}) eq 'HASH') { |
|
foreach my $item ('key','secret') { |
|
$ltiall{$id}{$item} = $encconfig{$id}{$item}; |
|
} |
|
} |
|
} |
|
&Apache::lonnet::do_cache_new('lti',$dom,\%ltiall,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
$lastactref->{'lti'} = 1; |
$lastactref->{'lti'} = 1; |
} |
} |
my %bynum; |
my %bynum; |
foreach my $itemid (sort(keys(%changes))) { |
foreach my $itemid (sort(keys(%changes))) { |
my $position = $confhash{$itemid}{'order'}; |
if (ref($confhash{$itemid}) eq 'HASH') { |
$bynum{$position} = $itemid; |
my $position = $confhash{$itemid}{'order'}; |
|
$bynum{$position} = $itemid; |
|
} |
} |
} |
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
my $itemid = $bynum{$pos}; |
my $itemid = $bynum{$pos}; |
if (ref($confhash{$itemid}) ne 'HASH') { |
if (ref($confhash{$itemid}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
|
} else { |
|
$resulttext .= '<li><b>'.$confhash{$itemid}{'consumer'}.'</b><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>'; |
Line 15519 sub modify_lti {
|
Line 16416 sub modify_lti {
|
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
} |
} |
} |
} |
if ($encconfig{$itemid}{'key'} ne '') { |
if ($ltienc{$itemid}{'key'} ne '') { |
$resulttext .= '<li>'.$lt{'key'}.': '.$encconfig{$itemid}{'key'}.'</li>'; |
$resulttext .= '<li>'.$lt{'key'}.': '.$ltienc{$itemid}{'key'}.'</li>'; |
} |
} |
if ($encconfig{$itemid}{'secret'} ne '') { |
if ($ltienc{$itemid}{'secret'} ne '') { |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
$resulttext .= '<li>'.$lt{'secret'}.': ['.&mt('not shown').']</li>'; |
my $num = length($encconfig{$itemid}{'secret'}); |
|
$resulttext .= ('*'x$num).'</li>'; |
|
} |
} |
if ($confhash{$itemid}{'requser'}) { |
if ($confhash{$itemid}{'requser'}) { |
if ($confhash{$itemid}{'callback'}) { |
if ($confhash{$itemid}{'callback'}) { |
Line 15677 sub modify_lti {
|
Line 16572 sub modify_lti {
|
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
} |
} |
} |
} |
|
if (keys(%deletions)) { |
|
foreach my $itemid (sort { $a <=> $b } keys(%deletions)) { |
|
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
|
} |
|
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
if (ref($lastactref) eq 'HASH') { |
|
if (($secchanges{'encrypt'}) || ($secchanges{'private'}) || (exists($secchanges{'suggested'}))) { |
|
&Apache::lonnet::get_domain_defaults($dom,1); |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
} else { |
} else { |
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
} |
} |
Line 15689 sub modify_lti {
|
Line 16595 sub modify_lti {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub get_priv_creds { |
|
my ($dom,$home,$encchg,$encrypt,$storedsec) = @_; |
|
my ($needenc,$cipher,$privnum); |
|
my %domdefs = &Apache::lonnet::get_domain_defaults($dom); |
|
if (($encchg) && (ref($encrypt) eq 'HASH')) { |
|
$needenc = $encrypt->{'consumers'} |
|
} else { |
|
$needenc = $domdefs{'ltienc_consumers'}; |
|
} |
|
if ($needenc) { |
|
if (($storedsec eq 'ok') || ((ref($domdefs{'ltiprivhosts'}) eq 'ARRAY') && |
|
(grep(/^\Q$home\E$/,@{$domdefs{'ltiprivhosts'}})))) { |
|
my %privhash = &Apache::lonnet::restore_dom('lti','private',$dom,$home,1); |
|
my $privkey = $privhash{'key'}; |
|
$privnum = $privhash{'version'}; |
|
if (($privnum) && ($privkey ne '')) { |
|
$cipher = Crypt::CBC->new({'key' => $privkey, |
|
'cipher' => 'DES'}); |
|
} |
|
} |
|
} |
|
return ($cipher,$privnum); |
|
} |
|
|
sub get_lti_id { |
sub get_lti_id { |
my ($domain,$consumer) = @_; |
my ($domain,$consumer,$dbname) = @_; |
# get lock on lti db |
unless (($dbname eq 'lti') || ($dbname eq 'suggested')) { |
|
return ('','invalid db'); |
|
} |
|
# get lock on db |
my $lockhash = { |
my $lockhash = { |
lock => $env{'user.name'}. |
lock => $env{'user.name'}. |
':'.$env{'user.domain'}, |
':'.$env{'user.domain'}, |
}; |
}; |
my $tries = 0; |
my $tries = 0; |
my $gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain); |
my $gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain); |
my ($id,$error); |
my ($id,$error); |
|
|
while (($gotlock ne 'ok') && ($tries<10)) { |
while (($gotlock ne 'ok') && ($tries<10)) { |
$tries ++; |
$tries ++; |
sleep (0.1); |
sleep (0.1); |
$gotlock = &Apache::lonnet::newput_dom('lti',$lockhash,$domain); |
$gotlock = &Apache::lonnet::newput_dom($dbname,$lockhash,$domain); |
} |
} |
if ($gotlock eq 'ok') { |
if ($gotlock eq 'ok') { |
my %currids = &Apache::lonnet::dump_dom('lti',$domain); |
my %currids = &Apache::lonnet::dump_dom($dbname,$domain); |
if ($currids{'lock'}) { |
if ($currids{'lock'}) { |
delete($currids{'lock'}); |
delete($currids{'lock'}); |
if (keys(%currids)) { |
if (keys(%currids)) { |
Line 15718 sub get_lti_id {
|
Line 16651 sub get_lti_id {
|
$id = 1; |
$id = 1; |
} |
} |
if ($id) { |
if ($id) { |
unless (&Apache::lonnet::newput_dom('lti',{ $id => $consumer },$domain) eq 'ok') { |
unless (&Apache::lonnet::newput_dom($dbname,{ $id => $consumer },$domain) eq 'ok') { |
$error = 'nostore'; |
$error = 'nostore'; |
} |
} |
} else { |
} else { |
$error = 'nonumber'; |
$error = 'nonumber'; |
} |
} |
} |
} |
my $dellockoutcome = &Apache::lonnet::del_dom('lti',['lock'],$domain); |
my $dellockoutcome = &Apache::lonnet::del_dom($dbname,['lock'],$domain); |
} else { |
} else { |
$error = 'nolock'; |
$error = 'nolock'; |
} |
} |
Line 16491 sub modify_contacts {
|
Line 17424 sub modify_contacts {
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
$contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
$newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'}; |
$newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'}; |
} |
} |
} |
} |
} |
} |
} |
} |
if (keys(%currsetting) > 0) { |
if (keys(%currsetting) > 0) { |
Line 16549 sub modify_contacts {
|
Line 17482 sub modify_contacts {
|
} |
} |
} |
} |
if (@statuses) { |
if (@statuses) { |
if (ref($currsetting{'overrides'}) eq 'HASH') { |
if (ref($currsetting{'overrides'}) eq 'HASH') { |
foreach my $key (keys(%{$currsetting{'overrides'}})) { |
foreach my $key (keys(%{$currsetting{'overrides'}})) { |
if (ref($currsetting{'overrides'}{$key}) eq 'HASH') { |
if (ref($currsetting{'overrides'}{$key}) eq 'HASH') { |
if (ref($newsetting{'override_'.$key}) eq 'HASH') { |
if (ref($newsetting{'override_'.$key}) eq 'HASH') { |
foreach my $item (@contacts,'bcc','others','include') { |
foreach my $item (@contacts,'bcc','others','include') { |
if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { |
if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { |
push(@{$changes{'overrides'}},$key); |
push(@{$changes{'overrides'}},$key); |
last; |
last; |
} |
} |
Line 16571 sub modify_contacts {
|
Line 17504 sub modify_contacts {
|
} |
} |
} else { |
} else { |
foreach my $key (@overrides) { |
foreach my $key (@overrides) { |
push(@{$changes{'overrides'}},$key); |
push(@{$changes{'overrides'}},$key); |
} |
} |
} |
} |
} |
} |
Line 16753 sub modify_contacts {
|
Line 17686 sub modify_contacts {
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
} elsif (!@text) { |
} elsif (!@text) { |
$resulttext .= &mt('No one'); |
$resulttext .= &mt('No one'); |
} |
} |
if ($includestr{$type} ne '') { |
if ($includestr{$type} ne '') { |
if ($includeloc{$type} eq 'b') { |
if ($includeloc{$type} eq 'b') { |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
$resulttext .= '<br />'.&mt('Text automatically added to e-mail body:').' '.$includestr{$type}; |
Line 16777 sub modify_contacts {
|
Line 17710 sub modify_contacts {
|
if (ref($newsetting{'override_'.$type}) eq 'HASH') { |
if (ref($newsetting{'override_'.$type}) eq 'HASH') { |
my @text; |
my @text; |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($newsetting{'override_'.$type}{$item}) { |
if ($newsetting{'override_'.$type}{$item}) { |
push(@text,$short_titles->{$item}); |
push(@text,$short_titles->{$item}); |
} |
} |
} |
} |
if ($newsetting{'override_'.$type}{'others'} ne '') { |
if ($newsetting{'override_'.$type}{'others'} ne '') { |
push(@text,$newsetting{'override_'.$type}{'others'}); |
push(@text,$newsetting{'override_'.$type}{'others'}); |
} |
} |
|
|
if (@text) { |
if (@text) { |
$resulttext .= &mt('Helpdesk e-mail sent to: [_1]', |
$resulttext .= &mt('Helpdesk e-mail sent to: [_1]', |
'<span class="LC_cusr_emph">'.join(', ',@text).'</span>'); |
'<span class="LC_cusr_emph">'.join(', ',@text).'</span>'); |
Line 16947 sub modify_contacts {
|
Line 17880 sub modify_contacts {
|
} |
} |
|
|
sub modify_privacy { |
sub modify_privacy { |
my ($dom,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
my ($resulttext,%current,%changes); |
my ($resulttext,%current,%changes); |
if (ref($domconfig{'privacy'}) eq 'HASH') { |
if (ref($domconfig{'privacy'}) eq 'HASH') { |
%current = %{$domconfig{'privacy'}}; |
%current = %{$domconfig{'privacy'}}; |
Line 17183 sub modify_privacy {
|
Line 18116 sub modify_privacy {
|
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
|
if ($changes{'approval'}) { |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
|
delete($domdefaults{'userapprovals'}); |
|
if (ref($privacyhash{'approval'}) eq 'HASH') { |
|
foreach my $domtype ('instdom','extdom') { |
|
if (ref($privacyhash{'approval'}{$domtype}) eq 'HASH') { |
|
foreach my $roletype ('domain','author','course','community') { |
|
if ($privacyhash{'approval'}{$domtype}{$roletype} eq 'user') { |
|
$domdefaults{'userapprovals'} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
last if ($domdefaults{'userapprovals'}); |
|
} |
|
} |
|
my $cachetime = 24*60*60; |
|
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
} else { |
} else { |
$resulttext = &mt('No changes made to user information settings'); |
$resulttext = &mt('No changes made to user information settings'); |
} |
} |
Line 17625 sub modify_passwords {
|
Line 18580 sub modify_passwords {
|
); |
); |
my $needed = '<ul><li>'. |
my $needed = '<ul><li>'. |
join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}). |
join('</li><li>',map {$rulenames{$_} } @{$confighash{'passwords'}{'chars'}}). |
'</li></ul>'; |
'</li></ul>'; |
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to: [_2]',$titles{'chars'},$needed).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] set to none',$titles{'chars'}).'</li>'; |
Line 18108 sub modify_selfcreation {
|
Line 19063 sub modify_selfcreation {
|
if (($chosen eq 'inst') || ($chosen eq 'noninst')) { |
if (($chosen eq 'inst') || ($chosen eq 'noninst')) { |
my $emaildom; |
my $emaildom; |
if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) { |
if ($env{'form.cancreate_emaildomain_'.$chosen.'_'.$type} =~ /^\@[^\@]+$/) { |
$emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type}; |
$emaildom = $env{'form.cancreate_emaildomain_'.$chosen.'_'.$type}; |
$cancreate{'emaildomain'}{$type}{$chosen} = $emaildom; |
$cancreate{'emaildomain'}{$type}{$chosen} = $emaildom; |
if (ref($curremaildom{$type}) eq 'HASH') { |
if (ref($curremaildom{$type}) eq 'HASH') { |
if (exists($curremaildom{$type}{$chosen})) { |
if (exists($curremaildom{$type}{$chosen})) { |
Line 18120 sub modify_selfcreation {
|
Line 19075 sub modify_selfcreation {
|
} |
} |
} elsif ($emaildom ne '') { |
} elsif ($emaildom ne '') { |
push(@{$changes{'cancreate'}},'emaildomain'); |
push(@{$changes{'cancreate'}},'emaildomain'); |
} |
} |
} |
} |
$cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type}; |
$cancreate{'emailoptions'}{$type} = $env{'form.cancreate_emailoptions_'.$type}; |
} elsif ($chosen eq 'custom') { |
} elsif ($chosen eq 'custom') { |
Line 18547 sub modify_selfcreation {
|
Line 19502 sub modify_selfcreation {
|
); |
); |
if (@types) { |
if (@types) { |
if (@statuses) { |
if (@statuses) { |
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). |
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). |
'<ul>'; |
'<ul>'; |
foreach my $status (@statuses) { |
foreach my $status (@statuses) { |
if ($status eq 'default') { |
if ($status eq 'default') { |
Line 18755 sub modify_selfcreation {
|
Line 19710 sub modify_selfcreation {
|
$typename = $othertitle; |
$typename = $othertitle; |
} else { |
} else { |
$typename = $usertypes{$type}; |
$typename = $usertypes{$type}; |
} |
} |
$chgtext .= &mt('(Affiliation: [_1])',$typename); |
$chgtext .= &mt('(Affiliation: [_1])',$typename); |
} |
} |
if (@{$email_rule{$type}} > 0) { |
if (@{$email_rule{$type}} > 0) { |
Line 18939 sub modify_usermodification {
|
Line 19894 sub modify_usermodification {
|
} |
} |
} |
} |
} |
} |
my @contexts = ('author','course'); |
my @contexts = ('author','coauthor','course'); |
my %context_title = ( |
my %context_title = ( |
author => 'In author context', |
author => 'In author context', |
|
coauthor => 'As co-author manager', |
course => 'In course context', |
course => 'In course context', |
); |
); |
my @fields = ('lastname','firstname','middlename','generation', |
my @fields = ('lastname','firstname','middlename','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
my %roles = ( |
my %roles = ( |
author => ['ca','aa'], |
author => ['ca','aa'], |
|
coauthor => ['ca','aa'], |
course => ['st','ep','ta','in','cr'], |
course => ['st','ep','ta','in','cr'], |
); |
); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
foreach my $context (@contexts) { |
foreach my $context (@contexts) { |
|
my $prefix = 'canmodify'; |
|
if ($context eq 'coauthor') { |
|
$prefix = 'cacanmodify'; |
|
} |
foreach my $role (@{$roles{$context}}) { |
foreach my $role (@{$roles{$context}}) { |
my @modifiable = &Apache::loncommon::get_env_multiple('form.canmodify_'.$role); |
my @modifiable = &Apache::loncommon::get_env_multiple('form.'.$prefix.'_'.$role); |
foreach my $item (@fields) { |
foreach my $item (@fields) { |
if (grep(/^\Q$item\E$/,@modifiable)) { |
if (grep(/^\Q$item\E$/,@modifiable)) { |
$modifyhash{$context}{$role}{$item} = 1; |
$modifyhash{$context}{$role}{$item} = 1; |
Line 19100 sub modify_defaults {
|
Line 20061 sub modify_defaults {
|
} |
} |
if ($item eq 'portal_def') { |
if ($item eq 'portal_def') { |
unless (grep(/^\Q$item\E$/,@errors)) { |
unless (grep(/^\Q$item\E$/,@errors)) { |
if ($newvalues{$item} eq '') { |
if ($newvalues{$item} eq '') { |
foreach my $field ('email','web') { |
foreach my $field ('email','web') { |
if (exists($domdefaults{$item.'_'.$field})) { |
if (exists($domdefaults{$item.'_'.$field})) { |
delete($domdefaults{$item.'_'.$field}); |
delete($domdefaults{$item.'_'.$field}); |
Line 19285 sub modify_defaults {
|
Line 20246 sub modify_defaults {
|
$resulttext =~ s/, $//; |
$resulttext =~ s/, $//; |
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; |
$resulttext .= '<li>'.&mt('Institutional user status types deleted').'</li>'; |
} |
} |
} |
} |
} elsif ($item eq 'unamemap_rule') { |
} elsif ($item eq 'unamemap_rule') { |
Line 20320 sub modify_coursedefaults {
|
Line 21281 sub modify_coursedefaults {
|
my @toggles = ('canuse_pdfforms','uselcmath','usejsme','inline_chem','ltiauth'); |
my @toggles = ('canuse_pdfforms','uselcmath','usejsme','inline_chem','ltiauth'); |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
'uploadquota_community','uploadquota_textbook','uploadquota_placement', |
'uploadquota_community','uploadquota_textbook','uploadquota_placement', |
'mysqltables_official','mysqltables_unofficial','mysqltables_community', |
'coursequota_official','coursequota_unofficial','coursequota_community', |
'mysqltables_textbook','mysqltables_placement'); |
'coursequota_textbook','coursequota_placement','mysqltables_official', |
|
'mysqltables_unofficial','mysqltables_community','mysqltables_textbook', |
|
'mysqltables_placement'); |
my @types = ('official','unofficial','community','textbook','placement'); |
my @types = ('official','unofficial','community','textbook','placement'); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
|
coursequota => 20, |
postsubmit => 60, |
postsubmit => 60, |
mysqltables => 172800, |
mysqltables => 172800, |
domexttool => 1, |
domexttool => 1, |
|
crsauthor => 1, |
|
crseditors => ['edit','xml'], |
); |
); |
my %texoptions = ( |
my %texoptions = ( |
MathJax => 'MathJax', |
MathJax => 'MathJax', |
mimetex => &mt('Convert to Images'), |
mimetex => &mt('Convert to Images'), |
tth => &mt('TeX to HTML'), |
tth => &mt('TeX to HTML'), |
); |
); |
|
|
|
my @editors = ('edit','xml','daxe'); |
|
my %editornames = &crseditor_titles(); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
|
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
if (ref($domconfig{'coursedefaults'}) ne 'HASH') { |
Line 20373 sub modify_coursedefaults {
|
Line 21343 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
} else { |
} else { |
my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/); |
my ($setting,$type) = ($item =~ /^(uploadquota|coursequota|mysqltables)_(\w+)$/); |
if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') { |
$currdef = $domconfig{'coursedefaults'}{$setting}{$type}; |
$currdef = $domconfig{'coursedefaults'}{$setting}{$type}; |
} |
} |
Line 20385 sub modify_coursedefaults {
|
Line 21355 sub modify_coursedefaults {
|
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
} elsif ($item =~ /^(uploadquota|coursequota|mysqltables)_/) { |
my $setting = $1; |
my $setting = $1; |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
$changes{$setting} = 1; |
$changes{$setting} = 1; |
Line 20520 sub modify_coursedefaults {
|
Line 21490 sub modify_coursedefaults {
|
$changes{'postsubmit'} = 1; |
$changes{'postsubmit'} = 1; |
} |
} |
} |
} |
my (%newdomexttool,%newexttool,%olddomexttool,%oldexttool); |
my (%newdomexttool,%newexttool,%newcrsauthor,%olddomexttool,%oldexttool,%oldcrsauthor, |
|
%posscrseditors); |
map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool'); |
map { $newdomexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.domexttool'); |
map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool'); |
map { $newexttool{$_} = 1; } &Apache::loncommon::get_env_multiple('form.exttool'); |
|
map { $newcrsauthor{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crsauthor'); |
|
map { $posscrseditors{$_} = 1; } &Apache::loncommon::get_env_multiple('form.crseditors'); |
if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') { |
%olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}}; |
%olddomexttool = %{$domconfig{'coursedefaults'}{'domexttool'}}; |
} else { |
} else { |
Line 20535 sub modify_coursedefaults {
|
Line 21508 sub modify_coursedefaults {
|
} |
} |
} |
} |
if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') { |
%oldexttool = %{$domconfig{'coursedefaults'}{'exttool'}}; |
%oldexttool = %{$domconfig{'coursedefaults'}{'exttool'}}; |
} else { |
} else { |
foreach my $type (@types) { |
foreach my $type (@types) { |
if ($staticdefaults{'exttool'}) { |
if ($staticdefaults{'exttool'}) { |
Line 20545 sub modify_coursedefaults {
|
Line 21518 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
if (ref($domconfig{'coursedefaults'}{'crsauthor'}) eq 'HASH') { |
|
%oldcrsauthor = %{$domconfig{'coursedefaults'}{'crsauthor'}}; |
|
} else { |
|
foreach my $type (@types) { |
|
if ($staticdefaults{'crsauthor'}) { |
|
$oldcrsauthor{$type} = 1; |
|
} else { |
|
$oldcrsauthor{$type} = 0; |
|
} |
|
} |
|
} |
|
my @newcrseditors = (); |
|
foreach my $editor (@editors) { |
|
if ($posscrseditors{$editor}) { |
|
push(@newcrseditors,$editor); |
|
} |
|
} |
|
if (ref($domconfig{'coursedefaults'}{'crseditors'}) eq 'ARRAY') { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($domconfig{'coursedefaults'}{'crseditors'}, |
|
\@newcrseditors); |
|
if (@diffs) { |
|
$changes{'crseditors'} = 1; |
|
} |
|
} else { |
|
my @diffs = |
|
&Apache::loncommon::compare_arrays($staticdefaults{'crseditors'}, |
|
\@newcrseditors); |
|
unless (@diffs == 0) { |
|
$changes{'crseditors'} = 1; |
|
} |
|
} |
foreach my $type (@types) { |
foreach my $type (@types) { |
unless ($newdomexttool{$type}) { |
unless ($newdomexttool{$type}) { |
$newdomexttool{$type} = 0; |
$newdomexttool{$type} = 0; |
Line 20552 sub modify_coursedefaults {
|
Line 21557 sub modify_coursedefaults {
|
unless ($newexttool{$type}) { |
unless ($newexttool{$type}) { |
$newexttool{$type} = 0; |
$newexttool{$type} = 0; |
} |
} |
|
unless ($newcrsauthor{$type}) { |
|
$newcrsauthor{$type} = 0; |
|
} |
if ($newdomexttool{$type} != $olddomexttool{$type}) { |
if ($newdomexttool{$type} != $olddomexttool{$type}) { |
$changes{'domexttool'} = 1; |
$changes{'domexttool'} = 1; |
} |
} |
if ($newexttool{$type} != $oldexttool{$type}) { |
if ($newexttool{$type} != $oldexttool{$type}) { |
$changes{'exttool'} = 1; |
$changes{'exttool'} = 1; |
} |
} |
|
if ($newcrsauthor{$type} != $oldcrsauthor{$type}) { |
|
$changes{'crsauthor'} = 1; |
|
} |
} |
} |
$defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool; |
$defaultshash{'coursedefaults'}{'domexttool'} = \%newdomexttool; |
$defaultshash{'coursedefaults'}{'exttool'} = \%newexttool; |
$defaultshash{'coursedefaults'}{'exttool'} = \%newexttool; |
|
$defaultshash{'coursedefaults'}{'crsauthor'} = \%newcrsauthor; |
|
$defaultshash{'coursedefaults'}{'crseditors'} = \@newcrseditors; |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
Line 20571 sub modify_coursedefaults {
|
Line 21584 sub modify_coursedefaults {
|
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) || |
($changes{'canclone'}) || ($changes{'mysqltables'}) || ($changes{'texengine'}) || |
($changes{'inline_chem'}) || ($changes{'ltiauth'}) || ($changes{'domexttool'}) || |
($changes{'inline_chem'}) || ($changes{'ltiauth'}) || ($changes{'domexttool'}) || |
($changes{'exttool'}) ) { |
($changes{'exttool'}) || ($changes{'coursequota'}) || ($changes{'crsauthor'})) { |
foreach my $item ('canuse_pdfforms','uselcmath','usejsme','inline_chem','texengine', |
foreach my $item ('canuse_pdfforms','uselcmath','usejsme','inline_chem','texengine', |
'ltiauth') { |
'ltiauth') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
Line 20604 sub modify_coursedefaults {
|
Line 21617 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
if ($changes{'coursequota'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') { |
|
foreach my $type (@types) { |
|
$domdefaults{$type.'coursequota'}=$defaultshash{'coursedefaults'}{'coursequota'}{$type}; |
|
} |
|
} |
|
} |
if ($changes{'canclone'}) { |
if ($changes{'canclone'}) { |
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
Line 20630 sub modify_coursedefaults {
|
Line 21650 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
|
if ($changes{'crsauthor'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'crsauthor'}) eq 'HASH') { |
|
foreach my $type (@types) { |
|
$domdefaults{$type.'crsauthor'}=$defaultshash{'coursedefaults'}{'crsauthor'}{$type}; |
|
} |
|
} |
|
} |
|
if ($changes{'crseditors'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'crseditors'}) eq 'ARRAY') { |
|
$domdefaults{'crseditors'}=join(',',@{$defaultshash{'coursedefaults'}{'crseditors'}}); |
|
} |
|
} |
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); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 20682 sub modify_coursedefaults {
|
Line 21714 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
} |
} |
|
} elsif ($item eq 'coursequota') { |
|
if (ref($defaultshash{'coursedefaults'}{'coursequota'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Default cumulative quota for all group portfolio spaces in course set as follows:').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'official'}.'</b>').'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'unofficial'}.'</b>').'</li>'. |
|
'<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'textbook'}.'</b>').'</li>'. |
|
'<li>'.&mt('Placement tests: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'placement'}.'</b>').'</li>'. |
|
'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'coursequota'}{'community'}.'</b>').'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Default cumulative quota for all group portfolio spaces in course remains default: [_1] MB',$staticdefaults{'coursequota'}).'</li>'; |
|
} |
} elsif ($item eq 'mysqltables') { |
} elsif ($item eq 'mysqltables') { |
if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'. |
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'. |
Line 20767 sub modify_coursedefaults {
|
Line 21812 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('LTI launch of deep-linked URL will require re-authentication').'</li>'; |
$resulttext .= '<li>'.&mt('LTI launch of deep-linked URL will require re-authentication').'</li>'; |
} |
} |
} elsif ($item eq 'domexttool') { |
} elsif (($item eq 'domexttool') || ($item eq 'exttool') || ($item eq 'crsauthor')) { |
my @noyes = (&mt('no'),&mt('yes')); |
my @noyes = (&mt('no'),&mt('yes')); |
if (ref($defaultshash{'coursedefaults'}{'domexttool'}) eq 'HASH') { |
my %status = ( |
$resulttext .= '<li>'.&mt('External Tools defined in the domain may be used as follows:').'<ul>'. |
domexttool => { |
'<li>'.&mt('Official courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'official'}].'</b>').'</li>'. |
ishash => &mt('External Tools defined in the domain may be used as follows:'), |
'<li>'.&mt('Unofficial courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'unofficial'}].'</b>').'</li>'. |
default => &mt('External Tools defined in the domain may be used in all course types, by default'), |
'<li>'.&mt('Textbook courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'textbook'}].'</b>').'</li>'. |
}, |
'<li>'.&mt('Placement tests: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'placement'}].'</b>').'</li>'. |
exttool => { |
'<li>'.&mt('Communities: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'domexttool'}{'community'}].'</b>').'</li>'. |
ishash => &mt('External Tools can be defined and configured in course containers as follows:'), |
|
default => &mt('External Tools can not be defined in any course types, by default'), |
|
}, |
|
crsauthor => { |
|
ishash => &mt('Standard Problems can be created within course containers as follows:'), |
|
default => &mt('Standard Problems can be created within any course type, by default'), |
|
}, |
|
); |
|
|
|
if (ref($defaultshash{'coursedefaults'}{$item}) eq 'HASH') { |
|
$resulttext .= '<li>'.$status{$item}{'ishash'}.'<ul>'. |
|
'<li>'.&mt('Official courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{$item}{'official'}].'</b>').'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{$item}{'unofficial'}].'</b>').'</li>'. |
|
'<li>'.&mt('Textbook courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{$item}{'textbook'}].'</b>').'</li>'. |
|
'<li>'.&mt('Placement tests: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{$item}{'placement'}].'</b>').'</li>'. |
|
'<li>'.&mt('Communities: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{$item}{'community'}].'</b>').'</li>'. |
'</ul>'. |
'</ul>'. |
'</li>'; |
'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('External Tools defined in the domain may be used in all course types, by default').'</li>'; |
$resulttext .= '<li>'.$status{$item}{'default'}.'</li>'; |
} |
} |
} elsif ($item eq 'exttool') { |
} elsif ($item eq 'crseditors') { |
my @noyes = (&mt('no'),&mt('yes')); |
if (ref($defaultshash{'coursedefaults'}{$item}) eq 'ARRAY') { |
if (ref($defaultshash{'coursedefaults'}{'exttool'}) eq 'HASH') { |
my $shown; |
$resulttext .= '<li>'.&mt('External Tools can be defined and configured in course containers as follows:').'<ul>'. |
if (@{$defaultshash{'coursedefaults'}{$item}}) { |
'<li>'.&mt('Official courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'official'}].'</b>').'</li>'. |
$shown = join(', ', map { $editornames{$_} } @{$defaultshash{'coursedefaults'}{$item}}); |
'<li>'.&mt('Unofficial courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'unofficial'}].'</b>').'</li>'. |
} else { |
'<li>'.&mt('Textbook courses: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'textbook'}].'</b>').'</li>'. |
$shown = &mt('None'); |
'<li>'.&mt('Placement tests: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'placement'}].'</b>').'</li>'. |
} |
'<li>'.&mt('Communities: [_1]','<b>'.$noyes[$defaultshash{'coursedefaults'}{'exttool'}{'community'}].'</b>').'</li>'. |
$resulttext .= '<li>'.&mt('Available editors for course/community resources: [_1]',$shown).'</li>'; |
'</ul>'. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('External Tools can not be defined in any course types, by default').'</li>'; |
|
} |
} |
} |
} |
} |
} |
Line 21188 sub modify_wafproxy {
|
Line 22244 sub modify_wafproxy {
|
} |
} |
} elsif ($currvalue{$item}) { |
} elsif ($currvalue{$item}) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} |
} |
} else { |
} else { |
if (keys(%curralias)) { |
if (keys(%curralias)) { |
Line 21196 sub modify_wafproxy {
|
Line 22252 sub modify_wafproxy {
|
} |
} |
if (keys(%currsaml)) { |
if (keys(%currsaml)) { |
$changes{'saml'} = 1; |
$changes{'saml'} = 1; |
} |
} |
if (keys(%currvalue)) { |
if (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
foreach my $key (keys(%currvalue)) { |
$changes{$key} = 1; |
$changes{$key} = 1; |
Line 21206 sub modify_wafproxy {
|
Line 22262 sub modify_wafproxy {
|
if (keys(%changes)) { |
if (keys(%changes)) { |
my %defaultshash = ( |
my %defaultshash = ( |
wafproxy => \%wafproxy, |
wafproxy => \%wafproxy, |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
Line 21222 sub modify_wafproxy {
|
Line 22278 sub modify_wafproxy {
|
$domdefaults{'waf_'.$item} = $wafproxy{$item}; |
$domdefaults{'waf_'.$item} = $wafproxy{$item}; |
} elsif (exists($domdefaults{'waf_'.$item})) { |
} elsif (exists($domdefaults{'waf_'.$item})) { |
delete($domdefaults{'waf_'.$item}); |
delete($domdefaults{'waf_'.$item}); |
} |
} |
} |
} |
} |
} |
if ($updatedomdefs) { |
if ($updatedomdefs) { |
Line 21289 sub modify_wafproxy {
|
Line 22345 sub modify_wafproxy {
|
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
$output .= '<li>'.&mt('Aliases deleted for hostnames').'</li>'; |
} |
} |
} elsif ($item eq 'saml') { |
} elsif ($item eq 'saml') { |
my $shown; |
my $shown; |
if (ref($wafproxy{'saml'}) eq 'HASH') { |
if (ref($wafproxy{'saml'}) eq 'HASH') { |
if (keys(%{$wafproxy{'saml'}})) { |
if (keys(%{$wafproxy{'saml'}})) { |
$shown = join(', ',sort(keys(%{$wafproxy{'saml'}}))); |
$shown = join(', ',sort(keys(%{$wafproxy{'saml'}}))); |
Line 21619 sub modify_usersessions {
|
Line 22675 sub modify_usersessions {
|
if (($offload eq 'offloadoth') && (@okoffloadoth)) { |
if (($offload eq 'offloadoth') && (@okoffloadoth)) { |
$changes{'offloadoth'} = 1; |
$changes{'offloadoth'} = 1; |
} |
} |
} |
} |
} |
} |
} else { |
} else { |
if (@okoffload) { |
if (@okoffload) { |
Line 22157 sub modify_loadbalancing {
|
Line 23213 sub modify_loadbalancing {
|
} |
} |
if ($env{'form.loadbalancing_cookie_'.$i}) { |
if ($env{'form.loadbalancing_cookie_'.$i}) { |
$defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1; |
$defaultshash{'loadbalancing'}{$balancer}{'cookie'} = 1; |
if (exists($currbalancer{$balancer})) { |
if (exists($currbalancer{$balancer})) { |
unless ($currcookies{$balancer}) { |
unless ($currcookies{$balancer}) { |
$changes{'curr'}{$balancer}{'cookie'} = 1; |
$changes{'curr'}{$balancer}{'cookie'} = 1; |
} |
} |
Line 22843 function balancerChange(balnum,baltotal,
|
Line 23899 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); |