--- loncom/interface/domainprefs.pm	2007/04/04 00:10:01	1.7
+++ loncom/interface/domainprefs.pm	2007/07/25 20:12:26	1.23
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.7 2007/04/04 00:10:01 albertel Exp $
+# $Id: domainprefs.pm,v 1.23 2007/07/25 20:12:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use LONCAPA();
 use LONCAPA::Enrollment;
+use File::Copy;
 
 sub handler {
     my $r=shift;
@@ -66,7 +67,7 @@ sub handler {
     }
     my %domconfig =
       &Apache::lonnet::get_dom('configuration',['login','rolecolors',
-                               'quotas','autoenroll','autoupdate'],$dom);
+                'quotas','autoenroll','autoupdate','directorysrch'],$dom);
     my @prefs = (
       { text => 'Default color schemes',
         help => 'Default_Color_Schemes',
@@ -105,12 +106,19 @@ sub handler {
                     col2 => 'Value',},
                    {col1 => 'User Population',
                     col2 => 'Updataeable user data'}],
-      },
+        },
+      { text => 'Institutional directory searches',
+        help => 'Domain_Directory_Search',
+        action => 'directorysrch',
+        header => [{col1 => 'Setting',
+                    col2 => 'Value',}],
+        },
     );
     my @roles = ('student','coordinator','author','admin');
     &Apache::lonhtmlcommon::add_breadcrumb
     ({href=>"javascript:changePage(document.$phase,'display')",
       text=>"Domain Configuration"});
