--- loncom/interface/domainprefs.pm 2014/03/31 01:09:11 1.232
+++ loncom/interface/domainprefs.pm 2014/04/13 00:42:06 1.234
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.232 2014/03/31 01:09:11 raeburn Exp $
+# $Id: domainprefs.pm,v 1.234 2014/04/13 00:42:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1472,7 +1472,7 @@ sub display_color_options {
$datatable .= '
'.
'';
foreach my $item (@{$links}) {
- my $color = $designs->{'link'}{$item} ? $designs->{'link'}{$item} : $defaults->{'links'}{$item};
+ my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
$datatable .= ''.$choices->{$item}."\n";
if ($designs->{'links'}{$item}) {
$datatable.=' ';
@@ -2974,7 +2974,7 @@ sub print_selfenrollment {
$datatable .= ' |
| ';
}
} elsif ($position eq 'bottom') {
- my ($itemsref,$namesref,$fieldsref) = &selfenroll_validation_types();
+ my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
my %currvalidation;
if (ref($settings) eq 'HASH') {
if (ref($settings->{'validation'}) eq 'HASH') {
@@ -5769,22 +5769,38 @@ sub modify_colors {
}
if ($role eq 'login') {
foreach my $item (@logintext) {
- unless ($env{'form.'.$role.'_'.$item} eq $defaults{'logintext'}{$item}) {
+ $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+ if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+ $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+ }
+ unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'logintext'}{$item})) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
} else {
- unless($env{'form.'.$role.'_fontmenu'} eq $defaults{'fontmenu'}) {
+ $env{'form.'.$role.'_fontmenu'} = lc($env{'form.'.$role.'_fontmenu'});
+ if ($env{'form.'.$role.'_fontmenu'} =~ /^\w+/) {
+ $env{'form.'.$role.'_fontmenu'} = '#'.$env{'form.'.$role.'_fontmenu'};
+ }
+ unless($env{'form.'.$role.'_fontmenu'} eq lc($defaults{'fontmenu'})) {
$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
}
}
foreach my $item (@bgs) {
- unless ($env{'form.'.$role.'_'.$item} eq $defaults{'bgs'}{$item} ) {
+ $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+ if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+ $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+ }
+ unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'bgs'}{$item})) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
foreach my $item (@links) {
- unless ($env{'form.'.$role.'_'.$item} eq $defaults{'links'}{$item}) {
+ $env{'form.'.$role.'_'.$item} = lc($env{'form.'.$role.'_'.$item});
+ if ($env{'form.'.$role.'_'.$item} =~ /^\w+/) {
+ $env{'form.'.$role.'_'.$item} = '#'.$env{'form.'.$role.'_'.$item};
+ }
+ unless ($env{'form.'.$role.'_'.$item} eq lc($defaults{'links'}{$item})) {
$confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
}
}
@@ -9376,7 +9392,7 @@ sub modify_selfenrollment {
default => 'Default settings',
validation => 'Validation of self-enrollment requests',
);
- my ($itemsref,$namesref,$fieldsref) = &selfenroll_validation_types();
+ my ($itemsref,$namesref,$fieldsref) = &Apache::lonuserutils::selfenroll_validation_types();
if (ref($ordered{'admin'}) eq 'ARRAY') {
foreach my $item (@{$ordered{'admin'}}) {