--- loncom/interface/domainprefs.pm	2007/12/12 19:44:53	1.34
+++ 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.34 2007/12/12 19:44:53 raeburn Exp $
+# $Id: domainprefs.pm,v 1.40 2008/01/04 17:47:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -281,11 +281,24 @@ sub handler {
               ' />  '.
               '<input type="button" value="uncheck all" '.
               'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
-              ' /></p>');
+              ' /></p><div class="LC_left_float">');
+        my ($numitems,$midpoint,$seconddiv,$count); 
+        $numitems = @prefs_order;
+        $midpoint = int($numitems/2);
+        if ($numitems%2) {
+            $midpoint ++;
+        }
+        $count = 0;
         foreach my $item (@prefs_order) {
-            $r->print('<p><label><input type="checkbox" name="actions" value="'.$item.'" />&nbsp;'.$prefs{$item}->{'text'}.'</label></p>');
+            $r->print('<h4><label><input type="checkbox" name="actions" value="'.$item.'" />&nbsp;'.$prefs{$item}->{'text'}.'</label></h4>');
+            $count ++;
+            if ((!$seconddiv) && ($count >= $midpoint)) {
+                $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
+                $seconddiv = 1;
+            }
         }
-        $r->print('<h3>'.&mt('Display options').'</h3>'."\n".
+        $r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
+                  &mt('Display options').'</h3>'."\n".
                   '<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
                   '<label><input type="radio" name="numcols" value="1">'.
                   &mt('one column').'</label>&nbsp;&nbsp;'.
@@ -823,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.= '<td>';
                 if (!$is_custom->{$img}) {
                     $datatable .= &mt('Default in use:').'<br />';
@@ -1022,6 +1053,10 @@ sub print_autoenroll {
         }
     }
     my $domform = &Apache::loncommon::select_dom_form($defdom,'sender_domain',1);
+    my $notif_sender;
+    if (ref($settings) eq 'HASH') {
+        $notif_sender = $settings->{'sender_uname'};
+    }
     my $datatable='<tr class="LC_odd_row">'.
                   '<td>'.&mt('Auto-enrollment active?').'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
@@ -1034,8 +1069,7 @@ sub print_autoenroll {
                   '</td><td class="LC_right_item"><span class="LC_nobreak">'.
                   &mt('username').':&nbsp;'.
                   '<input type="text" name="sender_uname" value="'.
-                  $settings->{'sender_uname'}.
-                  '" size="10" />&nbsp;&nbsp;'.&mt('domain').
+                  $notif_sender.'" size="10" />&nbsp;&nbsp;'.&mt('domain').
                   ':&nbsp;'.$domform.'</span></td></tr>';
     $$rowtotal += 2;
     return $datatable;
@@ -1178,9 +1212,11 @@ sub print_directorysrch {
     foreach my $title (@{$titleorder}) {
         if (defined($searchtitles->{$title})) {
             my $check = ' ';
-            if (ref($settings->{'searchby'}) eq 'ARRAY') {
-                if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
-                    $check = ' checked="checked" ';
+            if (ref($settings) eq 'HASH') { 
+                if (ref($settings->{'searchby'}) eq 'ARRAY') {
+                    if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
+                        $check = ' checked="checked" ';
+                    }
                 }
             }
             $datatable .= '<td class="LC_left_item">'.
@@ -1331,8 +1367,15 @@ sub print_usercreation {
                 $rowcount ++;
             }
         }
+        if ($rowcount == 0) {
+            $datatable .= '<tr><td colspan="2">'.&mt('No format rules have been defined for usernames or IDs in this domain.').'</td></tr>';  
+            $$rowtotal ++;
+            $rowcount ++;
+        }
     } elsif ($position eq 'middle') {
         my @creators = ('author','course');
+        my ($rules,$ruleorder) =
+            &Apache::lonnet::inst_userrules($dom,'username');
         my %lt = &usercreation_types();
         my %checked;
         if (ref($settings) eq 'HASH') {
@@ -1363,7 +1406,14 @@ sub print_usercreation {
             $datatable .= '<tr'.$css_class.'>'.
                          '<td><span class="LC_nobreak">'.$lt{$item}.
                          '</span></td><td align="right">';
-            foreach my $option ('any','official','unofficial','none') {
+            my @options = ('any');
+            if (ref($rules) eq 'HASH') {
+                if (keys(%{$rules}) > 0) {
+                    push(@options,('official','unofficial'));
+                }
+            }
+            push(@options,'none');
+            foreach my $option (@options) {
                 my $check = ' ';
                 if ($checked{$item} eq $option) {
                     $check = ' checked="checked" ';
@@ -1391,8 +1441,13 @@ sub print_usercreation {
                     }
                 }
             }
+        } else {
+            foreach my $item (@contexts) {
+                foreach my $auth (@authtypes) {
+                    $checked{$item}{$auth} = ' checked="checked" ';
+                }
+            }
         }
-        my @authtypes = ('int','krb4','krb5','loc');
         my %title = &context_names();
         my %authname = &authtype_names();
         my $rownum = 0;
@@ -1446,9 +1501,11 @@ sub user_formats_row {
                     $output .= '<tr>';
                 }
                 my $check = ' ';
-                if (ref($settings->{$type.'_rule'}) eq 'ARRAY') {
-                    if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) {
-                        $check = ' checked="checked" ';
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{$type.'_rule'}) eq 'ARRAY') {
+                        if (grep(/^\Q$ruleorder->[$i]\E$/,@{$settings->{$type.'_rule'}})) {
+                            $check = ' checked="checked" ';
+                        }
                     }
                 }
                 $output .= '<td class="LC_left_item">'.
@@ -1703,10 +1760,12 @@ sub usertype_update_row {
                     $datatable .= '<tr>';
                 }
                 my $check = ' ';
-                if (ref($settings->{'fields'}) eq 'HASH') {
-                    if (ref($settings->{'fields'}{$type}) eq 'ARRAY') {
-                        if (grep(/^\Q$fields->[$i]\E$/,@{$settings->{'fields'}{$type}})) {
-                            $check = ' checked="checked" ';
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{'fields'}) eq 'HASH') {
+                        if (ref($settings->{'fields'}{$type}) eq 'ARRAY') {
+                            if (grep(/^\Q$fields->[$i]\E$/,@{$settings->{'fields'}{$type}})) {
+                                $check = ' checked="checked" ';
+                            }
                         }
                     }
                 }
@@ -1863,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})