--- loncom/interface/domainprefs.pm 2009/04/22 14:09:13 1.93
+++ loncom/interface/domainprefs.pm 2009/05/19 20:00:24 1.96
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.93 2009/04/22 14:09:13 raeburn Exp $
+# $Id: domainprefs.pm,v 1.96 2009/05/19 20:00:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -162,7 +162,7 @@ sub handler {
col2 => 'Information settable when self-creating account (if directory data blank)'}],
},
'scantron' =>
- { text => 'Scantron format file',
+ { text => 'Bubblesheet format file',
help => 'Domain_Configuration_Scantron_Format',
header => [ {col1 => 'Item',
col2 => '',
@@ -204,7 +204,6 @@ sub handler {
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
} else {
if (keys(%domconfig) == 0) {
- &Apache::lonconfigsettings::print_header($r,$phase,$context);
my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
my @ids=&Apache::lonnet::current_machine_ids();
if (!grep(/^\Q$primarylibserv\E$/,@ids)) {
@@ -222,6 +221,7 @@ sub handler {
}
}
if ($custom_img_count > 0) {
+ &Apache::lonconfigsettings::print_header($r,$phase,$context);
my $switch_server = &check_switchserver($dom,$confname);
$r->print(
&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'
'.
@@ -1833,8 +1833,8 @@ sub print_scantronformat {
%confhash);
my $switchserver = &check_switchserver($dom,$confname);
my %lt = &Apache::lonlocal::texthash (
- default => 'Default scantron format file error',
- custom => 'Custom scantron format file error',
+ default => 'Default bubblesheet format file error',
+ custom => 'Custom bubblesheet format file error',
);
my %scantronfiles = (
default => 'default.tab',
@@ -1907,7 +1907,7 @@ sub print_scantronformat {
}
}
} else {
- $error{'default'} = &mt("Unable to copy default scantron formatfile to domain's RES space: [_1]",$switchserver);
+ $error{'default'} = &mt("Unable to copy default bubblesheet formatfile to domain's RES space: [_1]",$switchserver);
}
}
if (ref($settings) eq 'HASH') {
@@ -4200,22 +4200,25 @@ sub modify_usercreation {
$chgtext .= '';
}
} elsif ($type eq 'statustocreate') {
- if (@{$cancreate{'selfcreate'}} > 0) {
- if (@{$cancreate{$type}} == 0) {
- if (!grep(/^email$/,@{$cancreate{'selfcreate'}})) {
- $chgtext .= &mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.");
- }
- } elsif (ref($usertypes) eq 'HASH') {
- if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
- $chgtext .= &mt('creation of a new account for an institutional user is restricted to the following institutional affiliation(s):').'