';
if ($numdc > 1) {
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)');
} else {
@@ -4326,568 +4465,248 @@ sub print_validation_rows {
return $datatable;
}
-sub print_passwords {
- my ($position,$dom,$confname,$settings,$rowtotal) = @_;
- my ($datatable,$css_class);
- my $itemcount = 0;
- my %titles = &Apache::lonlocal::texthash (
- captcha => '"Forgot Password" CAPTCHA validation',
- link => 'Reset link expiration (hours)',
- case => 'Case-sensitive usernames/e-mail',
- prelink => 'Information required (form 1)',
- postlink => 'Information required (form 2)',
- emailsrc => 'LON-CAPA e-mail address type(s)',
- customtext => 'Domain specific text (HTML)',
- intauth_cost => 'Encryption cost for bcrypt (positive integer)',
- intauth_check => 'Check bcrypt cost if authenticated',
- intauth_switch => 'Existing crypt-based switched to bcrypt on authentication',
- permanent => 'Permanent e-mail address',
- critical => 'Critical notification address',
- notify => 'Notification address',
- min => 'Minimum password length',
- max => 'Maximum password length',
- chars => 'Required characters',
- numsaved => 'Number of previous passwords to save and disallow reuse',
- );
+sub print_usersessions {
+ my ($position,$dom,$settings,$rowtotal) = @_;
+ my ($css_class,$datatable,$itemcount,%checked,%choices);
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+
+ my @alldoms = &Apache::lonnet::all_domains();
+ my %serverhomes = %Apache::lonnet::serverhomeIDs;
+ my %servers = &Apache::lonnet::internet_dom_servers($dom);
+ my %altids = &id_for_thisdom(%servers);
if ($position eq 'top') {
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- my $shownlinklife = 2;
- my $prelink = 'both';
- my (%casesens,%postlink,%emailsrc,$nostdtext,$customurl);
- if (ref($settings) eq 'HASH') {
- if ($settings->{resetlink} =~ /^\d+(|\.\d*)$/) {
- $shownlinklife = $settings->{resetlink};
- }
- if (ref($settings->{resetcase}) eq 'ARRAY') {
- map { $casesens{$_} = 1; } (@{$settings->{resetcase}});
- }
- if ($settings->{resetprelink} =~ /^(both|either)$/) {
- $prelink = $settings->{resetprelink};
- }
- if (ref($settings->{resetpostlink}) eq 'HASH') {
- %postlink = %{$settings->{resetpostlink}};
- }
- if (ref($settings->{resetemail}) eq 'ARRAY') {
- map { $emailsrc{$_} = 1; } (@{$settings->{resetemail}});
- }
- if ($settings->{resetremove}) {
- $nostdtext = 1;
- }
- if ($settings->{resetcustom}) {
- $customurl = $settings->{resetcustom};
- }
- } else {
- if (ref($types) eq 'ARRAY') {
- foreach my $item (@{$types}) {
- $casesens{$item} = 1;
- $postlink{$item} = ['username','email'];
- }
- }
- $casesens{'default'} = 1;
- $postlink{'default'} = ['username','email'];
- $prelink = 'both';
- %emailsrc = (
- permanent => 1,
- critical => 1,
- notify => 1,
- );
- }
- $datatable = &captcha_choice('passwords',$settings,$$rowtotal);
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'link'}.' '.
- ''.
- ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'case'}.' '.
- '';
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- my $checkedcase;
- if ($casesens{$item}) {
- $checkedcase = ' checked="checked"';
+ if (keys(%serverhomes) > 1) {
+ my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
+ my $curroffloadnow;
+ if (ref($settings) eq 'HASH') {
+ if (ref($settings->{'offloadnow'}) eq 'HASH') {
+ $curroffloadnow = $settings->{'offloadnow'};
}
- $datatable .= ''.
- ' '.
- ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my %checkedpre = (
- both => ' checked="checked"',
- either => '',
- );
- if ($prelink eq 'either') {
- $checkedpre{either} = ' checked="checked"';
- $checkedpre{both} = '';
- }
- $datatable .= ''.$titles{'prelink'}.' '.
- ''.
- ' '.
- ''.
- ' '.$titles{'postlink'}.' '.
- '';
- my %postlinked;
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $item (@{$types}) {
- undef(%postlinked);
- $datatable .= ''.
- ''.$usertypes->{$item}.' ';
- if (ref($postlink{$item}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{$item}});
- }
- foreach my $field ('email','username') {
- my $checked;
- if ($postlinked{$field}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- }
- }
- if (ref($postlink{'default'}) eq 'ARRAY') {
- map { $postlinked{$_} = 1; } (@{$postlink{'default'}});
- }
- $datatable .= ''.
- ''.$othertitle.' ';
- foreach my $field ('email','username') {
- my $checked;
- if ($postlinked{$field}) {
- $checked = ' checked="checked"';
- }
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'emailsrc'}.' '.
- '';
- foreach my $type ('permanent','critical','notify') {
- my $checkedemail;
- if ($emailsrc{$type}) {
- $checkedemail = ' checked="checked"';
}
- $datatable .= ''.
- ' '.
- ' ';
- }
- $datatable .= ' ';
- $itemcount ++;
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- my $switchserver = &check_switchserver($dom,$confname);
- my ($showstd,$noshowstd);
- if ($nostdtext) {
- $noshowstd = ' checked="checked"';
- } else {
- $showstd = ' checked="checked"';
- }
- $datatable .= ''.$titles{'customtext'}.' '.
- ''.
- &mt('Retain standard text:').
- ' '.
- &mt('(If you use the same account ... reset a password from this page.)').' '.$link.
- ' '.
- ' '.&mt('Replace:').' ';
- }
- if ($switchserver) {
- $datatable .= ' '.&mt('Upload to library server: [_1]',$switchserver).' ';
+ $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal);
} else {
- $datatable .=' '.
- ' ';
+ $datatable .= ''.
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.').
+ ' ';
}
- $datatable .= ''.
- ''.$titles{$item}.
- ' ';
- if ($item eq 'intauth_switch') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes',
- 2 => 'Yes, and copy existing passwd file to passwd.bak file',
- );
- $datatable .= '';
- } elsif ($item eq 'intauth_check') {
- my @options = (0,1,2);
- my %optiondesc = &Apache::lonlocal::texthash (
- 0 => 'No',
- 1 => 'Yes, allow login then update passwd file using default cost (if higher)',
- 2 => 'Yes, disallow login if stored cost is less than domain default',
- );
- $datatable .= '';
- } else {
- $datatable .= ' ';
- $itemcount ++;
+ ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+ }
+ $$rowtotal += $itemcount;
+ return $datatable;
+}
+
+sub rules_by_location {
+ my ($settings,$prefix,$by_location,$by_ip,$types,$titles) = @_;
+ my ($datatable,$itemcount,$css_class);
+ if (keys(%{$by_location}) == 0) {
+ $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
+ $datatable = ''.
+ &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.').
+ ' ';
+ $itemcount = 1;
+ } else {
+ $itemcount = 0;
+ my $numinrow = 5;
+ my (%current,%checkedon,%checkedoff);
+ my @locations = sort(keys(%{$by_location}));
+ foreach my $type (@{$types}) {
+ $checkedon{$type} = '';
+ $checkedoff{$type} = ' checked="checked"';
}
- } elsif ($position eq 'lower') {
- my ($min,$max,%chars,$numsaved);
- $min = $Apache::lonnet::passwdmin;
if (ref($settings) eq 'HASH') {
- if ($settings->{min}) {
- $min = $settings->{min};
- }
- if ($settings->{max}) {
- $max = $settings->{max};
- }
- if (ref($settings->{chars}) eq 'ARRAY') {
- map { $chars{$_} = 1; } (@{$settings->{chars}});
- }
- if ($settings->{numsaved}) {
- $numsaved = $settings->{numsaved};
- }
- }
- my %rulenames = &Apache::lonlocal::texthash(
- uc => 'At least one upper case letter',
- lc => 'At least one lower case letter',
- num => 'At least one number',
- spec => 'At least one non-alphanumeric',
- );
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.$titles{'min'}.' '.
- ''.
- ' '.&mt('(Enter an integer: 7 or larger)').' '.
- ' '.$titles{'max'}.' '.
- ''.
- ' '.&mt('(Leave blank for no maximum)').' '.
- ' '.$titles{'chars'}.''.&mt('(Leave unchecked if not required)').
- ' ';
- my $numinrow = 2;
- my @possrules = ('uc','lc','num','spec');
- $datatable .= ''.$titles{'numsaved'}.' '.
- ''.
- ' '.&mt('(Leave blank to not save previous passwords)').' '.
- '
+ '.$titles->{$type}.'
+ ';
+ if ($type eq 'version') {
+ my @lcversions = &Apache::lonnet::all_loncaparevs();
+ my $selector = '';
+ foreach my $version (@lcversions) {
+ my $selected = '';
+ if ($current{'version'} eq $version) {
+ $selected = ' selected="selected"';
+ }
+ $selector .= ' '.$version.' ';
}
- }
- }
- $css_class = $itemcount%2?' class="LC_odd_row"':'';
- $datatable .= ''.
- ''.
- &mt('Requirements').''.
- ''.&mt("Course 'type' is not a Community").' '.
- ''.&mt('User is Course Coordinator and also course owner').' '.
- ''.&mt("Student's only active roles are student role(s) in course(s) owned by this user").' '.
- ''.&mt('User, course, and student share same domain').' '.
- ' '.
- ' '.
- '';
- foreach my $item ('by','for') {
- $datatable .= ''.
- ''.$ownertitles{$item}.' ';
- if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) {
- foreach my $type (@{$types}) {
- my $checked;
- if ($ownerchg{$item}{$type}) {
- $checked = ' checked="checked"';
+ $selector .= ' ';
+ $datatable .= &mt('remote server must be version: [_1] or later',$selector);
+ } else {
+ $datatable.= '
';
+ $itemcount ++;
}
- $datatable .= ' ';
}
- return $datatable;
+ return ($datatable,$itemcount);
}
-sub print_usersessions {
+sub print_ssl {
my ($position,$dom,$settings,$rowtotal) = @_;
- my ($css_class,$datatable,%checked,%choices);
- my (%by_ip,%by_location,@intdoms);
- &build_location_hashes(\@intdoms,\%by_ip,\%by_location);
-
- my @alldoms = &Apache::lonnet::all_domains();
- my %serverhomes = %Apache::lonnet::serverhomeIDs;
- my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my %altids = &id_for_thisdom(%servers);
+ my ($css_class,$datatable);
my $itemcount = 1;
if ($position eq 'top') {
- if (keys(%serverhomes) > 1) {
- my %spareid = ¤t_offloads_to($dom,$settings,\%servers);
- my ($curroffloadnow,$curroffloadoth);
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'offloadnow'}) eq 'HASH') {
- $curroffloadnow = $settings->{'offloadnow'};
- }
- if (ref($settings->{'offloadoth'}) eq 'HASH') {
- $curroffloadoth = $settings->{'offloadoth'};
+ my $primary_id = &Apache::lonnet::domain($dom,'primary');
+ my $intdom = &Apache::lonnet::internet_dom($primary_id);
+ my $same_institution;
+ if ($intdom ne '') {
+ my $internet_names = &Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'});
+ if (ref($internet_names) eq 'ARRAY') {
+ if (grep(/^\Q$intdom\E$/,@{$internet_names})) {
+ $same_institution = 1;
}
}
- my $other_insts = scalar(keys(%by_location));
- $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,
- $other_insts,$curroffloadnow,$curroffloadoth,$rowtotal);
+ }
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable = '';
+ if ($same_institution) {
+ my %domservers = &Apache::lonnet::get_servers($dom);
+ $datatable .= &LONCAPA::SSL::print_certstatus(\%domservers,'web','domprefs');
} else {
- $datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.');
+ $datatable .= &mt("You need to be logged into one of your own domain's servers to display information about the status of LON-CAPA SSL certificates.");
}
+ $datatable .= ' ';
+ $itemcount ++;
} else {
- if (keys(%by_location) == 0) {
- $datatable .= ''.
- &mt('Nothing to set here, as the cluster to which this domain belongs only contains one institution.');
- } else {
- my %lt = &usersession_titles();
- my $numinrow = 5;
- my $prefix;
- my @types;
- if ($position eq 'bottom') {
- $prefix = 'remote';
- @types = ('version','excludedomain','includedomain');
- } else {
- $prefix = 'hosted';
- @types = ('excludedomain','includedomain');
- }
- my (%current,%checkedon,%checkedoff);
- my @lcversions = &Apache::lonnet::all_loncaparevs();
- my @locations = sort(keys(%by_location));
- foreach my $type (@types) {
- $checkedon{$type} = '';
- $checkedoff{$type} = ' checked="checked"';
- }
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{$prefix}) eq 'HASH') {
- foreach my $key (keys(%{$settings->{$prefix}})) {
- $current{$key} = $settings->{$prefix}{$key};
- if ($key eq 'version') {
- if ($current{$key} ne '') {
- $checkedon{$key} = ' checked="checked"';
- $checkedoff{$key} = '';
- }
- } elsif (ref($current{$key}) eq 'ARRAY') {
- $checkedon{$key} = ' checked="checked"';
- $checkedoff{$key} = '';
- }
+ my %titles = &ssl_titles();
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+ my @alldoms = &Apache::lonnet::all_domains();
+ my %serverhomes = %Apache::lonnet::serverhomeIDs;
+ my @domservers = &Apache::lonnet::get_servers($dom);
+ my %servers = &Apache::lonnet::internet_dom_servers($dom);
+ my %altids = &id_for_thisdom(%servers);
+ if ($position eq 'middle') {
+ foreach my $type ('dom','intdom','other') {
+ my %checked;
+ $css_class = $itemcount%2?' class="LC_odd_row"':'';
+ $datatable .= ''.$titles{$type}.' '.
+ '';
+ my $skip;
+ if ($type eq 'dom') {
+ unless (keys(%servers) > 1) {
+ $datatable .= &mt('Nothing to set here, as there are no other servers/VMs');
+ $skip = 1;
}
}
- }
- foreach my $type (@types) {
- next if ($type ne 'version' && !@locations);
- $css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
- $datatable .= '
- '.$lt{$type}.'
- ';
- if ($type eq 'version') {
- my $selector = '';
- foreach my $version (@lcversions) {
- my $selected = '';
- if ($current{'version'} eq $version) {
- $selected = ' selected="selected"';
- }
- $selector .= ' '.$version.' ';
+ if ($type eq 'intdom') {
+ unless (@instdoms > 1) {
+ $datatable .= &mt('Nothing to set here, as there are no other domains for this institution');
+ $skip = 1;
+ }
+ } elsif ($type eq 'other') {
+ if (keys(%by_location) == 0) {
+ $datatable .= &mt('Nothing to set here, as there are no other institutions');
+ $skip = 1;
}
- $selector .= ' ';
- $datatable .= &mt('remote server must be version: [_1] or later',$selector);
- } else {
- $datatable.= '
';
+ $itemcount ++;
+ }
+ } else {
+ my $prefix = 'replication';
+ my @types = ('certreq','nocertreq');
+ if (keys(%by_location) == 0) {
+ $datatable .= ''.
+ &mt('Nothing to set here, as there are no other institutions').
+ ' ';
$itemcount ++;
+ } else {
+ ($datatable,$itemcount) =
+ &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
}
}
}
@@ -4895,10 +4714,59 @@ sub print_usersessions {
return $datatable;
}
+sub ssl_titles {
+ return &Apache::lonlocal::texthash (
+ dom => 'LON-CAPA servers/VMs from same domain',
+ intdom => 'LON-CAPA servers/VMs from same "internet" domain',
+ other => 'External LON-CAPA servers/VMs',
+ connect => 'Connections to other servers',
+ replication => 'Replicating content to other institutions',
+ certreq => 'Client certificate required, but specific domains exempt',
+ nocertreq => 'No client certificate required, except for specific domains',
+ no => 'SSL not used',
+ yes => 'SSL Optional (used if available)',
+ req => 'SSL Required',
+ );
+}
+
+sub print_trust {
+ my ($prefix,$dom,$settings,$rowtotal) = @_;
+ my ($css_class,$datatable,%checked,%choices);
+ my (%by_ip,%by_location,@intdoms,@instdoms);
+ &build_location_hashes(\@intdoms,\%by_ip,\%by_location,\@instdoms);
+ my $itemcount = 1;
+ my %titles = &trust_titles();
+ my @types = ('exc','inc');
+ if ($prefix eq 'top') {
+ $prefix = 'content';
+ } elsif ($prefix eq 'bottom') {
+ $prefix = 'msg';
+ }
+ ($datatable,$itemcount) = &rules_by_location($settings,$prefix,\%by_location,\%by_ip,\@types,\%titles);
+ $$rowtotal += $itemcount;
+ return $datatable;
+}
+
+sub trust_titles {
+ return &Apache::lonlocal::texthash(
+ content => "Access to this domain's content by others",
+ shared => "Access to other domain's content by this domain",
+ enroll => "Enrollment in this domain's courses by others",
+ othcoau => "Co-author roles in this domain for others",
+ coaurem => "Co-author roles for this domain's users elsewhere",
+ domroles => "Domain roles in this domain assignable to others",
+ catalog => "Course Catalog for this domain displayed elsewhere",
+ reqcrs => "Requests for creation of courses in this domain by others",
+ msg => "Users in other domains can send messages to this domain",
+ exc => "Allow all, but exclude specific domains",
+ inc => "Deny all, but include specific domains",
+ );
+}
+
sub build_location_hashes {
- my ($intdoms,$by_ip,$by_location) = @_;
+ my ($intdoms,$by_ip,$by_location,$instdoms) = @_;
return unless((ref($intdoms) eq 'ARRAY') && (ref($by_ip) eq 'HASH') &&
- (ref($by_location) eq 'HASH'));
+ (ref($by_location) eq 'HASH') && (ref($instdoms) eq 'ARRAY'));
my %iphost = &Apache::lonnet::get_iphost();
my $primary_id = &Apache::lonnet::domain($env{'request.role.domain'},'primary');
my $primary_ip = &Apache::lonnet::get_host_ip($primary_id);
@@ -4915,7 +4783,13 @@ sub build_location_hashes {
foreach my $id (@{$iphost{$ip}}) {
my $location = &Apache::lonnet::internet_dom($id);
if ($location) {
- next if (grep(/^\Q$location\E$/,@{$intdoms}));
+ if (grep(/^\Q$location\E$/,@{$intdoms})) {
+ my $dom = &Apache::lonnet::host_domain($id);
+ unless (grep(/^\Q$dom\E/,@{$instdoms})) {
+ push(@{$instdoms},$dom);
+ }
+ next;
+ }
if (ref($by_ip->{$ip}) eq 'ARRAY') {
unless(grep(/^\Q$location\E$/,@{$by_ip->{$ip}})) {
push(@{$by_ip->{$ip}},$location);
@@ -5023,8 +4897,7 @@ sub current_offloads_to {
}
sub spares_row {
- my ($dom,$servers,$spareid,$serverhomes,$altids,$other_insts,
- $curroffloadnow,$curroffloadoth,$rowtotal) = @_;
+ my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_;
my $css_class;
my $numinrow = 4;
my $itemcount = 1;
@@ -5044,34 +4917,22 @@ sub spares_row {
}
}
next unless (ref($spareid->{$server}) eq 'HASH');
- my ($checkednow,$checkedoth);
+ my $checkednow;
if (ref($curroffloadnow) eq 'HASH') {
if ($curroffloadnow->{$server}) {
$checkednow = ' checked="checked"';
}
}
- if (ref($curroffloadoth) eq 'HASH') {
- if ($curroffloadoth->{$server}) {
- $checkedoth = ' checked="checked"';
- }
- }
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : '';
$datatable .= '
'.
&mt('[_1] when busy, offloads to:'
,''.$server.' ').' '."\n".
+ ''."\n".
' '.
- "\n";
- if ($other_insts) {
- $datatable .= ''."\n".
- ' '.
+ ' '.&mt('Switch active users on next access').' '.
"\n";
- }
my (%current,%canselect);
my @choices =
&possible_newspares($server,$spareid->{$server},$serverhomes,$altids);
@@ -5195,13 +5056,13 @@ sub print_loadbalancing {
my $numinrow = 1;
my $datatable;
my %servers = &Apache::lonnet::internet_dom_servers($dom);
- my (%currbalancer,%currtargets,%currrules,%existing,%currcookies);
+ my (%currbalancer,%currtargets,%currrules,%existing);
if (ref($settings) eq 'HASH') {
%existing = %{$settings};
}
if ((keys(%servers) > 1) || (keys(%existing) > 0)) {
&get_loadbalancers_config(\%servers,\%existing,\%currbalancer,
- \%currtargets,\%currrules,\%currcookies);
+ \%currtargets,\%currrules);
} else {
return;
}
@@ -5278,9 +5139,6 @@ sub print_loadbalancing {
my %hostherechecked = (
no => ' checked="checked"',
);
- my %balcookiechecked = (
- no => ' checked="checked"',
- );
foreach my $sparetype (@sparestypes) {
my $targettable;
for (my $i=0; $i<$numspares; $i++) {
@@ -5336,11 +5194,6 @@ sub print_loadbalancing {
}
}
}
- if ($currcookies{$lonhost}) {
- %balcookiechecked = (
- yes => ' checked="checked"',
- );
- }
$datatable .= &mt('Hosting on balancer itself').''.$typetitles{$sparetype}.
' '.
+ $datatable .= ' '.
&loadbalancing_rules($dom,$intdom,$currrules{$lonhost},
$othertitle,$usertypes,$types,\%servers,
\%currbalancer,$lonhost,
@@ -5368,11 +5216,10 @@ sub print_loadbalancing {
}
sub get_loadbalancers_config {
- my ($servers,$existing,$currbalancer,$currtargets,$currrules,$currcookies) = @_;
+ my ($servers,$existing,$currbalancer,$currtargets,$currrules) = @_;
return unless ((ref($servers) eq 'HASH') &&
(ref($existing) eq 'HASH') && (ref($currbalancer) eq 'HASH') &&
- (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH') &&
- (ref($currcookies) eq 'HASH'));
+ (ref($currtargets) eq 'HASH') && (ref($currrules) eq 'HASH'));
if (keys(%{$existing}) > 0) {
my $oldlonhost;
foreach my $key (sort(keys(%{$existing}))) {
@@ -5391,9 +5238,6 @@ sub get_loadbalancers_config {
$currbalancer->{$key} = 1;
$currtargets->{$key} = $existing->{$key}{'targets'};
$currrules->{$key} = $existing->{$key}{'rules'};
- if ($existing->{$key}{'cookie'}) {
- $currcookies->{$key} = 1;
- }
}
}
} else {
@@ -5449,14 +5293,9 @@ sub loadbalancing_titles {
'_LC_ipchange' => &mt('Non-SSO users with IP mismatch'),
);
my @alltypes = ('_LC_adv','_LC_author','_LC_internetdom','_LC_external','_LC_ipchangesso','_LC_ipchange');
- my @available;
if (ref($types) eq 'ARRAY') {
- @available = @{$types};
- }
- unless (grep(/^default$/,@available)) {
- push(@available,'default');
+ unshift(@alltypes,@{$types},'default');
}
- unshift(@alltypes,@available);
my %titles;
foreach my $type (@alltypes) {
if ($type =~ /^_LC_/) {
@@ -5583,17 +5422,12 @@ sub contact_titles {
'adminemail' => 'Default Server Admin E-mail address',
'errormail' => 'Error reports to be e-mailed to',
'packagesmail' => 'Package update alerts to be e-mailed to',
- 'helpdeskmail' => "Helpdesk requests from all users in this domain",
- 'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains',
+ 'helpdeskmail' => "Helpdesk requests for this domain's users",
+ 'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains',
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)',
'requestsmail' => 'E-mail from course requests requiring approval',
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates',
'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
- 'hostipmail' => 'E-mail from nightly check of hostname/IP network changes',
- 'errorthreshold' => 'Error count threshold for status e-mail to admin(s)',
- 'errorsysmail' => 'Error count threshold for e-mail to developer group',
- 'errorweights' => 'Weights used to compute error count',
- 'errorexcluded' => 'Servers with unsent updates excluded from count',
);
my %short_titles = &Apache::lonlocal::texthash (
adminemail => 'Admin E-mail address',
@@ -5610,14 +5444,14 @@ sub helpform_fields {
'cc' => 'Cc e-mail',
'course' => 'Course Details',
'section' => 'Sections',
- 'screenshot' => 'File upload',
+ 'screenshot' => 'File upload',
);
my @fields = ('username','phone','user','course','section','cc','screenshot');
my %possoptions = (
username => ['yes','no','req'],
- phone => ['yes','no','req'],
+ phone => ['yes','no','req'],
user => ['yes','no'],
- cc => ['yes','no'],
+ cc => ['yes','no'],
course => ['yes','no'],
section => ['yes','no'],
screenshot => ['yes','no'],
@@ -5640,6 +5474,7 @@ sub tool_titles {
unofficial => 'Unofficial courses',
community => 'Communities',
textbook => 'Textbook courses',
+ placement => 'Placement tests',
);
return %titles;
}
@@ -5650,6 +5485,7 @@ sub courserequest_titles {
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
+ placement => 'Placement tests',
norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',
validate => 'With validation',
@@ -5814,8 +5650,7 @@ sub print_usercreation {
sub print_selfcreation {
my ($position,$dom,$settings,$rowtotal) = @_;
- my (@selfcreate,$createsettings,$processing,$emailoptions,$emailverified,
- $emaildomain,$datatable);
+ my (@selfcreate,$createsettings,$processing,$datatable);
if (ref($settings) eq 'HASH') {
if (ref($settings->{'cancreate'}) eq 'HASH') {
$createsettings = $settings->{'cancreate'};
@@ -5832,22 +5667,12 @@ sub print_selfcreation {
if (ref($createsettings->{'selfcreateprocessing'}) eq 'HASH') {
$processing = $createsettings->{'selfcreateprocessing'};
}
- if (ref($createsettings->{'emailoptions'}) eq 'HASH') {
- $emailoptions = $createsettings->{'emailoptions'};
- }
- if (ref($createsettings->{'emailverified'}) eq 'HASH') {
- $emailverified = $createsettings->{'emailverified'};
- }
- if (ref($createsettings->{'emaildomain'}) eq 'HASH') {
- $emaildomain = $createsettings->{'emaildomain'};
- }
}
}
}
my %radiohash;
my $numinrow = 4;
map { $radiohash{'cancreate_'.$_} = 1; } @selfcreate;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if ($position eq 'top') {
my %choices = &Apache::lonlocal::texthash (
cancreate_login => 'Institutional Login',
@@ -5862,12 +5687,14 @@ sub print_selfcreation {
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
\%choices,$itemcount,$onclick);
$$rowtotal += $itemcount;
+
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
if (ref($usertypes) eq 'HASH') {
if (keys(%{$usertypes}) > 0) {
$datatable .= &insttypes_row($createsettings,$types,$usertypes,
$dom,$numinrow,$othertitle,
- 'statustocreate',$rowtotal);
+ 'statustocreate',$$rowtotal);
$$rowtotal ++;
}
}
@@ -5880,7 +5707,7 @@ sub print_selfcreation {
$datatable .= ''.
''.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').' '.
''."\n".
- ''."\n";
+ ''."\n";
for (my $i=0; $i<@fields; $i++) {
$rem = $i%($numperrow);
if ($rem == 0) {
@@ -5912,430 +5739,150 @@ sub print_selfcreation {
$$rowtotal ++;
} elsif ($position eq 'middle') {
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom);
- my @posstypes;
+ my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
+ $usertypes->{'default'} = $othertitle;
if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
- }
- my %usertypeshash;
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
- $numinrow,$$rowtotal,\%usertypeshash);
- $$rowtotal ++;
+ push(@{$types},'default');
+ $usertypes->{'default'} = $othertitle;
+ foreach my $status (@{$types}) {
+ $datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'},
+ $numinrow,$$rowtotal,$usertypes);
+ $$rowtotal ++;
+ }
}
} else {
my %choices = &Apache::lonlocal::texthash (
- 'cancreate_email' => 'Non-institutional username (via e-mail verification)',
+ cancreate_email => 'E-mail address as username',
);
my @toggles = sort(keys(%choices));
my %defaultchecked = (
'cancreate_email' => 'off',
);
- my $customclass = 'LC_selfcreate_email';
- my $classprefix = 'LC_canmodify_emailusername_';
- my $optionsprefix = 'LC_options_emailusername_';
+ my $itemcount = 0;
my $display = 'none';
- my $rowstyle = 'display:none';
if (grep(/^\Qemail\E$/,@selfcreate)) {
$display = 'block';
- $rowstyle = 'display:table-row';
}
- my $onclick = "toggleRows(this.form,'cancreate_email','selfassign','$customclass','$classprefix','$optionsprefix');";
- ($datatable,$$rowtotal) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked,
- \%choices,$$rowtotal,$onclick);
- $datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- $datatable .= &captcha_choice('cancreate',$createsettings,$$rowtotal,$customclass,
- $rowstyle);
- $$rowtotal ++;
- my (@ordered,@posstypes,%usertypeshash);
+ my $onclick = "toggleDisplay(this.form,'emailoptions');";
+ my $additional = '';
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom);
- my ($emailrules,$emailruleorder) =
- &Apache::lonnet::inst_userrules($dom,'email');
- my $primary_id = &Apache::lonnet::domain($dom,'primary');
- my $intdom = &Apache::lonnet::internet_dom($primary_id);
- if (ref($types) eq 'ARRAY') {
- @posstypes = @{$types};
- }
- if (@posstypes) {
- unless (grep(/^default$/,@posstypes)) {
- push(@posstypes,'default');
- }
- if (ref($usertypes) eq 'HASH') {
- %usertypeshash = %{$usertypes};
- }
- my $currassign;
- if (ref($domdefaults{'inststatusguest'}) eq 'ARRAY') {
- $currassign = {
- selfassign => $domdefaults{'inststatusguest'},
- };
- @ordered = @{$domdefaults{'inststatusguest'}};
- } else {
- $currassign = { selfassign => [] };
- }
- my $onclicktypes = "toggleDataRow(this.form,'selfassign','$customclass','$optionsprefix',);".
- "toggleDataRow(this.form,'selfassign','$customclass','$classprefix',1);";
- $datatable .= &insttypes_row($currassign,$types,$usertypes,$dom,
- $numinrow,$othertitle,'selfassign',
- $rowtotal,$onclicktypes,$customclass,
- $rowstyle);
- $$rowtotal ++;
- $usertypeshash{'default'} = $othertitle;
- foreach my $status (@posstypes) {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
- my $rowid = $optionsprefix.$status;
- my $hidden = 1;
- my $currstyle = 'display:none';
- if (grep(/^\Q$status\E$/,@ordered)) {
- $currstyle = $rowstyle;
- $hidden = 0;
- }
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,$status,$rowid,
- $usertypeshash{$status},$css_class,$currstyle,$intdom);
- unless ($hidden) {
- $$rowtotal ++;
+ my $usertypes = {};
+ my $order = [];
+ if ((ref($domdefaults{'inststatustypes'}) eq 'HASH') && (ref($domdefaults{'inststatusguest'}) eq 'ARRAY')) {
+ $usertypes = $domdefaults{'inststatustypes'};
+ $order = $domdefaults{'inststatusguest'};
+ }
+ if (ref($order) eq 'ARRAY') {
+ push(@{$order},'default');
+ if (@{$order} > 1) {
+ $usertypes->{'default'} = &mt('Other users');
+ $additional .= '
';
+ foreach my $status (@{$order}) {
+ $additional .= ''.$usertypes->{$status}.' ';
+ }
+ $additional .= ' ';
+ foreach my $status (@{$order}) {
+ $additional .= ''.&email_as_username($rowtotal,$processing,$status).' ';
}
+ $additional .= '
';
+ } else {
+ $usertypes->{'default'} = &mt('All users');
+ $additional .= &email_as_username($rowtotal,$processing);
}
- } else {
- my $css_class;
- if ($$rowtotal%2) {
- $css_class = 'LC_odd_row ';
- }
- $css_class .= $customclass;
- $usertypeshash{'default'} = $othertitle;
- $datatable .= &noninst_users($processing,$emailverified,$emailoptions,$emaildomain,
- $emailrules,$emailruleorder,$settings,'default','',
- $othertitle,$css_class,$rowstyle,$intdom);
- $$rowtotal ++;
}
+ $additional .= '
'.
- "$description \n".
- ''.
- '';
- my %headers = &Apache::lonlocal::texthash(
- approve => 'Processing',
- email => 'E-mail',
- username => 'Username',
- );
- foreach my $item ('approve','email','username') {
- $output .= ''.$headers{$item}.' ';
- }
- $output .= ' ';
- foreach my $item ('approve','email','username') {
- $output .= '';
- my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
- if ($item eq 'approve') {
- %choices = &Apache::lonlocal::texthash (
- automatic => 'Automatically approved',
- approval => 'Queued for approval',
- );
- @options = ('automatic','approval');
- $hashref = $processing;
- $defoption = 'automatic';
- $name = 'cancreate_emailprocess_'.$type;
- } elsif ($item eq 'email') {
- %choices = &Apache::lonlocal::texthash (
- any => 'Any e-mail',
- inst => 'Institutional only',
- noninst => 'Non-institutional only',
- custom => 'Custom restrictions',
- );
- @options = ('any','inst','noninst');
- my $showcustom;
- if (ref($emailrules) eq 'HASH') {
- if (keys(%{$emailrules}) > 0) {
- push(@options,'custom');
- $showcustom = 'cancreate_emailrule';
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{'email_rule'}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- } elsif (ref($settings->{'email_rule'}) eq 'HASH') {
- if (ref($settings->{'email_rule'}{$type}) eq 'ARRAY') {
- foreach my $rule (@{$settings->{'email_rule'}{$type}}) {
- if (exists($emailrules->{$rule})) {
- $hascustom ++;
- }
- }
- }
- }
+ if ($processing->{'default'} eq $option) {
+ $checked = ' checked="checked"';
}
}
- }
- $onclick = ' onclick="toggleEmailOptions(this.form,'."'cancreate_emailoptions','$showcustom',".
- "'cancreate_emaildomain','$type'".');"';
- $hashref = $emailoptions;
- $defoption = 'any';
- $name = 'cancreate_emailoptions_'.$type;
- } elsif ($item eq 'username') {
- %choices = &Apache::lonlocal::texthash (
- all => 'Same as e-mail',
- first => 'Omit @domain',
- free => 'Free to choose',
- );
- @options = ('all','first','free');
- $hashref = $emailverified;
- $defoption = 'all';
- $name = 'cancreate_usernameoptions_'.$type;
- }
- foreach my $option (@options) {
- my $checked;
- if (ref($hashref) eq 'HASH') {
- if ($type eq '') {
- if (!exists($hashref->{'default'})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{'default'} eq $option) {
- $checked = ' checked="checked"';
- }
+ } else {
+ if (!exists($processing->{$type})) {
+ if ($option eq 'automatic') {
+ $checked = ' checked="checked"';
}
} else {
- if (!exists($hashref->{$type})) {
- if ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- } else {
- if ($hashref->{$type} eq $option) {
- $checked = ' checked="checked"';
- }
- }
- }
- } elsif (($item eq 'email') && ($hascustom)) {
- if ($option eq 'custom') {
- $checked = ' checked="checked"';
- }
- } elsif ($option eq $defoption) {
- $checked = ' checked="checked"';
- }
- $output .= ''.
- ' '.
- ''.&mt('Disallow').' '.
- &user_formats_row('email',$settings,$emailrules,
- $emailruleorder,$numinrow,'',$type);
- '
';
- } elsif (($option eq 'inst') || ($option eq 'noninst')) {
- my %text = &Apache::lonlocal::texthash (
- inst => 'must end:',
- noninst => 'cannot end:',
- );
- my $value;
- if (ref($emaildomain) eq 'HASH') {
- if (ref($emaildomain->{$type}) eq 'HASH') {
- $value = $emaildomain->{$type}->{$option};
- }
- }
- if ($value eq '') {
- $value = '@'.$intdom;
- }
- my $condition = 'cancreate_emaildomain_'.$option.'_'.$type;
- my $display = 'none';
- if ($checked) {
- $display = 'inline';
+ if ($processing->{$type} eq $option) {
+ $checked = ' checked="checked"';
}
- $output .= ''.
- ''.$text{$option}.' '.
- '
';
}
}
+ } elsif ($option eq 'automatic') {
+ $checked = ' checked="checked"';
+ }
+ my $name = 'cancreate_emailprocess';
+ if (($type ne '') && ($type ne 'default')) {
+ $name .= '_'.$type;
+ }
+ $output .= ''.
+ ' '."\n";
}
- $output .= "
'.
- ''.$rowname.' '."\n".
+ ' '.$rowname.' '."\n".
''."\n";
foreach my $option ('original','recaptcha','notused') {
$output .= ''."\n".
+ ' '."\n".
''.$pubtext.' '."\n".
' '.
- ''.
- &mt("Format rules to check for $text{$type}: ").
- ' ';
+ my $css_class = $rowcount%2?' class="LC_odd_row"':'';
+ $output = ''.
+ '';
+ if ($type eq 'email') {
+ $output .= &mt("Formats disallowed for $text{$type}: ");
+ } else {
+ $output .= &mt("Format rules to check for $text{$type}: ");
}
+ $output .= ' ';
- unless ($type eq 'email') {
- $output .= ' ';
- }
+ $output .= '
';
return $output;
}
@@ -6549,10 +6071,7 @@ sub print_usermodification {
sub print_defaults {
my ($position,$dom,$settings,$rowtotal) = @_;
my $rownum = 0;
- my ($datatable,$css_class,$titles);
- unless ($position eq 'bottom') {
- $titles = &defaults_titles($dom);
- }
+ my ($datatable,$css_class);
if ($position eq 'top') {
my @items = ('auth_def','auth_arg_def','lang_def','timezone_def',
'datelocale_def','portal_def');
@@ -6565,6 +6084,7 @@ sub print_defaults {
$defaults{$item} = $domdefaults{$item};
}
}
+ my $titles = &defaults_titles($dom);
foreach my $item (@items) {
if ($rownum%2) {
$css_class = '';
@@ -6613,14 +6133,19 @@ sub print_defaults {
$rownum ++;
}
} else {
- my %defaults;
+ my (%defaults);
if (ref($settings) eq 'HASH') {
- if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
+ if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH') &&
+ (ref($settings->{'inststatusguest'}) eq 'ARRAY')) {
my $maxnum = @{$settings->{'inststatusorder'}};
for (my $i=0; $i<$maxnum; $i++) {
$css_class = $rownum%2?' class="LC_odd_row"':'';
my $item = $settings->{'inststatusorder'}->[$i];
my $title = $settings->{'inststatustypes'}->{$item};
+ my $guestok;
+ if (grep(/^\Q$item\E$/,@{$settings->{'inststatusguest'}})) {
+ $guestok = 1;
+ }
my $chgstr = ' onchange="javascript:reorderTypes(this.form,'."'$item'".');"';
$datatable .= ''.
''.
@@ -6633,12 +6158,23 @@ sub print_defaults {
}
$datatable .= ''.$vpos.' ';
}
+ my ($checkedon,$checkedoff);
+ $checkedoff = ' checked="checked"';
+ if ($guestok) {
+ $checkedon = $checkedoff;
+ $checkedoff = '';
+ }
$datatable .= ' '.&mt('Internal ID:').' '.$item.' '.
' '.&mt('Name displayed').
+ ' '.&mt('Name displayed:').
' '.
+ ' '.
- &mt('Name displayed').
+ &mt('Name displayed:').
' '.
+ ' '.
&mt('An error occurred updating the domain configuration: [_1]',$putresult).' ';
}
@@ -6929,129 +6415,6 @@ sub legacy_scantronformat {
return ($url,$error);
}
-sub print_scantronconfig {
- my ($dom,$settings,$rowtotal) = @_;
- my $itemcount = 2;
- my $is_checked = ' checked="checked"';
- my %optionson = (
- hdr => ' checked="checked"',
- pad => ' checked="checked"',
- rem => ' checked="checked"',
- );
- my %optionsoff = (
- hdr => '',
- pad => '',
- rem => '',
- );
- my $currcsvsty = 'none';
- my ($datatable,%csvfields,%checked,%onclick,%csvoptions);
- my @fields = &scantroncsv_fields();
- my %titles = &scantronconfig_titles();
- if (ref($settings) eq 'HASH') {
- if (ref($settings->{config}) eq 'HASH') {
- if ($settings->{config}->{dat}) {
- $checked{'dat'} = $is_checked;
- }
- if (ref($settings->{config}->{csv}) eq 'HASH') {
- if (ref($settings->{config}->{csv}->{fields}) eq 'HASH') {
- %csvfields = %{$settings->{config}->{csv}->{fields}};
- if (keys(%csvfields) > 0) {
- $checked{'csv'} = $is_checked;
- $currcsvsty = 'block';
- }
- }
- if (ref($settings->{config}->{csv}->{options}) eq 'HASH') {
- %csvoptions = %{$settings->{config}->{csv}->{options}};
- foreach my $option (keys(%optionson)) {
- unless ($csvoptions{$option}) {
- $optionsoff{$option} = $optionson{$option};
- $optionson{$option} = '';
- }
- }
- }
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- } else {
- $checked{'dat'} = $is_checked;
- }
- $onclick{'csv'} = ' onclick="toggleScantron(this.form);"';
- my $css_class = $itemcount%2? ' class="LC_odd_row"':'';
- $datatable = ''.&mt('Supported formats').' '.
- '';
- foreach my $item ('dat','csv') {
- my $id;
- if ($item eq 'csv') {
- $id = 'id="scantronconfcsv" ';
- }
- $datatable .= ''.
- ''.&mt('CSV Column Mapping').' '.
- ''.&mt('Field').' '.&mt('Location').' '.$titles{$col}.' '.
- ''.
- ''.$shown.' ';
- }
- $datatable .= '
'.
- ''.
- ''.&mt('CSV Options').' ';
- foreach my $option ('hdr','pad','rem') {
- $datatable .= ''.$titles{$option}.':'.
- ' ';
- $itemcount ++;
- }
- }
- $datatable .= ' '.
''.$title{'togglecats'}.' '.
@@ -7165,8 +6543,22 @@ sub print_coursecategories {
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.' '.
' '.
+ ''.$title{'togglecatsplace'}.' '.
+ ''.
+ ' '.
+ ' '.
+ ''.$title{'categorizeplace'}.' '.
+ ''.
+ ' ';
- $$rowtotal += 4;
+ $$rowtotal += 6;
} else {
my $css_class;
my $itemcount = 1;
@@ -7191,12 +6583,15 @@ sub print_coursecategories {
my %default_names = (
instcode => &mt('Official courses'),
communities => &mt('Communities'),
+ placement => &mt('Placement Tests'),
);
if ((!grep(/^instcode$/,@{$cats[0]})) ||
($cathash->{'instcode::0'} eq '') ||
(!grep(/^communities$/,@{$cats[0]})) ||
- ($cathash->{'communities::0'} eq '')) {
+ ($cathash->{'communities::0'} eq '') ||
+ (!grep(/^placement$/,@{$cats[0]})) ||
+ ($cathash->{'placement::0'} eq '')) {
$maxnum ++;
}
my $lastidx;
@@ -7217,7 +6612,7 @@ sub print_coursecategories {
$datatable .= ''.$vpos.' ';
}
$datatable .= '';
- if ($parent eq 'instcode' || $parent eq 'communities') {
+ if ($parent eq 'instcode' || $parent eq 'communities' || $parent eq 'placement') {
$datatable .= ''
.$default_names{$parent}.' ';
if ($parent eq 'instcode') {
@@ -7240,7 +6635,7 @@ sub print_coursecategories {
$datatable .= '
';
}
$datatable .= ' ';
@@ -7272,7 +6667,7 @@ sub print_coursecategories {
.''.$hdritem->{'header'}->[1]->{'col2'}.' '.$hdritem->{'header'}->[1]->{'col2'}.' '
.&initialize_categories($itemcount);
}
$$rowtotal += $itemcount;
@@ -7353,7 +6748,7 @@ sub print_serverstatuses {
''.
' '."\n";
+ ''."\n";
}
$$rowtotal += $rownum;
return $datatable;
@@ -7361,14 +6756,14 @@ sub print_serverstatuses {
sub serverstatus_pages {
return ('userstatus','lonstatus','loncron','server-status','codeversions',
- 'checksums','clusterstatus','metadata_keywords','metadata_harvest',
- 'takeoffline','takeonline','showenv','toggledebug','ping','domconf',
- 'uniquecodes','diskusage','coursecatalog');
+ 'checksums','clusterstatus','certstatus','metadata_keywords',
+ 'metadata_harvest','takeoffline','takeonline','showenv','toggledebug',
+ 'ping','domconf','uniquecodes','diskusage','coursecatalog');
}
sub defaults_javascript {
my ($settings) = @_;
- return unless (ref($settings) eq 'HASH');
+ return unless (ref($settings) eq 'HASH');
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) {
my $maxnum = scalar(@{$settings->{'inststatusorder'}});
if ($maxnum eq '') {
@@ -7429,94 +6824,6 @@ ENDSCRIPT
}
}
-sub passwords_javascript {
- my %intalert = &Apache::lonlocal::texthash (
- authcheck => 'Warning: disallowing login for an authenticated user if the stored cost is less than the default will require a password reset by/for the user.',
- authcost => 'Warning: bcrypt encryption cost for internal authentication must be an integer.',
- passmin => 'Warning: minimum password length must be a positive integer greater than 6.',
- passmax => 'Warning: maximum password length must be a positive integer (or blank).',
- passexp => 'Warning: days before password expiration must be a positive integer (or blank).',
- passnum => 'Warning: number of previous passwords to save must be a positive integer (or blank).',
- );
- &js_escape(\%intalert);
- my $defmin = $Apache::lonnet::passwdmin;
- my $intauthjs = <<"ENDSCRIPT";
-
-function warnIntAuth(field) {
- if (field.name == 'intauth_check') {
- if (field.value == '2') {
- alert('$intalert{authcheck}');
- }
- }
- if (field.name == 'intauth_cost') {
- field.value.replace(/\s/g,'');
- if (field.value != '') {
- var regexdigit=/^\\d+\$/;
- if (!regexdigit.test(field.value)) {
- alert('$intalert{authcost}');
- }
- }
- }
- return;
-}
-
-function warnIntPass(field) {
- field.value.replace(/^\s+/,'');
- field.value.replace(/\s+\$/,'');
- var regexdigit=/^\\d+\$/;
- if (field.name == 'passwords_min') {
- if (field.value == '') {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- } else {
- if (!regexdigit.test(field.value)) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- var minval = parseInt(field.value,10);
- if (minval < $defmin) {
- alert('$intalert{passmin}');
- field.value = '$defmin';
- }
- }
- } else {
- if (field.value == '0') {
- field.value = '';
- }
- if (field.value != '') {
- if (field.name == 'passwords_expire') {
- var regexpposnum=/^\\d+(|\\.\\d*)\$/;
- if (!regexpposnum.test(field.value)) {
- alert('$intalert{passexp}');
- field.value = '';
- } else {
- var expval = parseFloat(field.value);
- if (expval == 0) {
- alert('$intalert{passexp}');
- field.value = '';
- }
- }
- } else {
- if (!regexdigit.test(field.value)) {
- if (field.name == 'passwords_max') {
- alert('$intalert{passmax}');
- } else {
- if (field.name == 'passwords_numsaved') {
- alert('$intalert{passnum}');
- }
- }
- field.value = '';
- }
- }
- }
- }
- return;
-}
-
-ENDSCRIPT
- return &Apache::lonhtmlcommon::scripttag($intauthjs);
-}
-
sub coursecategories_javascript {
my ($settings) = @_;
my ($output,$jstext,$cathash);
@@ -7541,9 +6848,11 @@ sub coursecategories_javascript {
}
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"');
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"');
+ my $placement_reserved = &mt('The name: [_1] is a reserved category.','"placement"');
my $choose_again = "\n".&mt('Please use a different name for the new top level category.');
&js_escape(\$instcode_reserved);
&js_escape(\$communities_reserved);
+ &js_escape(\$placement_reserved);
&js_escape(\$choose_again);
$output = <<"ENDSCRIPT";