--- loncom/interface/domainprefs.pm 2008/01/04 10:17:13 1.39 +++ loncom/interface/domainprefs.pm 2008/01/04 17:47:51 1.40 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.39 2008/01/04 10:17:13 raeburn Exp $ +# $Id: domainprefs.pm,v 1.40 2008/01/04 17:47:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -836,8 +836,26 @@ sub display_color_options { } } if ($showfile) { - $showfile = &Apache::loncommon::lonhttpdurl($showfile); - $fullsize = &Apache::loncommon::lonhttpdurl($imgfile); + if ($showfile =~ m{^/(adm|res)/}) { + if ($showfile =~ m{^/res/}) { + my $local_showfile = + &Apache::lonnet::filelocation('',$showfile); + &Apache::lonnet::repcopy($local_showfile); + } + $showfile = &Apache::loncommon::lonhttpdurl($showfile); + } + if ($imgfile) { + if ($imgfile =~ m{^/(adm|res)/}) { + if ($imgfile =~ m{^/res/}) { + my $local_imgfile = + &Apache::lonnet::filelocation('',$imgfile); + &Apache::lonnet::repcopy($local_imgfile); + } + $fullsize = &Apache::loncommon::lonhttpdurl($imgfile); + } else { + $fullsize = $imgfile; + } + } $datatable.= ''; if (!$is_custom->{$img}) { $datatable .= &mt('Default in use:').'
'; @@ -1904,6 +1922,9 @@ sub modify_colors { } } my ($width,$height) = &thumb_dimensions(); + if (ref($domconfig->{$role}) ne 'HASH') { + $domconfig->{$role} = {}; + } foreach my $img (@images) { if ( ! $env{'form.'.$role.'_'.$img.'.filename'} && !defined($domconfig->{$role}{$img}) @@ -2145,7 +2166,7 @@ sub check_configuser { sub check_authorstatus { my ($dom,$confname,%currroles) = @_; my $author_ok; - if (!$currroles{$confname.':'.$dom.':au'}) { + if (!$currroles{':'.$dom.':au'}) { my $start = time; my $end = 0; $author_ok =