--- loncom/interface/domainprefs.pm 2024/10/11 23:29:34 1.444
+++ loncom/interface/domainprefs.pm 2025/03/13 14:28:53 1.451
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.444 2024/10/11 23:29:34 raeburn Exp $
+# $Id: domainprefs.pm,v 1.451 2025/03/13 14:28:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2009,10 +2009,11 @@ sub commblocktype_text {
'passwd' => 'Change Password',
'grades' => 'Gradebook',
'search' => 'Course search',
+ 'index' => 'Course content index',
'wishlist' => 'Stored links',
'annotate' => 'Annotations',
);
- my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','annotate','passwd'];
+ my $typeorder = ['com','chat','boards','port','groups','blogs','about','wishlist','printout','grades','search','index','annotate','passwd'];
return ($typeorder,\%types);
}
@@ -2021,7 +2022,7 @@ sub print_rolecolors {
my %choices = &color_font_choices();
my @bgs = ('pgbg','tabbg','sidebg');
my @links = ('link','alink','vlink');
- my @images = ('img');
+ my @images = ();
my %alt_text = &Apache::lonlocal::texthash(img => "Banner for $role role");
my %designhash = &Apache::loncommon::get_domainconf($dom);
my %defaultdesign = %Apache::loncommon::defaultdesign;
@@ -2029,10 +2030,6 @@ sub print_rolecolors {
my %defaults = &role_defaults($role,\@bgs,\@links,\@images);
if (ref($settings) eq 'HASH') {
if (ref($settings->{$role}) eq 'HASH') {
- if ($settings->{$role}->{'img'} ne '') {
- $designs{'img'} = $settings->{$role}->{'img'};
- $is_custom{'img'} = 1;
- }
if ($settings->{$role}->{'font'} ne '') {
$designs{'font'} = $settings->{$role}->{'font'};
$is_custom{'font'} = 1;
@@ -2055,10 +2052,6 @@ sub print_rolecolors {
}
}
} else {
- if ($designhash{$dom.'.'.$role.'.img'} ne '') {
- $designs{img} = $designhash{$dom.'.'.$role.'.img'};
- $is_custom{'img'} = 1;
- }
if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') {
$designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'};
$is_custom{'fontmenu'} = 1;
@@ -2108,7 +2101,6 @@ sub role_defaults {
}
} else {
%defaults = (
- img => $defaultdesign{$role.'.img'},
font => $defaultdesign{$role.'.font'},
fontmenu => $defaultdesign{$role.'.fontmenu'},
);
@@ -5407,42 +5399,6 @@ sub print_ltitools {
return $datatable;
}
-sub ltitools_names {
- my %lt = &Apache::lonlocal::texthash(
- 'title' => 'Title',
- 'version' => 'Version',
- 'msgtype' => 'Message Type',
- 'sigmethod' => 'Signature Method',
- 'url' => 'URL',
- 'key' => 'Key',
- 'lifetime' => 'Nonce lifetime (s)',
- 'secret' => 'Secret',
- 'icon' => 'Icon',
- 'user' => 'User',
- 'fullname' => 'Full Name',
- 'firstname' => 'First Name',
- 'lastname' => 'Last Name',
- 'email' => 'E-mail',
- 'roles' => 'Role',
- 'window' => 'Window',
- 'tab' => 'Tab',
- 'iframe' => 'iFrame',
- 'height' => 'Height',
- 'width' => 'Width',
- 'linktext' => 'Default Link Text',
- 'explanation' => 'Default Explanation',
- 'passback' => 'Tool can return grades:',
- 'roster' => 'Tool can retrieve roster:',
- 'crstarget' => 'Display target',
- 'crslabel' => 'Course label',
- 'crstitle' => 'Course title',
- 'crslinktext' => 'Link Text',
- 'crsexplanation' => 'Explanation',
- 'crsappend' => 'Provider URL',
- );
- return %lt;
-}
-
sub secrets_form {
my ($dom,$context,$encrypt,$privkeys,$rowtotal) = @_;
my @ids=&Apache::lonnet::current_machine_ids();
@@ -12148,7 +12104,11 @@ sub modifiable_userdata_row {
my $hashref;
if ($context eq 'lti') {
if (ref($settings) eq 'HASH') {
- $hashref = $settings->{'instdata'};
+ my %instdata;
+ if (ref($settings->{'instdata'}) eq 'ARRAY') {
+ map { $instdata{$_} = 1; } @{$settings->{'instdata'}};
+ }
+ $hashref = \%instdata;
}
} elsif ($context eq 'privacy') {
my ($key,$inner) = split(/_/,$role);
@@ -12159,7 +12119,7 @@ sub modifiable_userdata_row {
}
} elsif (ref($settings->{$context}) eq 'HASH') {
if (ref($settings->{$context}->{$role}) eq 'HASH') {
- $hashref = $settings->{'lti_instdata'};
+ $hashref = $settings->{$context}->{$role};
}
if ($role eq 'emailusername') {
if ($statustype) {
@@ -13134,7 +13094,6 @@ sub check_exempt_addresses {
sub color_font_choices {
my %choices =
&Apache::lonlocal::texthash (
- img => "Header",
bgs => "Background colors",
links => "Link colors",
images => "Images",
@@ -13189,13 +13148,15 @@ sub modify_ipaccess {
foreach my $idx (@items) {
my $itemid = $itemids{$idx};
next unless ($itemid);
- my %current;
- unless ($idx eq 'add') {
+ my ($position,%current);
+ if ($idx eq 'add') {
+ $position = $env{'form.ipaccess_pos_add'};
+ } else {
+ $position = $env{'form.ipaccess_pos_'.$itemid};
if (ref($domconfig{'ipaccess'}{$itemid}) eq 'HASH') {
%current = %{$domconfig{'ipaccess'}{$itemid}};
}
}
- my $position = $env{'form.ipaccess_pos_'.$itemid};
$position =~ s/\D+//g;
if ($position ne '') {
$allpos[$position] = $itemid;
@@ -13728,7 +13689,7 @@ sub modify_colors {
@images = ('img','logo','domlogo','login');
@bgs = ('pgbg','mainbg','sidebg');
} else {
- @images = ('img');
+ @images = ();
@bgs = ('pgbg','tabbg','sidebg');
}
my %defaults = &role_defaults($role,\@bgs,\@links,\@images,\@logintext);
@@ -13754,7 +13715,7 @@ sub modify_colors {
if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
$env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
}
- unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
+ unless ($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
}
}
@@ -16094,9 +16055,9 @@ sub modify_lti {
}
my @possinstdata = &Apache::loncommon::get_env_multiple('form.lti_instdata_'.$idx);
if (@possinstdata) {
- foreach my $field (@possinstdata) {
+ foreach my $field (sort(@possinstdata)) {
if (exists($fieldtitles{$field})) {
- push(@{$confhash{$itemid}{'instdata'}});
+ push(@{$confhash{$itemid}{'instdata'}},$field);
}
}
}
@@ -16258,7 +16219,7 @@ sub modify_lti {
}
}
unless ($changes{$itemid}) {
- foreach my $field ('makeuser','lcmenu') {
+ foreach my $field ('makeuser','lcmenu','instdata') {
if (ref($currlti{$field}) eq 'ARRAY') {
if (ref($confhash{$itemid}{$field}) eq 'ARRAY') {
my @diffs = &Apache::loncommon::compare_arrays($currlti{$field},
@@ -16472,8 +16433,10 @@ sub modify_lti {
$resulttext .= ''.&mt('Institutional data will be used when creating a new user for: [_1]',
join(', ',map { $fieldtitles{$_}; } @{$confhash{$itemid}{'instdata'}})).'';
} else {
- $resulttext .= ''.&mt('No institutional data used when creating a new user.').'';
+ $resulttext .= ''.&mt('No institutional data used when creating a new user').'';
}
+ } else {
+ $resulttext .= ''.&mt('No institutional data used when creating a new user').'';
}
foreach my $item ('topmenu','inlinemenu') {
$resulttext .= ''.$lt{$item}.': ';
@@ -17984,6 +17947,8 @@ sub modify_privacy {
if (@diffs > 0) {
$changes{$status} = 1;
}
+ } elsif (@newvalues > 0) {
+ $changes{$status} = 1;
}
} else {
my @stdfields;
@@ -18023,6 +17988,8 @@ sub modify_privacy {
if (@diffs > 0) {
$changes{'othdom'} = 1;
}
+ } elsif (@newvalues > 0) {
+ $changes{'othdom'} = 1;
}
} else {
my @stdfields = ('lastname','firstname','middlename','generation','permanentemail');