+    my $confname = $dom.'-domainconfig';
     if ($phase eq 'process') {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:changePage(document.$phase,'$phase')",
@@ -118,7 +126,8 @@ sub handler {
         &print_header($r,$phase);
         foreach my $item (@prefs) {
             $r->print('<h3>'.&mt($item->{'text'}).'</h3>'.
-                   &process_changes($r,$dom,$item->{'action'},\@roles,%domconfig));
+                      &process_changes($r,$dom,$confname,
+                        $item->{'action'},\@roles,%domconfig));
         }
         $r->print('<p>');
         &print_footer($r,$phase,'display','Back to actions menu');
@@ -130,52 +139,79 @@ sub handler {
         my %helphash;   
         my $numprefs = @prefs;
         &print_header($r,$phase);
+        if (keys(%domconfig) == 0) {
+            my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
+            my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf');
+            my $hostid = $perlvarref->{'lonHostID'};
+            if ($hostid ne $primarylibserv) {
+                my %designhash = &Apache::loncommon::get_domainconf($dom);
+                my @loginimages = ('img','logo','domlogo');
+                my $custom_img_count = 0;
+                foreach my $img (@loginimages) {
+                    if ($designhash{$dom.'.login.'.$img} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                foreach my $role (@roles) {
+                    if ($designhash{$dom.'.'.$role.'.img'} ne '') {
+                        $custom_img_count ++;
+                    }
+                }
+                if ($custom_img_count > 0) {
+                    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.').'<br />'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'<br /><br />'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
+                    return OK;
+                }
+            }
+        }
         $r->print('<table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">');
         foreach my $item (@prefs) {
             if ($item->{'action'} eq 'login') {
                 $r->print('</td><td width="6%">&nbsp;</td><td align="left" valign="top" width="47%">');
             }
-            &print_config_box($r,$dom,$phase,$item->{'action'},
+            &print_config_box($r,$dom,$confname,$phase,$item->{'action'},
                               $item,$domconfig{$item->{'action'}});
         }
         $r->print('
-           </table>
-          </td>
-         </tr>
-        </table>
       </td>
     </tr>
    </table>');
-        &print_footer($r,$phase,'process','Store changes');
+        &print_footer($r,$phase,'process','Save changes');
     }
     return OK;
 }
 
 sub process_changes {
-    my ($r,$dom,$action,$roles,%domconfig) = @_;
+    my ($r,$dom,$confname,$action,$roles,%domconfig) = @_;
     my $output;
     if ($action eq 'login') {
-        $output = &modify_login($r,$dom,%domconfig);
+        $output = &modify_login($r,$dom,$confname,%domconfig);
     } elsif ($action eq 'rolecolors') {
-        $output = &modify_rolecolors($r,$dom,$roles,%domconfig);
+        $output = &modify_rolecolors($r,$dom,$confname,$roles,
+                                     %domconfig);
     } elsif ($action eq 'quotas') {
         $output = &modify_quotas($dom,%domconfig);
     } elsif ($action eq 'autoenroll') {
         $output = &modify_autoenroll($dom,%domconfig);
     } elsif ($action eq 'autoupdate') {
         $output = &modify_autoupdate($dom,%domconfig);
+    } elsif ($action eq 'directorysrch') {
+        $output = &modify_directorysrch($dom,%domconfig);
     }
     return $output;
 }
 
 sub print_config_box {
-    my ($r,$dom,$phase,$action,$item,$settings) = @_;
+    my ($r,$dom,$confname,$phase,$action,$item,$settings) = @_;
     $r->print('
          <table class="LC_nested_outer">
           <tr>
-           <th>'.&mt($item->{text}).'&nbsp;'.
-           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
-          </tr>');
+           <th>'.&mt($item->{text}).'&nbsp;</th></tr>');
+# 
+# FIXME - put the help link back in when the help files exist
+#           <th>'.&mt($item->{text}).'&nbsp;'.
+#           &Apache::loncommon::help_open_topic($item->{'help'}).'</th>
+#          </tr>');
     if (($action eq 'autoupdate') || ($action eq 'rolecolors')) {
         my $colspan = ($action eq 'rolecolors')?' colspan="2"':'';
         $r->print('
@@ -189,7 +225,7 @@ sub print_config_box {
         if ($action eq 'autoupdate') {
             $r->print(&print_autoupdate('top',$dom,$settings));
         } else {
-            $r->print(&print_rolecolors($phase,'student',$dom,$settings));
+            $r->print(&print_rolecolors($phase,'student',$dom,$confname,$settings));
         }
         $r->print('
            </table>
@@ -205,7 +241,7 @@ sub print_config_box {
         if ($action eq 'autoupdate') {
             $r->print(&print_autoupdate('bottom',$dom,$settings));
         } else {
-            $r->print(&print_rolecolors($phase,'coordinator',$dom,$settings).'
+            $r->print(&print_rolecolors($phase,'coordinator',$dom,$confname,$settings).'
            </table>
           </td>
          </tr>
@@ -216,7 +252,7 @@ sub print_config_box {
               <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[2]->{'col1'}.'</td>
               <td class="LC_right_item">'.$item->{'header'}->[2]->{'col2'}.'</td>
              </tr>'.
-            &print_rolecolors($phase,'author',$dom,$settings).'
+            &print_rolecolors($phase,'author',$dom,$confname,$settings).'
            </table>
           </td>
          </tr>
@@ -227,7 +263,7 @@ sub print_config_box {
               <td class="LC_left_item"'.$colspan.'>'.$item->{'header'}->[3]->{'col1'}.'</td>
               <td class="LC_right_item">'.$item->{'header'}->[3]->{'col2'}.'</td>
              </tr>'.
-            &print_rolecolors($phase,'admin',$dom,$settings));
+            &print_rolecolors($phase,'admin',$dom,$confname,$settings));
         }
     } else {
         $r->print('
@@ -246,11 +282,13 @@ sub print_config_box {
               <td class="LC_right_item">'.$item->{'header'}->[0]->{'col2'}.'</td>
              </tr>');
         if ($action eq 'login') {
-           $r->print(&print_login($dom,$phase,$settings));
+           $r->print(&print_login($dom,$confname,$phase,$settings));
         } elsif ($action eq 'quotas') {
            $r->print(&print_quotas($dom,$settings));
         } elsif ($action eq 'autoenroll') {
            $r->print(&print_autoenroll($dom,$settings));
+        } elsif ($action eq 'directorysrch') {
+           $r->print(&print_directorysrch($dom,$settings));
         }  
     }
     $r->print('
@@ -277,7 +315,7 @@ function changePage(formname,newphase) {
                                            $js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings'));
     $r->print('
-<form name="parmform">
+<form name="parmform" action="">
 <input type="hidden" name="pres_marker" />
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
@@ -305,7 +343,7 @@ sub print_footer {
 }
 
 sub print_login {
-    my ($dom,$phase,$settings) = @_;
+    my ($dom,$confname,$phase,$settings) = @_;
     my %choices = &login_choices();
     my ($catalogon,$catalogoff,$adminmailon,$adminmailoff);
     $catalogon = ' checked="checked" ';
@@ -360,23 +398,16 @@ sub print_login {
             }
         }
     } else {
-        $designs{'domlogo'} = '';
-        if (-e '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif') {
-            $designs{'domlogo'} = '/home/httpd/html/adm/lonDomLogos/'.$dom.'.gif';
-            $is_custom{'domlogo'} = 1;
-        }
-        if ($designhash{$dom.'.login.img'} ne '') {
-            $designs{'img'} = $designhash{$dom.'.login.img'};
-            $is_custom{'img'} = 1;
-        }
-        if ($designhash{$dom.'.login.logo'} ne '') {
-            $designs{'logo'} = $designhash{$dom.'.login.logo'};
-            $is_custom{'logo'} = 1;
-        }
         if ($designhash{$dom.'.login.font'} ne '') {
             $designs{'font'} = $designhash{$dom.'.login.font'};
             $is_custom{'font'} = 1;
         }
+        foreach my $item (@images) {
+            if ($designhash{$dom.'.login.'.$item} ne '') {
+                $designs{$item} = $designhash{$dom.'.login.'.$item};
+                $is_custom{$item} = 1;
+            }
+        }
         foreach my $item (@bgs) {
             if ($designhash{$dom.'.login.'.$item} ne '') {
                 $designs{'bgs'}{$item} = $designhash{$dom.'.login.'.$item};
@@ -398,22 +429,22 @@ sub print_login {
     my $datatable = 
         '<tr'.$css_class.'><td colspan="2">'.$choices{'coursecatalog'}.
         '</td><td>'.
-        '<nobr><input type="radio" name="coursecatalog"'.
-        $catalogon.' value="1" />'.&mt('Yes').'&nbsp;'.
-        '<input type="radio" name="coursecatalog"'.
-        $catalogoff.'value="0" />'.&mt('No').'</nobr></td>'.
+        '<span class="LC_nobreak"><label><input type="radio" name="coursecatalog"'.
+        $catalogon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+        '<label><input type="radio" name="coursecatalog"'.
+        $catalogoff.'value="0" />'.&mt('No').'</label></span></td>'.
         '</tr>';
     $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
         '<td colspan="2">'.$choices{'adminmail'}.'</td>'.
-        '<td><nobr>'.
-        '<input type="radio" name="adminmail"'.
-        $adminmailon.' value="1" />'.&mt('Yes').'&nbsp;'.
-        '<input type="radio" name="adminmail"'.
-        $adminmailoff.'value="0" />'.&mt('No').'</nobr></td>';
+        '<td><span class="LC_nobreak">'.
+        '<label><input type="radio" name="adminmail"'.
+        $adminmailon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+        '<label><input type="radio" name="adminmail"'.
+        $adminmailoff.'value="0" />'.&mt('No').'</label></span></td></tr>';
     $itemcount ++;
-    $datatable .= &display_color_options($dom,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
+    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
     $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
@@ -440,7 +471,7 @@ sub login_choices {
 }
 
 sub print_rolecolors {
-    my ($phase,$role,$dom,$settings) = @_;
+    my ($phase,$role,$dom,$confname,$settings) = @_;
     my %choices = &color_font_choices();
     my @bgs = ('pgbg','tabbg','sidebg');
     my @links = ('link','alink','vlink');
@@ -506,15 +537,14 @@ sub print_rolecolors {
         }
     }
     my $itemcount = 1;
-    my $datatable = display_color_options($dom,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
+    my $datatable = &display_color_options($dom,$confname,$phase,$role,$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text);
     $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
 
 sub display_color_options {
-    my ($dom,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
+    my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
         $images,$bgs,$links,$alt_text) = @_;
-    my $configuname = $dom.'-domainconfig';
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
     my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
@@ -524,24 +554,26 @@ sub display_color_options {
         $datatable .= '<td>&nbsp;</td>';
     }
     my $fontlink = &color_pick($phase,$role,'font',$choices->{'font'},$designs->{'font'});
-    $datatable .= '<td><nobr>'.
+    $datatable .= '<td><span class="LC_nobreak">'.
                   '<input type="text" size="10" name="'.$role.'_font"'.
-                  ' value="'.$designs->{'font'}.'" />&nbsp'.$fontlink.
-                  '</nobr></td></tr>';
+                  ' value="'.$designs->{'font'}.'" />&nbsp;'.$fontlink.
+                  '</span></td></tr>';
+    my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
-        $itemcount ++;
+	$itemcount ++;
         $css_class = $itemcount%2?' class="LC_odd_row"':'';
-        $datatable .= '</tr><tr'.$css_class.'>'.
+        $datatable .= '<tr'.$css_class.'>'.
                       '<td>'.$choices->{$img}.'</td>';
-        my $imgfile;
+        my ($imgfile, $img_import);
         if ($designs->{$img} ne '') {
             $imgfile = $designs->{$img};
+	    $img_import = ($imgfile =~ m{^/adm/});
         } else {
             $imgfile = $defaults->{$img};
         }
         if ($imgfile) {
-            my $showfile;
-            if ($imgfile =~ m-^(/uploaded/\Q$dom\E/\Q$configuname\E/portfolio.*)/([^/]+)$-) {
+            my ($showfile,$fullsize);
+            if ($imgfile =~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
                 my $urldir = $1;
                 my $filename = $2;
                 my @info = &Apache::lonnet::stat_file($designs->{$img});
@@ -557,6 +589,7 @@ sub display_color_options {
                     $showfile = '';
                 }
             } elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) {
+                $showfile = $imgfile;
                 my $imgdir = $1;
                 my $filename = $2;
                 if (-e "/home/httpd/html/$imgdir/tn-".$filename) {
@@ -565,21 +598,35 @@ sub display_color_options {
                     my $input = "/home/httpd/html".$imgfile;
                     my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename;
                     if (!-e $output) {
-                        system("convert -sample 200x50 $input $output");
+                        my ($width,$height) = &thumb_dimensions();
+                        my ($fullwidth,$fullheight) = &check_dimensions($input);
+                        if ($fullwidth ne '' && $fullheight ne '') {
+                            if ($fullwidth > $width && $fullheight > $height) { 
+                                my $size = $width.'x'.$height;
+                                system("convert -sample $size $input $output");
+                                $showfile = '/'.$imgdir.'/tn-'.$filename;
+                            }
+                        }
                     }
-                    $showfile = '/'.$imgdir.'/tn-'.$filename;
                 }
-            } 
+            }
             if ($showfile) {
+                $showfile = &Apache::loncommon::lonhttpdurl($showfile);
+                $fullsize =  &Apache::loncommon::lonhttpdurl($imgfile);
                 $datatable.= '<td>';
                 if (!$is_custom->{$img}) {
                     $datatable .= &mt('Default in use:').'<br />';
                 }
-                $datatable.= '<img src="'.$showfile.'" alt="'.
-                             $alt_text->{$img}.'" /></td>';
+		if ($img_import) {
+		    $datatable.= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
+		}
+                $datatable.= '<a href="'.$fullsize.'" target="_blank"><img src="'.
+                             $showfile.'" alt="'.$alt_text->{$img}.
+                             '" border="0" /></a></td>';
                 if ($is_custom->{$img}) {
-                    $datatable.='<td><nobr><input type="checkbox" name="'.$role.'_del_'.$img.'" value="1">'.
-                                &mt('Delete?').'&nbsp;'.&mt('Replace:').'</nobr><br />';
+                    $datatable.='<td><span class="LC_nobreak"><label><input type="checkbox" name="'.
+                                $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
+                                '</label>&nbsp;'.&mt('Replace:').'</span><br />';
                 } else {
                     $datatable.='<td valign="bottom">'.&mt('Upload:').'<br />';
                 }
@@ -591,7 +638,12 @@ sub display_color_options {
             $datatable .= '<td colspan="2" class="LC_right_item"><br />'.
                           &mt('Upload:');
         }
-        $datatable .= '&nbsp;<input type="file" name="'.$role.'_'.$img.'" /></nobr></td></tr>';
+        if ($switchserver) {
+            $datatable .= &mt('Upload to library server: [_1]',$switchserver);
+        } else {
+            $datatable .='&nbsp;<input type="file" name="'.$role.'_'.$img.'" />';
+        }
+        $datatable .= '</td></tr>';
     }
     $itemcount ++;
     $css_class = $itemcount%2?' class="LC_odd_row"':'';
@@ -604,7 +656,7 @@ sub display_color_options {
         }
     }
     if ($bgs_def) {
-        $datatable .= '<td>'.&mt('Default(s) in use').'<br /><table border="0"><tr>'.$bgs_def.'</tr></table></td>';
+        $datatable .= '<td>'.&mt('Default(s) in use:').'<br /><table border="0"><tr>'.$bgs_def.'</tr></table></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -631,7 +683,7 @@ sub display_color_options {
         }
     }
     if ($links_def) {
-        $datatable .= '<td>'.&mt('Default(s) in use').'<br /><table border="0"><tr>'.$links_def.'</tr></table></td>';
+        $datatable .= '<td>'.&mt('Default(s) in use:').'<br /><table border="0"><tr>'.$links_def.'</tr></table></td>';
     } else {
         $datatable .= '<td>&nbsp;</td>';
     }
@@ -690,33 +742,22 @@ ENDCOL
 sub print_quotas {
     my ($dom,$settings) = @_;
     my $datatable;
-    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
-    my $othertitle = "All users";
-    my @types;
-    if (ref($order) eq 'ARRAY') {
-        @types = @{$order};
-    }
-    if (@types == 0) {
-        if (ref($usertypes) eq 'HASH') {
-            @types = sort(keys(%{$usertypes}));
-        }
-    }
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
     my $typecount = 0;
     my $css_class;
-    if (@types > 0) {
-        foreach my $type (@types) {
+    if (@{$types} > 0) {
+        foreach my $type (@{$types}) {
             if (defined($usertypes->{$type})) {
                 $typecount ++;
                 $css_class = $typecount%2?' class="LC_odd_row"':'';
                 $datatable .= '<tr'.$css_class.'>'. 
                               '<td>'.$usertypes->{$type}.'</td>'.
-                              '<td class="LC_right_item"><nobr>'.
+                              '<td class="LC_right_item"><span class="LC_nobreak">'.
                               '<input type="text" name="quota_'.$type.
                               '" value="'.$settings->{$type}.
-                              '" size="5" /> Mb</nobr></td></tr>';
+                              '" size="5" /> Mb</span></td></tr>';
             }
         }
-        $othertitle = "Other users";
     }
     my $defaultquota = '20';
     if (ref($settings) eq 'HASH') {
@@ -728,17 +769,16 @@ sub print_quotas {
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.&mt($othertitle).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
-                  '<input type="text" name="default" value="'.
-                  $defaultquota.'" size="5" /> Mb</nobr></td></tr>';
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<input type="text" name="defaultquota" value="'.
+                  $defaultquota.'" size="5" /> Mb</span></td></tr>';
     return $datatable;
 }
 
 sub print_autoenroll {
     my ($dom,$settings) = @_;
-    my $defdom = $dom;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($runon,$runoff);
+    my ($defdom,$runon,$runoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -760,23 +800,31 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+    } else {
+        if ($autorun) {
+            $runon = ' checked="checked" ';
+            $runoff = ' ';
+        } else {
+            $runoff = ' checked="checked" ';
+            $runon = ' ';
+        }
     }
     my $domform = &Apache::loncommon::select_dom_form($defdom,'sender_domain',1);
     my $datatable='<tr class="LC_odd_row">'.
                   '<td>'.&mt('Auto-enrollment active?').'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
-                  '<input type="radio" name="autoenroll_run"'.
-                  $runon.' value="1" />'.&mt('Yes').'&nbsp;'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoenroll_run"'.
-                  $runoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  $runon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autoenroll_run"'.
+                  $runoff.' value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt('Notification messages - sender').
-                  '</td><td class="LC_right_item"><nobr>'.
+                  '</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').
-                  ':&nbsp;'.$domform.'</nobr></td></tr>';
+                  ':&nbsp;'.$domform.'</span></td></tr>';
     return $datatable;
 }
 
@@ -804,48 +852,36 @@ sub print_autoupdate {
                     );
         $datatable = '<tr class="LC_odd_row">'. 
                   '<td>'.&mt($title{'run'}).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
                   '<input type="radio" name="autoupdate_run"'.
-                  $updateon.' value="1" />'.&mt('Yes').'&nbsp;'.
-                  '<input type="radio" name="autoupdate_run"'.
-                  $updateoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  $updateon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="autoupdate_run"'.
+                  $updateoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt($title{'classlists'}).'</td>'.
-                  '<td class="LC_right_item"><nobr>'.
-                  '<input type="radio" name="classlists"'.
-                  $classlistson.' value="1" />'.&mt('Yes').'&nbsp;'.
-                  '<input type="radio" name="classlists"'.
-                  $classlistsoff.'value="0" />'.&mt('No').'</nobr></td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak">'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistson.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="classlists"'.
+                  $classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr>';
     } else {
-        my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
-        my @types;
-        if (ref($order) eq 'ARRAY') {
-            @types = @{$order};
-        }
-        if (@types == 0) {
-            if (ref($usertypes) eq 'HASH') {
-                @types = sort(keys(%{$usertypes}));
-            }
-        }
-        my $othertitle = &mt('All users');
-        if (keys(%{$usertypes}) > 0) {
-            $othertitle = &mt('Other users');
-        }
-        my @fields = ('lastname','firstname','middlename','gen','email','id');
+        my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
+        my @fields = ('lastname','firstname','middlename','gen',
+                      'permanentemail','id');
         my %fieldtitles = &Apache::lonlocal::texthash (
                             id => 'Student/Employee ID',
-                            email => 'E-mail address',
+                            permanentemail => 'E-mail address',
                             lastname => 'Last Name',
                             firstname => 'First Name',
                             middlename => 'Middle Name',
                             gen => 'Generation',
                       );
         my $numrows = 0;
-        if (@types > 0) {
+        if (@{$types} > 0) {
             $datatable = 
                 &usertype_update_row($settings,$usertypes,\%fieldtitles,
-                                     \@fields,\@types,\$numrows);
+                                     \@fields,$types,\$numrows);
         }
         $datatable .= 
             &usertype_update_row($settings,{'default' => $othertitle},
@@ -855,6 +891,144 @@ sub print_autoupdate {
     return $datatable;
 }
 
+sub print_directorysrch {
+    my ($dom,$settings) = @_;
+    my $srchon = ' ';
+    my $srchoff = ' checked="checked" ';
+    my $exacton = '';
+    my $containson = ' checked="checked" ';
+    my $specifyon = '';
+    if (ref($settings) eq 'HASH') {
+        if ($settings->{'available'} eq '1') {
+            $srchon = $srchoff;
+            $srchoff = ' ';
+        }
+        if ($settings->{'searchtypes'} eq 'exact') {
+            $exacton = $containson;
+            $containson = ' ';
+        }
+        if ($settings->{'searchtypes'} eq 'specify') {
+            $specifyon = $containson;
+            $containson = ' ';
+        }
+    }
+    my ($searchtitles,$titleorder) = &sorted_searchtitles();
+    my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
+
+    my $numinrow = 4;
+    my $datatable='<tr class="LC_odd_row">'.
+                  '<td>'.&mt('Directory search available?').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="dirsrch_available"'.
+                  $srchon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
+                  '<label><input type="radio" name="dirsrch_available"'.
+                  $srchoff.' value="0" />'.&mt('No').'</label></span></td>'.
+                  '</tr><tr>'.
+                  '<td>'.&mt('Search latitude').'</td>'.
+                  '<td class="LC_right_item"><span class="LC_nobreak"><label>'.
+                  '<input type="radio" name="searchtypes"'.
+                  $exacton.' value="exact" />'.&mt('Exact match only').'</label>&nbsp;'.
+                  '<label><input type="radio" name="searchtypes"'.
+                  $containson.' value="contains" />'.&mt('Contains is a match').'</label>'.
+                  '&nbsp;<label><input type="radio" name="searchtypes"'.
+                  $specifyon.' value="specify" />'.&mt('Specifiable type').
+                  '</label></span></td></tr>'.
+                  '<tr class="LC_odd_row">'.
+                  '<td>'.&mt('Users permitted to search').
+                  '</td><td class="LC_left_item"><table>';
+    for (my $i=0; $i<@{$types}; $i++) {
+        if (defined($usertypes->{$types->[$i]})) {
+            my $rem = $i%($numinrow);
+            if ($rem == 0) {
+                if ($i > 0) {
+                    $datatable .= '</tr>';
+                }
+                $datatable .= '<tr>';
+            }
+            my $check = ' ';
+            if (ref($settings->{'cansearch'}) eq 'ARRAY') {
+                if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
+                    $check = ' checked="checked" ';
+                }
+            }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="cansearch" '.
+                          'value="'.$types->[$i].'"'.$check.'/>'.
+                          $usertypes->{$types->[$i]}.'</label></span></td>';
+        }
+    }
+
+    my $rem = @{$types}%($numinrow);
+    my $colsleft = $numinrow - $rem;
+    if ($colsleft > 1) {
+        $datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">';
+    } else {
+        $datatable .= '<td class="LC_left_item">';
+    }
+    my $defcheck = ' ';
+    if (ref($settings->{'cansearch'}) eq 'ARRAY') {
+         if (grep(/^default$/,@{$settings->{'cansearch'}})) {
+              $defcheck = ' checked="checked" ';
+         }
+    }
+    $datatable .= '<span class="LC_nobreak"><label>'.
+                  '<input type="checkbox" name="cansearch" '.
+                  'value="default"'.$defcheck.'/>'.
+                  $othertitle.'</label></span></td>'.
+                  '</tr></table></td></tr>';
+
+    $datatable .= '<tr>'.
+                  '<td>'.&mt('Supported search methods').
+                  '</td><td class="LC_left_item"><table><tr>';
+    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" ';
+                }
+            }
+            $datatable .= '<td class="LC_left_item">'.
+                          '<span class="LC_nobreak"><label>'.
+                          '<input type="checkbox" name="searchby" '.
+                          'value="'.$title.'"'.$check.'/>'.
+                          $searchtitles->{$title}.'</label></span></td>';
+        }
+    }
+    $datatable .= '</tr></table></td></tr>';
+    return $datatable;
+}
+
+sub sorted_inst_types {
+    my ($dom) = @_;
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
+    my $othertitle = "All users";
+    my @types;
+    if (ref($order) eq 'ARRAY') {
+        @types = @{$order};
+    }
+    if (@types == 0) {
+        if (ref($usertypes) eq 'HASH') {
+            @types = sort(keys(%{$usertypes}));
+        }
+    }
+    if (keys(%{$usertypes}) > 0) {
+        $othertitle = &mt('Other users');
+    }
+    return ($othertitle,$usertypes,\@types);
+}
+
+sub sorted_searchtitles {
+    my %searchtitles = &Apache::lonlocal::texthash(
+                         'uname' => 'username',
+                         'lastname' => 'last name',
+                         'lastfirst' => 'last name, first name',
+                     );
+    my @titleorder = ('uname','lastname','lastfirst');
+    return (\%searchtitles,\@titleorder);
+}
+
 sub usertype_update_row {
     my ($settings,$usertypes,$fieldtitles,$fields,$types,$rownums) = @_;
     my $datatable;
@@ -892,10 +1066,10 @@ sub usertype_update_row {
                 } else {
                     $datatable .= '<td>';
                 }
-                $datatable .= '<nobr><input type="checkbox" name="updateable_'.
-                              $type.'_'.$fields->[$i].'" '.
-                              '" value="1"'.$check.'/>'.
-                              $fieldtitles->{$fields->[$i]}.'</nobr></td>';
+                $datatable .= '<span class="LC_nobreak"><label>'.
+                              '<input type="checkbox" name="updateable_'.$type.
+                              '_'.$fields->[$i].'" value="1"'.$check.'/>'.
+                              $fieldtitles->{$fields->[$i]}.'</label></span></td>';
             }
             $datatable .= '</tr></table></td></tr>';
         }
@@ -904,14 +1078,14 @@ sub usertype_update_row {
 }
 
 sub modify_login {
-    my ($r,$dom,%domconfig) = @_;
+    my ($r,$dom,$confname,%domconfig) = @_;
     my ($resulttext,$errors,$colchgtext,%changes,%colchanges);
     my %title = ( coursecatalog => 'Display course catalog',
                   adminmail => 'Display administrator E-mail address');
     my @offon = ('off','on');
     my %loginhash;
-    ($errors,%colchanges) = &modify_colors($r,$dom,['login'],\%domconfig,
-                                          \%loginhash);
+    ($errors,%colchanges) = &modify_colors($r,$dom,$confname,['login'],
+                                           \%domconfig,\%loginhash);
     $loginhash{login}{coursecatalog} = $env{'form.coursecatalog'};
     $loginhash{login}{adminmail} = $env{'form.adminmail'};
     if (ref($colchanges{'login'}) eq 'HASH') {  
@@ -947,10 +1121,11 @@ sub modify_login {
             $resulttext = &mt('No changes made to log-in page settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
-        $resulttext .= &mt('The following errors occurred: ').'<ul>'.
+        $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
                        $errors.'</ul>';
     }
     return $resulttext;
@@ -974,10 +1149,10 @@ sub color_font_choices {
 }
 
 sub modify_rolecolors {
-    my ($r,$dom,$roles,%domconfig) = @_;
+    my ($r,$dom,$confname,$roles,%domconfig) = @_;
     my ($resulttext,%rolehash);
     $rolehash{'rolecolors'} = {};
-    my ($errors,%changes) = &modify_colors($r,$dom,$roles,
+    my ($errors,%changes) = &modify_colors($r,$dom,$confname,$roles,
                          $domconfig{'rolecolors'},$rolehash{'rolecolors'});
     my $putresult = &Apache::lonnet::put_dom('configuration',\%rolehash,
                                              $dom);
@@ -989,7 +1164,8 @@ sub modify_rolecolors {
             $resulttext = &mt('No changes made to default color schemes');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -999,16 +1175,20 @@ sub modify_rolecolors {
 }
 
 sub modify_colors {
-    my ($r,$dom,$roles,$domconfig,$confhash) = @_;
-    my %changes;
+    my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_;
+    my (%changes,%choices);
     my @bgs = ('pgbg','mainbg','sidebg');
     my @links = ('link','alink','vlink');
     my @images;
-    my $configuname = $dom.'-domainconfig';
     my $servadm = $r->dir_config('lonAdmEMail');
     my $errors;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
+            %choices = &login_choices();
+        } else {
+            %choices = &color_font_choices();
+        }
+        if ($role eq 'login') {
             @images = ('img','logo','domlogo');
         } else {
             @images = ('img');
@@ -1017,34 +1197,71 @@ sub modify_colors {
         foreach my $item (@bgs,@links) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
-        foreach my $img (@images) { 
+        my ($configuserok,$author_ok,$switchserver,%currroles);
+        my $uhome = &Apache::lonnet::homeserver($confname,$dom,1);
+        ($configuserok,%currroles) = &check_configuser($uhome,$dom,
+                                                       $confname,$servadm);
+        if ($configuserok eq 'ok') {
+            $switchserver = &check_switchserver($dom,$confname);
+            if ($switchserver eq '') {
+                $author_ok = &check_authorstatus($dom,$confname,%currroles);
+            }
+        }
+        my ($width,$height) = &thumb_dimensions();
+        foreach my $img (@images) {
+	    if ( ! $env{'form.'.$role.'_'.$img.'.filename'} 
+		 && !defined($domconfig->{$role}{$img})
+		 && !$env{'form.'.$role.'_del_'.$img}
+		 && $env{'form.'.$role.'_import_'.$img}) {
+		# import the old configured image from the .tab setting
+		# if they haven't provided a new one 
+		$domconfig->{$role}{$img} = 
+		    $env{'form.'.$role.'_import_'.$img};
+	    }
             if ($env{'form.'.$role.'_'.$img.'.filename'} ne '') {
-                my $configuserok; 
-                if (&Apache::lonnet::homeserver($configuname,$dom) eq 'no_host') {
-                    srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.
-                    my $configpass = &LONCAPA::Enrollment::create_password();
-                    $configuserok = &Apache::lonnet::modifyuser($dom,$configuname,'','internal',$configpass,'','','','','',undef,$servadm);
-                } else {
-                    $configuserok = 'ok';
-                }
+                my $error;
                 if ($configuserok eq 'ok') {
-                    my $result = 
-                      &Apache::lonnet::userfileupload($role.'_'.$img,'',
-                        'portfolio/'.$img,'','','',$configuname,$dom,'200','50');
-                    if ($result =~ m|(^/uploaded/.+)/([^/]+)$|) {
-                        my $urldir = $1;
-                        my $filename = $2; 
-                        my $allowresult = &Apache::lonnet::make_public_indefinitely($result);
-                        if ($allowresult eq 'ok') {
-                            &Apache::lonnet::make_public_indefinitely($urldir.'/tn-'.$filename);
-                            $confhash->{$role}{$img} = $result;
-                            $changes{$role}{$img} = 1;
+                    if ($switchserver) {
+                        $error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver);
+                    } else {
+                        if ($author_ok eq 'ok') {
+                            my ($result,$logourl) = 
+                                &publishlogo($r,'upload',$role.'_'.$img,
+                                           $dom,$confname,$img,$width,$height);
+                            if ($result eq 'ok') {
+                                $confhash->{$role}{$img} = $logourl;
+                                $changes{$role}{'images'}{$img} = 1;
+                            } else {
+                                $error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result);
+                            }
+                        } else {
+                            $error = &mt("Upload of [_1] image for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3].  Error was: [_4].",$choices{$img},$confname,$dom,$author_ok);
                         }
                     }
                 } else {
-                    my $error = &mt("Upload of image [_1] for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$img,$configuname,$dom,$configuserok);
-                   &Apache::lonnet::logthis($error);
-                   $errors .= '<li>'.$error.'</li>';
+                    $error = &mt("Upload of [_1] image for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$choices{$img},$confname,$dom,$configuserok);
+                }
+                if ($error) {
+                    &Apache::lonnet::logthis($error);
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
+                }
+            } elsif ($domconfig->{$role}{$img} ne '') {
+                if ($domconfig->{$role}{$img} !~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
+                    my $error;
+                    if ($configuserok eq 'ok') {
+# is confname an author?
+                        if ($switchserver eq '') {
+                            if ($author_ok eq 'ok') {
+                                my ($result,$logourl) = 
+                               &publishlogo($r,'copy',$domconfig->{$role}{$img},
+                                            $dom,$confname,$img,$width,$height);
+                                if ($result eq 'ok') {
+                                    $confhash->{$role}{$img} = $logourl;
+				    $changes{$role}{'images'}{$img} = 1;
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -1054,14 +1271,16 @@ sub modify_colors {
                     if ($domconfig->{$role}{$img} ne '') {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } else {
-                            $confhash->{$role}{$img} = $domconfig->{$role}{$img};
+                            if ($confhash->{$role}{$img} eq '') {
+                                $confhash->{$role}{$img} = $domconfig->{$role}{$img};
+                            }
                         }
                     } else {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
                 }  
@@ -1123,7 +1342,7 @@ sub default_change_checker {
     foreach my $img (@{$images}) {
         if ($env{'form.'.$role.'_del_'.$img}) {
             $confhash->{$role}{$img} = '';
-            $changes->{$role}{$img} = 1;
+            $changes->{$role}{'images'}{$img} = 1;
         }
     }
     if ($confhash->{$role}{'font'}) {
@@ -1160,7 +1379,11 @@ sub display_colorchgs {
                         if ($confhash->{$role}{$item} eq '') {
                             $resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>';
                         } else {
-                            $resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$confhash->{$role}{$item}).'</li>';
+                            my $newitem = $confhash->{$role}{$item};
+                            if ($key eq 'images') {
+                                $newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" valign="bottom" />';
+                            }
+                            $resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>';
                         }
                     }
                     if ($role ne 'login') {
@@ -1182,6 +1405,279 @@ sub display_colorchgs {
     return $resulttext;
 }
 
+sub thumb_dimensions {
+    return ('200','50');
+}
+
+sub check_dimensions {
+    my ($inputfile) = @_;
+    my ($fullwidth,$fullheight);
+    if ($inputfile =~ m|^[/\w.\-]+$|) {
+        if (open(PIPE,"identify $inputfile 2>&1 |")) {
+            my $imageinfo = <PIPE>;
+            if (!close(PIPE)) {
+                &Apache::lonnet::logthis("Failed to close PIPE opened to retrieve image information for $inputfile");
+            }
+            chomp($imageinfo);
+            my ($fullsize) = 
+                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/);
+            if ($fullsize) {
+                ($fullwidth,$fullheight) = split(/x/,$fullsize);
+            }
+        }
+    }
+    return ($fullwidth,$fullheight);
+}
+
+sub check_configuser {
+    my ($uhome,$dom,$confname,$servadm) = @_;
+    my ($configuserok,%currroles);
+    if ($uhome eq 'no_host') {
+        srand( time() ^ ($$ + ($$ << 15))  ); # Seed rand.
+        my $configpass = &LONCAPA::Enrollment::create_password();
+        $configuserok = 
+            &Apache::lonnet::modifyuser($dom,$confname,'','internal',
+                             $configpass,'','','','','',undef,$servadm);
+    } else {
+        $configuserok = 'ok';
+        %currroles = 
+            &Apache::lonnet::get_my_roles($confname,$dom,'userroles');
+    }
+    return ($configuserok,%currroles);
+}
+
+sub check_authorstatus {
+    my ($dom,$confname,%currroles) = @_;
+    my $author_ok;
+    if (!$currroles{':'.$dom.':au'}) {
+        my $start = time;
+        my $end = 0;
+        $author_ok = 
+            &Apache::lonnet::assignrole($dom,$confname,'/'.$dom.'/',
+                                        'au',$end,$start);
+    } else {
+        $author_ok = 'ok';
+    }
+    return $author_ok;
+}
+
+sub publishlogo {
+    my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight) = @_;
+    my ($output,$fname,$logourl);
+    if ($action eq 'upload') {
+        $fname=$env{'form.'.$formname.'.filename'};
+        chop($env{'form.'.$formname});
+    } else {
+        ($fname) = ($formname =~ /([^\/]+)$/);
+    }
+    $fname=&Apache::lonnet::clean_filename($fname);
+# See if there is anything left
+    unless ($fname) { return ('error: no uploaded file'); }
+    $fname="$subdir/$fname";
+    my $filepath='/home/'.$confname.'/public_html';
+    my ($fnamepath,$file,$fetchthumb);
+    $file=$fname;
+    if ($fname=~m|/|) {
+        ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
+    }
+    my @parts=split(/\//,$filepath.'/'.$fnamepath);
+    my $count;
+    for ($count=4;$count<=$#parts;$count++) {
+        $filepath.="/$parts[$count]";
+        if ((-e $filepath)!=1) {
+            mkdir($filepath,02770);
+        }
+    }
+    # Check for bad extension and disallow upload
+    if ($file=~/\.(\w+)$/ &&
+        (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+        $output = 
+            &mt('Invalid file extension ([_1]) - reserved for LONCAPA use.',$1); 
+    } elsif ($file=~/\.(\w+)$/ &&
+        !defined(&Apache::loncommon::fileembstyle($1))) {
+        $output = &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1);
+    } elsif ($file=~/\.(\d+)\.(\w+)$/) {
+        $output = &mt('File name not allowed a rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2);
+    } elsif (-d "$filepath/$file") {
+        $output = &mt('File name is a directory name - rename the file and re-upload');
+    } else {
+        my $source = $filepath.'/'.$file;
+        my $logfile;
+        if (!open($logfile,">>$source".'.log')) {
+            return (&mt('No write permission to Construction Space'));
+        }
+        print $logfile
+"\n================= Publish ".localtime()." ================\n".
+$env{'user.name'}.':'.$env{'user.domain'}."\n";
+# Save the file
+        if (!open(FH,'>'.$source)) {
+            &Apache::lonnet::logthis('Failed to create '.$source);
+            return (&mt('Failed to create file'));
+        }
+        if ($action eq 'upload') {
+            if (!print FH ($env{'form.'.$formname})) {
+                &Apache::lonnet::logthis('Failed to write to '.$source);
+                return (&mt('Failed to write file'));
+            }
+        } else {
+            my $original = &Apache::lonnet::filelocation('',$formname);
+            if(!copy($original,$source)) {
+                &Apache::lonnet::logthis('Failed to copy '.$original.' to '.$source);
+                return (&mt('Failed to write file'));
+            }
+        }
+        close(FH);
+        chmod(0660, $source); # Permissions to rw-rw---.
+
+        my $docroot=$r->dir_config('lonDocRoot');
+        my $targetdir=$docroot.'/res/'.$dom.'/'.$confname .'/'.$fnamepath;
+        my $copyfile=$targetdir.'/'.$file;
+
+        my @parts=split(/\//,$targetdir);
+        my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+        for (my $count=5;$count<=$#parts;$count++) {
+            $path.="/$parts[$count]";
+            if (!-e $path) {
+                print $logfile "\nCreating directory ".$path;
+                mkdir($path,02770);
+            }
+        }
+        my $versionresult;
+        if (-e $copyfile) {
+            $versionresult = &logo_versioning($targetdir,$file,$logfile);
+        } else {
+            $versionresult = 'ok';
+        }
+        if ($versionresult eq 'ok') {
+            if (copy($source,$copyfile)) {
+                print $logfile "\nCopied original source to ".$copyfile."\n";
+                $output = 'ok';
+                &write_metadata($dom,$confname,$formname,$targetdir,$file,$logfile);
+                $logourl = '/res/'.$dom.'/'.$confname.'/'.$fname;
+            } else {
+                print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
+                $output = &mt('Failed to copy file to RES space').", $!";
+            }
+            if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
+                my $inputfile = $filepath.'/'.$file;
+                my $outfile = $filepath.'/'.'tn-'.$file;
+                my ($fullwidth,$fullheight) = &check_dimensions($inputfile);
+                if ($fullwidth ne '' && $fullheight ne '') { 
+                    if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
+                        my $thumbsize = $thumbwidth.'x'.$thumbheight;
+                        system("convert -sample $thumbsize $inputfile $outfile");
+                        chmod(0660, $filepath.'/tn-'.$file);
+                        if (-e $outfile) {
+                            my $copyfile=$targetdir.'/tn-'.$file;
+                            if (copy($outfile,$copyfile)) {
+                                print $logfile "\nCopied source to ".$copyfile."\n";
+                                &write_metadata($dom,$confname,$formname,
+                                                $targetdir,'tn-'.$file,$logfile);
+                            } else {
+                                print $logfile "\nUnable to write ".$copyfile.
+                                               ':'.$!."\n";
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $output = $versionresult;
+        }
+    }
+    return ($output,$logourl);
+}
+
+sub logo_versioning {
+    my ($targetdir,$file,$logfile) = @_;
+    my $target = $targetdir.'/'.$file;
+    my ($maxversion,$fn,$extn,$output);
+    $maxversion = 0;
+    if ($file =~ /^(.+)\.(\w+)$/) {
+        $fn=$1;
+        $extn=$2;
+    }
+    opendir(DIR,$targetdir);
+    while (my $filename=readdir(DIR)) {
+        if ($filename=~/\Q$fn\E\.(\d+)\.\Q$extn\E$/) {
+            $maxversion=($1>$maxversion)?$1:$maxversion;
+        }
+    }
+    $maxversion++;
+    print $logfile "\nCreating old version ".$maxversion."\n";
+    my $copyfile=$targetdir.'/'.$fn.'.'.$maxversion.'.'.$extn;
+    if (copy($target,$copyfile)) {
+        print $logfile "Copied old target to ".$copyfile."\n";
+        $copyfile=$copyfile.'.meta';
+        if (copy($target.'.meta',$copyfile)) {
+            print $logfile "Copied old target metadata to ".$copyfile."\n";
+            $output = 'ok';
+        } else {
+            print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
+            $output = &mt('Failed to copy old meta').", $!, ";
+        }
+    } else {
+        print $logfile "Unable to write ".$copyfile.':'.$!."\n";
+        $output = &mt('Failed to copy old target').", $!, ";
+    }
+    return $output;
+}
+
+sub write_metadata {
+    my ($dom,$confname,$formname,$targetdir,$file,$logfile) = @_;
+    my (%metadatafields,%metadatakeys,$output);
+    $metadatafields{'title'}=$formname;
+    $metadatafields{'creationdate'}=time;
+    $metadatafields{'lastrevisiondate'}=time;
+    $metadatafields{'copyright'}='public';
+    $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
+                                         $env{'user.domain'};
+    $metadatafields{'authorspace'}=$confname.':'.$dom;
+    $metadatafields{'domain'}=$dom;
+    {
+        print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file;
+        my $mfh;
+        unless (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) {
+            $output = &mt('Could not write metadata');
+        }
+        foreach (sort keys %metadatafields) {
+            unless ($_=~/\./) {
+                my $unikey=$_;
+                $unikey=~/^([A-Za-z]+)/;
+                my $tag=$1;
+                $tag=~tr/A-Z/a-z/;
+                print $mfh "\n\<$tag";
+                foreach (split(/\,/,$metadatakeys{$unikey})) {
+                    my $value=$metadatafields{$unikey.'.'.$_};
+                    $value=~s/\"/\'\'/g;
+                    print $mfh ' '.$_.'="'.$value.'"';
+                }
+                print $mfh '>'.
+                    &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
+                        .'</'.$tag.'>';
+            }
+        }
+        $output = 'ok';
+        print $logfile "\nWrote metadata";
+        close($mfh);
+    }
+}
+
+sub check_switchserver {
+    my ($dom,$confname) = @_;
+    my ($allowed,$switchserver);
+    my $home = &Apache::lonnet::homeserver($confname,$dom);
+    if ($home eq 'no_host') {
+        $home = &Apache::lonnet::domain($dom,'primary');
+    }
+    my @ids=&Apache::lonnet::current_machine_ids();
+    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+    if (!$allowed) {
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
+    }
+    return $switchserver;
+}
+
 sub modify_quotas {
     my ($dom,%domconfig) = @_;
     my ($resulttext,%changes);
@@ -1193,6 +1689,7 @@ sub modify_quotas {
             $formhash{$1} = $env{$key};
         }
     }
+    $formhash{'default'} = $env{'form.defaultquota'};
     if (ref($domconfig{'quotas'}) eq 'HASH') {
         foreach my $key (keys(%{$domconfig{'quotas'}})) {
             if (exists($formhash{$key})) {
@@ -1227,7 +1724,8 @@ sub modify_quotas {
             $resulttext = &mt('No changes made to default quotas');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1245,10 +1743,17 @@ sub modify_autoenroll {
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages');
     my @offon = ('off','on');
+    my $sender_uname = $env{'form.sender_uname'};
+    my $sender_domain = $env{'form.sender_domain'};
+    if ($sender_domain eq '') {
+        $sender_uname = '';
+    } elsif ($sender_uname eq '') {
+        $sender_domain = '';
+    }
     my %autoenrollhash =  (
                        autoenroll => { run => $env{'form.autoenroll_run'},
-                                       sender_uname => $env{'form.sender_uname'},
-                                       sender_domain => $env{'form.sender_domain'},
+                                       sender_uname => $sender_uname,
+                                       sender_domain => $sender_domain,
 
                                 }
                      );
@@ -1261,21 +1766,13 @@ sub modify_autoenroll {
              }
         } elsif ($autorun) {
             if ($env{'form.autoenroll_run'} ne '1') {
-                $changes{'run'} = 1;
+                 $changes{'run'} = 1;
             }
         }
-        if (exists($currautoenroll{sender_uname})) {
-            if ($currautoenroll{'sender_uname'} ne $env{'form.sender_uname'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_uname'} ne $sender_uname) {
             $changes{'sender'} = 1;
         }
-        if (exists($currautoenroll{sender_domain})) {
-            if ($currautoenroll{'sender_domain'} ne $env{'form.sender_domain'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_domain'} ne $sender_domain) {
             $changes{'sender'} = 1;
         }
         if (keys(%changes) > 0) {
@@ -1284,14 +1781,19 @@ sub modify_autoenroll {
                 $resulttext .= '<li>'.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'</li>';
             }
             if ($changes{'sender'}) {
-                $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$env{'form.sender_uname'}.':'.$env{'form.sender_domain'}).'</li>';
+                if ($sender_uname eq '' || $sender_domain eq '') {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to default (course owner).").'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>';
+                }
             }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1312,7 +1814,7 @@ sub modify_autoupdate {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my %fieldtitles = &Apache::lonlocal::texthash (
                         id => 'Student/Employee ID',
-                        email => 'E-mail address',
+                        permanentemail => 'E-mail address',
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',
@@ -1410,7 +1912,137 @@ sub modify_autoupdate {
             $resulttext = &mt('No changes made to autoupdates');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
+    }
+    return $resulttext;
+}
+
+sub modify_directorysrch {
+    my ($dom,%domconfig) = @_;
+    my ($resulttext,%changes);
+    my %currdirsrch;
+    if (ref($domconfig{'directorysrch'}) eq 'HASH') {
+        foreach my $key (keys(%{$domconfig{'directorysrch'}})) {
+            $currdirsrch{$key} = $domconfig{'directorysrch'}{$key};
+        }
+    }
+    my %title = ( available => 'Directory search available',
+                  cansearch => 'Users permitted to search',
+                  searchby => 'Search types',
+                  searchtypes => 'Search latitude');
+
+    my @offon = ('off','on');
+
+    my @cansearch = &Apache::loncommon::get_env_multiple('form.cansearch');
+    my @searchby = &Apache::loncommon::get_env_multiple('form.searchby');
+
+    if (ref($currdirsrch{'cansearch'}) eq 'ARRAY') {
+        foreach my $type (@{$currdirsrch{'cansearch'}}) {
+            if (!grep(/^\Q$type\E$/,@cansearch)) {
+                push(@{$changes{'cansearch'}},$type);
+            }
+        }
+        foreach my $type (@cansearch) {
+            if (!grep(/^\Q$type\E$/,@{$currdirsrch{'cansearch'}})) {
+                push(@{$changes{'cansearch'}},$type);
+            }
+        }
+    } else {
+        push(@{$changes{'cansearch'}},@cansearch);
+    }
+
+    if (ref($currdirsrch{'searchby'}) eq 'ARRAY') {
+        foreach my $by (@{$currdirsrch{'searchby'}}) {
+            if (!grep(/^\Q$by\E$/,@searchby)) {
+                push(@{$changes{'searchby'}},$by);
+            }
+        }
+        foreach my $by (@searchby) {
+            if (!grep(/^\Q$by\E$/,@{$currdirsrch{'searchby'}})) {
+                push(@{$changes{'searchby'}},$by);
+            }
+        }
+    } else {
+        push(@{$changes{'searchby'}},@searchby);
+    }
+    
+    my %dirsrch_hash =  (
+            directorysrch => { available => $env{'form.dirsrch_available'},
+                               cansearch => \@cansearch,
+                               searchby => \@searchby,
+                               searchtypes => $env{'form.searchtypes'},
+                             }
+            );
+    my $putresult = &Apache::lonnet::put_dom('configuration',\%dirsrch_hash,
+                                             $dom);
+    if ($putresult eq 'ok') {
+        if (exists($currdirsrch{'available'})) {
+             if ($currdirsrch{'available'} ne $env{'form.dirsrch_available'}) {
+                 $changes{'available'} = 1;
+             }
+        } else {
+            if ($env{'form.dirsrch_available'} eq '1') {
+                $changes{'available'} = 1;
+            }
+        }
+        if (exists($currdirsrch{'searchtypes'})) {
+             if ($currdirsrch{'searchtypes'} ne $env{'form.searchtypes'}) {
+                 $changes{'searchtypes'} = 1;
+             }
+        } else {
+            if ($env{'form.searchtypes'}) {
+                $changes{'searchtypes'} = 1;
+            }
+        }
+        if (keys(%changes) > 0) {
+            $resulttext = &mt('Changes made:').'<ul>';
+            if ($changes{'available'}) {
+                $resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>';
+            }
+            if (ref($changes{'cansearch'}) eq 'ARRAY') {
+                my ($othertitle,$usertypes,$types) = &sorted_inst_types($dom);
+                my $chgtext;
+                foreach my $type (@cansearch) {
+                    if (defined($usertypes->{$type})) {
+                        $chgtext .= $usertypes->{$type}.'; ';
+                    }
+                }
+                if (grep(/^default$/,@cansearch)) {
+                    $chgtext .= $othertitle;
+                } else {
+                    $chgtext =~ s/\; $//;
+                }
+                $resulttext .= '<li>'.&mt("$title{'cansearch'} set to: [_1]",$chgtext).'</li>';
+            }
+            if (ref($changes{'searchby'}) eq 'ARRAY') {
+                my ($searchtitles,$titleorder) = &sorted_searchtitles();
+                my $chgtext;
+                foreach my $type (@{$titleorder}) {
+                    if (grep(/^\Q$type\E$/,@searchby)) {
+                        if (defined($searchtitles->{$type})) {
+                            $chgtext .= $searchtitles->{$type}.'; ';
+                        }
+                    }
+                }
+                $chgtext =~ s/\; $//;
+                $resulttext .= '<li>'.&mt("$title{'searchby'} set to: [_1]",$chgtext).'</li>';
+            }
+            if ($changes{'searchtypes'}) {
+                my %srchtypes_desc = ( 
+                                       exact => 'Exact match only',
+                                       contains => 'Contains is a match',
+                                       specify => 'Match type specifiable',
+                                     );
+                $resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"$srchtypes_desc{$env{'form.searchtypes'}}\"").'</li>';
+            }
+            $resulttext .= '</ul>';
+        } else {
+            $resulttext = &mt('No changes made to institution directory search settings');
+        }
+    } else {
+        $resulttext = '<span class="LC_error">'.
+            &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }